Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the "stretch ACK violation" bug documented in internet draft

Browse Source 
draft-ietf-tcpimpl-prob-02.txt.  Also, fix another bug in the header
prediction case where an ACK would not be sent when it should be.
This commit is contained in:
thorpej 1997-12-11 06:33:29 +00:00
parent 5325d6d716
commit 6c1840c05c
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
sys/netinet/tcp_input.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: tcp_input.c,v 1.36 1997/11/21 06:41:54 thorpej Exp $ */
/* $NetBSD: tcp_input.c,v 1.37 1997/12/11 06:33:29 thorpej Exp $ */
/*
* Copyright (c) 1982, 1986, 1988, 1990, 1993, 1994
@ -110,6 +110,20 @@ extern u_long sb_max;
#define TSTMP_LT(a,b) ((int)((a)-(b)) < 0)
#define TSTMP_GEQ(a,b) ((int)((a)-(b)) >= 0)
/*
* Macro to compute ACK transmission behavior. Delay the ACK unless
* the other side PUSH'd or we have already delayed an ACK (must send
* an ACK every two segments).
*/
#define TCP_SETUP_ACK(tp, ti) \
do { \
if ((ti)->ti_flags & TH_PUSH || \
(tp)->t_flags & TF_DELACK) \
tp->t_flags |= TF_ACKNOW; \
else \
tp->t_flags |= TF_DELACK; \
} while (0)
/*
* Insert segment ti into reassembly queue of tcp with
* control block tp. Return TH_FIN if reassembly now includes
@ -124,10 +138,7 @@ extern u_long sb_max;
if ((ti)->ti_seq == (tp)->rcv_nxt && \
(tp)->segq.lh_first == NULL && \
(tp)->t_state == TCPS_ESTABLISHED) { \
if ((ti)->ti_flags & TH_PUSH) \
tp->t_flags |= TF_ACKNOW; \
else \
tp->t_flags |= TF_DELACK; \
TCP_SETUP_ACK(tp, ti); \
(tp)->rcv_nxt += (ti)->ti_len; \
flags = (ti)->ti_flags & TH_FIN; \
tcpstat.tcps_rcvpack++;\
@ -606,10 +617,9 @@ after_listen:
m->m_len -= sizeof(struct tcpiphdr)+off-sizeof(struct tcphdr);
sbappend(&so->so_rcv, m);
sorwakeup(so);
if (ti->ti_flags & TH_PUSH)
tp->t_flags |= TF_ACKNOW;
else
tp->t_flags |= TF_DELACK;
TCP_SETUP_ACK(tp, ti);
if (tp->t_flags & TF_ACKNOW)
(void) tcp_output(tp);
return;
}
}