diff options
| author | carlosg <carlosg> | 2006-10-05 22:40:14 +0000 |
|---|---|---|
| committer | carlosg <carlosg> | 2006-10-05 22:40:14 +0000 |
| commit | 6da9dca8b8f4e97a16fe2a3399e6d54fa94c7137 (patch) | |
| tree | 9bcae239c98bf3e0a30f39458086680feab5aac7 | |
| parent | f47a9349484ace8adec505c846b54da36b7321d8 (diff) | |
2006-10-06 Carlos Garnacho <carlosg@gnome.org>
* IfacesConfig.pm, Network/Ifaces.pm: save/restore gateway settings
for static interfaces.
* configure.in: preemptively bump minor number.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | IfacesConfig.pm | 12 | ||||
| -rw-r--r-- | Network/Ifaces.pm | 12 | ||||
| -rw-r--r-- | configure.in | 2 |
4 files changed, 19 insertions, 13 deletions
@@ -1,3 +1,9 @@ +2006-10-06 Carlos Garnacho <carlosg@gnome.org> + + * IfacesConfig.pm, Network/Ifaces.pm: save/restore gateway settings + for static interfaces. + * configure.in: preemptively bump minor number. + 2006-10-05 Carlos Garnacho <carlosg@gnome.org> Ported to 1.9.x a huge and incredible patch by Darren Kenny diff --git a/IfacesConfig.pm b/IfacesConfig.pm index 54b5cfe..7439a2c 100644 --- a/IfacesConfig.pm +++ b/IfacesConfig.pm @@ -45,16 +45,16 @@ sub new } dbus_method ("get", [], - [[ "array", [ "struct", "string", "int32", "int32", "int32", "string", "string", "string", "string" ]], - [ "array", [ "struct", "string", "int32", "int32", "int32", "string", "string", "string", "string", "string", "int32", "string" ]], - [ "array", [ "struct", "string", "int32", "int32", "int32", "string", "string", "string", "string" ]], + [[ "array", [ "struct", "string", "int32", "int32", "int32", "string", "string", "string", "string", "string" ]], + [ "array", [ "struct", "string", "int32", "int32", "int32", "string", "string", "string", "string", "string", "string", "int32", "string" ]], + [ "array", [ "struct", "string", "int32", "int32", "int32", "string", "string", "string", "string", "string" ]], [ "array", [ "struct", "string", "int32", "int32", "string", "string" ]], [ "array", [ "struct", "string", "int32", "int32", "string", "string", "string", "int32", "int32", "string", "string", "int32", "int32", "int32", "int32" ]], [ "array", [ "struct", "string", "int32", "int32", "string", "string", "string", "string", "int32", "int32", "int32", "int32" ]]]); dbus_method ("set", - [[ "array", [ "struct", "string", "int32", "int32", "int32", "string", "string", "string", "string" ]], - [ "array", [ "struct", "string", "int32", "int32", "int32", "string", "string", "string", "string", "string", "int32", "string" ]], - [ "array", [ "struct", "string", "int32", "int32", "int32", "string", "string", "string", "string" ]], + [[ "array", [ "struct", "string", "int32", "int32", "int32", "string", "string", "string", "string", "string" ]], + [ "array", [ "struct", "string", "int32", "int32", "int32", "string", "string", "string", "string", "string", "string", "int32", "string" ]], + [ "array", [ "struct", "string", "int32", "int32", "int32", "string", "string", "string", "string", "string" ]], [ "array", [ "struct", "string", "int32", "int32", "string", "string" ]], [ "array", [ "struct", "string", "int32", "int32", "string", "string", "string", "int32", "int32", "string", "string", "int32", "int32", "int32", "int32" ]], [ "array", [ "struct", "string", "int32", "int32", "string", "string", "string", "string", "int32", "int32", "int32", "int32" ]]], []); diff --git a/Network/Ifaces.pm b/Network/Ifaces.pm index 2f2022e..9c9e4df 100644 --- a/Network/Ifaces.pm +++ b/Network/Ifaces.pm @@ -3633,14 +3633,14 @@ sub get push @$ethernet, [ $$iface{"dev"}, $$iface{"enabled"}, $$iface{"auto"}, &bootproto_to_code ($iface), $$iface{"address"}, $$iface{"netmask"}, - $$iface{"network"}, $$iface{"broadcast"} ]; + $$iface{"network"}, $$iface{"broadcast"}, $$iface{"gateway"} ]; } elsif ($type eq "wireless") { push @$wireless, [ $$iface{"dev"}, $$iface{"enabled"}, $$iface{"auto"}, &bootproto_to_code ($iface), $$iface{"address"}, $$iface{"netmask"}, - $$iface{"network"}, $$iface{"broadcast"}, + $$iface{"network"}, $$iface{"broadcast"}, $$iface{"gateway"}, $$iface{"essid"}, ($$iface{"key_type"} eq "ascii") ? 0 : 1, $$iface{"key"} ]; @@ -3650,7 +3650,7 @@ sub get push @$irlan, [ $$iface{"dev"}, $$iface{"enabled"}, $$iface{"auto"}, &bootproto_to_code ($iface), $$iface{"address"}, $$iface{"netmask"}, - $$iface{"network"}, $$iface{"broadcast"} ]; + $$iface{"network"}, $$iface{"broadcast"}, $$iface{"gateway"} ]; } elsif ($type eq "plip") { @@ -3692,7 +3692,7 @@ sub set $hash{$$iface[0]} = { "dev" => $$iface[0], "enabled" => $$iface[1], "auto" => $$iface[2], "bootproto" => $bootproto, - "address" => $$iface[4], "netmask" => $$iface[5] }; + "address" => $$iface[4], "netmask" => $$iface[5], "gateway" => $$iface[8] }; } foreach $iface (@$wireless) @@ -3702,7 +3702,7 @@ sub set $hash{$$iface[0]} = { "dev" => $$iface[0], "enabled" => $$iface[1], "auto" => $$iface[2], "bootproto" => $bootproto, - "address" => $$iface[4], "netmask" => $$iface[5], + "address" => $$iface[4], "netmask" => $$iface[5], "gateway" => $$iface[8], "essid" => $$iface[8], "key_type" => $key_type, "key" => $$iface[10] }; } @@ -3711,7 +3711,7 @@ sub set $bootproto = ($$iface[3] == 2) ? "dhcp" : "none"; $hash{$$iface[0]} = { "dev" => $$iface[0], "enabled" => $$iface[1], "auto" => $$iface[2], "bootproto" => $bootproto, - "address" => $$iface[4], "netmask" => $$iface[5] }; + "address" => $$iface[4], "netmask" => $$iface[5], "gateway" => $$iface[8] }; } foreach $iface (@$plip) diff --git a/configure.in b/configure.in index 5a4ca31..e834093 100644 --- a/configure.in +++ b/configure.in @@ -2,7 +2,7 @@ AC_PREREQ(2.52) dnl ============================================================== dnl Process this file with autoconf to produce a configure script. dnl ============================================================== -AC_INIT(system-tools-backends,1.9.6) +AC_INIT(system-tools-backends,1.9.7) AC_CONFIG_AUX_DIR(.) AC_CONFIG_HEADERS(config.h) AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) |