diff options
| author | darrenr <darrenr@FreeBSD.org> | 2004-12-16 21:02:16 +0000 |
|---|---|---|
| committer | darrenr <darrenr@FreeBSD.org> | 2004-12-16 21:02:16 +0000 |
| commit | e928230a0ac761138b23b94e3117398b0f28d823 (patch) | |
| tree | 5da3376ad5b65cbb3df9cecf25d285341ec1ab40 /sys/contrib | |
| parent | 0ca0cdb376d390706a4ec5932fb9e6ab663d6dbc (diff) | |
| download | FreeBSD-src-e928230a0ac761138b23b94e3117398b0f28d823.zip FreeBSD-src-e928230a0ac761138b23b94e3117398b0f28d823.tar.gz | |
Using just m_pullup to get all of the interesting bits in packet into one
buffer doesn't work for ipv6 packets, so use m_defrag() here instead as an
easy drop-in replacement.
PR: 70399
Diffstat (limited to 'sys/contrib')
| -rw-r--r-- | sys/contrib/ipfilter/netinet/fil.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sys/contrib/ipfilter/netinet/fil.c b/sys/contrib/ipfilter/netinet/fil.c index 495163b..e214fff 100644 --- a/sys/contrib/ipfilter/netinet/fil.c +++ b/sys/contrib/ipfilter/netinet/fil.c @@ -2433,7 +2433,12 @@ void *ipin; ATOMIC_INCL(frstats[out].fr_pull[0]); qf->qf_data = MTOD(m, char *) + ipoff; # else - m = m_pullup(m, len); +# if (__FreeBSD_version >= 490000) + if ((len > MHLEN) && ((m->m_flags & M_PKTHDR) != 0)) + m = m_defrag(m, M_DONTWAIT); + else +# endif + m = m_pullup(m, len); *fin->fin_mp = m; if (m == NULL) { ATOMIC_INCL(frstats[out].fr_pull[1]); |
