From nobody Fri Sep 15 14:08:51 2023 X-Original-To: dev-commits-ports-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 4RnGJM68NQz4sV0d; Fri, 15 Sep 2023 14:08:51 +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 4RnGJM5Kmxz4GXD; Fri, 15 Sep 2023 14:08:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694786931; 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=KqIg9OgKPBnogi6Za+W6hKPowDw81G31xTZ2AyQPeww=; b=S0qqcxNrA5vmGqhpSsn3/+OWOzKKv52hwGJuFXgg5WKN3dMaMNt/cHw2PyaO+vRdG4aN/m fseaMFHoQ1LApkkJhB1PRmE1QesVS5Z0Rf3qyVJ7bOmmVlDVQJC0BMg+LQoUafbkKyg2PZ BDPC1lOLoOnqnSQUabIqQPMlLVGw/t0IpgSXNJpvsXZzaILC0djlF6Tve27+qcjd+igXqR mfbaf94VIpbldPnhNd4eB1UK0afOS9HOPnJmd98u/EMKdGBOhKhNjmG5x9mxNH0/L178H9 VgwXKkrI/2ONVO/EbHZBfUVeLa0DNDUweqP79QdYQTiDUZqSNvG0r1fQc7SuIA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694786931; a=rsa-sha256; cv=none; b=Vgh309oU+pMOsxSsSQxdcaHjf0HQarbeNOQXqPHydopmdbOGwQG5ZTAeawjtrbVhn1yDgD qT8OigQNVttFO8E72heP+7PxROFdrIQioL4vSKyDnahTWYVgkITZW/To3K/QSe0eQOiEt/ cGVVoT2A8PW7dlh+hNH2QpIrTsVn+S6JltYGz+F9I0s423RxEkPM87EZXkrREjBMVjL1fE 8lYB5gTfp8U9Fa0bDH1IRlquBOIz/aXhac0fqyonaohIIKLaHZ4UWJpPoy8KBukzkllAJz 6IarjiiKmUuf7tlPw+EXnBqU2pG9XqXtDBHwaUJwrZMsC7A4zwDRJSaT1b0GRA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694786931; 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=KqIg9OgKPBnogi6Za+W6hKPowDw81G31xTZ2AyQPeww=; b=wNHI2NQ+JdfkSmM4newgyxuQXs+wHLS/d+RGAVCU309i0RR+u99dDt4YTPwxMHFVE7Yy+P Z3IjnKnZPYhzr8z0863iKqSfF0ieufHoAUQikxqLzrxLJzt1aZzshJRc80E1RnQ6ES1gbo N40MNvO1YS74rmttqwIWgxBdbtU70SIEjGFgjXGIUmmoT13EtycINvZpM9jtOuSiYYVkxP MiwCEt0MllzoAjbeab7MeUPWaw87ymcDxocAebHHF2UuYHlgLFnOSRaLw6EmshzPAkON3W 0J4IT9bL462Lz8gZeZM7KCtXcfXRqjI4Omb1Zsp2peI4HcjQ6iduj80J/d5DZQ== 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 4RnGJM4PM2zBVM; Fri, 15 Sep 2023 14:08:51 +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 38FE8pGJ090989; Fri, 15 Sep 2023 14:08:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38FE8pBj090986; Fri, 15 Sep 2023 14:08:51 GMT (envelope-from git) Date: Fri, 15 Sep 2023 14:08:51 GMT Message-Id: <202309151408.38FE8pBj090986@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Cy Schubert Subject: git: e242127d30cd - 2023Q3 - net/hostapd-devel: wpa: Enable receiving priority tagged (VID 0) frames List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q3 X-Git-Reftype: branch X-Git-Commit: e242127d30cdcef77f50503bd266996c1ed8a50b Auto-Submitted: auto-generated The branch 2023Q3 has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=e242127d30cdcef77f50503bd266996c1ed8a50b commit e242127d30cdcef77f50503bd266996c1ed8a50b Author: R. Christian McDonald AuthorDate: 2023-09-12 05:26:24 +0000 Commit: Cy Schubert CommitDate: 2023-09-15 14:07:46 +0000 net/hostapd-devel: wpa: Enable receiving priority tagged (VID 0) frames Certain internet service providers transmit vlan 0 priority tagged EAPOL frames from the ONT towards the residential gateway. VID 0 should be ignored, and the frame processed according to the priority set in the 802.1P bits and the encapsulated EtherType (i.e. EAPOL). The pcap filter utilized by l2_packet is inadquate for this use case. Here we modify the pcap filter to accept both unencapsulated and encapsulated (with VLAN 0) EAPOL EtherTypes. This preserves the original filter behavior while also matching on encapsulated EAPOL. Sponsored by: Rubicon Communications, LLC ("Netgate") Reviewed by: cy Obtained from: src bb5d6d14d81b PR: 273696 (cherry picked from commit 92b2d8e1bf08f4b81a5b3b92b30149dfd0807538) --- net/hostapd-devel/Makefile | 2 +- .../patch-src_l2__packet_l2__packet__freebsd.c | 30 ++++++++++++++++++++-- 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/net/hostapd-devel/Makefile b/net/hostapd-devel/Makefile index 06df1ba11977..d05bb9153e71 100644 --- a/net/hostapd-devel/Makefile +++ b/net/hostapd-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME= hostapd PORTVERSION= ${COMMIT_DATE} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net PKGNAMESUFFIX= -devel diff --git a/net/hostapd-devel/files/patch-src_l2__packet_l2__packet__freebsd.c b/net/hostapd-devel/files/patch-src_l2__packet_l2__packet__freebsd.c index 224ca67ee95f..5cef27d8a415 100644 --- a/net/hostapd-devel/files/patch-src_l2__packet_l2__packet__freebsd.c +++ b/net/hostapd-devel/files/patch-src_l2__packet_l2__packet__freebsd.c @@ -1,5 +1,5 @@ --- src/l2_packet/l2_packet_freebsd.c.orig 2023-09-05 10:38:47.000000000 -0700 -+++ src/l2_packet/l2_packet_freebsd.c 2023-09-11 22:12:22.076149000 -0700 ++++ src/l2_packet/l2_packet_freebsd.c 2023-09-11 22:21:57.799201000 -0700 @@ -8,7 +8,10 @@ */ @@ -12,7 +12,15 @@ #include #endif /* __APPLE__ */ #include -@@ -76,24 +79,28 @@ +@@ -20,6 +23,7 @@ + #include + #endif /* __sun__ */ + ++#include + #include + #include + #include +@@ -76,24 +80,33 @@ { struct l2_packet_data *l2 = eloop_ctx; pcap_t *pcap = sock_ctx; @@ -43,6 +51,24 @@ buf = (unsigned char *) (ethhdr + 1); - len = hdr.caplen - sizeof(*ethhdr); + len = hdr->caplen - sizeof(*ethhdr); ++ /* handle 8021Q encapsulated frames */ ++ if (ethhdr->h_proto == htons(ETH_P_8021Q)) { ++ buf += ETHER_VLAN_ENCAP_LEN; ++ len -= ETHER_VLAN_ENCAP_LEN; ++ } } l2->rx_callback(l2->rx_callback_ctx, ethhdr->h_source, buf, len); } +@@ -122,10 +135,10 @@ + os_snprintf(pcap_filter, sizeof(pcap_filter), + "not ether src " MACSTR " and " + "( ether dst " MACSTR " or ether dst " MACSTR " ) and " +- "ether proto 0x%x", ++ "( ether proto 0x%x or ( vlan 0 and ether proto 0x%x ) )", + MAC2STR(l2->own_addr), /* do not receive own packets */ + MAC2STR(l2->own_addr), MAC2STR(pae_group_addr), +- protocol); ++ protocol, protocol); + if (pcap_compile(l2->pcap, &pcap_fp, pcap_filter, 1, pcap_netp) < 0) { + fprintf(stderr, "pcap_compile: %s\n", pcap_geterr(l2->pcap)); + return -1;