fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-04-21 10:00:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

platform: merge branch 'th/platform_link_logging'

Browse source 
Add to_string() functions and some refactoring.

https://bugzilla.gnome.org/show_bug.cgi?id=725612

Signed-off-by: Thomas Haller <thaller@redhat.com>
This commit is contained in:
Thomas Haller 2014-03-13 21:44:20 +01:00
commit 45a326d9c7
4 changed files with 275 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/devices/nm-device.c
View file

@ -1069,6 +1069,9 @@ link_disconnect_action_cb (gpointer user_data)
NMDevice *device = NM_DEVICE (user_data);
NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (device);
nm_log_dbg (LOGD_DEVICE, "(%s): link disconnected (calling deferred action) (id=%u)",
nm_device_get_iface (device), priv->carrier_defer_id);
priv->carrier_defer_id = 0;
nm_log_info (LOGD_DEVICE, "(%s): link disconnected (calling deferred action)",
@ -1079,6 +1082,19 @@ link_disconnect_action_cb (gpointer user_data)
return FALSE;
}
static void
link_disconnect_action_cancel (NMDevice *self)
{
NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self);
if (priv->carrier_defer_id) {
g_source_remove (priv->carrier_defer_id);
nm_log_dbg (LOGD_DEVICE, "(%s): link disconnected (canceling deferred action) (id=%u)",
nm_device_get_iface (self), priv->carrier_defer_id);
priv->carrier_defer_id = 0;
}
}
void
nm_device_set_carrier (NMDevice *device, gboolean carrier)
{
@ -1095,10 +1111,7 @@ nm_device_set_carrier (NMDevice *device, gboolean carrier)
if (priv->carrier) {
nm_log_info (LOGD_DEVICE, "(%s): link connected", iface);
if (priv->carrier_defer_id) {
g_source_remove (priv->carrier_defer_id);
priv->carrier_defer_id = 0;
}
link_disconnect_action_cancel (device);
klass->carrier_changed (device, TRUE);
if (priv->carrier_wait_id) {
@ -1114,6 +1127,8 @@ nm_device_set_carrier (NMDevice *device, gboolean carrier)
iface, LINK_DISCONNECT_DELAY);
priv->carrier_defer_id = g_timeout_add_seconds (LINK_DISCONNECT_DELAY,
link_disconnect_action_cb, device);
nm_log_dbg (LOGD_DEVICE, "(%s): link disconnected (deferring action for %d seconds) (id=%u)",
iface, LINK_DISCONNECT_DELAY, priv->carrier_defer_id);
}
}
@ -5580,10 +5595,7 @@ dispose (GObject *object)
g_clear_pointer (&priv->ip6_saved_properties, g_hash_table_unref);
if (priv->carrier_defer_id) {
g_source_remove (priv->carrier_defer_id);
priv->carrier_defer_id = 0;
}
link_disconnect_action_cancel (self);
if (priv->con_provider) {
g_signal_handlers_disconnect_by_func (priv->con_provider, cp_connection_added, self);

209
src/platform/nm-linux-platform.c
View file

@ -76,6 +76,8 @@ typedef struct {
G_DEFINE_TYPE (NMLinuxPlatform, nm_linux_platform, NM_TYPE_PLATFORM)
static const char *to_string_object (NMPlatform *platform, struct nl_object *obj);
void
nm_linux_platform_setup (void)
{
@ -781,15 +783,15 @@ udev_get_driver (NMPlatform *platform, GUdevDevice *device, int ifindex)
return driver;
}
static void
static gboolean
init_link (NMPlatform *platform, NMPlatformLink *info, struct rtnl_link *rtnllink)
{
NMLinuxPlatformPrivate *priv = NM_LINUX_PLATFORM_GET_PRIVATE (platform);
GUdevDevice *udev_device;
memset (info, 0, sizeof (*info));
g_return_val_if_fail (rtnllink, FALSE);
g_assert (rtnllink);
memset (info, 0, sizeof (*info));
info->ifindex = rtnl_link_get_ifindex (rtnllink);
g_strlcpy (info->name, rtnl_link_get_name (rtnllink), sizeof (info->name));
@ -812,6 +814,8 @@ init_link (NMPlatform *platform, NMPlatformLink *info, struct rtnl_link *rtnllin
info->driver = "unknown";
info->udi = g_udev_device_get_sysfs_path (udev_device);
}
return TRUE;
}
/* Hack: Empty bridges and bonds have IFF_LOWER_UP flag and therefore they break
@ -858,13 +862,13 @@ hack_empty_master_iff_lower_up (NMPlatform *platform, struct nl_object *object)
rtnl_link_unset_flags (rtnllink, IFF_LOWER_UP);
}
static void
static gboolean
init_ip4_address (NMPlatformIP4Address *address, struct rtnl_addr *rtnladdr)
{
struct nl_addr *nladdr = rtnl_addr_get_local (rtnladdr);
struct nl_addr *nlpeer = rtnl_addr_get_peer (rtnladdr);
g_assert (nladdr);
g_return_val_if_fail (nladdr, FALSE);
memset (address, 0, sizeof (*address));
@ -873,15 +877,23 @@ init_ip4_address (NMPlatformIP4Address *address, struct rtnl_addr *rtnladdr)
address->timestamp = nm_utils_get_monotonic_timestamp_s ();
address->lifetime = rtnl_addr_get_valid_lifetime (rtnladdr);
address->preferred = rtnl_addr_get_preferred_lifetime (rtnladdr);
g_assert (nl_addr_get_len (nladdr) == sizeof (address->address));
if (!nladdr || nl_addr_get_len (nladdr) != sizeof (address->address)) {
g_return_val_if_reached (FALSE);
return FALSE;
}
memcpy (&address->address, nl_addr_get_binary_addr (nladdr), sizeof (address->address));
if (nlpeer) {
g_assert (nl_addr_get_len (nlpeer) == sizeof (address->peer_address));
if (nl_addr_get_len (nlpeer) != sizeof (address->peer_address)) {
g_return_val_if_reached (FALSE);
return FALSE;
}
memcpy (&address->peer_address, nl_addr_get_binary_addr (nlpeer), sizeof (address->peer_address));
}
return TRUE;
}
static void
static gboolean
init_ip6_address (NMPlatformIP6Address *address, struct rtnl_addr *rtnladdr)
{
struct nl_addr *nladdr = rtnl_addr_get_local (rtnladdr);
@ -895,12 +907,20 @@ init_ip6_address (NMPlatformIP6Address *address, struct rtnl_addr *rtnladdr)
address->lifetime = rtnl_addr_get_valid_lifetime (rtnladdr);
address->preferred = rtnl_addr_get_preferred_lifetime (rtnladdr);
address->flags = rtnl_addr_get_flags (rtnladdr);
g_assert (nl_addr_get_len (nladdr) == sizeof (address->address));
if (!nladdr || nl_addr_get_len (nladdr) != sizeof (address->address)) {
g_return_val_if_reached (FALSE);
return FALSE;
}
memcpy (&address->address, nl_addr_get_binary_addr (nladdr), sizeof (address->address));
if (nlpeer) {
g_assert (nl_addr_get_len (nlpeer) == sizeof (address->peer_address));
if (nl_addr_get_len (nlpeer) != sizeof (address->peer_address)) {
g_return_val_if_reached (FALSE);
return FALSE;
}
memcpy (&address->peer_address, nl_addr_get_binary_addr (nlpeer), sizeof (address->peer_address));
}
return TRUE;
}
static gboolean
@ -923,11 +943,17 @@ init_ip4_route (NMPlatformIP4Route *route, struct rtnl_route *rtnlroute)
route->plen = nl_addr_get_prefixlen (dst);
/* Workaround on previous workaround for libnl default route prefixlen bug. */
if (nl_addr_get_len (dst)) {
g_assert (nl_addr_get_len (dst) == sizeof (route->network));
if (nl_addr_get_len (dst) != sizeof (route->network)) {
g_return_val_if_reached (FALSE);
return FALSE;
}
memcpy (&route->network, nl_addr_get_binary_addr (dst), sizeof (route->network));
}
if (gw) {
g_assert (nl_addr_get_len (gw) == sizeof (route->network));
if (nl_addr_get_len (gw) != sizeof (route->network)) {
g_return_val_if_reached (FALSE);
return FALSE;
}
memcpy (&route->gateway, nl_addr_get_binary_addr (gw), sizeof (route->gateway));
}
route->metric = rtnl_route_get_priority (rtnlroute);
@ -956,11 +982,17 @@ init_ip6_route (NMPlatformIP6Route *route, struct rtnl_route *rtnlroute)
route->plen = nl_addr_get_prefixlen (dst);
/* Workaround on previous workaround for libnl default route prefixlen bug. */
if (nl_addr_get_len (dst)) {
g_assert (nl_addr_get_len (dst) == sizeof (route->network));
if (nl_addr_get_len (dst) != sizeof (route->network)) {
g_return_val_if_reached (FALSE);
return FALSE;
}
memcpy (&route->network, nl_addr_get_binary_addr (dst), sizeof (route->network));
}
if (gw) {
g_assert (nl_addr_get_len (gw) == sizeof (route->network));
if (nl_addr_get_len (gw) != sizeof (route->network)) {
g_return_val_if_reached (FALSE);
return FALSE;
}
memcpy (&route->gateway, nl_addr_get_binary_addr (gw), sizeof (route->gateway));
}
route->metric = rtnl_route_get_priority (rtnlroute);
@ -969,6 +1001,92 @@ init_ip6_route (NMPlatformIP6Route *route, struct rtnl_route *rtnlroute)
return TRUE;
}
static char to_string_buffer[255];
#define SET_AND_RETURN_STRING_BUFFER(...) \
G_STMT_START { \
g_snprintf (to_string_buffer, sizeof (to_string_buffer), ## __VA_ARGS__); \
g_return_val_if_reached (to_string_buffer); \
return to_string_buffer; \
} G_STMT_END
static const char *
to_string_link (NMPlatform *platform, struct rtnl_link *obj)
{
NMPlatformLink pl_obj;
if (init_link (platform, &pl_obj, obj))
return nm_platform_link_to_string (&pl_obj);
SET_AND_RETURN_STRING_BUFFER ("(invalid link %p)", obj);
}
static const char *
to_string_ip4_address (struct rtnl_addr *obj)
{
NMPlatformIP4Address pl_obj;
if (init_ip4_address (&pl_obj, obj))
return nm_platform_ip4_address_to_string (&pl_obj);
SET_AND_RETURN_STRING_BUFFER ("(invalid ip4 address %p)", obj);
}
static const char *
to_string_ip6_address (struct rtnl_addr *obj)
{
NMPlatformIP6Address pl_obj;
if (init_ip6_address (&pl_obj, obj))
return nm_platform_ip6_address_to_string (&pl_obj);
SET_AND_RETURN_STRING_BUFFER ("(invalid ip6 address %p)", obj);
}
static const char *
to_string_ip4_route (struct rtnl_route *obj)
{
NMPlatformIP4Route pl_obj;
if (init_ip4_route (&pl_obj, obj))
return nm_platform_ip4_route_to_string (&pl_obj);
SET_AND_RETURN_STRING_BUFFER ("(invalid ip4 route %p)", obj);
}
static const char *
to_string_ip6_route (struct rtnl_route *obj)
{
NMPlatformIP6Route pl_obj;
if (init_ip6_route (&pl_obj, obj))
return nm_platform_ip6_route_to_string (&pl_obj);
SET_AND_RETURN_STRING_BUFFER ("(invalid ip6 route %p)", obj);
}
static const char *
to_string_object_with_type (NMPlatform *platform, struct nl_object *obj, ObjectType type)
{
switch (type) {
case LINK:
return to_string_link (platform, (struct rtnl_link *) obj);
case IP4_ADDRESS:
return to_string_ip4_address ((struct rtnl_addr *) obj);
case IP6_ADDRESS:
return to_string_ip6_address ((struct rtnl_addr *) obj);
case IP4_ROUTE:
return to_string_ip4_route ((struct rtnl_route *) obj);
case IP6_ROUTE:
return to_string_ip6_route ((struct rtnl_route *) obj);
default:
SET_AND_RETURN_STRING_BUFFER ("(unknown netlink object %p)", obj);
}
}
static const char *
to_string_object (NMPlatform *platform, struct nl_object *obj)
{
return to_string_object_with_type (platform, obj, object_type_from_nl_object (obj));
}
#undef SET_AND_RETURN_STRING_BUFFER
/******************************************************************/
/* Object and cache manipulation */
@ -1059,7 +1177,8 @@ announce_object (NMPlatform *platform, const struct nl_object *object, ObjectSta
NMPlatformLink device;
struct rtnl_link *rtnl_link = (struct rtnl_link *) object;
init_link (platform, &device, rtnl_link);
if (!init_link (platform, &device, rtnl_link))
return;
/* Skip hardware devices not yet discovered by udev. They will be
* announced by udev_device_added(). This doesn't apply to removed
@ -1103,7 +1222,8 @@ announce_object (NMPlatform *platform, const struct nl_object *object, ObjectSta
{
NMPlatformIP4Address address;
init_ip4_address (&address, (struct rtnl_addr *) object);
if (!init_ip4_address (&address, (struct rtnl_addr *) object))
return;
/* Address deletion is sometimes accompanied by route deletion. We need to
* check all routes belonging to the same interface.
@ -1123,7 +1243,8 @@ announce_object (NMPlatform *platform, const struct nl_object *object, ObjectSta
{
NMPlatformIP6Address address;
init_ip6_address (&address, (struct rtnl_addr *) object);
if (!init_ip6_address (&address, (struct rtnl_addr *) object))
return;
g_signal_emit_by_name (platform, sig, address.ifindex, &address, reason);
}
return;
@ -1236,7 +1357,7 @@ add_object (NMPlatform *platform, struct nl_object *obj)
case -NLE_EXIST:
break;
default:
error ("Netlink error: %s", nl_geterror (nle));
error ("Netlink error adding %s: %s", to_string_object (platform, object), nl_geterror (nle));
nl_object_dump (object, &dp);
return FALSE;
}
@ -1292,7 +1413,7 @@ delete_object (NMPlatform *platform, struct nl_object *obj)
}
/* fall-through to error, because we only expect this for addresses. */
default:
error ("Netlink error: %s", nl_geterror (nle));
error ("Netlink error deleting %s: %s", to_string_object (platform, obj), nl_geterror (nle));
return FALSE;
}
@ -1608,8 +1729,8 @@ link_get_all (NMPlatform *platform)
struct rtnl_link *rtnl_link = (struct rtnl_link *) object;
if (link_is_announceable (platform, rtnl_link)) {
init_link (platform, &device, rtnl_link);
g_array_append_val (links, device);
if (init_link (platform, &device, rtnl_link))
g_array_append_val (links, device);
}
}
@ -1654,6 +1775,9 @@ link_add (NMPlatform *platform, const char *name, NMLinkType type)
r = system ("modprobe bonding max_bonds=0");
}
debug ("link: add link '%s' of type '%s' (%d)",
name, type_to_string (type), (int) type);
return add_object (platform, build_rtnl_link (0, name, type));
}
@ -1704,11 +1828,11 @@ link_change (NMPlatform *platform, int ifindex, struct rtnl_link *change)
case -NLE_EXIST:
break;
case -NLE_OBJ_NOTFOUND:
error ("Firmware not found; Netlink error: %s)", nl_geterror (nle));
error ("Firmware not found for changing link %s; Netlink error: %s)", to_string_link (platform, change), nl_geterror (nle));
platform->error = NM_PLATFORM_ERROR_NO_FIRMWARE;
return FALSE;
default:
error ("Netlink error: %s", nl_geterror (nle));
error ("Netlink error changing link %s: %s", to_string_link (platform, change), nl_geterror (nle));
return FALSE;
}
@ -1818,6 +1942,13 @@ link_change_flags (NMPlatform *platform, int ifindex, unsigned int flags, gboole
else
rtnl_link_unset_flags (change, flags);
if (nm_logging_enabled (LOGL_DEBUG, LOGD_PLATFORM)) {
char buf[512];
rtnl_link_flags2str (flags, buf, sizeof (buf));
debug ("link: change %d: flags %s '%s' (%d)", ifindex, value ? "set" : "unset", buf, flags);
}
return link_change (platform, ifindex, change);
}
@ -1961,6 +2092,13 @@ link_set_address (NMPlatform *platform, int ifindex, gconstpointer address, size
rtnl_link_set_addr (change, nladdr);
if (nm_logging_enabled (LOGL_DEBUG, LOGD_PLATFORM)) {
char *mac = nm_utils_hwaddr_ntoa_len (address, length);
debug ("link: change %d: address %s (%lu bytes)", ifindex, mac, (unsigned long) length);
g_free (mac);
}
return link_change (platform, ifindex, change);
}
@ -1986,6 +2124,8 @@ link_set_mtu (NMPlatform *platform, int ifindex, guint32 mtu)
g_return_val_if_fail (change != NULL, FALSE);
rtnl_link_set_mtu (change, mtu);
debug ("link: change %d: mtu %lu", ifindex, (unsigned long)mtu);
return link_change (platform, ifindex, change);
}
@ -2033,6 +2173,9 @@ vlan_add (NMPlatform *platform, const char *name, int parent, int vlan_id, guint
rtnl_link_vlan_set_id (rtnllink, vlan_id);
rtnl_link_vlan_set_flags (rtnllink, kernel_flags);
debug ("link: add vlan '%s', parent %d, vlan id %d, flags %X (native: %X)",
name, parent, vlan_id, (unsigned int) vlan_flags, kernel_flags);
return add_object (platform, object);
}
@ -2062,6 +2205,8 @@ vlan_set_ingress_map (NMPlatform *platform, int ifindex, int from, int to)
return FALSE;
rtnl_link_vlan_set_ingress_map (change, from, to);
debug ("link: change %d: vlan ingress map %d -> %d", ifindex, from, to);
return link_change (platform, ifindex, change);
}
@ -2074,6 +2219,8 @@ vlan_set_egress_map (NMPlatform *platform, int ifindex, int from, int to)
return FALSE;
rtnl_link_vlan_set_egress_map (change, from, to);
debug ("link: change %d: vlan egress map %d -> %d", ifindex, from, to);
return link_change (platform, ifindex, change);
}
@ -2086,6 +2233,8 @@ link_enslave (NMPlatform *platform, int master, int slave)
rtnl_link_set_master (change, master);
debug ("link: change %d: enslave to master %d", slave, master);
return link_change (platform, slave, change);
}
@ -2570,9 +2719,10 @@ ip4_address_get_all (NMPlatform *platform, int ifindex)
for (object = nl_cache_get_first (priv->address_cache); object; object = nl_cache_get_next (object)) {
if (nl_object_is_marked (object)) {
init_ip4_address (&address, (struct rtnl_addr *) object);
address.source = NM_PLATFORM_SOURCE_KERNEL;
g_array_append_val (addresses, address);
if (init_ip4_address (&address, (struct rtnl_addr *) object)) {
address.source = NM_PLATFORM_SOURCE_KERNEL;
g_array_append_val (addresses, address);
}
nl_object_unmark (object);
}
}
@ -2594,9 +2744,10 @@ ip6_address_get_all (NMPlatform *platform, int ifindex)
for (object = nl_cache_get_first (priv->address_cache); object; object = nl_cache_get_next (object)) {
if (nl_object_is_marked (object)) {
init_ip6_address (&address, (struct rtnl_addr *) object);
address.source = NM_PLATFORM_SOURCE_KERNEL;
g_array_append_val (addresses, address);
if (init_ip6_address (&address, (struct rtnl_addr *) object)) {
address.source = NM_PLATFORM_SOURCE_KERNEL;
g_array_append_val (addresses, address);
}
nl_object_unmark (object);
}
}

88
src/platform/nm-platform.c
View file

@ -1850,6 +1850,52 @@ _to_string_dev (int ifindex, char *buf, size_t size)
static char to_string_buffer[256];
const char *
nm_platform_link_to_string (const NMPlatformLink *link)
{
char master[20];
char parent[20];
char *driver, *udi, *type;
GString *str;
if (!link)
return "(unknown link)";
str = g_string_new (NULL);
if (!link->arp)
g_string_append (str, "NOARP,");
if (link->up)
g_string_append (str, "UP");
else
g_string_append (str, "DOWN");
if (link->connected)
g_string_append (str, ",LOWER_UP");
if (link->master)
g_snprintf (master, sizeof (master), " master %d", link->master);
else
master[0] = 0;
if (link->parent)
g_snprintf (parent, sizeof (master), "@%d", link->parent);
else
parent[0] = 0;
driver = link->driver ? g_strdup_printf (" driver '%s'", link->driver) : NULL;
udi = link->udi ? g_strdup_printf (" udi '%s'", link->udi) : NULL;
type = link->type_name ? NULL : g_strdup_printf ("(%d)", link->type);
g_snprintf (to_string_buffer, sizeof (to_string_buffer), "%d: %s%s <%s> mtu %d%s %s%s%s",
link->ifindex, link->name, parent, str->str,
link->mtu, master, link->type_name ? link->type_name : type,
driver ? driver : "", udi ? udi : "");
g_string_free (str, TRUE);
g_free (driver);
g_free (udi);
g_free (type);
return to_string_buffer;
}
/**
* nm_platform_ip4_address_to_string:
* @route: pointer to NMPlatformIP4Address address structure
@ -1891,6 +1937,30 @@ nm_platform_ip4_address_to_string (const NMPlatformIP4Address *address)
return to_string_buffer;
}
/**
* nm_platform_addr_flags2str: wrapper for rtnl_addr_flags2str(),
* which might not yet support some recent address flags.
**/
void
nm_platform_addr_flags2str (int flags, char *buf, size_t size)
{
rtnl_addr_flags2str(flags, buf, size);
/* There are two recent flags IFA_F_MANAGETEMPADDR and IFA_F_NOPREFIXROUTE.
* If libnl does not yet support them, add them by hand.
* These two flags were introduced together with the extended ifa_flags,
* so, check for that.
*/
if ((flags & IFA_F_MANAGETEMPADDR) && !nm_platform_check_support_libnl_extended_ifa_flags ()) {
strncat (buf, buf[0] ? "," IFA_F_MANAGETEMPADDR_STR : IFA_F_MANAGETEMPADDR_STR,
size - strlen (buf) - 1);
}
if ((flags & IFA_F_NOPREFIXROUTE) && !nm_platform_check_support_libnl_extended_ifa_flags ()) {
strncat (buf, buf[0] ? "," IFA_F_NOPREFIXROUTE_STR : IFA_F_NOPREFIXROUTE_STR,
size - strlen (buf) - 1);
}
}
/**
* nm_platform_ip6_address_to_string:
* @route: pointer to NMPlatformIP6Address address structure
@ -1924,21 +1994,7 @@ nm_platform_ip6_address_to_string (const NMPlatformIP6Address *address)
_to_string_dev (address->ifindex, str_dev, sizeof (str_dev));
rtnl_addr_flags2str(address->flags, s_flags, sizeof (s_flags));
/* There are two recent flags IFA_F_MANAGETEMPADDR and IFA_F_NOPREFIXROUTE.
* If libnl does not yet support them, add them by hand.
* These two flags were introduced together with the extended ifa_flags,
* so, check for that.
**/
if ((address->flags & IFA_F_MANAGETEMPADDR) && !nm_platform_check_support_libnl_extended_ifa_flags ()) {
strncat (s_flags, s_flags[0] ? "," IFA_F_MANAGETEMPADDR_STR : IFA_F_MANAGETEMPADDR_STR,
sizeof (s_flags) - strlen (s_flags) - 1);
}
if ((address->flags & IFA_F_NOPREFIXROUTE) && !nm_platform_check_support_libnl_extended_ifa_flags ()) {
strncat (s_flags, s_flags[0] ? "," IFA_F_NOPREFIXROUTE_STR : IFA_F_NOPREFIXROUTE_STR,
sizeof (s_flags) - strlen (s_flags) - 1);
}
nm_platform_addr_flags2str (address->flags, s_flags, sizeof (s_flags));
str_flags = s_flags[0] ? g_strconcat (" flags ", s_flags, NULL) : NULL;
@ -2111,7 +2167,7 @@ nm_platform_ip6_route_cmp (const NMPlatformIP6Route *a, const NMPlatformIP6Route
static void
log_link (NMPlatformLink *device, const char *change_type)
{
debug ("signal: link %s: %s (%d)", change_type, device->name, device->ifindex);
debug ("signal: link %s: %s", change_type, nm_platform_link_to_string (device));
}
static void

3
src/platform/nm-platform.h
View file

@ -502,6 +502,7 @@ gboolean nm_platform_ip4_route_sync (int ifindex, const GArray *known_routes);
gboolean nm_platform_ip6_route_sync (int ifindex, const GArray *known_routes);
gboolean nm_platform_route_flush (int ifindex);
const char *nm_platform_link_to_string (const NMPlatformLink *link);
const char *nm_platform_ip4_address_to_string (const NMPlatformIP4Address *address);
const char *nm_platform_ip6_address_to_string (const NMPlatformIP6Address *address);
const char *nm_platform_ip4_route_to_string (const NMPlatformIP4Route *route);
@ -515,6 +516,8 @@ int nm_platform_ip6_route_cmp (const NMPlatformIP6Route *a, const NMPlatformIP6R
gboolean nm_platform_check_support_libnl_extended_ifa_flags (void);
gboolean nm_platform_check_support_kernel_extended_ifa_flags (void);
void nm_platform_addr_flags2str (int flags, char *buf, size_t size);
#define auto_g_free __attribute__((cleanup(put_g_free)))
static void __attribute__((unused))
put_g_free (void *ptr)