Skip to content

BPF: Improve headers #619

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rsmarples merged 1 commit into from
Jun 1, 2026
+14 −11
Merged

BPF: Improve headers #619

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 14 additions & 11 deletions src/bpf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,21 +34,22 @@
#include <netinet/if_ether.h>

#include <arpa/inet.h>
#include <errno.h>
#include <fcntl.h>
#include <stddef.h>
#include <stdlib.h>
#include <string.h>

#ifdef __linux__
/* Special BPF snowflake. */
#include "config.h"
#ifdef USE_LIBPCAP
#include <pcap/bpf.h>
#elif defined(__linux__)
#include <linux/filter.h>
#define bpf_insn sock_filter
#else
#include <net/bpf.h>
#endif

#include <errno.h>
#include <fcntl.h>
#include <stddef.h>
#include <stdlib.h>
#include <string.h>

#include "arp.h"
#include "bpf.h"
#include "common.h"
Expand Down Expand Up @@ -268,7 +269,7 @@ static const struct bpf_insn bpf_arp_ether[] = {
/* Make sure the hardware length matches. */
BPF_STMT(BPF_LD + BPF_B + BPF_IND, offsetof(struct arphdr, ar_hln)),
BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K,
sizeof(((struct ether_arp *)0)->arp_sha), 1, 0),
sizeof(((struct ether_header *)0)->ether_shost), 1, 0),
BPF_STMT(BPF_RET + BPF_K, 0),
};
#define BPF_ARP_ETHER_LEN __arraycount(bpf_arp_ether)
Expand Down Expand Up @@ -314,8 +315,10 @@ bpf_arp_rw(const struct bpf *bpf, const struct in_addr *ia, bool recv)
case ARPHRD_ETHER:
memcpy(bp, bpf_arp_ether, sizeof(bpf_arp_ether));
bp += BPF_ARP_ETHER_LEN;
arp_len = sizeof(struct ether_header) +
sizeof(struct ether_arp);
arp_len = sizeof(struct ether_header) + sizeof(struct arphdr) +
((sizeof(((struct ether_header *)0)->ether_shost) +
sizeof(uint32_t)) *
2);
break;
default:
errno = EINVAL;
Expand Down