git: e242127d30cd - 2023Q3 - net/hostapd-devel: wpa: Enable receiving priority tagged (VID 0) frames

The branch 2023Q3 has been updated by cy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=e242127d30cdcef77f50503bd266996c1ed8a50b

commit e242127d30cdcef77f50503bd266996c1ed8a50b
Author:     R. Christian McDonald <rcm@rcm.sh>
AuthorDate: 2023-09-12 05:26:24 +0000
Commit:     Cy Schubert <cy@FreeBSD.org>
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 <net/bpf.h>
  #endif /* __APPLE__ */
  #include <pcap.h>
-@@ -76,24 +79,28 @@
+@@ -20,6 +23,7 @@
+ #include <sys/sysctl.h>
+ #endif /* __sun__ */
+ 
++#include <net/ethernet.h>
+ #include <net/if.h>
+ #include <net/if_dl.h>
+ #include <net/route.h>
+@@ -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;