From nobody Sun Apr 9 09:28:25 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 4PvRc96t8Wz4499H; Sun, 9 Apr 2023 09:28:25 +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 4PvRc95YmQz41sB; Sun, 9 Apr 2023 09:28:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681032505; 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=jm5p8f4zKA/9pjV0f/arHBDQ3c5yfX05j6TfrqsHma8=; b=FXiUV4JRFblxUcT5ApKivyjQMg8sqnms2e56aMuZkDT+ELSKr7EWKiUPLKoB46Zkqm7S5P Un4GurrIOJYfAoWvCEJWX2bR7vdTsfNQ9oaOJ69HJv6etwNvke7l9pyTxy8zeC6pJH7KI7 SIfsaKf0t/Q685/jXKhi/F3DFR0I9IjTquPle8vcZMnb5LsXc3oDY9TePSzMLU2jSP6EDf JEJg5M+VFzAJ1AduOEXl9zAmFNSWrI1mQZjY9MjADakPUDTip+OzaLsbeIDZCSap46Zxbk ujljp2qT+dTaWNdnuls19I3z3wi0c9vS4IeKL3HoVfPnE1XaQuoA8mTwTXK3eA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681032505; 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=jm5p8f4zKA/9pjV0f/arHBDQ3c5yfX05j6TfrqsHma8=; b=f5Ms6G/hM9ixqDpexQUeShDbBc9POBlA6WYf1T59RDDmD9gBj4Yca/iYLDcGkqsCON8QOS iXJ/3freOmZEvxSjwfe9V5KJLhmy20RPngpgbR4vcn1Z4Xs/iANRcSM+ylMTwG3CjHTGlm 1juk29l4FBIop7sjEbFFY2e795RkPU7y1eL0Va8UhofjAMuQmlOvKiHvkzxgYQmJwpWrEK nkOUFxxFU/IDYdHDVZHX/xzCiufY/YF8wxJikpzhSrzdFZOdwGZw4bOy7/YQPz0emsWg3T TFolwvTVNVFKlZ4mOZgnnhBFda4dBvWzdfvfAOyBGDCyCGHLnpZCSUzp13u1mA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681032505; a=rsa-sha256; cv=none; b=pvWd5mzfoP6xIhLZNRqj+2Mu5IKhmHDq0+q95d649gezLf1BAWsrn7+MXszZg+k6RSU0ou Axl2Yzmfeenyfu9btpuNV7RoKyaIin/kTAzh/j0f4j7N71mJBrbljqejLRs6+dL3a+Xv+j DELDGGMw8Ayo53NXliUhhZ44Bzpw5+w3ktNOt9iFTu61fCIwpM/zE93GE/NdYjkFRqFt88 NLm80jK5AOh4Xk+cUa7TcRAWtxn7yTYNhbdIxKvuwp4mpqJ8BPus67j4Vdt3zcLUJ662Yo DX7LP4SMqDRiyYNYj8/S4+GP7QpR13jJSENDrnhJCwAn62NJQE/G/bA7hyVSUA== 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 4PvRc94bbQz13NL; Sun, 9 Apr 2023 09:28:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 3399SPO6065956; Sun, 9 Apr 2023 09:28:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3399SP07065955; Sun, 9 Apr 2023 09:28:25 GMT (envelope-from git) Date: Sun, 9 Apr 2023 09:28:25 GMT Message-Id: <202304090928.3399SP07065955@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: 0d4038e3012b - main - netlink: set prefix-related flags to the created nexthop. 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: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0d4038e3012b86c4f1ce5c2f25736993a1c9ac38 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=0d4038e3012b86c4f1ce5c2f25736993a1c9ac38 commit 0d4038e3012b86c4f1ce5c2f25736993a1c9ac38 Author: Alexander V. Chernikov AuthorDate: 2023-04-09 09:26:12 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-04-09 09:26:12 +0000 netlink: set prefix-related flags to the created nexthop. This fixes incorrect flag combinations when adding IPv4/IPv6 host routes. MFC after: 3 days --- sys/netlink/route/rt.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/netlink/route/rt.c b/sys/netlink/route/rt.c index 288ff111a038..7e81d59d696b 100644 --- a/sys/netlink/route/rt.c +++ b/sys/netlink/route/rt.c @@ -732,7 +732,7 @@ get_pxflag(const struct nl_parsed_route *attrs) pxflag = NHF_DEFAULT; break; case AF_INET6: - if (attrs->rtm_dst_len == 32) + if (attrs->rtm_dst_len == 128) pxflag = NHF_HOST; else if (attrs->rtm_dst_len == 0) pxflag = NHF_DEFAULT; @@ -776,6 +776,7 @@ create_nexthop_one(struct nl_parsed_route *attrs, struct rta_mpath_nh *mpnh, } if (mpnh->ifp != NULL) nhop_set_transmit_ifp(nh, mpnh->ifp); + nhop_set_pxtype_flag(nh, get_pxflag(attrs)); nhop_set_rtflags(nh, attrs->rta_rtflags); if (attrs->rtm_protocol > RTPROT_STATIC) nhop_set_origin(nh, attrs->rtm_protocol); @@ -852,6 +853,7 @@ create_nexthop_from_attrs(struct nl_parsed_route *attrs, nhop_set_broadcast(nh, true); if (attrs->rtm_protocol > RTPROT_STATIC) nhop_set_origin(nh, attrs->rtm_protocol); + nhop_set_pxtype_flag(nh, get_pxflag(attrs)); nhop_set_rtflags(nh, attrs->rta_rtflags); switch (attrs->rtm_type) {