From nobody Tue Oct 04 21:40:07 2022 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 4Mhrhl6YqKz4dmZG; Tue, 4 Oct 2022 21:40:07 +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 4Mhrhl684Bz3LVj; Tue, 4 Oct 2022 21:40:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664919607; 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=UrPluz7A+4PURcupoWAoVSbQF36vZTU/H9KU516YCF8=; b=xD6MZwE9Epc6JsUpUWVsmpvCrWizW8m7T/ybuF8BE0SNVtk6NLjcxSBqRm+8YrPYRr+i+z bpimVvFFcS9SL9YSlCDbWQC1+gbetx1oxzFXW/HL3AaGbL+pZe4jV2RD5ApemlxA4tFYcK ydX7ySRTEoQdctoRWXS7l7Fv0DoH2kvUVuO4Shp077Gy3+l+VEkd21lSlaL9tG0T58peWZ yt0vOfkoFQC/0V9l/QNztN3XAPLcqUz5Nl2sZKsTG+vfr7DQHYgAGKwfJxt7rpu9RbGRcp g5uQ4ziAxDO/valSx1PmSKj61RGrOLHV6NMD1hYKkQ2Q/Yn0DfpBdCc2WTh7Iw== 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 4Mhrhl5DJmzhW4; Tue, 4 Oct 2022 21:40:07 +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 294Le7nu040245; Tue, 4 Oct 2022 21:40:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 294Le7xB040242; Tue, 4 Oct 2022 21:40:07 GMT (envelope-from git) Date: Tue, 4 Oct 2022 21:40:07 GMT Message-Id: <202210042140.294Le7xB040242@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: b958b862b1f4 - main - netlink: make it working without INET6 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: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b958b862b1f43f5fef881c1f9aee6618d7d24197 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664919607; 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=UrPluz7A+4PURcupoWAoVSbQF36vZTU/H9KU516YCF8=; b=NPkbAyWM32oeumQuQ9oauxeAW/B/Sxr3ONBRBhZftX63kYKBZLLsZn+697sMomJdPs4/9D diOLfDrenyxon0oO/4OKKmIuXilJsJkoxAsHVQeduSVIlSQStCPv5b23Lzv8TlCe+87qf3 rbnAdI/K4eaBrRgbr0YTinA50CelobcPi3G3h+RfAuGbCMinjl27nxoyEXydUqsQqS1i6z 04oxBDowZBPgJcgReKfj33TTt6uqW1+BnB3c6qP6E+D40FNwQbHVEWpAk6PDOsF9yW66JD KGCwgDgIzlomGZS6yM6OA1coXkU+8MuR/2mDEwfcVXcT+x/imelJa77NTrQghQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664919607; a=rsa-sha256; cv=none; b=A5G0YSyfGNQFxzmvdr19zMRtjmd8vCvY56z5CxRh5mC46133glrl42sSw38cZdFPo64pQJ cInKWLTy2YQWS5C3yYVd43UI8sS1UV2Z81QSijy4DEvupt8i8EYeMrIq/BVMM9uoAZCDkg 2P5k/m7XmeRdRGiQ4uIaDPj7zSKuOSrevvD/zTPfgMrw3Pa5x8DtV3Zsbsxu9dC/HnTBAZ TvsomeGt4TUO0BXdh1m5EL8Ksqbfblo60pqblHntuNOR1rAPQvyysWEYpl3C9+hvicYwqp I/yB7DB/Wy7pTFw5FktukxGJ3x68SWqhVMOuZTjeAGwQZVH8fkRFntJCwO7IDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=b958b862b1f43f5fef881c1f9aee6618d7d24197 commit b958b862b1f43f5fef881c1f9aee6618d7d24197 Author: Gleb Smirnoff AuthorDate: 2022-10-04 21:39:49 +0000 Commit: Gleb Smirnoff CommitDate: 2022-10-04 21:39:49 +0000 netlink: make it working without INET6 --- sys/netlink/route/iface.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/sys/netlink/route/iface.c b/sys/netlink/route/iface.c index 8bb4406ad8be..5ffe11cc7e80 100644 --- a/sys/netlink/route/iface.c +++ b/sys/netlink/route/iface.c @@ -196,21 +196,27 @@ dump_sa(struct nl_writer *nw, int attr, const struct sockaddr *sa) { uint32_t addr_len = 0; const void *addr_data = NULL; +#ifdef INET6 struct in6_addr addr6; +#endif if (sa == NULL) return (true); switch (sa->sa_family) { +#ifdef INET case AF_INET: addr_len = sizeof(struct in_addr); addr_data = &((const struct sockaddr_in *)sa)->sin_addr; break; +#endif +#ifdef INET6 case AF_INET6: in6_splitscope(&((const struct sockaddr_in6 *)sa)->sin6_addr, &addr6, &addr_len); addr_len = sizeof(struct in6_addr); addr_data = &addr6; break; +#endif case AF_LINK: addr_len = ((const struct sockaddr_dl *)sa)->sdl_alen; addr_data = LLADDR_CONST((const struct sockaddr_dl *)sa); @@ -563,6 +569,7 @@ ifa_get_scope(const struct ifaddr *ifa) sa = ifa->ifa_addr; switch (sa->sa_family) { +#ifdef INET case AF_INET: { struct in_addr addr; @@ -573,6 +580,8 @@ ifa_get_scope(const struct ifaddr *ifa) addr_scope = RT_SCOPE_LINK; break; } +#endif +#ifdef INET6 case AF_INET6: { const struct in6_addr *addr; @@ -583,6 +592,7 @@ ifa_get_scope(const struct ifaddr *ifa) addr_scope = RT_SCOPE_LINK; break; } +#endif } return (addr_scope); @@ -599,20 +609,28 @@ inet6_get_plen(const struct in6_addr *addr) static uint8_t get_sa_plen(const struct sockaddr *sa) { - const struct in6_addr *paddr6; +#ifdef INET const struct in_addr *paddr; +#endif +#ifdef INET6 + const struct in6_addr *paddr6; +#endif switch (sa->sa_family) { +#ifdef INET case AF_INET: if (sa == NULL) return (32); paddr = &(((const struct sockaddr_in *)sa)->sin_addr); return bitcount32(paddr->s_addr);; +#endif +#ifdef INET6 case AF_INET6: if (sa == NULL) return (128); paddr6 = &(((const struct sockaddr_in6 *)sa)->sin6_addr); return inet6_get_plen(paddr6); +#endif } return (0); @@ -718,12 +736,16 @@ rtnl_handle_ifaddr(void *arg __unused, struct ifaddr *ifa, int cmd) uint32_t group = 0; switch (ifa->ifa_addr->sa_family) { +#ifdef INET case AF_INET: group = RTNLGRP_IPV4_IFADDR; break; +#endif +#ifdef INET6 case AF_INET6: group = RTNLGRP_IPV6_IFADDR; break; +#endif default: NL_LOG(LOG_DEBUG2, "ifa notification for unknown AF: %d", ifa->ifa_addr->sa_family);