forked from Lainports/freebsd-ports
d2ff3920b8
Submitted by: maintainer Reviewed by: Approved by: Obtained from: MFC after: Add two patches to solve the following problems: patch-ab - resolves a problem with a mbuf-tag in 5.1 - Submitted by: Pyun YongHyeon <yongari@kt-is.co.kr> patch-ac - pulls in two critical fixes from OpenBSD patch branch - Obtained from: OpenBSD Change BROKEN to IGNORE tag in Makefile, suggested by: kris@ && bump PORTREVISION.
29 lines
1 KiB
Text
29 lines
1 KiB
Text
--- pf/pf.c Wed May 7 09:33:21 2003
|
|
+++ pf/pf.c Tue Jun 17 17:02:08 2003
|
|
@@ -2837,6 +2837,7 @@
|
|
/* check incoming packet for BINAT/RDR */
|
|
if ((rdr = pf_get_translation(PF_IN, ifp, pd->proto,
|
|
saddr, 0, daddr, 0, &naddr, NULL, af)) != NULL) {
|
|
+ PF_ACPY(&baddr, daddr, af);
|
|
switch (af) {
|
|
#ifdef INET
|
|
case AF_INET:
|
|
@@ -3179,7 +3180,7 @@
|
|
/* Retrans: not more than one window back */
|
|
(ackskew >= -MAXACKWINDOW) &&
|
|
/* Acking not more than one window back */
|
|
- (ackskew <= MAXACKWINDOW)) {
|
|
+ (ackskew <= (MAXACKWINDOW << sws))) {
|
|
/* Acking not more than one window forward */
|
|
|
|
(*state)->packets++;
|
|
@@ -3346,7 +3347,7 @@
|
|
SEQ_GEQ(seq, src->seqlo - (dst->max_win << dws)) ?
|
|
' ': '2',
|
|
(ackskew >= -MAXACKWINDOW) ? ' ' : '3',
|
|
- (ackskew <= MAXACKWINDOW) ? ' ' : '4',
|
|
+ (ackskew <= (MAXACKWINDOW << sws)) ? ' ' : '4',
|
|
SEQ_GEQ(src->seqhi + MAXACKWINDOW, end) ?' ' :'5',
|
|
SEQ_GEQ(seq, src->seqlo - MAXACKWINDOW) ?' ' :'6');
|
|
}
|
|
|