diff options
| author | bms <bms@FreeBSD.org> | 2003-11-19 22:31:36 +0800 |
|---|---|---|
| committer | bms <bms@FreeBSD.org> | 2003-11-19 22:31:36 +0800 |
| commit | 1c38996e5c1504e1db42b4ab134af9f2e190a5c1 (patch) | |
| tree | 73790ed3aed405e949e525036ba1c83506366cd4 | |
| parent | dca8f4561a795bdf95b3b93f363f4102be9c216c (diff) | |
| download | freebsd-ports-gnome-1c38996e5c1504e1db42b4ab134af9f2e190a5c1.tar.gz freebsd-ports-gnome-1c38996e5c1504e1db42b4ab134af9f2e190a5c1.tar.zst freebsd-ports-gnome-1c38996e5c1504e1db42b4ab134af9f2e190a5c1.zip | |
Fix pf for ${OSVERSION} >= 501114, i.e. the 5.2 freeze point, when andre@'s
tcp hostcache changes took place.
| -rw-r--r-- | security/pf/Makefile | 4 | ||||
| -rw-r--r-- | security/pf/files/extra-patch-pf::pf.c | 22 |
2 files changed, 26 insertions, 0 deletions
diff --git a/security/pf/Makefile b/security/pf/Makefile index e4f9c551c42d..3e3aeaff2596 100644 --- a/security/pf/Makefile +++ b/security/pf/Makefile @@ -50,6 +50,10 @@ PLIST_SUB+= WITH_ALTQ="@comment " IGNORE= "Only for 5.0 and above" .endif +.if ${OSVERSION} >= 501114 +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-pf::pf.c +.endif + .if !exists(${SRC_BASE}/sys/Makefile) && \ (defined(WITH_ALTQ) && !exists(${SYS_ALTQ}/Makefile)) IGNORE= "Kernel source files required" diff --git a/security/pf/files/extra-patch-pf::pf.c b/security/pf/files/extra-patch-pf::pf.c new file mode 100644 index 000000000000..30be4db7683e --- /dev/null +++ b/security/pf/files/extra-patch-pf::pf.c @@ -0,0 +1,22 @@ +Update pf to be more in line with current TCP stack behaviour at +5.2 code freeze point after andre's initial commit to decouple +protocol-level stats from routing. -- bms@FreeBSD.org + +--- pf/pf.c.orig Wed Nov 19 11:51:34 2003 ++++ pf/pf.c Wed Nov 19 11:53:42 2003 +@@ -1376,14 +1376,10 @@ + */ + NTOHS(ip->ip_len); + NTOHS(ip->ip_off); +- ip_rtaddr(ip->ip_dst, &ro); + PF_UNLOCK(); +- ip_output(m, (void *)NULL, &ro, 0, (void *)NULL, ++ ip_output(m, (void *)NULL, (void *)NULL, 0, (void *)NULL, + (void *)NULL); + PF_LOCK(); +- if(ro.ro_rt) { +- RTFREE(ro.ro_rt); +- } + #else + ip_output(m, (void *)NULL, (void *)NULL, 0, (void *)NULL, + (void *)NULL); |