diff options
| author | Dan Williams <dcbw@redhat.com> | 2008-08-07 13:41:04 +0000 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2008-08-07 13:41:04 +0000 |
| commit | 2dbd644fe924345aae6edf74278ba428ad0a478a (patch) | |
| tree | 924d331123eff1b00f5e2c69bf35c4357d65e9dc /src/NetworkManagerSystem.c | |
| parent | 6d7474e565046b360e2b7ff1b84b6b1b30c71caa (diff) | |
| download | NetworkManager-modem-manager.tar.gz | |
Merge from trunk r3901modem-manager
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/branches/modem-manager@3902 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
Diffstat (limited to 'src/NetworkManagerSystem.c')
| -rw-r--r-- | src/NetworkManagerSystem.c | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/src/NetworkManagerSystem.c b/src/NetworkManagerSystem.c index 8aa885c0f2..bf6b11d792 100644 --- a/src/NetworkManagerSystem.c +++ b/src/NetworkManagerSystem.c @@ -107,6 +107,7 @@ nm_system_device_set_ip4_route (const char *iface, guint32 ip4_dest, guint32 ip4_prefix, guint32 ip4_gateway, + guint32 metric, int mss) { struct nl_handle *nlh; @@ -148,6 +149,10 @@ nm_system_device_set_ip4_route (const char *iface, } } + /* Metric */ + if (metric) + rtnl_route_set_prio (route, metric); + /* Add the route */ err = rtnl_route_add (nlh, route, 0); if (err == -ESRCH && ip4_gateway) { @@ -284,14 +289,15 @@ nm_system_device_set_from_ip4_config (const char *iface, sleep (1); - len = nm_ip4_config_get_num_static_routes (config); + len = nm_ip4_config_get_num_routes (config); for (i = 0; i < len; i++) { - const NMSettingIP4Address *route = nm_ip4_config_get_static_route (config, i); + const NMSettingIP4Route *route = nm_ip4_config_get_route (config, i); nm_system_device_set_ip4_route (iface, config, route->address, route->prefix, - route->gateway, + route->next_hop, + route->metric, nm_ip4_config_get_mss (config)); } @@ -344,7 +350,7 @@ nm_system_vpn_device_set_from_ip4_config (NMDevice *active_device, } nm_system_device_set_ip4_route (nm_device_get_ip_iface (active_device), - ad_config, vpn_gw, 32, ad_gw, + ad_config, vpn_gw, 32, ad_gw, 0, nm_ip4_config_get_mss (config)); } } @@ -362,14 +368,15 @@ nm_system_vpn_device_set_from_ip4_config (NMDevice *active_device, nm_system_device_set_mtu (iface, nm_ip4_config_get_mtu (config)); /* Set routes */ - num = nm_ip4_config_get_num_static_routes (config); + num = nm_ip4_config_get_num_routes (config); for (i = 0; i < num; i++) { - const NMSettingIP4Address *route = nm_ip4_config_get_static_route (config, i); + const NMSettingIP4Route *route = nm_ip4_config_get_route (config, i); nm_system_device_set_ip4_route (iface, config, route->address, route->prefix, - route->gateway, + route->next_hop, + route->metric, nm_ip4_config_get_mss (config)); } |