From nobody Tue Sep 19 17:39:36 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rqpnh6YWyz4vC34; Tue, 19 Sep 2023 17:39:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rqpnh65Xtz3H1N; Tue, 19 Sep 2023 17:39:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695145176; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T4R4jzOtn6X9L3VrvZMTwMjDboYUjg1aFVh6c17LRfw=; b=b/9IIdcrU+XaPeZq/XHIR623k5UZLk/Z1WxJdw8s3S0/2GCcONvnYrOfl6bMzKIDWP0DMP XaVHbRM6MwJXjIe0Y/UMnuE1aGgbd7B+yDddddcstZIfEOQfMJSQGJes4CAjD3xwj17j8k +8iBXJBmuSym430pkpJztoxggh3IGi6ubzzNJcagRTynM5I/u61q274JMohhrn1QiQTn8P y3YVdehVicCt+nsccU2xY06FZtdjDFn63bd2+kCqlXRO5gahL3QQeXqk9NB0cLjLMeVKuh dK+d6U9SLSLgDG4gWbCLSV39vLZFxmucHMshEdj/bgyqS1S+vz1czQziP6z7yQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695145176; a=rsa-sha256; cv=none; b=YOq/vkT7Hqr0FVVIQoitScAmh79+j6L4/vuWlBxHbIEKvC0zmf/k3YElcnGmwZyfxoQh+O rWqDu96HhA1BmxEnqt9MwnmJxZnKyszuRV0q7FleSxsaSZ60ORYXtxJWQ7s9YWX3XIrd03 3xlhg6jBXAmFzBK8Wq5xopRC+diCqnkJqt4vo/62Rmo+JY4ToW8qI2Jnv7dsZq+FB+FwF1 67UrwFyZgPoZc+JMfINhnnZOYz0+z5MKVHfrDktX94n+C8mnUZcR6j2Y7VetwTmL//k0xi eq8Y8lxHhNjlgoVkrCHiQoGO+VwlASi0xaG419j+lpQF+cXd85+wKu4ijNqymQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695145176; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T4R4jzOtn6X9L3VrvZMTwMjDboYUjg1aFVh6c17LRfw=; b=YtjM7cBzBrOL/36NOauWtDiqV47AmD3qfk+dT+xmmlOVxcxNqsg1C1OvfZKL7ndc9R5atx RzW2U+f/HB1/7hvFv7rZl9hwo43jq9VfXykZoft2fq1UNksYusg8RHl5vFKfG7PrxckDUV FbDoXsTY1tiRmu5Hnp6lJju7wIcHIxWJlONiwRM6cUGT4FnAHFw4mmL3Y/DTBSxDv7FqXk i7171SUFfMOfhq6f3d3qMfWtzBxEqjTCFs9jcQQqMQCzdlyggK8+JznEM9vN8IX3+ksMib m+s+IKkoRFc1Q3JJ4tHy4m83Asww0DNOEJOtuQ5hSVpxbrYerRVcd+Ttt9N90g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rqpnh58nRz7cv; Tue, 19 Sep 2023 17:39:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38JHdaVE008845; Tue, 19 Sep 2023 17:39:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38JHdaE8008842; Tue, 19 Sep 2023 17:39:36 GMT (envelope-from git) Date: Tue, 19 Sep 2023 17:39:36 GMT Message-Id: <202309191739.38JHdaE8008842@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 2a78083fc2a1 - main - route(8): fix `route not found` exit code and warn with netlink List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2a78083fc2a14af863afb098925b0682698a2838 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=2a78083fc2a14af863afb098925b0682698a2838 commit 2a78083fc2a14af863afb098925b0682698a2838 Author: R. Christian McDonald AuthorDate: 2023-09-19 16:46:49 +0000 Commit: Kristof Provost CommitDate: 2023-09-19 17:34:02 +0000 route(8): fix `route not found` exit code and warn with netlink Fix route(8) incorrectly returning a zero exit code even when unable to find the specified route with route -n get . Reviewed by: kp Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D41882 --- sbin/route/route_netlink.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/sbin/route/route_netlink.c b/sbin/route/route_netlink.c index 0dbd90151e10..cad1c8030535 100644 --- a/sbin/route/route_netlink.c +++ b/sbin/route/route_netlink.c @@ -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); }