d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Further satisfy my paranoia by making sure that the ACKNOW is only

Browse Source 
set when ti_len is non-zero.
This commit is contained in:
David Greenman 1995-04-10 17:37:46 +00:00
parent afa70c96dd
commit d79940da0a
2 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sys/netinet/tcp_input.c
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* From: @(#)tcp_input.c 8.5 (Berkeley) 4/10/94
* $Id: tcp_input.c,v 1.19 1995/04/09 01:29:24 davidg Exp $
* $Id: tcp_input.c,v 1.20 1995/04/10 17:16:10 davidg Exp $
*/
#ifndef TUBA_INCLUDE
@ -88,7 +88,10 @@ struct inpcbinfo tcbinfo;
if ((ti)->ti_seq == (tp)->rcv_nxt && \
(tp)->seg_next == (struct tcpiphdr *)(tp) && \
(tp)->t_state == TCPS_ESTABLISHED) { \
tp->t_flags |= TF_DELACK; \
if (ti->ti_flags & TH_PUSH) \
tp->t_flags |= TF_ACKNOW; \
else \
tp->t_flags |= TF_DELACK; \
(tp)->rcv_nxt += (ti)->ti_len; \
flags = (ti)->ti_flags & TH_FIN; \
tcpstat.tcps_rcvpack++;\
@ -1556,14 +1559,6 @@ dodata: /* XXX */
tcp_trace(TA_INPUT, ostate, tp, &tcp_saveti, 0);
#endif
/*
* If this is a short packet, then ACK now - with Nagel
* congestion avoidance sender won't send more until
* he gets an ACK.
*/
if (tiflags & TH_PUSH)
tp->t_flags |= TF_ACKNOW;
/*
* Return any desired output.
*/

15
sys/netinet/tcp_reass.c
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* From: @(#)tcp_input.c 8.5 (Berkeley) 4/10/94
* $Id: tcp_input.c,v 1.19 1995/04/09 01:29:24 davidg Exp $
* $Id: tcp_input.c,v 1.20 1995/04/10 17:16:10 davidg Exp $
*/
#ifndef TUBA_INCLUDE
@ -88,7 +88,10 @@ struct inpcbinfo tcbinfo;
if ((ti)->ti_seq == (tp)->rcv_nxt && \
(tp)->seg_next == (struct tcpiphdr *)(tp) && \
(tp)->t_state == TCPS_ESTABLISHED) { \
tp->t_flags |= TF_DELACK; \
if (ti->ti_flags & TH_PUSH) \
tp->t_flags |= TF_ACKNOW; \
else \
tp->t_flags |= TF_DELACK; \
(tp)->rcv_nxt += (ti)->ti_len; \
flags = (ti)->ti_flags & TH_FIN; \
tcpstat.tcps_rcvpack++;\
@ -1556,14 +1559,6 @@ dodata: /* XXX */
tcp_trace(TA_INPUT, ostate, tp, &tcp_saveti, 0);
#endif
/*
* If this is a short packet, then ACK now - with Nagel
* congestion avoidance sender won't send more until
* he gets an ACK.
*/
if (tiflags & TH_PUSH)
tp->t_flags |= TF_ACKNOW;
/*
* Return any desired output.
*/