From a172ccdd6331351c51bcc0bf6f080e4cd3f561a2 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Wed, 11 Jun 2008 18:04:43 +0000 Subject: [PATCH] 2008-06-11 Dan Williams * src/NetworkManagerSystem.c - (nm_system_device_set_ip4_route, nm_system_device_replace_default_ip4_route): check for the right return value from rtnl_route_add() to know when to add a gateway route (from Tambet) git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3749 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 8 ++++++++ src/NetworkManagerSystem.c | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9b2bcb33a1..ce5ff5a64b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-06-11 Dan Williams + + * src/NetworkManagerSystem.c + - (nm_system_device_set_ip4_route, + nm_system_device_replace_default_ip4_route): check for the right + return value from rtnl_route_add() to know when to add a gateway + route (from Tambet) + 2008-06-11 Dan Williams * src/NetworkManagerPolicy.c diff --git a/src/NetworkManagerSystem.c b/src/NetworkManagerSystem.c index 1d61ff3e62..f27eddf439 100644 --- a/src/NetworkManagerSystem.c +++ b/src/NetworkManagerSystem.c @@ -172,7 +172,7 @@ nm_system_device_set_ip4_route (const char *iface, /* Add the route */ err = rtnl_route_add (nlh, route, 0); - if (err == ESRCH && ip4_gateway) { + if (err == -ESRCH && ip4_gateway) { /* Gateway might be over a bridge; try adding a route to gateway first */ struct rtnl_route *route2; @@ -590,7 +590,7 @@ nm_system_device_replace_default_ip4_route (const char *iface, guint32 gw, guint if (err == 0) { /* Everything good */ goto out; - } else if (err != ESRCH) { + } else if (err != -ESRCH) { nm_warning ("rtnl_route_add() returned error %s (%d)\n%s", strerror (err), err, nl_geterror()); goto out;