fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-28 18:00:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

netlink: replace libnl 1.x functions

Browse source 
Confusingly, nm-platform-compat's rtnl_link_set_oif adds a new nexthop
with ifindex set, while rtnl_link_set_gateway sets gateway for an
existing nexthop. Keeping the behavior to avoid potential problems.
This commit is contained in:
Pavel Šimerda 2013-03-05 21:33:53 +01:00
parent 92481c6a6a
commit 47a3e24d32
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -21,7 +21,6 @@
#include "logging/nm-logging.h"
#include "nm-netlink-utils.h"
#include "nm-netlink-monitor.h"
#include "nm-netlink-compat.h"
#include <arpa/inet.h>
#include <netinet/in.h>
@ -126,14 +125,18 @@ nm_netlink_route_new (int ifindex,
{
va_list var_args;
struct rtnl_route *route;
struct rtnl_nexthop *nexthop;
NmNlProp prop = NMNL_PROP_INVALID;
int value;
route = rtnl_route_alloc ();
g_return_val_if_fail (route != NULL, NULL);
if (ifindex > 0)
rtnl_route_set_oif (route, ifindex);
if (ifindex > 0) {
nexthop = rtnl_route_nh_alloc();
rtnl_route_nh_set_ifindex (nexthop, ifindex);
rtnl_route_add_nexthop (route, nexthop);
}
if (family != AF_UNSPEC)
rtnl_route_set_family (route, family);
if (mss > 0)
@ -223,7 +226,10 @@ _route_add (struct rtnl_route *route,
if (gw_addr) {
nl_addr_set_prefixlen (gw_addr, 0);
rtnl_route_set_gateway (route, gw_addr);
if (rtnl_route_get_nnexthops (route) == 1)
rtnl_route_nh_set_gateway (rtnl_route_nexthop_n (route, 0), gw_addr);
else
nm_log_warn (LOGD_DEVICE, "Netlink didn't have exactly one nexthop.");
rtnl_route_set_scope (route, RT_SCOPE_UNIVERSE);
nl_addr_put (gw_addr);
} else
@ -350,7 +356,7 @@ dump_route (struct rtnl_route *route)
}
nm_log_dbg (log_level, " route idx %d family %s (%d) addr %s/%d",
rtnl_route_get_oif (route),
rtnl_route_nh_get_ifindex (rtnl_route_nexthop_n (route, 0)),
sf, family,
strlen (buf4) ? buf4 : (strlen (buf6) ? buf6 : "<unknown>"),
prefixlen);
@ -378,11 +384,15 @@ foreach_route_cb (struct nl_object *object, void *user_data)
if (info->out_route)
return;
/* Only care about single-nexthop routes */
if (rtnl_route_get_nnexthops (route) != 1)
return;
if (nm_logging_level_enabled (LOGL_DEBUG))
dump_route (route);
if ( info->ifindex > 0
&& rtnl_route_get_oif (route) != info->ifindex)
&& rtnl_route_nh_get_ifindex (rtnl_route_nexthop_n (route, 0)) != info->ifindex)
return;
if ( info->scope != RT_SCOPE_UNIVERSE