Attachment 6736 Details for Bug 15071 – file.diff

[patch] file.diff

file.diff (text/plain), 1.47 KB, created by Jun-ichiro itojun Hagino on 1999-11-24 09:10:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jun-ichiro itojun Hagino

Created: 1999-11-24 09:10:00 UTC

Size: 1.47 KB

patch

obsolete

>Index: tcp_input.c
>===================================================================
>RCS file: /home/ncvs/src/sys/netinet/tcp_input.c,v
>retrieving revision 1.96
>diff -c -r1.96 tcp_input.c
>*** tcp_input.c	1999/10/09 20:42:15	1.96
>--- tcp_input.c	1999/11/24 08:55:01
>***************
>*** 286,291 ****
>--- 286,292 ----
>  	register int tiflags;
>  	struct socket *so = 0;
>  	int todrop, acked, ourfinisacked, needoutput = 0;
>+ 	int hdroptlen;
>  	struct in_addr laddr;
>  	int dropsocket = 0;
>  	int iss = 0;
>***************
>*** 376,383 ****
>  	/*
>  	 * Drop TCP, IP headers and TCP options.
>  	 */
>! 	m->m_data += sizeof(struct tcpiphdr)+off-sizeof(struct tcphdr);
>! 	m->m_len  -= sizeof(struct tcpiphdr)+off-sizeof(struct tcphdr);
>  
>  	/*
>  	 * Locate pcb for segment.
>--- 377,385 ----
>  	/*
>  	 * Drop TCP, IP headers and TCP options.
>  	 */
>! 	hdroptlen = sizeof(struct tcpiphdr) + off - sizeof(struct tcphdr);
>! 	m->m_data += hdroptlen;
>! 	m->m_len -= hdroptlen;
>  
>  	/*
>  	 * Locate pcb for segment.
>***************
>*** 1059,1064 ****
>--- 1061,1068 ----
>  				goto dropwithreset;
>  			if (CC_GT(to.to_cc, tp->cc_recv)) {
>  				tp = tcp_close(tp);
>+ 				m->m_data -= hdroptlen;
>+ 				m->m_len += hdroptlen;
>  				goto findpcb;
>  			}
>  			else
>***************
>*** 1282,1287 ****
>--- 1286,1293 ----
>  			    SEQ_GT(ti->ti_seq, tp->rcv_nxt)) {
>  				iss = tp->snd_nxt + TCP_ISSINCR;
>  				tp = tcp_close(tp);
>+ 				m->m_data -= hdroptlen;
>+ 				m->m_len += hdroptlen;
>  				goto findpcb;
>  			}
>  			/*

Actions: View | Diff

Attachments on bug 15071: 6736 | 6737