fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-11 16:30:39 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

libnl3: Fix ESRCH return types

Browse source 
ESRCH becomes NLE_OBJ_NOTFOUND. Includes workaround for libnl
  aliased return value where ESRCH is being converted to a generic
  unspecified error by libnl [1].

  [1] http://git.kernel.org/?p=libs/netlink/libnl.git;a=commit;h=7e9d5f
This commit is contained in:
Alfredo Matos 2011-08-04 10:26:21 +01:00 • committed by Dan Williams
parent 790c16c9f2
commit 2e32003fd2
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/nm-netlink-utils.c
View file

@ -181,7 +181,12 @@ nm_netlink_route_delete (struct rtnl_route *route)
nlh = nm_netlink_get_default_handle ();
err = rtnl_route_delete (nlh, route, 0);
return (err && (err != -NLE_RANGE)) ? FALSE : TRUE;
/* Workaround libnl BUG: ESRCH is aliased to generic NLE_FAILURE
* See: http://git.kernel.org/?p=libs/netlink/libnl.git;a=commit;h=7e9d5f */
if (err == -NLE_FAILURE)
err = -NLE_OBJ_NOTFOUND;
return (err && (err != -NLE_OBJ_NOTFOUND)) ? FALSE : TRUE;
}

10
src/nm-system.c
View file

@ -136,7 +136,7 @@ nm_system_device_set_ip4_route (int ifindex,
/* Add the route */
err = rtnl_route_add (nlh, route, 0);
if (err == -ESRCH && ip4_gateway) {
if (((err == -NLE_OBJ_NOTFOUND) || (err == -NLE_FAILURE)) && ip4_gateway) {
/* Gateway might be over a bridge; try adding a route to gateway first */
struct rtnl_route *route2;
@ -524,7 +524,7 @@ nm_system_set_ip6_route (int ifindex,
/* Add the route */
err = rtnl_route_add (nlh, route, 0);
if (err == -ESRCH && ip6_gateway) {
if (((err == -NLE_OBJ_NOTFOUND) || (err == -NLE_FAILURE)) && ip6_gateway) {
/* Gateway might be over a bridge; try adding a route to gateway first */
struct rtnl_route *route2;
@ -953,7 +953,7 @@ nm_system_replace_default_ip4_route_vpn (int ifindex,
err = replace_default_ip4_route (ifindex, int_gw, mss);
if (err == 0) {
return TRUE;
} else if (err != -ESRCH) {
} else if ((err != -NLE_OBJ_NOTFOUND) && (err != -NLE_FAILURE)) {
nm_log_err (LOGD_DEVICE | LOGD_IP4,
"(%s): failed to set IPv4 default route: %d",
iface, err);
@ -999,7 +999,7 @@ nm_system_replace_default_ip4_route (int ifindex, guint32 gw, guint32 mss)
err = replace_default_ip4_route (ifindex, gw, mss);
if (err == 0) {
return TRUE;
} else if (err != -ESRCH) {
} else if ((err != -NLE_OBJ_NOTFOUND) && (err != -NLE_FAILURE)) {
nm_log_err (LOGD_DEVICE | LOGD_IP4,
"(%s): failed to set IPv4 default route: %d",
iface, err);
@ -1141,7 +1141,7 @@ nm_system_replace_default_ip6_route (int ifindex, const struct in6_addr *gw)
err = replace_default_ip6_route (ifindex, gw);
if (err == 0)
return TRUE;
if (err != -ESRCH) {
if ((err != -NLE_OBJ_NOTFOUND) && (err != -NLE_FAILURE)) {
nm_log_err (LOGD_DEVICE | LOGD_IP6,
"(%s): failed to set IPv6 default route: %d",
iface, err);