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

platform: handle empty arrays in array_contains_ip[46]_*()

Browse Source
This commit is contained in:
Pavel Šimerda
2013-07-29 23:00:44 +02:00
parent 53e55aab36
commit 22c4f5f5af
1 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1168,9 +1168,10 @@ nm_platform_ip6_address_exists (int ifindex, struct in6_addr address, int plen)
static gboolean static gboolean
array_contains_ip4_address (const GArray *addresses, const NMPlatformIP4Address *address) array_contains_ip4_address (const GArray *addresses, const NMPlatformIP4Address *address)
{ {
int i; guint len = addresses ? addresses->len : 0;
guint i;
for (i = 0; i < addresses->len; i++) { for (i = 0; i < len; i++) {
NMPlatformIP4Address *candidate = &g_array_index (addresses, NMPlatformIP4Address, i); NMPlatformIP4Address *candidate = &g_array_index (addresses, NMPlatformIP4Address, i);
if (candidate->ifindex == address->ifindex && if (candidate->ifindex == address->ifindex &&
@@ -1185,9 +1186,10 @@ array_contains_ip4_address (const GArray *addresses, const NMPlatformIP4Address
static gboolean static gboolean
array_contains_ip6_address (const GArray *addresses, const NMPlatformIP6Address *address) array_contains_ip6_address (const GArray *addresses, const NMPlatformIP6Address *address)
{ {
int i; guint len = addresses ? addresses->len : 0;
guint i;
for (i = 0; i < addresses->len; i++) { for (i = 0; i < len; i++) {
NMPlatformIP6Address *candidate = &g_array_index (addresses, NMPlatformIP6Address, i); NMPlatformIP6Address *candidate = &g_array_index (addresses, NMPlatformIP6Address, i);
if (candidate->ifindex == address->ifindex && if (candidate->ifindex == address->ifindex &&
@@ -1245,7 +1247,7 @@ nm_platform_ip4_address_sync (int ifindex, const GArray *known_addresses)
address = &g_array_index (addresses, NMPlatformIP4Address, i); address = &g_array_index (addresses, NMPlatformIP4Address, i);
address->ifindex = 0; address->ifindex = 0;
if (!known_addresses || !array_contains_ip4_address (known_addresses, address)) if (!array_contains_ip4_address (known_addresses, address))
nm_platform_ip4_address_delete (ifindex, address->address, address->plen); nm_platform_ip4_address_delete (ifindex, address->address, address->plen);
} }
g_array_free (addresses, TRUE); g_array_free (addresses, TRUE);
@@ -1307,7 +1309,7 @@ nm_platform_ip6_address_sync (int ifindex, const GArray *known_addresses)
if (IN6_IS_ADDR_LINKLOCAL (&address->address)) if (IN6_IS_ADDR_LINKLOCAL (&address->address))
continue; continue;
if (!known_addresses || !array_contains_ip6_address (known_addresses, address)) if (!array_contains_ip6_address (known_addresses, address))
nm_platform_ip6_address_delete (ifindex, address->address, address->plen); nm_platform_ip6_address_delete (ifindex, address->address, address->plen);
} }
g_array_free (addresses, TRUE); g_array_free (addresses, TRUE);
@@ -1477,12 +1479,12 @@ nm_platform_ip6_route_exists (int ifindex, struct in6_addr network, int plen, in
static gboolean static gboolean
array_contains_ip4_route (const GArray *routes, const NMPlatformIP4Route *route) array_contains_ip4_route (const GArray *routes, const NMPlatformIP4Route *route)
{ {
int i; guint len = routes ? routes->len : 0;
guint i;
for (i = 0; i < routes->len; i++) { for (i = 0; i < len; i++)
if (!memcmp (&g_array_index (routes, NMPlatformIP4Route, i), route, sizeof (*route))) if (!memcmp (&g_array_index (routes, NMPlatformIP4Route, i), route, sizeof (*route)))
return TRUE; return TRUE;
}
return FALSE; return FALSE;
} }
@@ -1490,12 +1492,12 @@ array_contains_ip4_route (const GArray *routes, const NMPlatformIP4Route *route)
static gboolean static gboolean
array_contains_ip6_route (const GArray *routes, const NMPlatformIP6Route *route) array_contains_ip6_route (const GArray *routes, const NMPlatformIP6Route *route)
{ {
int i; guint len = routes ? routes->len : 0;
guint i;
for (i = 0; i < routes->len; i++) { for (i = 0; i < len; i++)
if (!memcmp (&g_array_index (routes, NMPlatformIP6Route, i), route, sizeof (*route))) if (!memcmp (&g_array_index (routes, NMPlatformIP6Route, i), route, sizeof (*route)))
return TRUE; return TRUE;
}
return FALSE; return FALSE;
} }
@@ -1529,7 +1531,7 @@ nm_platform_ip4_route_sync (int ifindex, const GArray *known_routes)
if (!route->plen) if (!route->plen)
continue; continue;
if (!known_routes || !array_contains_ip4_route (known_routes, route)) if (!array_contains_ip4_route (known_routes, route))
nm_platform_ip4_route_delete (ifindex, route->network, route->plen, route->metric); nm_platform_ip4_route_delete (ifindex, route->network, route->plen, route->metric);
} }
g_array_free (routes, TRUE); g_array_free (routes, TRUE);
@@ -1581,7 +1583,7 @@ nm_platform_ip6_route_sync (int ifindex, const GArray *known_routes)
if (!route->plen) if (!route->plen)
continue; continue;
if (!known_routes || !array_contains_ip6_route (known_routes, route)) if (!array_contains_ip6_route (known_routes, route))
nm_platform_ip6_route_delete (ifindex, route->network, route->plen, route->metric); nm_platform_ip6_route_delete (ifindex, route->network, route->plen, route->metric);
} }
g_array_free (routes, TRUE); g_array_free (routes, TRUE);