From 2469c867a164210ce96143517059f21db7f1fd17 Mon Sep 17 00:00:00 2001 From: rgrimes Date: Wed, 25 May 1994 09:21:21 +0000 Subject: The big 4.4BSD Lite to FreeBSD 2.0.0 (Development) patch. Reviewed by: Rodney W. Grimes Submitted by: John Dyson and David Greenman --- sys/netinet/tcp_reass.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'sys/netinet/tcp_reass.c') diff --git a/sys/netinet/tcp_reass.c b/sys/netinet/tcp_reass.c index 2dd1d74..3af8140 100644 --- a/sys/netinet/tcp_reass.c +++ b/sys/netinet/tcp_reass.c @@ -217,13 +217,13 @@ tcp_input(m, iphlen) register struct tcpiphdr *ti; register struct inpcb *inp; caddr_t optp = NULL; - int optlen; + int optlen = 0; int len, tlen, off; register struct tcpcb *tp = 0; register int tiflags; - struct socket *so; + struct socket *so = 0; int todrop, acked, ourfinisacked, needoutput = 0; - short ostate; + short ostate = 0; struct in_addr laddr; int dropsocket = 0; int iss = 0; @@ -1173,7 +1173,7 @@ step6: * but if two URG's are pending at once, some out-of-band * data may creep in... ick. */ - if (ti->ti_urp <= ti->ti_len + if (ti->ti_urp <= (u_long)ti->ti_len #ifdef SO_OOBINLINE && (so->so_options & SO_OOBINLINE) == 0 #endif -- cgit v1.1