From nobody Fri Jul 14 07:46:58 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 4R2Npp3kRBz4mmkW; Fri, 14 Jul 2023 07:46:58 +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 4R2Npp36Nsz3lbc; Fri, 14 Jul 2023 07:46:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689320818; 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=CNKmuw1rQOyiZbJBqhf4+2xxuEBo26J0wvc6pXeDf9c=; b=fH8rPSEQrjgkcpaK8+STRUl4DkCHlcK+YrIkqZZiuefw7JhNByRTartusZJYGXuonnY6Nn 1bZf8PREUgvGlpy2SXRaolYa7U4Lhk8mUMdfYDZQJ2KQYEqU9Ya/5HYhCNwUgyNUAzjF6T d5abA5eYZFejkUrcMMMvXV2c5lDzcKWXQ2Z/Ok3En3uaKhyisCafAiDGs65fLOgXxGA6ml 8uLSae9PJ079/TH0o0F/BMe3/l3GurgPsx2y3rfeJg83Omxo5n8YvdoDWVnMrFZKco/wnU IasO/Rj3Omu8Huyj9BZ5o/beNv+bOcIV2OtOzw//8k5tyd/us5etT5NtFTgzxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689320818; 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=CNKmuw1rQOyiZbJBqhf4+2xxuEBo26J0wvc6pXeDf9c=; b=CMLc1+KeK9z+Ht22qJna+ZCA7ODOgcDMVdc+yhF9UCu/wsI3BEB83nHY00F5CKtOjo8cs6 sIUDjc5UxscPtJ8JBJB7gKbUtmjW6X3NbA8eGNEBhXDnduI95nIN6xHm3nNv/aIrpEoA9Y AQUTcB5E3aofHyhBI1Dg6762OvkkxnEN6QMonX1mUQcSc5nqHKFdSMFyHc8ZIBhAQBtpR/ QD2XpsQzCYeHh5N9TSGdNNvHTB1xNV43I9vf2HZwyX1mvIOmdSpmbh9OrxgSPkUkrA2hCD 26ycRvPJP8/LZrQrDqkBr9gmJBqY1CG7JbA1jZ65uVZAVrOi2KhF+4YUWxlifA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689320818; a=rsa-sha256; cv=none; b=nFOkrx1fc1+YcJ0MzwzfOY8P+xXVUDwRr7iOlWuGkBG6oASr1c1/VImtNDuAsDnLcbJ2av qZU7EVK9/n3pbRK+NbtKaUfu6Hi9ik3sHelbWhVus1UfDkcc7EeWAVSEqZVxiJEDSz87LQ RngtwiNckfkDCHkdCIoYqGNJ/ienJN0+oMV0RmEUMCDZ8rhKpa/TVATGDoTTlf9+pneLQb n6jx2xLvV9SNNgUlcE0dhL1yBy5v/mvuMo1/Jq7LUSENpzPOntPtJehiyy4oCkKSfghGNK RS0O+aOKO6bcYDUOWwduJfkfXewHc+yjayB2Ma1eCSNLrKp6F+lN5D13seUShw== 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 4R2Npp26lnz1PBL; Fri, 14 Jul 2023 07:46:58 +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 36E7kwtm032794; Fri, 14 Jul 2023 07:46:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36E7kwUc032793; Fri, 14 Jul 2023 07:46:58 GMT (envelope-from git) Date: Fri, 14 Jul 2023 07:46:58 GMT Message-Id: <202307140746.36E7kwUc032793@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: 77c9e608854f - main - pfsync: fix NOINET6 build 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 77c9e608854fa0bbb0d2e6ed972fc0b26f5b4a7e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=77c9e608854fa0bbb0d2e6ed972fc0b26f5b4a7e commit 77c9e608854fa0bbb0d2e6ed972fc0b26f5b4a7e Author: Kristof Provost AuthorDate: 2023-07-13 12:39:25 +0000 Commit: Kristof Provost CommitDate: 2023-07-14 07:18:43 +0000 pfsync: fix NOINET6 build While here also fix a few minor style(9) issues. --- sys/netpfil/pf/if_pfsync.c | 53 +++++++++++++++++++++++++++++++--------------- sys/netpfil/pf/pfsync_nv.c | 2 +- 2 files changed, 37 insertions(+), 18 deletions(-) diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c index 5df51d20e05f..fa5ffd4649f6 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -2689,10 +2689,13 @@ static int pfsync_multicast_setup(struct pfsync_softc *sc, struct ifnet *ifp, struct in_mfilter* imf, struct in6_mfilter* im6f) { +#ifdef INET struct ip_moptions *imo = &sc->sc_imo; +#endif +#ifdef INET6 struct ip6_moptions *im6o = &sc->sc_im6o; - int error; struct sockaddr_in6 *syncpeer_sa6 = NULL; +#endif if (!(ifp->if_flags & IFF_MULTICAST)) return (EADDRNOTAVAIL); @@ -2700,46 +2703,45 @@ pfsync_multicast_setup(struct pfsync_softc *sc, struct ifnet *ifp, switch (sc->sc_sync_peer.ss_family) { #ifdef INET case AF_INET: - { + { + int error; + ip_mfilter_init(&imo->imo_head); imo->imo_multicast_vif = -1; if ((error = in_joingroup(ifp, - &(((struct sockaddr_in *)&sc->sc_sync_peer)->sin_addr), - NULL, &imf->imf_inm)) != 0) - { + &((struct sockaddr_in *)&sc->sc_sync_peer)->sin_addr, NULL, + &imf->imf_inm)) != 0) return (error); - } ip_mfilter_insert(&imo->imo_head, imf); imo->imo_multicast_ifp = ifp; imo->imo_multicast_ttl = PFSYNC_DFLTTL; imo->imo_multicast_loop = 0; break; - } + } #endif #ifdef INET6 case AF_INET6: - { + { + int error; + syncpeer_sa6 = (struct sockaddr_in6 *)&sc->sc_sync_peer; if ((error = in6_setscope(&syncpeer_sa6->sin6_addr, ifp, NULL))) - { return (error); - } + ip6_mfilter_init(&im6o->im6o_head); if ((error = in6_joingroup(ifp, &syncpeer_sa6->sin6_addr, NULL, &(im6f->im6f_in6m), 0)) != 0) - { return (error); - } ip6_mfilter_insert(&im6o->im6o_head, im6f); im6o->im6o_multicast_ifp = ifp; im6o->im6o_multicast_hlim = PFSYNC_DFLTTL; im6o->im6o_multicast_loop = 0; break; - } } #endif + } return (0); } @@ -2747,10 +2749,9 @@ pfsync_multicast_setup(struct pfsync_softc *sc, struct ifnet *ifp, static void pfsync_multicast_cleanup(struct pfsync_softc *sc) { +#ifdef INET struct ip_moptions *imo = &sc->sc_imo; - struct ip6_moptions *im6o = &sc->sc_im6o; struct in_mfilter *imf; - struct in6_mfilter *im6f; while ((imf = ip_mfilter_first(&imo->imo_head)) != NULL) { ip_mfilter_remove(&imo->imo_head, imf); @@ -2758,6 +2759,11 @@ pfsync_multicast_cleanup(struct pfsync_softc *sc) ip_mfilter_free(imf); } imo->imo_multicast_ifp = NULL; +#endif + +#ifdef INET6 + struct ip6_moptions *im6o = &sc->sc_im6o; + struct in6_mfilter *im6f; while ((im6f = ip6_mfilter_first(&im6o->im6o_head)) != NULL) { ip6_mfilter_remove(&im6o->im6o_head, im6f); @@ -2765,6 +2771,7 @@ pfsync_multicast_cleanup(struct pfsync_softc *sc) ip6_mfilter_free(im6f); } im6o->im6o_multicast_ifp = NULL; +#endif } void @@ -2818,8 +2825,6 @@ pfsync_kstatus_to_softc(struct pfsync_kstatus *status, struct pfsync_softc *sc) struct ifnet *sifp; struct in_mfilter *imf = NULL; struct in6_mfilter *im6f = NULL; - struct sockaddr_in *status_sin; - struct sockaddr_in6 *status_sin6; int error; int c; @@ -2832,8 +2837,10 @@ pfsync_kstatus_to_softc(struct pfsync_kstatus *status, struct pfsync_softc *sc) return (EINVAL); switch (status->syncpeer.ss_family) { +#ifdef INET case AF_UNSPEC: case AF_INET: { + struct sockaddr_in *status_sin; status_sin = (struct sockaddr_in *)&(status->syncpeer); if (sifp != NULL) { if (status_sin->sin_addr.s_addr == 0 || @@ -2851,7 +2858,10 @@ pfsync_kstatus_to_softc(struct pfsync_kstatus *status, struct pfsync_softc *sc) } break; } +#endif +#ifdef INET6 case AF_INET6: { + struct sockaddr_in6 *status_sin6; status_sin6 = (struct sockaddr_in6*)&(status->syncpeer); if (sifp != NULL) { if (IN6_IS_ADDR_UNSPECIFIED(&status_sin6->sin6_addr) || @@ -2869,6 +2879,7 @@ pfsync_kstatus_to_softc(struct pfsync_kstatus *status, struct pfsync_softc *sc) } break; } +#endif } PFSYNC_LOCK(sc); @@ -2954,10 +2965,14 @@ pfsync_kstatus_to_softc(struct pfsync_kstatus *status, struct pfsync_softc *sc) if (error) { if_rele(sifp); PFSYNC_UNLOCK(sc); +#ifdef INET if (imf != NULL) ip_mfilter_free(imf); +#endif +#ifdef INET6 if (im6f != NULL) ip6_mfilter_free(im6f); +#endif return (error); } } @@ -2966,6 +2981,7 @@ pfsync_kstatus_to_softc(struct pfsync_kstatus *status, struct pfsync_softc *sc) sc->sc_sync_if = sifp; switch (sc->sc_sync_peer.ss_family) { +#ifdef INET case AF_INET: { struct ip *ip; ip = &sc->sc_template.ipv4; @@ -2981,6 +2997,8 @@ pfsync_kstatus_to_softc(struct pfsync_kstatus *status, struct pfsync_softc *sc) ip->ip_dst = ((struct sockaddr_in *)&sc->sc_sync_peer)->sin_addr; break; } +#endif +#ifdef INET6 case AF_INET6: { struct ip6_hdr *ip6; ip6 = &sc->sc_template.ipv6; @@ -2997,6 +3015,7 @@ pfsync_kstatus_to_softc(struct pfsync_kstatus *status, struct pfsync_softc *sc) NET_EPOCH_EXIT(et); break; } +#endif } /* Request a full state table update. */ diff --git a/sys/netpfil/pf/pfsync_nv.c b/sys/netpfil/pf/pfsync_nv.c index 1a461d138fc7..66b81e8c0b7d 100644 --- a/sys/netpfil/pf/pfsync_nv.c +++ b/sys/netpfil/pf/pfsync_nv.c @@ -47,7 +47,6 @@ pfsync_syncpeer_nvlist_to_sockaddr(const nvlist_t *nvl, struct sockaddr_storage *sa) { int af; - int error; if (!nvlist_exists_number(nvl, "af")) return (EINVAL); @@ -74,6 +73,7 @@ pfsync_syncpeer_nvlist_to_sockaddr(const nvlist_t *nvl, case AF_INET6: { struct sockaddr_in6 *in6 = (struct sockaddr_in6 *)sa; size_t len; + int error; const void *addr = nvlist_get_binary(nvl, "address", &len); in6->sin6_family = af; if (len != sizeof(*in6))