From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 9 Feb 2021 09:35:45 +0000 (+0900)
Subject: network: Route::gw_family may be AF_UNSPEC
X-Git-Tag: v248-rc1~84
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=35d39c94a90067fb13f06ca48688c861cb260fc1;p=thirdparty%2Fsystemd.git

network: Route::gw_family may be AF_UNSPEC
---

diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c
index 6ab5941343f..474f8a8861d 100644
--- a/src/network/networkd-route.c
+++ b/src/network/networkd-route.c
@@ -623,7 +623,7 @@ static void log_route_debug(const Route *route, const char *str, const Link *lin
                 }
                 if (!in_addr_is_null(route->family, &route->src))
                         (void) in_addr_to_string(route->family, &route->src, &src);
-                if (!in_addr_is_null(route->gw_family, &route->gw))
+                if (in_addr_is_null(route->gw_family, &route->gw) == 0)
                         (void) in_addr_to_string(route->gw_family, &route->gw, &gw);
                 if (!in_addr_is_null(route->family, &route->prefsrc))
                         (void) in_addr_to_string(route->family, &route->prefsrc, &prefsrc);
@@ -1260,7 +1260,7 @@ int link_set_routes(Link *link) {
                         if (rt->gateway_from_dhcp_or_ra)
                                 continue;
 
-                        if ((in_addr_is_null(rt->gw_family, &rt->gw) && ordered_set_isempty(rt->multipath_routes)) != (phase == PHASE_NON_GATEWAY))
+                        if ((in_addr_is_null(rt->gw_family, &rt->gw) != 0 && ordered_set_isempty(rt->multipath_routes)) != (phase == PHASE_NON_GATEWAY))
                                 continue;
 
                         r = route_configure(rt, link, route_handler, NULL);