system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-10-06 16:40:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

route(8): fix route not found exit code and warn with netlink

Browse source 
Fix route(8) incorrectly returning a zero exit code even when unable to
find the specified route with route -n get <route>.

Reviewed by:	kp
Sponsored by:	Rubicon Communications, LLC ("Netgate")
Differential Revision:	https://reviews.freebsd.org/D41882
This commit is contained in:
R. Christian McDonald 2023-09-19 18:46:49 +02:00 committed by Kristof Provost
parent 2ccfa855b2
commit 2a78083fc2
1 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
sbin/route/route_netlink.c
View file

@ -271,22 +271,27 @@ rtmsg_nl_int(struct nl_helper *h, int cmd, int rtm_flags, int fib, int rtm_addrs
hdr = snl_read_reply(ss, hdr->nlmsg_seq);
if (nl_type == NL_RTM_GETROUTE) {
if (hdr->nlmsg_type == NL_RTM_NEWROUTE)
if (hdr->nlmsg_type == NL_RTM_NEWROUTE) {
print_getmsg(h, hdr, dst);
else {
snl_parse_errmsg(ss, hdr, &e);
if (e.error == ESRCH)
warn("route has not been found");
else
warn("message indicates error %d", e.error);
return (0);
}
return (0);
}
if (snl_parse_errmsg(ss, hdr, &e))
if (snl_parse_errmsg(ss, hdr, &e)) {
switch (e.error) {
case (ESRCH):
warnx("route has not been found");
break;
default:
if (e.error == 0)
break;
warnc(e.error, "message indicates error");
}
return (e.error);
}
}
return (EINVAL);
}