colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

platform: fix handling of labels

Browse Source 
If an address has a label without a ':' in it (eg, its label is just
$DEVICE, not $DEVICE:$NUM), then ignore it.
This commit is contained in:
Dan Winship
2014-03-26 12:43:24 -04:00
parent 726e84cfbf
commit 4dba720d8c
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/platform/nm-linux-platform.c
View File

@@ -892,7 +892,8 @@ init_ip4_address (NMPlatformIP4Address *address, struct rtnl_addr *rtnladdr)
memcpy (&address->peer_address, nl_addr_get_binary_addr (nlpeer), sizeof (address->peer_address)); memcpy (&address->peer_address, nl_addr_get_binary_addr (nlpeer), sizeof (address->peer_address));
} }
label = rtnl_addr_get_label (rtnladdr); label = rtnl_addr_get_label (rtnladdr);
if (label && *label) /* Check for ':'; we're only interested in labels used as interface aliases */
if (label && strchr (label, ':'))
g_strlcpy (address->label, label, sizeof (address->label)); g_strlcpy (address->label, label, sizeof (address->label));
return TRUE; return TRUE;