FreeBSD Bugzilla – Attachment 234491 Details for
Bug 264238
wpa_supplicant 2.10 fails to associate to open secondary VAP when primary VAP is WPA
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Two patches in current and stable/13 that are not in 13.1
Two-missing-patches.diff (text/plain), 1.21 KB, created by
Cy Schubert
on 2022-06-06 16:01:07 UTC
(
hide
)
Description:
Two patches in current and stable/13 that are not in 13.1
Filename:
MIME Type:
Creator:
Cy Schubert
Created:
2022-06-06 16:01:07 UTC
Size:
1.21 KB
patch
obsolete
>diff --git a/contrib/wpa/src/l2_packet/l2_packet_freebsd.c b/contrib/wpa/src/l2_packet/l2_packet_freebsd.c >index 48e18fffba57..0461758ff210 100644 >--- a/contrib/wpa/src/l2_packet/l2_packet_freebsd.c >+++ b/contrib/wpa/src/l2_packet/l2_packet_freebsd.c >@@ -77,24 +77,27 @@ static void l2_packet_receive(int sock, void *eloop_ctx, void *sock_ctx) > { > struct l2_packet_data *l2 = eloop_ctx; > pcap_t *pcap = sock_ctx; >- struct pcap_pkthdr hdr; >+ struct pcap_pkthdr *hdr; > const u_char *packet; > struct l2_ethhdr *ethhdr; > unsigned char *buf; > size_t len; > >- packet = pcap_next(pcap, &hdr); >+ if (pcap_next_ex(pcap, &hdr, &packet) == -1) { >+ wpa_printf(MSG_ERROR, "Error reading packet, has device disappeared?"); >+ eloop_terminate(); >+ } > >- if (!l2->rx_callback || !packet || hdr.caplen < sizeof(*ethhdr)) >+ if (!l2->rx_callback || !packet || hdr->caplen < sizeof(*ethhdr)) > return; > > ethhdr = (struct l2_ethhdr *) packet; > if (l2->l2_hdr) { > buf = (unsigned char *) ethhdr; >- len = hdr.caplen; >+ len = hdr->caplen; > } else { > buf = (unsigned char *) (ethhdr + 1); >- len = hdr.caplen - sizeof(*ethhdr); >+ len = hdr->caplen - sizeof(*ethhdr); > } > l2->rx_callback(l2->rx_callback_ctx, ethhdr->h_source, buf, len); > }
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 264238
:
234405
|
234407
|
234478
| 234491 |
234669
|
234682
|
234695
|
234745
|
234801
|
234807
|
234808
|
234816
|
234848
|
234857
|
234903
|
234915
|
235029
|
235030
|
235049
|
235050
|
235051
|
235053
|
235055