d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

check that we have an ipv4 packet before swapping ip_len and ip_off.

Browse Source 
This should fix the handling of ipv6 packets which i broke when i
made ipfw operate on packets in network format.

Reported by: Hajimu UMEMOTO
This commit is contained in:
Luigi Rizzo 2010-01-07 12:00:54 +00:00
parent b4b13eba35
commit 59a613b14d
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/netinet/ipfw/ip_fw_pfil.c
View File

@ -104,7 +104,8 @@ ipfw_check_hook(void *arg, struct mbuf **m0, struct ifnet *ifp, int dir,
int ret;
/* all the processing now uses ip_len in net format */
SET_NET_IPLEN(mtod(*m0, struct ip *));
if (mtod(*m0, struct ip *)->ip_v == 4)
SET_NET_IPLEN(mtod(*m0, struct ip *));
/* convert dir to IPFW values */
dir = (dir == PFIL_IN) ? DIR_IN : DIR_OUT;
@ -236,7 +237,7 @@ ipfw_check_hook(void *arg, struct mbuf **m0, struct ifnet *ifp, int dir,
FREE_PKT(*m0);
*m0 = NULL;
}
if (*m0)
if (*m0 && mtod(*m0, struct ip *)->ip_v == 4)
SET_HOST_IPLEN(mtod(*m0, struct ip *));
return ret;
}