Skip to content

fix: use ifnet kernel interfaces #7

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

Open
gawen947 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix: use ifnet kernel interfaces #7

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d73d21
fix: use ifnet kernel interfaces
gawen947 Dec 18, 2025
808e23b
fix: add missing ifnet function in FreeBSD 13
gawen947 Dec 20, 2025
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
10 changes: 8 additions & 2 deletions ndpacket.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,12 @@

// called by pfil_run_hooks() @ ip6_input.c:ip_input()

#if __FreeBSD_version < 1400000
static uint8_t if_getaddrlen(if_t ifp) {
return (ifp->if_addrlen);
}
#endif

#ifdef PFIL_VERSION
pfil_return_t packet(struct mbuf **packet_mp, struct ifnet *packet_ifnet,
const int packet_dir, void *packet_arg, struct inpcb *packet_inpcb) {
Expand Down Expand Up @@ -183,7 +189,7 @@ int packet(void *packet_arg, struct mbuf **packet_mp, struct ifnet *packet_ifnet
// create a new mbuf to send a neighbor advertisement
// ICMPv6 options are rounded up to 8 bytes alignment
maxlen = (sizeof(struct ip6_hdr) + sizeof(struct nd_neighbor_advert) +
sizeof(struct nd_opt_hdr) + packet_ifnet->if_addrlen + 7) & ~7;
sizeof(struct nd_opt_hdr) + if_getaddrlen(packet_ifnet) + 7) & ~7;
if (max_linkhdr + maxlen > MCLBYTES) {
printf("NDPROXY ERROR: reply length > MCLBYTES\n");
return 0;
Expand All @@ -203,7 +209,7 @@ int packet(void *packet_arg, struct mbuf **packet_mp, struct ifnet *packet_ifnet
// packet content:
// IPv6 header + ICMPv6 Neighbor Advertisement including target address + target link-layer ICMPv6 address option
mreply->m_pkthdr.len = mreply->m_len = (sizeof(struct ip6_hdr) + sizeof(struct nd_neighbor_advert)
+ sizeof(struct nd_opt_hdr) + packet_ifnet->if_addrlen + 7) & ~7;
+ sizeof(struct nd_opt_hdr) + if_getaddrlen(packet_ifnet) + 7) & ~7;

// reserve space for the link-layer header
mreply->m_data += max_linkhdr;
Expand Down