From 8ad299376012b9d2b2109a369d1b3838f03dae62 Mon Sep 17 00:00:00 2001 From: jlemon Date: Sun, 21 May 2000 21:26:06 +0000 Subject: [PATCH] Compute the checksum before handing the packet off to IPFilter. Tested by: Cy Schubert --- sys/contrib/ipfilter/netinet/fil.c | 8 ++++++++ sys/netinet/fil.c | 8 ++++++++ sys/netinet/ip_output.c | 3 +-- sys/netinet/ip_var.h | 2 ++ 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/sys/contrib/ipfilter/netinet/fil.c b/sys/contrib/ipfilter/netinet/fil.c index bb53f4970bb9..8dea84b0d2ed 100644 --- a/sys/contrib/ipfilter/netinet/fil.c +++ b/sys/contrib/ipfilter/netinet/fil.c @@ -632,6 +632,14 @@ int out; m->m_flags &= ~M_CANFASTFWD; # endif /* M_CANFASTFWD */ + /* + * disable delayed checksums. + */ + if (m->m_pkthdr.csum_flags & CSUM_DELAY_DATA) { + in_delayed_cksum(m); + m->m_pkthdr.csum_flags &= ~CSUM_DELAY_DATA; + } + if ((ip->ip_p == IPPROTO_TCP || ip->ip_p == IPPROTO_UDP || ip->ip_p == IPPROTO_ICMP)) { int plen = 0; diff --git a/sys/netinet/fil.c b/sys/netinet/fil.c index bb53f4970bb9..8dea84b0d2ed 100644 --- a/sys/netinet/fil.c +++ b/sys/netinet/fil.c @@ -632,6 +632,14 @@ int out; m->m_flags &= ~M_CANFASTFWD; # endif /* M_CANFASTFWD */ + /* + * disable delayed checksums. + */ + if (m->m_pkthdr.csum_flags & CSUM_DELAY_DATA) { + in_delayed_cksum(m); + m->m_pkthdr.csum_flags &= ~CSUM_DELAY_DATA; + } + if ((ip->ip_p == IPPROTO_TCP || ip->ip_p == IPPROTO_UDP || ip->ip_p == IPPROTO_ICMP)) { int plen = 0; diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c index bd7526686943..47b2c37413b3 100644 --- a/sys/netinet/ip_output.c +++ b/sys/netinet/ip_output.c @@ -96,7 +96,6 @@ static MALLOC_DEFINE(M_IPMOPTS, "ip_moptions", "internet multicast options"); u_short ip_id; -static void in_delayed_cksum(struct mbuf *m); static struct mbuf *ip_insertoptions __P((struct mbuf *, struct mbuf *, int *)); static void ip_mloopback __P((struct ifnet *, struct mbuf *, struct sockaddr_in *, int)); @@ -954,7 +953,7 @@ bad: goto done; } -static void +void in_delayed_cksum(struct mbuf *m) { struct ip *ip; diff --git a/sys/netinet/ip_var.h b/sys/netinet/ip_var.h index ac7f79c5bc9e..1610ae2fdaf0 100644 --- a/sys/netinet/ip_var.h +++ b/sys/netinet/ip_var.h @@ -189,6 +189,8 @@ extern u_int16_t ip_divert_cookie; extern struct sockaddr_in *ip_fw_fwd_addr; +void in_delayed_cksum(struct mbuf *m); + #endif /* _KERNEL */ #endif /* !_NETINET_IP_VAR_H_ */