From nobody Mon Jan 23 22:12:18 2023 X-Original-To: dev-commits-src-branches@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 4P148f3Phfz2t12g; Mon, 23 Jan 2023 22:12:18 +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 4P148f2VQTz3MPZ; Mon, 23 Jan 2023 22:12:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674511938; 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=JOf5rmmMunVw+U+gIlUBc6amfCHqaH7o0zz/kBYl4/g=; b=lBgW81h7zsTZ+XSyVVqm9UHJUSi2mQGGiAvVhE2vwBVFjqHgfljRRdysrLZKhmpk30kNZs vVv1WybZryQ7LnjpIeCCvmGxPQUGOxKQlyrgSU+blGLwoquBV3fK804OhfTK6bKL2PKWhf fP6+yAySOyPTxFazD6IhSs0Xbrrjy30v5l963WJ3D6TPYwsuc9y/ee6ZuUIFWP+MxjO0Fc W0n3q1cmxDmu7FFQOyIMO5WLzeXHFpMxUbUOqjFcePKk7oWeu7DG7zgwGs4dZ5q+m2Rdke yS9d6WRG4XHHjUkOSwhsZy3wgUDZJ1WG6sB+VzYWNLWmRP1MtvuK5Ros+MAfWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674511938; 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=JOf5rmmMunVw+U+gIlUBc6amfCHqaH7o0zz/kBYl4/g=; b=PJ8NMLUswZg8JdOWu5KEgpia6gypWkQ4fxLUa9t3cmthDgRS3R2BfBYLbKvhNZnP0chSfl MfdCQJkBVCW6GPjJWrpzSPWZFflW4t9DhmMPbG1dlNJuS721Ratag17xtY3XAQfLakfpZh XdORZjTtn15E5Avm/+P1lIRJt/kwa6BCtsQ9qzgeKi69kGQnwZvm17Gshg0tj6z0W0nhs/ Cc7ftc78eogxnp5pwaZCuWCCZB8dNLsds6SLmoiQORxVLdXRENL68+JSBlrGTqS/nAEJdb pLymgxC0tk0MZ7rAK4Kc0JHPiCov08j8pWegIhAXF1D+PsNJkCCEKKKbtZOvuQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674511938; a=rsa-sha256; cv=none; b=Zrbpvpm14fDtNIlDW6LGkxC/ypdmdHSN8ZdgQ+hevVg57iOvi38SHItMOb75/wrDQtZJB9 0WJE5ziJXTt+hLXzhSlRl1so/g3B6dN7+8IT1blKxz0jhtMjR+OjZ/0BNqaT2tB+tRo9C1 jPqxaClleUJMiqKiPbXCroN40sPr6WgsNfZr+8i1163flhMJmjDAi1PERYOwQuBiygHc0Q nBeZrLp+k1GPAtgNoqMhoQr3zD6Bs8nJG9/Ioh+5ooSxB3EhwRVOizxEKBbKUXdp9Dn88E ryRnBgTCs9DIEaXwjzTdfS5XZfwwLbeu6dDq7TPT22LvmoNU7ugTwyzjfG5TUA== 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 4P148f1MZmzlm3; Mon, 23 Jan 2023 22:12:18 +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 30NMCI6P017256; Mon, 23 Jan 2023 22:12:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30NMCIpV017255; Mon, 23 Jan 2023 22:12:18 GMT (envelope-from git) Date: Mon, 23 Jan 2023 22:12:18 GMT Message-Id: <202301232212.30NMCIpV017255@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: 17e6123e6c93 - stable/13 - netlink: fix ifaddr reporting. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 17e6123e6c931375fa0cd5b0b8a578d9710008b8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=17e6123e6c931375fa0cd5b0b8a578d9710008b8 commit 17e6123e6c931375fa0cd5b0b8a578d9710008b8 Author: Alexander V. Chernikov AuthorDate: 2023-01-06 19:13:42 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-01-23 22:09:04 +0000 netlink: fix ifaddr reporting. Output the proper attributes for IPv4/IPvv6 ifaddrs: * IFA_ADDRESS contains local address in every case except p2p, in that case it contains the peer address * IFA_LOCAL contains local address. It is always present in IPv4, or in IPv6/p2p. * IFA_BROADCAST contains the network broadcast address (if any) Reported by: Adam Wood Tested by: Adam Wood (cherry picked from commit 13214c601a49d733bd17d42b927788bb9feea536) --- sys/netlink/route/iface.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/sys/netlink/route/iface.c b/sys/netlink/route/iface.c index b033ba71009d..81ae5bc8090f 100644 --- a/sys/netlink/route/iface.c +++ b/sys/netlink/route/iface.c @@ -794,11 +794,23 @@ dump_iface_addr(struct nl_writer *nw, struct ifnet *ifp, struct ifaddr *ifa, ifamsg->ifa_scope = ifa_get_scope(ifa); ifamsg->ifa_index = ifp->if_index; - struct sockaddr *dst_sa = ifa->ifa_dstaddr; - if ((dst_sa == NULL) || (dst_sa->sa_family != sa->sa_family)) - dst_sa = sa; - dump_sa(nw, IFA_ADDRESS, dst_sa); - dump_sa(nw, IFA_LOCAL, sa); + if (ifp->if_flags & IFF_POINTOPOINT) { + dump_sa(nw, IFA_ADDRESS, ifa->ifa_dstaddr); + dump_sa(nw, IFA_LOCAL, sa); + } else { + dump_sa(nw, IFA_ADDRESS, sa); +#ifdef INET + /* + * In most cases, IFA_ADDRESS == IFA_LOCAL + * Skip IFA_LOCAL for anything except INET + */ + if (sa->sa_family == AF_INET) + dump_sa(nw, IFA_LOCAL, sa); +#endif + } + if (ifp->if_flags & IFF_BROADCAST) + dump_sa(nw, IFA_BROADCAST, ifa->ifa_broadaddr); + nlattr_add_string(nw, IFA_LABEL, if_name(ifp)); uint32_t val = 0; // ifa->ifa_flags;