don't respond to broadcasts
[unix-history] / usr / src / sys / netinet / tcp_input.c
index 5c5b308..2e01026 100644 (file)
-/*     tcp_input.c     1.32    81/11/26        */
-
-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/mbuf.h"
-#include "../h/protosw.h"
-#include "../h/socket.h"
-#include "../h/socketvar.h"
-#include "../net/in.h"
-#include "../net/in_pcb.h"
-#include "../net/in_systm.h"
+/*
+ * Copyright (c) 1982 Regents of the University of California.
+ * All rights reserved.  The Berkeley software License Agreement
+ * specifies the terms and conditions for redistribution.
+ *
+ *     @(#)tcp_input.c 6.15 (Berkeley) %G%
+ */
+
+#include "param.h"
+#include "systm.h"
+#include "mbuf.h"
+#include "protosw.h"
+#include "socket.h"
+#include "socketvar.h"
+#include "errno.h"
+
 #include "../net/if.h"
 #include "../net/if.h"
-#include "../net/ip.h"
-#include "../net/ip_var.h"
-#include "../net/tcp.h"
-#include "../net/tcp_fsm.h"
-#include "../net/tcp_seq.h"
-#include "../net/tcp_timer.h"
-#include "../net/tcp_var.h"
-#include "../net/tcpip.h"
-#include "/usr/include/errno.h"
+#include "../net/route.h"
+
+#include "in.h"
+#include "in_pcb.h"
+#include "in_systm.h"
+#include "ip.h"
+#include "ip_var.h"
+#include "tcp.h"
+#include "tcp_fsm.h"
+#include "tcp_seq.h"
+#include "tcp_timer.h"
+#include "tcp_var.h"
+#include "tcpip.h"
+#include "tcp_debug.h"
 
 
+int    tcpprintfs = 0;
 int    tcpcksum = 1;
 int    tcpcksum = 1;
+struct tcpiphdr tcp_saveti;
+extern tcpnodelack;
 
 
-struct sockaddr_in tcp_sockaddr = { AF_INET };
+struct tcpcb *tcp_newtcpcb();
+
+/*
+ * Insert segment ti into reassembly queue of tcp with
+ * control block tp.  Return TH_FIN if reassembly now includes
+ * a segment with FIN.  The macro form does the common case inline
+ * (segment is the next to be received on an established connection,
+ * and the queue is empty), avoiding linkage into and removal
+ * from the queue and repetition of various conversions.
+ */
+#define        TCP_REASS(tp, ti, m, so, flags) { \
+       if ((ti)->ti_seq == (tp)->rcv_nxt && \
+           (tp)->seg_next == (struct tcpiphdr *)(tp) && \
+           (tp)->t_state == TCPS_ESTABLISHED) { \
+               (tp)->rcv_nxt += (ti)->ti_len; \
+               flags = (ti)->ti_flags & TH_FIN; \
+               sbappend(&(so)->so_rcv, (m)); \
+               sorwakeup(so); \
+       } else \
+               (flags) = tcp_reass((tp), (ti)); \
+}
+
+tcp_reass(tp, ti)
+       register struct tcpcb *tp;
+       register struct tcpiphdr *ti;
+{
+       register struct tcpiphdr *q;
+       struct socket *so = tp->t_inpcb->inp_socket;
+       struct mbuf *m;
+       int flags;
+
+       /*
+        * Call with ti==0 after become established to
+        * force pre-ESTABLISHED data up to user socket.
+        */
+       if (ti == 0)
+               goto present;
+
+       /*
+        * Find a segment which begins after this one does.
+        */
+       for (q = tp->seg_next; q != (struct tcpiphdr *)tp;
+           q = (struct tcpiphdr *)q->ti_next)
+               if (SEQ_GT(q->ti_seq, ti->ti_seq))
+                       break;
+
+       /*
+        * If there is a preceding segment, it may provide some of
+        * our data already.  If so, drop the data from the incoming
+        * segment.  If it provides all of our data, drop us.
+        */
+       if ((struct tcpiphdr *)q->ti_prev != (struct tcpiphdr *)tp) {
+               register int i;
+               q = (struct tcpiphdr *)q->ti_prev;
+               /* conversion to int (in i) handles seq wraparound */
+               i = q->ti_seq + q->ti_len - ti->ti_seq;
+               if (i > 0) {
+                       if (i >= ti->ti_len)
+                               goto drop;
+                       m_adj(dtom(ti), i);
+                       ti->ti_len -= i;
+                       ti->ti_seq += i;
+               }
+               q = (struct tcpiphdr *)(q->ti_next);
+       }
+
+       /*
+        * While we overlap succeeding segments trim them or,
+        * if they are completely covered, dequeue them.
+        */
+       while (q != (struct tcpiphdr *)tp) {
+               register int i = (ti->ti_seq + ti->ti_len) - q->ti_seq;
+               if (i <= 0)
+                       break;
+               if (i < q->ti_len) {
+                       q->ti_seq += i;
+                       q->ti_len -= i;
+                       m_adj(dtom(q), i);
+                       break;
+               }
+               q = (struct tcpiphdr *)q->ti_next;
+               m = dtom(q->ti_prev);
+               remque(q->ti_prev);
+               m_freem(m);
+       }
+
+       /*
+        * Stick new segment in its place.
+        */
+       insque(ti, q->ti_prev);
+
+present:
+       /*
+        * Present data to user, advancing rcv_nxt through
+        * completed sequence space.
+        */
+       if (TCPS_HAVERCVDSYN(tp->t_state) == 0)
+               return (0);
+       ti = tp->seg_next;
+       if (ti == (struct tcpiphdr *)tp || ti->ti_seq != tp->rcv_nxt)
+               return (0);
+       if (tp->t_state == TCPS_SYN_RECEIVED && ti->ti_len)
+               return (0);
+       do {
+               tp->rcv_nxt += ti->ti_len;
+               flags = ti->ti_flags & TH_FIN;
+               remque(ti);
+               m = dtom(ti);
+               ti = (struct tcpiphdr *)ti->ti_next;
+               if (so->so_state & SS_CANTRCVMORE)
+                       m_freem(m);
+               else
+                       sbappend(&so->so_rcv, m);
+       } while (ti != (struct tcpiphdr *)tp && ti->ti_seq == tp->rcv_nxt);
+       sorwakeup(so);
+       return (flags);
+drop:
+       m_freem(dtom(ti));
+       return (0);
+}
 
 /*
  * TCP input routine, follows pages 65-76 of the
 
 /*
  * TCP input routine, follows pages 65-76 of the
@@ -34,63 +166,93 @@ tcp_input(m0)
        register struct tcpiphdr *ti;
        struct inpcb *inp;
        register struct mbuf *m;
        register struct tcpiphdr *ti;
        struct inpcb *inp;
        register struct mbuf *m;
+       struct mbuf *om = 0;
        int len, tlen, off;
        int len, tlen, off;
-       register struct tcpcb *tp;
+       register struct tcpcb *tp = 0;
        register int tiflags;
        struct socket *so;
        register int tiflags;
        struct socket *so;
-       int acceptable;
-       tcp_seq todrop, acked;
+       int todrop, acked;
+       short ostate;
+       struct in_addr laddr;
+       int dropsocket = 0;
 
 
-COUNT(TCP_INPUT);
        /*
        /*
-        * Get ip and tcp header together in first mbuf.
+        * Get IP and TCP header together in first mbuf.
+        * Note: IP leaves IP header in first mbuf.
         */
        m = m0;
        ti = mtod(m, struct tcpiphdr *);
         */
        m = m0;
        ti = mtod(m, struct tcpiphdr *);
-       if (ti->ti_len > sizeof (struct ip))
-               ip_stripoptions((struct ip *)ti, (char *)0);
-       if (m->m_len < sizeof (struct tcpiphdr)) {
-               if (m_pullup(m, sizeof (struct tcpiphdr)) == 0) {
+       if (((struct ip *)ti)->ip_hl > (sizeof (struct ip) >> 2))
+               ip_stripoptions((struct ip *)ti, (struct mbuf *)0);
+       if (m->m_off > MMAXOFF || m->m_len < sizeof (struct tcpiphdr)) {
+               if ((m = m_pullup(m, sizeof (struct tcpiphdr))) == 0) {
                        tcpstat.tcps_hdrops++;
                        tcpstat.tcps_hdrops++;
-                       goto drop;
+                       return;
                }
                ti = mtod(m, struct tcpiphdr *);
        }
 
        /*
                }
                ti = mtod(m, struct tcpiphdr *);
        }
 
        /*
-        * Checksum extended tcp header and data.
+        * Checksum extended TCP header and data.
         */
        tlen = ((struct ip *)ti)->ip_len;
        len = sizeof (struct ip) + tlen;
        if (tcpcksum) {
                ti->ti_next = ti->ti_prev = 0;
                ti->ti_x1 = 0;
         */
        tlen = ((struct ip *)ti)->ip_len;
        len = sizeof (struct ip) + tlen;
        if (tcpcksum) {
                ti->ti_next = ti->ti_prev = 0;
                ti->ti_x1 = 0;
-               ti->ti_len = htons((u_short)tlen);
-               if ((ti->ti_sum = in_cksum(m, len)) != 0xffff) {
+               ti->ti_len = (u_short)tlen;
+               ti->ti_len = htons((u_short)ti->ti_len);
+               if (ti->ti_sum = in_cksum(m, len)) {
+                       if (tcpprintfs)
+                               printf("tcp sum: src %x\n", ti->ti_src);
                        tcpstat.tcps_badsum++;
                        tcpstat.tcps_badsum++;
-                       printf("tcp cksum %x\n", ti->ti_sum);
                        goto drop;
                }
        }
 
        /*
                        goto drop;
                }
        }
 
        /*
-        * Check that tcp offset makes sense,
-        * process tcp options and adjust length.
+        * Check that TCP offset makes sense,
+        * pull out TCP options and adjust length.
         */
        off = ti->ti_off << 2;
         */
        off = ti->ti_off << 2;
-       if (off < sizeof (struct tcphdr) || off > ti->ti_len) {
+       if (off < sizeof (struct tcphdr) || off > tlen) {
+               if (tcpprintfs)
+                       printf("tcp off: src %x off %d\n", ti->ti_src, off);
                tcpstat.tcps_badoff++;
                goto drop;
        }
                tcpstat.tcps_badoff++;
                goto drop;
        }
-       ti->ti_len = tlen - off;
-#if 0
-       if (off > sizeof (struct tcphdr) >> 2)
-               tcp_options(ti);
-#endif
+       tlen -= off;
+       ti->ti_len = tlen;
+       if (off > sizeof (struct tcphdr)) {
+               if (m->m_len < sizeof(struct ip) + off) {
+                       if ((m = m_pullup(m, sizeof (struct ip) + off)) == 0) {
+                               tcpstat.tcps_hdrops++;
+                               return;
+                       }
+                       ti = mtod(m, struct tcpiphdr *);
+               }
+               om = m_get(M_DONTWAIT, MT_DATA);
+               if (om == 0)
+                       goto drop;
+               om->m_len = off - sizeof (struct tcphdr);
+               { caddr_t op = mtod(m, caddr_t) + sizeof (struct tcpiphdr);
+                 bcopy(op, mtod(om, caddr_t), (unsigned)om->m_len);
+                 m->m_len -= om->m_len;
+                 bcopy(op+om->m_len, op,
+                  (unsigned)(m->m_len-sizeof (struct tcpiphdr)));
+               }
+       }
        tiflags = ti->ti_flags;
 
        /*
        tiflags = ti->ti_flags;
 
        /*
-        * Convert tcp protocol specific fields to host format.
+        * Drop TCP and IP headers.
+        */
+       off += sizeof (struct ip);
+       m->m_off += off;
+       m->m_len -= off;
+
+       /*
+        * Convert TCP protocol specific fields to host format.
         */
        ti->ti_seq = ntohl(ti->ti_seq);
        ti->ti_ack = ntohl(ti->ti_ack);
         */
        ti->ti_seq = ntohl(ti->ti_seq);
        ti->ti_ack = ntohl(ti->ti_ack);
@@ -101,23 +263,73 @@ COUNT(TCP_INPUT);
         * Locate pcb for segment.
         */
        inp = in_pcblookup
         * Locate pcb for segment.
         */
        inp = in_pcblookup
-               (&tcb, ti->ti_src, ti->ti_sport, ti->ti_dst, ti->ti_dport);
+               (&tcb, ti->ti_src, ti->ti_sport, ti->ti_dst, ti->ti_dport,
+               INPLOOKUP_WILDCARD);
 
        /*
         * If the state is CLOSED (i.e., TCB does not exist) then
 
        /*
         * If the state is CLOSED (i.e., TCB does not exist) then
-        * all data in the incoming segment is discarded.  (p. 65).
+        * all data in the incoming segment is discarded.
         */
        if (inp == 0)
                goto dropwithreset;
        tp = intotcpcb(inp);
        if (tp == 0)
                goto dropwithreset;
         */
        if (inp == 0)
                goto dropwithreset;
        tp = intotcpcb(inp);
        if (tp == 0)
                goto dropwithreset;
+       so = inp->inp_socket;
+       if (so->so_options & SO_DEBUG) {
+               ostate = tp->t_state;
+               tcp_saveti = *ti;
+       }
+       if (so->so_options & SO_ACCEPTCONN) {
+               so = sonewconn(so);
+               if (so == 0)
+                       goto drop;
+               /*
+                * This is ugly, but ....
+                *
+                * Mark socket as temporary until we're
+                * committed to keeping it.  The code at
+                * ``drop'' and ``dropwithreset'' check the
+                * flag dropsocket to see if the temporary
+                * socket created here should be discarded.
+                * We mark the socket as discardable until
+                * we're committed to it below in TCPS_LISTEN.
+                */
+               dropsocket++;
+               inp = (struct inpcb *)so->so_pcb;
+               inp->inp_laddr = ti->ti_dst;
+               inp->inp_lport = ti->ti_dport;
+               inp->inp_options = ip_srcroute();
+               tp = intotcpcb(inp);
+               tp->t_state = TCPS_LISTEN;
+       }
+
+       /*
+        * Segment received on connection.
+        * Reset idle time and keep-alive timer.
+        */
+       tp->t_idle = 0;
+       tp->t_timer[TCPT_KEEP] = TCPTV_KEEP;
+
+       /*
+        * Process options if not in LISTEN state,
+        * else do it below (after getting remote address).
+        */
+       if (om && tp->t_state != TCPS_LISTEN) {
+               tcp_dooptions(tp, om, ti);
+               om = 0;
+       }
 
        /*
         * Calculate amount of space in receive window,
         * and then do TCP input processing.
 
        /*
         * Calculate amount of space in receive window,
         * and then do TCP input processing.
+        * Receive window is amount of space in rcv queue,
+        * but not less than advertised window.
         */
        tp->rcv_wnd = sbspace(&so->so_rcv);
         */
        tp->rcv_wnd = sbspace(&so->so_rcv);
+       if (tp->rcv_wnd < 0)
+               tp->rcv_wnd = 0;
+       tp->rcv_wnd = MAX(tp->rcv_wnd, (short)(tp->rcv_adv - tp->rcv_nxt));
 
        switch (tp->t_state) {
 
 
        switch (tp->t_state) {
 
@@ -125,31 +337,64 @@ COUNT(TCP_INPUT);
         * If the state is LISTEN then ignore segment if it contains an RST.
         * If the segment contains an ACK then it is bad and send a RST.
         * If it does not contain a SYN then it is not interesting; drop it.
         * If the state is LISTEN then ignore segment if it contains an RST.
         * If the segment contains an ACK then it is bad and send a RST.
         * If it does not contain a SYN then it is not interesting; drop it.
+        * Don't bother responding if the destination was a broadcast.
         * Otherwise initialize tp->rcv_nxt, and tp->irs, select an initial
         * tp->iss, and send a segment:
         *     <SEQ=ISS><ACK=RCV_NXT><CTL=SYN,ACK>
         * Also initialize tp->snd_nxt to tp->iss+1 and tp->snd_una to tp->iss.
         * Fill in remote peer address fields if not previously specified.
         * Enter SYN_RECEIVED state, and process any other fields of this
         * Otherwise initialize tp->rcv_nxt, and tp->irs, select an initial
         * tp->iss, and send a segment:
         *     <SEQ=ISS><ACK=RCV_NXT><CTL=SYN,ACK>
         * Also initialize tp->snd_nxt to tp->iss+1 and tp->snd_una to tp->iss.
         * Fill in remote peer address fields if not previously specified.
         * Enter SYN_RECEIVED state, and process any other fields of this
-        * segment in this state.  (p. 65)
+        * segment in this state.
         */
         */
-       case TCPS_LISTEN:
+       case TCPS_LISTEN: {
+               struct mbuf *am;
+               register struct sockaddr_in *sin;
+
                if (tiflags & TH_RST)
                        goto drop;
                if (tiflags & TH_ACK)
                        goto dropwithreset;
                if ((tiflags & TH_SYN) == 0)
                        goto drop;
                if (tiflags & TH_RST)
                        goto drop;
                if (tiflags & TH_ACK)
                        goto dropwithreset;
                if ((tiflags & TH_SYN) == 0)
                        goto drop;
+               if (in_broadcast(ti->ti_dst))
+                       goto drop;
+               am = m_get(M_DONTWAIT, MT_SONAME);
+               if (am == NULL)
+                       goto drop;
+               am->m_len = sizeof (struct sockaddr_in);
+               sin = mtod(am, struct sockaddr_in *);
+               sin->sin_family = AF_INET;
+               sin->sin_addr = ti->ti_src;
+               sin->sin_port = ti->ti_sport;
+               laddr = inp->inp_laddr;
+               if (inp->inp_laddr.s_addr == INADDR_ANY)
+                       inp->inp_laddr = ti->ti_dst;
+               if (in_pcbconnect(inp, am)) {
+                       inp->inp_laddr = laddr;
+                       (void) m_free(am);
+                       goto drop;
+               }
+               (void) m_free(am);
+               tp->t_template = tcp_template(tp);
+               if (tp->t_template == 0) {
+                       in_pcbdisconnect(inp);
+                       dropsocket = 0;         /* socket is already gone */
+                       tp = 0;
+                       goto drop;
+               }
+               if (om) {
+                       tcp_dooptions(tp, om, ti);
+                       om = 0;
+               }
                tp->iss = tcp_iss; tcp_iss += TCP_ISSINCR/2;
                tp->irs = ti->ti_seq;
                tcp_sendseqinit(tp);
                tcp_rcvseqinit(tp);
                tp->t_state = TCPS_SYN_RECEIVED;
                tp->iss = tcp_iss; tcp_iss += TCP_ISSINCR/2;
                tp->irs = ti->ti_seq;
                tcp_sendseqinit(tp);
                tcp_rcvseqinit(tp);
                tp->t_state = TCPS_SYN_RECEIVED;
-               if (inp->inp_faddr.s_addr == 0) {
-                       inp->inp_faddr = ti->ti_src;
-                       inp->inp_fport = ti->ti_sport;
-               }
+               tp->t_timer[TCPT_KEEP] = TCPTV_KEEP;
+               dropsocket = 0;         /* committed to socket */
                goto trimthenstep6;
                goto trimthenstep6;
+               }
 
        /*
         * If the state is SYN_SENT:
 
        /*
         * If the state is SYN_SENT:
@@ -166,47 +411,58 @@ COUNT(TCP_INPUT);
        case TCPS_SYN_SENT:
                if ((tiflags & TH_ACK) &&
                    (SEQ_LEQ(ti->ti_ack, tp->iss) ||
        case TCPS_SYN_SENT:
                if ((tiflags & TH_ACK) &&
                    (SEQ_LEQ(ti->ti_ack, tp->iss) ||
-                    SEQ_GT(ti->ti_ack, tp->snd_nxt)))
+                    SEQ_GT(ti->ti_ack, tp->snd_max)))
                        goto dropwithreset;
                if (tiflags & TH_RST) {
                        if (tiflags & TH_ACK)
                        goto dropwithreset;
                if (tiflags & TH_RST) {
                        if (tiflags & TH_ACK)
-                               tcp_drop(tp, ECONNRESET);
+                               tp = tcp_drop(tp, ECONNREFUSED);
                        goto drop;
                }
                if ((tiflags & TH_SYN) == 0)
                        goto drop;
                        goto drop;
                }
                if ((tiflags & TH_SYN) == 0)
                        goto drop;
-               tp->iss = ti->ti_ack;
-               tcp_sendseqinit(tp);
+               tp->snd_una = ti->ti_ack;
+               if (SEQ_LT(tp->snd_nxt, tp->snd_una))
+                       tp->snd_nxt = tp->snd_una;
+               tp->t_timer[TCPT_REXMT] = 0;
                tp->irs = ti->ti_seq;
                tcp_rcvseqinit(tp);
                tp->t_flags |= TF_ACKNOW;
                tp->irs = ti->ti_seq;
                tcp_rcvseqinit(tp);
                tp->t_flags |= TF_ACKNOW;
-               if (SEQ_GT(tp->snd_una, tp->iss))
+               if (SEQ_GT(tp->snd_una, tp->iss)) {
+                       soisconnected(so);
                        tp->t_state = TCPS_ESTABLISHED;
                        tp->t_state = TCPS_ESTABLISHED;
-               else
+                       tp->t_maxseg = MIN(tp->t_maxseg, tcp_mss(tp));
+                       (void) tcp_reass(tp, (struct tcpiphdr *)0);
+               } else
                        tp->t_state = TCPS_SYN_RECEIVED;
                goto trimthenstep6;
 
 trimthenstep6:
                /*
                        tp->t_state = TCPS_SYN_RECEIVED;
                goto trimthenstep6;
 
 trimthenstep6:
                /*
-                * If had syn, advance ti->ti_seq to correspond
-                * to first data byte.
-                */
-               if (tiflags & TH_SYN)
-                       ti->ti_seq++;
-
-               /*
+                * Advance ti->ti_seq to correspond to first data byte.
                 * If data, trim to stay within window,
                 * dropping FIN if necessary.
                 */
                 * If data, trim to stay within window,
                 * dropping FIN if necessary.
                 */
+               ti->ti_seq++;
                if (ti->ti_len > tp->rcv_wnd) {
                        todrop = ti->ti_len - tp->rcv_wnd;
                        m_adj(m, -todrop);
                        ti->ti_len = tp->rcv_wnd;
                        ti->ti_flags &= ~TH_FIN;
                }
                if (ti->ti_len > tp->rcv_wnd) {
                        todrop = ti->ti_len - tp->rcv_wnd;
                        m_adj(m, -todrop);
                        ti->ti_len = tp->rcv_wnd;
                        ti->ti_flags &= ~TH_FIN;
                }
+               tp->snd_wl1 = ti->ti_seq - 1;
                goto step6;
        }
 
                goto step6;
        }
 
+       /*
+        * If data is received on a connection after the
+        * user processes are gone, then RST the other end.
+        */
+       if ((so->so_state & SS_NOFDREF) && tp->t_state > TCPS_CLOSE_WAIT &&
+           ti->ti_len) {
+               tp = tcp_close(tp);
+               goto dropwithreset;
+       }
+
        /*
         * States other than LISTEN or SYN_SENT.
         * First check that at least some bytes of segment are within 
        /*
         * States other than LISTEN or SYN_SENT.
         * First check that at least some bytes of segment are within 
@@ -215,23 +471,26 @@ trimthenstep6:
        if (tp->rcv_wnd == 0) {
                /*
                 * If window is closed can only take segments at
        if (tp->rcv_wnd == 0) {
                /*
                 * If window is closed can only take segments at
-                * window edge, and have to drop data and EOL from
+                * window edge, and have to drop data and PUSH from
                 * incoming segments.
                 */
                if (tp->rcv_nxt != ti->ti_seq)
                        goto dropafterack;
                if (ti->ti_len > 0) {
                 * incoming segments.
                 */
                if (tp->rcv_nxt != ti->ti_seq)
                        goto dropafterack;
                if (ti->ti_len > 0) {
+                       m_adj(m, ti->ti_len);
                        ti->ti_len = 0;
                        ti->ti_flags &= ~(TH_PUSH|TH_FIN);
                }
        } else {
                /*
                        ti->ti_len = 0;
                        ti->ti_flags &= ~(TH_PUSH|TH_FIN);
                }
        } else {
                /*
-                * If segment begins before rcv_next, drop leading
+                * If segment begins before rcv_nxt, drop leading
                 * data (and SYN); if nothing left, just ack.
                 */
                 * data (and SYN); if nothing left, just ack.
                 */
-               if (SEQ_GT(tp->rcv_nxt, ti->ti_seq)) {
-                       todrop = tp->rcv_nxt - ti->ti_seq;
+               todrop = tp->rcv_nxt - ti->ti_seq;
+               if (todrop > 0) {
                        if (tiflags & TH_SYN) {
                        if (tiflags & TH_SYN) {
+                               tiflags &= ~TH_SYN;
+                               ti->ti_flags &= ~TH_SYN;
                                ti->ti_seq++;
                                if (ti->ti_urp > 1) 
                                        ti->ti_urp--;
                                ti->ti_seq++;
                                if (ti->ti_urp > 1) 
                                        ti->ti_urp--;
@@ -239,7 +498,8 @@ trimthenstep6:
                                        tiflags &= ~TH_URG;
                                todrop--;
                        }
                                        tiflags &= ~TH_URG;
                                todrop--;
                        }
-                       if (todrop > ti->ti_len)
+                       if (todrop > ti->ti_len ||
+                           todrop == ti->ti_len && (tiflags&TH_FIN) == 0)
                                goto dropafterack;
                        m_adj(m, todrop);
                        ti->ti_seq += todrop;
                                goto dropafterack;
                        m_adj(m, todrop);
                        ti->ti_seq += todrop;
@@ -248,20 +508,17 @@ trimthenstep6:
                                ti->ti_urp -= todrop;
                        else {
                                tiflags &= ~TH_URG;
                                ti->ti_urp -= todrop;
                        else {
                                tiflags &= ~TH_URG;
-                               /* ti->ti_flags &= ~TH_URG; */
-                               /* ti->ti_urp = 0; */
+                               ti->ti_flags &= ~TH_URG;
+                               ti->ti_urp = 0;
                        }
                        }
-                       /* tiflags &= ~TH_SYN; */
-                       /* ti->ti_flags &= ~TH_SYN; */
                }
                /*
                 * If segment ends after window, drop trailing data
                 * (and PUSH and FIN); if nothing left, just ACK.
                 */
                }
                /*
                 * If segment ends after window, drop trailing data
                 * (and PUSH and FIN); if nothing left, just ACK.
                 */
-               if (SEQ_GT(ti->ti_seq+ti->ti_len, tp->rcv_nxt+tp->rcv_wnd)) {
-                       todrop =
-                            ti->ti_seq+ti->ti_len - (tp->rcv_nxt+tp->rcv_wnd);
-                       if (todrop > ti->ti_len)
+               todrop = (ti->ti_seq+ti->ti_len) - (tp->rcv_nxt+tp->rcv_wnd);
+               if (todrop > 0) {
+                       if (todrop >= ti->ti_len)
                                goto dropafterack;
                        m_adj(m, -todrop);
                        ti->ti_len -= todrop;
                                goto dropafterack;
                        m_adj(m, -todrop);
                        ti->ti_len -= todrop;
@@ -280,27 +537,22 @@ trimthenstep6:
         *      Close the tcb.
         */
        if (tiflags&TH_RST) switch (tp->t_state) {
         *      Close the tcb.
         */
        if (tiflags&TH_RST) switch (tp->t_state) {
-               
+
        case TCPS_SYN_RECEIVED:
        case TCPS_SYN_RECEIVED:
-               if (inp->inp_socket->so_options & SO_ACCEPTCONN) {
-                       tp->t_state = TCPS_LISTEN;
-                       inp->inp_faddr.s_addr = 0;
-                       goto drop;
-               }
-               tcp_drop(tp, ECONNREFUSED);
+               tp = tcp_drop(tp, ECONNREFUSED);
                goto drop;
 
        case TCPS_ESTABLISHED:
        case TCPS_FIN_WAIT_1:
        case TCPS_FIN_WAIT_2:
        case TCPS_CLOSE_WAIT:
                goto drop;
 
        case TCPS_ESTABLISHED:
        case TCPS_FIN_WAIT_1:
        case TCPS_FIN_WAIT_2:
        case TCPS_CLOSE_WAIT:
-               tcp_drop(tp, ECONNRESET);
+               tp = tcp_drop(tp, ECONNRESET);
                goto drop;
 
        case TCPS_CLOSING:
        case TCPS_LAST_ACK:
        case TCPS_TIME_WAIT:
                goto drop;
 
        case TCPS_CLOSING:
        case TCPS_LAST_ACK:
        case TCPS_TIME_WAIT:
-               tcp_close(tp);
+               tp = tcp_close(tp);
                goto drop;
        }
 
                goto drop;
        }
 
@@ -309,7 +561,7 @@ trimthenstep6:
         * error and we send an RST and drop the connection.
         */
        if (tiflags & TH_SYN) {
         * error and we send an RST and drop the connection.
         */
        if (tiflags & TH_SYN) {
-               tcp_drop(tp, ECONNABORTED);
+               tp = tcp_drop(tp, ECONNRESET);
                goto dropwithreset;
        }
 
                goto dropwithreset;
        }
 
@@ -331,16 +583,23 @@ trimthenstep6:
         */
        case TCPS_SYN_RECEIVED:
                if (SEQ_GT(tp->snd_una, ti->ti_ack) ||
         */
        case TCPS_SYN_RECEIVED:
                if (SEQ_GT(tp->snd_una, ti->ti_ack) ||
-                   SEQ_GT(ti->ti_ack, tp->snd_nxt))
+                   SEQ_GT(ti->ti_ack, tp->snd_max))
                        goto dropwithreset;
                        goto dropwithreset;
+               tp->snd_una++;                  /* SYN acked */
+               if (SEQ_LT(tp->snd_nxt, tp->snd_una))
+                       tp->snd_nxt = tp->snd_una;
+               tp->t_timer[TCPT_REXMT] = 0;
                soisconnected(so);
                tp->t_state = TCPS_ESTABLISHED;
                soisconnected(so);
                tp->t_state = TCPS_ESTABLISHED;
+               tp->t_maxseg = MIN(tp->t_maxseg, tcp_mss(tp));
+               (void) tcp_reass(tp, (struct tcpiphdr *)0);
+               tp->snd_wl1 = ti->ti_seq - 1;
                /* fall into ... */
 
        /*
         * In ESTABLISHED state: drop duplicate ACKs; ACK out of range
         * ACKs.  If the ack is in the range
                /* fall into ... */
 
        /*
         * In ESTABLISHED state: drop duplicate ACKs; ACK out of range
         * ACKs.  If the ack is in the range
-        *      tp->snd_una < ti->ti_ack <= tp->snd_nxt
+        *      tp->snd_una < ti->ti_ack <= tp->snd_max
         * then advance tp->snd_una to ti->ti_ack and drop
         * data from the retransmission queue.  If this ACK reflects
         * more up to date window information we update our window information.
         * then advance tp->snd_una to ti->ti_ack and drop
         * data from the retransmission queue.  If this ACK reflects
         * more up to date window information we update our window information.
@@ -350,32 +609,55 @@ trimthenstep6:
        case TCPS_FIN_WAIT_2:
        case TCPS_CLOSE_WAIT:
        case TCPS_CLOSING:
        case TCPS_FIN_WAIT_2:
        case TCPS_CLOSE_WAIT:
        case TCPS_CLOSING:
+       case TCPS_LAST_ACK:
+       case TCPS_TIME_WAIT:
 #define        ourfinisacked   (acked > 0)
 
 #define        ourfinisacked   (acked > 0)
 
-               if (SEQ_LT(ti->ti_ack, tp->snd_una))
+               if (SEQ_LEQ(ti->ti_ack, tp->snd_una))
                        break;
                        break;
-               if (SEQ_GT(ti->ti_ack, tp->snd_nxt))
+               if (SEQ_GT(ti->ti_ack, tp->snd_max))
                        goto dropafterack;
                acked = ti->ti_ack - tp->snd_una;
                        goto dropafterack;
                acked = ti->ti_ack - tp->snd_una;
+
+               /*
+                * If transmit timer is running and timed sequence
+                * number was acked, update smoothed round trip time.
+                */
+               if (tp->t_rtt && SEQ_GT(ti->ti_ack, tp->t_rtseq)) {
+                       if (tp->t_srtt == 0)
+                               tp->t_srtt = tp->t_rtt;
+                       else
+                               tp->t_srtt =
+                                   tcp_alpha * tp->t_srtt +
+                                   (1 - tcp_alpha) * tp->t_rtt;
+                       tp->t_rtt = 0;
+               }
+
+               if (ti->ti_ack == tp->snd_max)
+                       tp->t_timer[TCPT_REXMT] = 0;
+               else {
+                       TCPT_RANGESET(tp->t_timer[TCPT_REXMT],
+                           tcp_beta * tp->t_srtt, TCPTV_MIN, TCPTV_MAX);
+                       tp->t_rxtshift = 0;
+               }
+               /*
+                * When new data is acked, open the congestion window a bit.
+                */
+               if (acked > 0)
+                       tp->snd_cwnd = MIN(11 * tp->snd_cwnd / 10, 65535);
                if (acked > so->so_snd.sb_cc) {
                if (acked > so->so_snd.sb_cc) {
-                       sbflush(&so->so_snd);
-                       acked -= so->so_snd.sb_cc;
+                       tp->snd_wnd -= so->so_snd.sb_cc;
+                       sbdrop(&so->so_snd, so->so_snd.sb_cc);
                } else {
                        sbdrop(&so->so_snd, acked);
                } else {
                        sbdrop(&so->so_snd, acked);
+                       tp->snd_wnd -= acked;
                        acked = 0;
                }
                        acked = 0;
                }
-               /* if acked our FIN is acked */
+               if ((so->so_snd.sb_flags & SB_WAIT) || so->so_snd.sb_sel)
+                       sowwakeup(so);
                tp->snd_una = ti->ti_ack;
                tp->snd_una = ti->ti_ack;
-
-               /*
-                * Update window information.
-                */
-               if (SEQ_LT(tp->snd_wl1, ti->ti_seq) ||
-                   tp->snd_wl1==ti->ti_seq && SEQ_LEQ(tp->snd_wl2,ti->ti_seq)) {
-                       tp->snd_wnd = ti->ti_win;
-                       tp->snd_wl1 = ti->ti_seq;
-                       tp->snd_wl2 = ti->ti_ack;
-               }
+               if (SEQ_LT(tp->snd_nxt, tp->snd_una))
+                       tp->snd_nxt = tp->snd_una;
 
                switch (tp->t_state) {
 
 
                switch (tp->t_state) {
 
@@ -385,8 +667,20 @@ trimthenstep6:
                 * then enter FIN_WAIT_2.
                 */
                case TCPS_FIN_WAIT_1:
                 * then enter FIN_WAIT_2.
                 */
                case TCPS_FIN_WAIT_1:
-                       if (ourfinisacked)
+                       if (ourfinisacked) {
+                               /*
+                                * If we can't receive any more
+                                * data, then closing user can proceed.
+                                * Starting the timer is contrary to the
+                                * specification, but if we don't get a FIN
+                                * we'll hang forever.
+                                */
+                               if (so->so_state & SS_CANTRCVMORE) {
+                                       soisdisconnected(so);
+                                       tp->t_timer[TCPT_2MSL] = TCPTV_MAXIDLE;
+                               }
                                tp->t_state = TCPS_FIN_WAIT_2;
                                tp->t_state = TCPS_FIN_WAIT_2;
+                       }
                        break;
 
                /*
                        break;
 
                /*
@@ -396,9 +690,13 @@ trimthenstep6:
                 * the segment.
                 */
                case TCPS_CLOSING:
                 * the segment.
                 */
                case TCPS_CLOSING:
-                       if (ourfinisacked)
+                       if (ourfinisacked) {
                                tp->t_state = TCPS_TIME_WAIT;
                                tp->t_state = TCPS_TIME_WAIT;
-                       goto drop;
+                               tcp_canceltimers(tp);
+                               tp->t_timer[TCPT_2MSL] = 2 * TCPTV_MSL;
+                               soisdisconnected(so);
+                       }
+                       break;
 
                /*
                 * The only thing that can arrive in  LAST_ACK state
 
                /*
                 * The only thing that can arrive in  LAST_ACK state
@@ -408,7 +706,7 @@ trimthenstep6:
                 */
                case TCPS_LAST_ACK:
                        if (ourfinisacked)
                 */
                case TCPS_LAST_ACK:
                        if (ourfinisacked)
-                               tcp_close(tp);
+                               tp = tcp_close(tp);
                        goto drop;
 
                /*
                        goto drop;
 
                /*
@@ -417,7 +715,7 @@ trimthenstep6:
                 * it and restart the finack timer.
                 */
                case TCPS_TIME_WAIT:
                 * it and restart the finack timer.
                 */
                case TCPS_TIME_WAIT:
-                       tp->t_timer[TCPT_2MSL] = 2 * TCPSC_MSL;
+                       tp->t_timer[TCPT_2MSL] = 2 * TCPTV_MSL;
                        goto dropafterack;
                }
 #undef ourfinisacked
                        goto dropafterack;
                }
 #undef ourfinisacked
@@ -425,20 +723,59 @@ trimthenstep6:
 
 step6:
        /*
 
 step6:
        /*
-        * If an URG bit is set in the segment and is greater than the
-        * current known urgent pointer, then signal the user that the
-        * remote side has urgent data.  This should not happen
-        * in CLOSE_WAIT, CLOSING, LAST-ACK or TIME_WAIT STATES since
-        * a FIN has been received from the remote side.  In these states
-        * we ignore the URG.
-        */
-       if ((tiflags & TH_URG) == 0 && TCPS_HAVERCVDFIN(tp->t_state) == 0)
-               if (SEQ_GT(ti->ti_urp, tp->rcv_up)) {
-                       tp->rcv_up = ti->ti_urp;
-#if 0
-                       soisurgendata(so);              /* XXX */
-#endif
+        * Update window information.
+        */
+       if (SEQ_LT(tp->snd_wl1, ti->ti_seq) || tp->snd_wl1 == ti->ti_seq &&
+           (SEQ_LT(tp->snd_wl2, ti->ti_ack) ||
+            tp->snd_wl2 == ti->ti_ack && ti->ti_win > tp->snd_wnd)) {
+               tp->snd_wnd = ti->ti_win;
+               tp->snd_wl1 = ti->ti_seq;
+               tp->snd_wl2 = ti->ti_ack;
+       }
+
+       /*
+        * Process segments with URG.
+        */
+       if ((tiflags & TH_URG) && ti->ti_urp &&
+           TCPS_HAVERCVDFIN(tp->t_state) == 0) {
+               /*
+                * This is a kludge, but if we receive accept
+                * random urgent pointers, we'll crash in
+                * soreceive.  It's hard to imagine someone
+                * actually wanting to send this much urgent data.
+                */
+               if (ti->ti_urp + (unsigned) so->so_rcv.sb_cc > 32767) {
+                       ti->ti_urp = 0;                 /* XXX */
+                       tiflags &= ~TH_URG;             /* XXX */
+                       ti->ti_flags &= ~TH_URG;        /* XXX */
+                       goto badurp;                    /* XXX */
                }
                }
+               /*
+                * If this segment advances the known urgent pointer,
+                * then mark the data stream.  This should not happen
+                * in CLOSE_WAIT, CLOSING, LAST_ACK or TIME_WAIT STATES since
+                * a FIN has been received from the remote side. 
+                * In these states we ignore the URG.
+                */
+               if (SEQ_GT(ti->ti_seq+ti->ti_urp, tp->rcv_up)) {
+                       tp->rcv_up = ti->ti_seq + ti->ti_urp;
+                       so->so_oobmark = so->so_rcv.sb_cc +
+                           (tp->rcv_up - tp->rcv_nxt) - 1;
+                       if (so->so_oobmark == 0)
+                               so->so_state |= SS_RCVATMARK;
+                       sohasoutofband(so);
+                       tp->t_oobflags &= ~(TCPOOB_HAVEDATA | TCPOOB_HADDATA);
+               }
+               /*
+                * Remove out of band data so doesn't get presented to user.
+                * This can happen independent of advancing the URG pointer,
+                * 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)
+                       tcp_pulloutofband(so, ti);
+       }
+badurp:                                                        /* XXX */
 
        /*
         * Process the segment text, merging it into the TCP sequencing queue,
 
        /*
         * Process the segment text, merging it into the TCP sequencing queue,
@@ -448,28 +785,28 @@ step6:
         * case PRU_RCVD).  If a FIN has already been received on this
         * connection then we just ignore the text.
         */
         * case PRU_RCVD).  If a FIN has already been received on this
         * connection then we just ignore the text.
         */
-       if (ti->ti_len) {
-               if (TCPS_HAVERCVDFIN(tp->t_state))
-                       goto drop;
-               off += sizeof (struct ip);              /* drop IP header */
-               m->m_off += off;
-               m->m_len -= off;
-               tiflags = tcp_reass(tp, ti);
-               tp->t_flags |= TF_ACKNOW;               /* XXX TF_DELACK */
-       } else
+       if ((ti->ti_len || (tiflags&TH_FIN)) &&
+           TCPS_HAVERCVDFIN(tp->t_state) == 0) {
+               TCP_REASS(tp, ti, m, so, tiflags);
+               if (tcpnodelack == 0)
+                       tp->t_flags |= TF_DELACK;
+               else
+                       tp->t_flags |= TF_ACKNOW;
+       } else {
                m_freem(m);
                m_freem(m);
+               tiflags &= ~TH_FIN;
+       }
 
        /*
 
        /*
-        * If FIN is received then if we haven't received SYN and
-        * therefore can't validate drop the segment.  Otherwise ACK
-        * the FIN and let the user know that the connection is closing.
+        * If FIN is received ACK the FIN and let the user know
+        * that the connection is closing.
         */
         */
-       if ((tiflags & TH_FIN)) {
-               if (TCPS_HAVERCVDSYN(tp->t_state) == 0)
-                       goto drop;
-               socantrcvmore(so);
-               tp->t_flags |= TF_ACKNOW;
-               tp->rcv_nxt++;
+       if (tiflags & TH_FIN) {
+               if (TCPS_HAVERCVDFIN(tp->t_state) == 0) {
+                       socantrcvmore(so);
+                       tp->t_flags |= TF_ACKNOW;
+                       tp->rcv_nxt++;
+               }
                switch (tp->t_state) {
 
                /*
                switch (tp->t_state) {
 
                /*
@@ -495,191 +832,200 @@ step6:
                 * standard timers.
                 */
                case TCPS_FIN_WAIT_2:
                 * standard timers.
                 */
                case TCPS_FIN_WAIT_2:
-                       tp->t_state = TCPS_TIME_WAIT;;
+                       tp->t_state = TCPS_TIME_WAIT;
                        tcp_canceltimers(tp);
                        tcp_canceltimers(tp);
-                       tp->t_timer[TCPT_2MSL] = TCPSC_2MSL;
+                       tp->t_timer[TCPT_2MSL] = 2 * TCPTV_MSL;
+                       soisdisconnected(so);
                        break;
 
                /*
                 * In TIME_WAIT state restart the 2 MSL time_wait timer.
                 */
                case TCPS_TIME_WAIT:
                        break;
 
                /*
                 * In TIME_WAIT state restart the 2 MSL time_wait timer.
                 */
                case TCPS_TIME_WAIT:
-                       tp->t_timer[TCPT_2MSL] = TCPSC_2MSL;
+                       tp->t_timer[TCPT_2MSL] = 2 * TCPTV_MSL;
                        break;
                }
        }
                        break;
                }
        }
+       if (so->so_options & SO_DEBUG)
+               tcp_trace(TA_INPUT, ostate, tp, &tcp_saveti, 0);
 
        /*
         * Return any desired output.
         */
 
        /*
         * Return any desired output.
         */
-       tcp_output(tp);
+       (void) tcp_output(tp);
        return;
 
 dropafterack:
        /*
        return;
 
 dropafterack:
        /*
-        * Generate an ACK, then drop incoming segment.
-        * Make ACK reflect our state.
+        * Generate an ACK dropping incoming segment if it occupies
+        * sequence space, where the ACK reflects our state.
         */
         */
-       if (tiflags & TH_RST)
+       if ((tiflags&TH_RST) ||
+           tlen == 0 && (tiflags&(TH_SYN|TH_FIN)) == 0)
                goto drop;
                goto drop;
-       tcp_respond(ti, tp->rcv_nxt, tp->snd_nxt, TH_ACK);
-       goto drop;
+       if (tp->t_inpcb->inp_socket->so_options & SO_DEBUG)
+               tcp_trace(TA_RESPOND, ostate, tp, &tcp_saveti, 0);
+       tcp_respond(tp, ti, tp->rcv_nxt, tp->snd_nxt, TH_ACK);
+       return;
 
 dropwithreset:
 
 dropwithreset:
+       if (om) {
+               (void) m_free(om);
+               om = 0;
+       }
        /*
        /*
-        * Generate a RST, then drop incoming segment.
+        * Generate a RST, dropping incoming segment.
         * Make ACK acceptable to originator of segment.
         * Make ACK acceptable to originator of segment.
+        * Don't bother to respond if destination was broadcast.
         */
         */
-       if (tiflags & TH_RST)
+       if ((tiflags & TH_RST) || in_broadcast(ti->ti_dst))
                goto drop;
        if (tiflags & TH_ACK)
                goto drop;
        if (tiflags & TH_ACK)
-               tcp_respond(ti, 0, ti->ti_ack, TH_RST);
+               tcp_respond(tp, ti, (tcp_seq)0, ti->ti_ack, TH_RST);
        else {
                if (tiflags & TH_SYN)
                        ti->ti_len++;
        else {
                if (tiflags & TH_SYN)
                        ti->ti_len++;
-               tcp_respond(ti, ti->ti_seq+ti->ti_len, 0, TH_RST|TH_ACK);
+               tcp_respond(tp, ti, ti->ti_seq+ti->ti_len, (tcp_seq)0,
+                   TH_RST|TH_ACK);
        }
        }
-       goto drop;
+       /* destroy temporarily created socket */
+       if (dropsocket)
+               (void) soabort(so);
+       return;
 
 drop:
 
 drop:
+       if (om)
+               (void) m_free(om);
        /*
         * Drop space held by incoming segment and return.
         */
        /*
         * Drop space held by incoming segment and return.
         */
+       if (tp && (tp->t_inpcb->inp_socket->so_options & SO_DEBUG))
+               tcp_trace(TA_DROP, ostate, tp, &tcp_saveti, 0);
        m_freem(m);
        m_freem(m);
+       /* destroy temporarily created socket */
+       if (dropsocket)
+               (void) soabort(so);
+       return;
 }
 
 }
 
-/*
- * Insert segment ti into reassembly queue of tcp with
- * control block tp.  Return TH_FIN if reassembly now includes
- * a segment with FIN.
- */
-tcp_reass(tp, ti, endp)
-       register struct tcpcb *tp;
-       register struct tcpiphdr *ti;
-       int *endp;
+tcp_dooptions(tp, om, ti)
+       struct tcpcb *tp;
+       struct mbuf *om;
+       struct tcpiphdr *ti;
 {
 {
-       register struct tcpiphdr *q;
-       struct socket *so = tp->t_inpcb->inp_socket;
-       int flags = 0;          /* no FIN */
-       int overage;
-COUNT(TCP_REASS);
+       register u_char *cp;
+       int opt, optlen, cnt;
 
 
-       /*
-        * If no data in this segment may want
-        * to move data up to socket structure (if
-        * connection is now established).
-        */
-       if (ti->ti_len == 0) {
-               m_freem(dtom(ti));
-               goto present;
-       }
-
-       /*
-        * Find a segment which begins after this one does.
-        */
-       for (q = tp->seg_next; q != (struct tcpiphdr *)tp;
-           q = (struct tcpiphdr *)q->ti_next)
-               if (SEQ_GT(q->ti_seq, ti->ti_seq))
+       cp = mtod(om, u_char *);
+       cnt = om->m_len;
+       for (; cnt > 0; cnt -= optlen, cp += optlen) {
+               opt = cp[0];
+               if (opt == TCPOPT_EOL)
                        break;
                        break;
-
-       /*
-        * If there is a preceding segment, it may provide some of
-        * our data already.  If so, drop the data from the incoming
-        * segment.  If it provides all of our data, drop us.
-        */
-       if ((struct tcpiphdr *)q->ti_prev != (struct tcpiphdr *)tp) {
-               register int i;
-               q = (struct tcpiphdr *)(q->ti_prev);
-               /* conversion to int (in i) handles seq wraparound */
-               i = q->ti_seq + q->ti_len - ti->ti_seq;
-               if (i > 0) {
-                       if (i >= ti->ti_len)
-                               goto drop;
-                       m_adj(dtom(tp), i);
-                       ti->ti_len -= i;
-                       ti->ti_seq += i;
+               if (opt == TCPOPT_NOP)
+                       optlen = 1;
+               else {
+                       optlen = cp[1];
+                       if (optlen <= 0)
+                               break;
                }
                }
-               q = (struct tcpiphdr *)(q->ti_next);
-       }
+               switch (opt) {
 
 
-       /*
-        * While we overlap succeeding segments trim them or,
-        * if they are completely covered, dequeue them.
-        */
-       while (q != (struct tcpiphdr *)tp &&
-           SEQ_GT(ti->ti_seq + ti->ti_len, q->ti_seq)) {
-               register int i = (ti->ti_seq + ti->ti_len) - q->ti_seq;
-               if (i < q->ti_len) {
-                       q->ti_len -= i;
-                       m_adj(dtom(q), i);
+               default:
+                       break;
+
+               case TCPOPT_MAXSEG:
+                       if (optlen != 4)
+                               continue;
+                       if (!(ti->ti_flags & TH_SYN))
+                               continue;
+                       tp->t_maxseg = *(u_short *)(cp + 2);
+                       tp->t_maxseg = ntohs((u_short)tp->t_maxseg);
+                       tp->t_maxseg = MIN(tp->t_maxseg, tcp_mss(tp));
                        break;
                }
                        break;
                }
-               q = (struct tcpiphdr *)q->ti_next;
-               m_freem(dtom(q->ti_prev));
-               remque(q->ti_prev);
        }
        }
+       (void) m_free(om);
+}
 
 
-       /*
-        * Stick new segment in its place.
-        */
-       insque(ti, q->ti_prev);
-       tp->t_seqcnt += ti->ti_len;
+/*
+ * Pull out of band byte out of a segment so
+ * it doesn't appear in the user's data queue.
+ * It is still reflected in the segment length for
+ * sequencing purposes.
+ */
+tcp_pulloutofband(so, ti)
+       struct socket *so;
+       struct tcpiphdr *ti;
+{
+       register struct mbuf *m;
+       int cnt = ti->ti_urp - 1;
+       
+       m = dtom(ti);
+       while (cnt >= 0) {
+               if (m->m_len > cnt) {
+                       char *cp = mtod(m, caddr_t) + cnt;
+                       struct tcpcb *tp = sototcpcb(so);
 
 
-       /*
-        * Calculate available space and discard segments for
-        * which there is too much.
-        */
-       overage = 
-           (so->so_rcv.sb_cc + tp->t_seqcnt) - so->so_rcv.sb_hiwat;
-       if (overage > 0) {
-               q = tp->seg_prev;
-               for (;;) {
-                       register int i = MIN(q->ti_len, overage);
-                       overage -= i;
-                       tp->t_seqcnt -= i;
-                       q->ti_len -= i;
-                       m_adj(dtom(q), -i);
-                       if (q->ti_len)
-                               break;
-                       if (q == ti)
-                               panic("tcp_reass dropall");
-                       q = (struct tcpiphdr *)q->ti_prev;
-                       remque(q->ti_next);
+                       tp->t_iobc = *cp;
+                       tp->t_oobflags |= TCPOOB_HAVEDATA;
+                       bcopy(cp+1, cp, (unsigned)(m->m_len - cnt - 1));
+                       m->m_len--;
+                       return;
                }
                }
-       }
-
-       /*
-        * Advance rcv_next through newly completed sequence space.
-        */
-       while (ti->ti_seq == tp->rcv_nxt) {
-               tp->rcv_nxt += ti->ti_len;
-               flags = ti->ti_flags & TH_FIN;
-               ti = (struct tcpiphdr *)ti->ti_next;
-               if (ti == (struct tcpiphdr *)tp)
+               cnt -= m->m_len;
+               m = m->m_next;
+               if (m == 0)
                        break;
        }
                        break;
        }
+       panic("tcp_pulloutofband");
+}
 
 
-present:
-       /*
-        * Present data to user.
-        */
-       if (tp->t_state < TCPS_ESTABLISHED)
-               return (flags);
-       ti = tp->seg_next;
-       while (ti != (struct tcpiphdr *)tp && ti->ti_seq < tp->rcv_nxt) {
-               remque(ti);
-               sbappend(&so->so_rcv, dtom(ti));
-               tp->t_seqcnt -= ti->ti_len;
-               if (tp->t_seqcnt < 0)
-                       panic("tcp_reass");
-               ti = (struct tcpiphdr *)ti->ti_next;
+/*
+ *  Determine a reasonable value for maxseg size.
+ *  If the route is known, use one that can be handled
+ *  on the given interface without forcing IP to fragment.
+ *  If bigger than a page (CLBYTES), round down to nearest pagesize
+ *  to utilize pagesize mbufs.
+ *  If interface pointer is unavailable, or the destination isn't local,
+ *  use a conservative size (512 or the default IP max size, but no more
+ *  than the mtu of the interface through which we route),
+ *  as we can't discover anything about intervening gateways or networks.
+ *
+ *  This is ugly, and doesn't belong at this level, but has to happen somehow.
+ */
+tcp_mss(tp)
+       register struct tcpcb *tp;
+{
+       struct route *ro;
+       struct ifnet *ifp;
+       int mss;
+       struct inpcb *inp;
+
+       inp = tp->t_inpcb;
+       ro = &inp->inp_route;
+       if ((ro->ro_rt == (struct rtentry *)0) ||
+           (ifp = ro->ro_rt->rt_ifp) == (struct ifnet *)0) {
+               /* No route yet, so try to acquire one */
+               if (inp->inp_faddr.s_addr != INADDR_ANY) {
+                       ro->ro_dst.sa_family = AF_INET;
+                       ((struct sockaddr_in *) &ro->ro_dst)->sin_addr =
+                               inp->inp_faddr;
+                       rtalloc(ro);
+               }
+               if ((ro->ro_rt == 0) || (ifp = ro->ro_rt->rt_ifp) == 0)
+                       return (TCP_MSS);
        }
        }
-       if (so->so_state & SS_CANTRCVMORE)
-               sbflush(&so->so_rcv);
-       else
-               sorwakeup(so);
-       return (flags);
-drop:
-       m_freem(dtom(ti));
-       return (flags);
+
+       mss = ifp->if_mtu - sizeof(struct tcpiphdr);
+#if    (CLBYTES & (CLBYTES - 1)) == 0
+       if (mss > CLBYTES)
+               mss &= ~(CLBYTES-1);
+#else
+       if (mss > CLBYTES)
+               mss = mss / CLBYTES * CLBYTES;
+#endif
+       if (in_localaddr(inp->inp_faddr))
+               return (mss);
+       return (MIN(mss, TCP_MSS));
 }
 }