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

platform: simplify address comparisons

Browse source
This commit is contained in:
Pavel Šimerda 2013-07-29 23:32:58 +02:00
parent 22c4f5f5af
commit 3cf1b71de2
1 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1174,9 +1174,7 @@ array_contains_ip4_address (const GArray *addresses, const NMPlatformIP4Address
for (i = 0; i < len; i++) {
NMPlatformIP4Address *candidate = &g_array_index (addresses, NMPlatformIP4Address, i);
if (candidate->ifindex == address->ifindex &&
candidate->address == address->address &&
candidate->plen == address->plen)
if (candidate->address == address->address && candidate->plen == address->plen)
return TRUE;
}
@ -1192,9 +1190,7 @@ array_contains_ip6_address (const GArray *addresses, const NMPlatformIP6Address
for (i = 0; i < len; i++) {
NMPlatformIP6Address *candidate = &g_array_index (addresses, NMPlatformIP6Address, i);
if (candidate->ifindex == address->ifindex &&
IN6_ARE_ADDR_EQUAL (&candidate->address, &address->address) &&
candidate->plen == address->plen)
if (IN6_ARE_ADDR_EQUAL (&candidate->address, &address->address) && candidate->plen == address->plen)
return TRUE;
}
@ -1245,7 +1241,6 @@ nm_platform_ip4_address_sync (int ifindex, const GArray *known_addresses)
addresses = nm_platform_ip4_address_get_all (ifindex);
for (i = 0; i < addresses->len; i++) {
address = &g_array_index (addresses, NMPlatformIP4Address, i);
address->ifindex = 0;
if (!array_contains_ip4_address (known_addresses, address))
nm_platform_ip4_address_delete (ifindex, address->address, address->plen);
@ -1303,7 +1298,6 @@ nm_platform_ip6_address_sync (int ifindex, const GArray *known_addresses)
addresses = nm_platform_ip6_address_get_all (ifindex);
for (i = 0; i < addresses->len; i++) {
address = &g_array_index (addresses, NMPlatformIP6Address, i);
address->ifindex = 0;
/* Leave link local address management to the kernel */
if (IN6_IS_ADDR_LINKLOCAL (&address->address))