UCS/NETLINK: code review fixes

amastbaum · amastbaum · commit 41c9c1fd3c80 · 2025-11-11T14:41:43.000+02:00
diff --git a/src/ucs/sys/netlink.c b/src/ucs/sys/netlink.c
@@ -184,12 +184,12 @@ ucs_netlink_get_route_info(const struct rtattr *rta, int len, int *if_index_p,
     for (; RTA_OK(rta, len); rta = RTA_NEXT(rta, len)) {
         if (rta->rta_type == RTA_OIF) {
             *if_index_p = *((const int *)RTA_DATA(rta));
-        } else if ((rta->rta_type == RTA_DST) || (rta->rta_type == RTA_GATEWAY)) {
+        } else if (rta->rta_type == RTA_DST) {
             *dst_in_addr = RTA_DATA(rta);
         }
     }
 
-    if ((*if_index_p == -1) || (*dst_in_addr == NULL)) {
+    if ((*if_index_p == -1) || ((*dst_in_addr == NULL) && (rtm_dst_len != 0))) {
         return UCS_ERR_INVALID_PARAM;
     }
 
@@ -272,7 +272,7 @@ static void ucs_netlink_lookup_route(ucs_netlink_route_info_t *info)
             continue;
         }
 
-        if (is_default_gw || ucs_sockaddr_is_same_subnet(
+        if (ucs_sockaddr_is_same_subnet(
                                 info->sa_remote,
                                 (const struct sockaddr *)&curr_entry->dest,
                                 curr_entry->subnet_prefix_len)) {

Original file line number	Diff line number	Diff line change
`@@ -184,12 +184,12 @@ ucs_netlink_get_route_info(const struct rtattr rta, int len, int if_index_p,`
`184`	`184`	`for (; RTA_OK(rta, len); rta = RTA_NEXT(rta, len)) {`
`185`	`185`	`if (rta->rta_type == RTA_OIF) {`
`186`	`186`	`if_index_p = ((const int *)RTA_DATA(rta));`
`187`		`- } else if ((rta->rta_type == RTA_DST) \|\| (rta->rta_type == RTA_GATEWAY)) {`
	`187`	`+ } else if (rta->rta_type == RTA_DST) {`
`188`	`188`	`*dst_in_addr = RTA_DATA(rta);`
`189`	`189`	`}`
`190`	`190`	`}`
`191`	`191`
`192`		`- if ((if_index_p == -1) \|\| (dst_in_addr == NULL)) {`
	`192`	`+ if ((if_index_p == -1) \|\| ((dst_in_addr == NULL) && (rtm_dst_len != 0))) {`
`193`	`193`	`return UCS_ERR_INVALID_PARAM;`
`194`	`194`	`}`
`195`	`195`
`@@ -272,7 +272,7 @@ static void ucs_netlink_lookup_route(ucs_netlink_route_info_t *info)`
`272`	`272`	`continue;`
`273`	`273`	`}`
`274`	`274`
`275`		`- if (is_default_gw \|\| ucs_sockaddr_is_same_subnet(`
	`275`	`+ if (ucs_sockaddr_is_same_subnet(`
`276`	`276`	`info->sa_remote,`
`277`	`277`	`(const struct sockaddr *)&curr_entry->dest,`
`278`	`278`	`curr_entry->subnet_prefix_len)) {`