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

platform: fix inverting guint8 value inet6_addr_gen_mode_inv

Browse Source 
Fixes: e8e455817b
This commit is contained in:
Thomas Haller
2015-06-25 18:44:58 +02:00
parent 4fa01c7dc9
commit c2754ede5c
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1019,7 +1019,7 @@ _nmp_vt_cmd_plobj_init_from_nl_link (NMPlatform *platform, NMPlatformObject *_ob
guint8 mode = 0; guint8 mode = 0;
if (rtnl_link_inet6_get_addr_gen_mode (nlo, &mode) == 0) if (rtnl_link_inet6_get_addr_gen_mode (nlo, &mode) == 0)
obj->inet6_addr_gen_mode_inv = ~mode; obj->inet6_addr_gen_mode_inv = _nm_platform_uint8_inv (mode);
} }
#endif #endif

6
src/platform/nm-platform.c
View File

@@ -930,7 +930,7 @@ nm_platform_link_get_user_ipv6ll_enabled (NMPlatform *self, int ifindex)
pllink = nm_platform_link_get (self, ifindex); pllink = nm_platform_link_get (self, ifindex);
if (pllink && pllink->inet6_addr_gen_mode_inv) if (pllink && pllink->inet6_addr_gen_mode_inv)
return (~pllink->inet6_addr_gen_mode_inv) == IN6_ADDR_GEN_MODE_NONE; return _nm_platform_uint8_inv (pllink->inet6_addr_gen_mode_inv) == IN6_ADDR_GEN_MODE_NONE;
} }
#endif #endif
return FALSE; return FALSE;
@@ -2448,7 +2448,7 @@ nm_platform_link_to_string (const NMPlatformLink *link)
str_vlan[0] = '\0'; str_vlan[0] = '\0';
if (link->inet6_addr_gen_mode_inv) { if (link->inet6_addr_gen_mode_inv) {
switch ((guint8) ~link->inet6_addr_gen_mode_inv) { switch (_nm_platform_uint8_inv (link->inet6_addr_gen_mode_inv)) {
case 0: case 0:
g_snprintf (str_addrmode, sizeof (str_addrmode), " addrgenmode eui64"); g_snprintf (str_addrmode, sizeof (str_addrmode), " addrgenmode eui64");
break; break;
@@ -2456,7 +2456,7 @@ nm_platform_link_to_string (const NMPlatformLink *link)
g_snprintf (str_addrmode, sizeof (str_addrmode), " addrgenmode none"); g_snprintf (str_addrmode, sizeof (str_addrmode), " addrgenmode none");
break; break;
default: default:
g_snprintf (str_addrmode, sizeof (str_addrmode), " addrgenmode %d", (int) (guint8) (~link->inet6_addr_gen_mode_inv)); g_snprintf (str_addrmode, sizeof (str_addrmode), " addrgenmode %d", _nm_platform_uint8_inv (link->inet6_addr_gen_mode_inv));
break; break;
} }
} else } else

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

@@ -571,8 +571,9 @@ NMPlatform *nm_platform_try_get (void);
* *
* Returns: the bitwise inverse of the route scope. * Returns: the bitwise inverse of the route scope.
* */ * */
#define nm_platform_route_scope_inv _nm_platform_uint8_inv
static inline guint8 static inline guint8
nm_platform_route_scope_inv (guint8 scope) _nm_platform_uint8_inv (guint8 scope)
{ {
return (guint8) ~scope; return (guint8) ~scope;
} }