From nobody Fri Sep 15 14:08:50 2023 X-Original-To: dev-commits-ports-all@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 4RnGJL63z7z4sV8J; Fri, 15 Sep 2023 14:08:50 +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 4RnGJL4mnfz4G9R; Fri, 15 Sep 2023 14:08:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694786930; 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=ds/KRYzGYzYhKDe7+FXilGKpZBsPmUiVMjuEr01eKcE=; b=n/dFyveQ3J4/GidMklYQoyO7s7u6x8mOjymVpudVRUqBLezECTCq5hhdGlfMpljAdXQbks rsLXXuffW2v47xEOfYIiZqGQzl8XBZoUcB/KFcs8rMAea7LHSOgLXUBd5upegbMZTdMWq6 BOg8TlVH97/G1f23n4bpjNp5HHto2T2XgZ7SrHg0dDal+j/egv2El6V2F/bjOv2COuFAaG 3yCQNb7ZTJwbT24Pn9IvUWdaAiicIQR8B5p7brVvgtzJvxZt/2W1XNzxbg2sAjMAYRrP88 EXyYbonc6kwqB4xo40e/xmUS9CoHGlXKfYq4/C8sykthKMxHSdcUouQuGC3zSQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694786930; a=rsa-sha256; cv=none; b=cU8sk2CkSJQrE15ZJJkLv6xjf0mtqli2a4g372B1kKuAmQ0lUPlYootv/pN/Wf5HWZMDeO pnwe1gyrsWUSOe+r4Szz01YM2cNsWfFY27t4ULRwH0oA+D3u/+9MSonWOHeDUn7mVlf1M2 UIAPbcHgQVt07kft+0r5dOkh9xOLkLbGKIKl4ky1k2Jv2GiqrQuL1UPZQ2OJ4T43P9ahi2 EqgkhH9LA9wzheGWK5LGOwlDS+3RYC2uQcJRI1U3/v1ik65w1sGyCMXKQ5BrrtyUksKuBM DUKQHJ0qfNlTZpfeEtItVnsb7BY8TbyeJmTCn7r+3MXYzY5WUl0e9yCRW6JH/Q== 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=1694786930; 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=ds/KRYzGYzYhKDe7+FXilGKpZBsPmUiVMjuEr01eKcE=; b=HaGIKGz/0c/d08bqNaICL9PFTDeSnT3xE4p3lZ1C4B9Yb3sF7wa5anP/71MTQJN9hnB18d WkI9ba+QvdqRsTYgPkCTHTcoOkUADnanNhsMHh3tN81Jje8jpCGz9cE5Eg6MQP3JcRlIGE SQikQEfPD8pGVXHrc0tlZOrgERGt9sNHaZaCaYMp77n/Q+/0eZ8ycLgw919nKqMfjACKVt UDFNPj0tSLS2JuqGiozmTuXTmOpWomnQ9OTbBBcxgiWBHknc85xLbZYEbYoUeyNLI5Dr4a LSsIGY1PyY6cr23vAdUo9Zhz75HFwoxhh40bLPAzXbIvSp9PVLVAaKYL8aPsBw== 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 4RnGJL3pyrzC0j; Fri, 15 Sep 2023 14:08:50 +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 38FE8oln090934; Fri, 15 Sep 2023 14:08:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38FE8oLa090931; Fri, 15 Sep 2023 14:08:50 GMT (envelope-from git) Date: Fri, 15 Sep 2023 14:08:50 GMT Message-Id: <202309151408.38FE8oLa090931@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: a313183071ac - 2023Q3 - net/hostapd: wpa: Enable receiving priority tagged (VID 0) frames List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: a313183071ac551368e87214ebf5ef6e5fa589d0 Auto-Submitted: auto-generated The branch 2023Q3 has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=a313183071ac551368e87214ebf5ef6e5fa589d0 commit a313183071ac551368e87214ebf5ef6e5fa589d0 Author: R. Christian McDonald AuthorDate: 2023-09-12 05:26:08 +0000 Commit: Cy Schubert CommitDate: 2023-09-15 14:07:45 +0000 net/hostapd: 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 33410dc2fce35423090de7566b10b2ce4ba5795c) --- net/hostapd/Makefile | 2 +- .../patch-src_l2__packet_l2__packet__freebsd.c | 30 ++++++++++++++++++++-- 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/net/hostapd/Makefile b/net/hostapd/Makefile index 1e6d5841681a..e4951adea292 100644 --- a/net/hostapd/Makefile +++ b/net/hostapd/Makefile @@ -1,6 +1,6 @@ PORTNAME= hostapd PORTVERSION= 2.10 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= net MASTER_SITES= https://w1.fi/releases/ diff --git a/net/hostapd/files/patch-src_l2__packet_l2__packet__freebsd.c b/net/hostapd/files/patch-src_l2__packet_l2__packet__freebsd.c index 9d290e5dff5c..e0aa170fa91f 100644 --- a/net/hostapd/files/patch-src_l2__packet_l2__packet__freebsd.c +++ b/net/hostapd/files/patch-src_l2__packet_l2__packet__freebsd.c @@ -1,5 +1,5 @@ --- src/l2_packet/l2_packet_freebsd.c.orig 2022-01-16 12:51:29.000000000 -0800 -+++ src/l2_packet/l2_packet_freebsd.c 2023-09-11 22:00:09.826831000 -0700 ++++ src/l2_packet/l2_packet_freebsd.c 2023-09-11 22:21:12.054042000 -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;