From nobody Sat Apr 8 11:40:12 2023 X-Original-To: dev-commits-src-main@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 4PttZj2zHYz44LBp; Sat, 8 Apr 2023 11:40:13 +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 4PttZj1yjjz4HXR; Sat, 8 Apr 2023 11:40:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680954013; 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=uG6jdlet2qLGWtqc8ThKeLe9CK3DymsKCTZGMFiBNro=; b=Zpysz28tOY2yFGFmHIh0sWPeKYKpAiAOe62am/L7y6He+jp7kS9fhMlcGg9yY/VX4if3Ok Kq1hvilY5Zna0G1rXzYKjQ0XTSDa1DBO5ExaFY19icXbeyAOoZkN56C+Pht2/tIgYSSp8u KkXijhkElqdneM5EJxzG+4eMEv19XqicE4n9eYKih521aH+3SnbDBGpsVvzNbPdSoDduP1 HhhOZCATFqyleQn/f7XF+xVpNJQwe2YunoVvpqwN8iX29G09mzWE2x26wk1c+4qs3DNUWQ roJzdTsaxGR7wLLzJMqvOIst2b40gjceDWUhTrpFScXTcd+mNXWdZAVRUbqBJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680954013; 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=uG6jdlet2qLGWtqc8ThKeLe9CK3DymsKCTZGMFiBNro=; b=WTTKRs9k0NDtPBc8L5KIehzluaRJmiYsXteksjeEthmU6hMUDzBQmiwmWCoYL5kJG4lNce a+OfqBvQjWy1rDJ4nPHE2x3+f4QH8h00tHiYJC88PZBcUc787+oMH38TTd0g3UaTgfucpW sojSXESEaBwXiFGwHEYvVi+49+Rs/VSZaYi8kgePCV8PC9DEzNPaNTEVr5FUtm4eU42x90 lZ+t9E43/4k8n8uR44bTPIHFXU/uvC/jCkeeySh1k2h/u7QYAke8rsS5Ff9EelQOvwkb7B fx273hQKI5LGcpJKhSKNLgM8kdywXnDjHAusw9MspgWPx2zybqmeo/gZ8s3uIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680954013; a=rsa-sha256; cv=none; b=EzJ/QCwMM2yAMPi8igTqm5Xwm9yumF0jqXmJtZEBPy1p14x4GGWTNVUes3dgu9aKfzSqRn sBFOClMFeWWoSsVKXmmXqTnWfiVfHtl/4FIg3TiEFFdSGSd6UI5xjVuhZrHxkIOAodevsU VTj2xFzlBUB0Wnt0o1n2oot0Sk/8jiZN+0yjRQfFuFuw53B9d36Lyy2izGNre7VvshJRJx ROhKRiBjRrgtFh45SFZ5HEiPi55fB8rgPCB+rjKu22YSdiIRCPN8bxP1khHIX1tWFeA4st QCIaDpww6NXeZLIS5rk6PuP4NqWZkKdrJJ225WeHut210UehiY4s9SOMVhKB2w== 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 4PttZj0lGNzQQK; Sat, 8 Apr 2023 11:40:13 +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 338BeCwj016196; Sat, 8 Apr 2023 11:40:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 338BeC4V016186; Sat, 8 Apr 2023 11:40:12 GMT (envelope-from git) Date: Sat, 8 Apr 2023 11:40:12 GMT Message-Id: <202304081140.338BeC4V016186@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: ee8f5c2a31ec - main - route: fix netlink route operations with link-local gw / dst. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: ee8f5c2a31ec6f5913f404daeade6e1ac30f4336 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=ee8f5c2a31ec6f5913f404daeade6e1ac30f4336 commit ee8f5c2a31ec6f5913f404daeade6e1ac30f4336 Author: Alexander V. Chernikov AuthorDate: 2023-04-08 11:38:05 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-04-08 11:38:05 +0000 route: fix netlink route operations with link-local gw / dst. Extract ifindex from either gw or dst sockaddr and add it as a dedicated RTA_OIF attribute. --- sbin/route/route_netlink.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/sbin/route/route_netlink.c b/sbin/route/route_netlink.c index a3e9860244a9..a9f550ef6f43 100644 --- a/sbin/route/route_netlink.c +++ b/sbin/route/route_netlink.c @@ -220,20 +220,37 @@ rtmsg_nl_int(struct nl_helper *h, int cmd, int rtm_flags, int fib, int rtm_addrs snl_add_msg_attr_ip(&nw, RTA_DST, dst); snl_add_msg_attr_u32(&nw, RTA_TABLE, fib); + uint32_t rta_oif = 0; + if (gw != NULL) { if (rtm_flags & RTF_GATEWAY) { if (gw->sa_family == dst->sa_family) snl_add_msg_attr_ip(&nw, RTA_GATEWAY, gw); else snl_add_msg_attr_ipvia(&nw, RTA_VIA, gw); + if (gw->sa_family == AF_INET6) { + struct sockaddr_in6 *gw6 = (struct sockaddr_in6 *)gw; + + if (IN6_IS_ADDR_LINKLOCAL(&gw6->sin6_addr)) + rta_oif = gw6->sin6_scope_id; + } } else { /* Should be AF_LINK */ struct sockaddr_dl *sdl = (struct sockaddr_dl *)gw; if (sdl->sdl_index != 0) - snl_add_msg_attr_u32(&nw, RTA_OIF, sdl->sdl_index); + rta_oif = sdl->sdl_index; } } + if (dst->sa_family == AF_INET6 && rta_oif == 0) { + struct sockaddr_in6 *dst6 = (struct sockaddr_in6 *)dst; + + if (IN6_IS_ADDR_LINKLOCAL(&dst6->sin6_addr)) + rta_oif = dst6->sin6_scope_id; + } + + if (rta_oif != 0) + snl_add_msg_attr_u32(&nw, RTA_OIF, rta_oif); if (rtm_flags != 0) snl_add_msg_attr_u32(&nw, NL_RTA_RTFLAGS, rtm_flags);