summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS3
-rw-r--r--lib/network/tools.pm14
2 files changed, 16 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 9df811d..7c50c3a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+- prevent segfaulting on forking when glib/gtk create threads behind us
+ (mga#12041)
+
2.5
- fix mga web url (mga#11972)
- do not request password for draknetcenter (mga#12017)
diff --git a/lib/network/tools.pm b/lib/network/tools.pm
index c80c269..c8e0cf6 100644
--- a/lib/network/tools.pm
+++ b/lib/network/tools.pm
@@ -216,8 +216,20 @@ sub get_default_connection {
return $gw_intf, get_interface_status($gw_intf), $net->{resolv}{dnsServer};
}
+#- returns the gateway address
+# advantage over get_default_connection() is that we don't fork,
+# which prevent segfaulting when glib/gtk create threads behind us (mga#12041)
+sub get_gw_address() {
+ my $gateway;
+ foreach (cat_('/proc/net/route')) {
+ $gateway = $1 if /^\S+\s+00000000\s+([0-9A-F]+)/;
+ }
+ # Linux gives it as a hex number in network byte order:
+ $gateway ? join(".", unpack "CCCC", pack "L", hex $gateway) : undef;
+}
+
sub has_network_connection() {
- (undef, undef, my $gw_address) = get_default_connection({});
+ my $gw_address = get_gw_address();
to_bool($gw_address);
}