fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-30 12:00:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

route-manager: refactor: a readability improvement

Browse source 
(cherry picked from commit 6c5d93b847)

Conflicts:
	src/nm-route-manager.c
This commit is contained in:
Lubomir Rintel 2015-03-09 14:12:00 +01:00 • committed by Thomas Haller
parent 435632a757
commit fe9dada57a
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2101,7 +2101,8 @@ nm_platform_ip4_route_sync (int ifindex, const GArray *known_routes)
if (NM_PLATFORM_IP_ROUTE_IS_DEFAULT (known_route))
continue;
if ((known_route->gateway == 0) ^ (i_type == 0)) {
if ( (i_type == 0 && known_route->gateway != 0)
|| (i_type == 1 && known_route->gateway == 0)) {
/* Make two runs over the list of routes. On the first, only add
* device routes, on the second the others (gateway routes). */
continue;
@ -2175,7 +2176,8 @@ nm_platform_ip6_route_sync (int ifindex, const GArray *known_routes)
if (NM_PLATFORM_IP_ROUTE_IS_DEFAULT (known_route))
continue;
if (IN6_IS_ADDR_UNSPECIFIED (&known_route->gateway) ^ (i_type == 0)) {
if ( (i_type == 0 && !IN6_IS_ADDR_UNSPECIFIED (&known_route->gateway))
|| (i_type == 1 && IN6_IS_ADDR_UNSPECIFIED (&known_route->gateway))) {
/* Make two runs over the list of routes. On the first, only add
* device routes, on the second the others (gateway routes). */
continue;