fix per Jeffrey Jongeward

[unix-history] / usr / src / sys / netinet / tcp_input.c

diff --git a/usr/src/sys/netinet/tcp_input.c b/usr/src/sys/netinet/tcp_input.c
index ef6d2c9..9ac2aea 100644 (file)
--- a/usr/src/sys/netinet/tcp_input.c
+++ b/usr/src/sys/netinet/tcp_input.c
@@ -1,4 +1,4 @@
-/*     tcp_input.c     1.53    82/02/19        */
+/*     tcp_input.c     1.67    82/04/10        */

 
 #include "../h/param.h"
 #include "../h/systm.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"


@@ -7,6 +7,7 @@
 #include "../h/socket.h"
 #include "../h/socketvar.h"
 #include "../net/in.h"
 #include "../h/socket.h"
 #include "../h/socketvar.h"
 #include "../net/in.h"

+#include "../net/route.h"

 #include "../net/in_pcb.h"
 #include "../net/in_systm.h"
 #include "../net/if.h"
 #include "../net/in_pcb.h"
 #include "../net/in_systm.h"
 #include "../net/if.h"


@@ -45,6 +46,7 @@ tcp_input(m0)
        struct socket *so;
        int todrop, acked;
        short ostate;
        struct socket *so;
        int todrop, acked;
        short ostate;

+       struct in_addr laddr;

 
 COUNT(TCP_INPUT);
        /*
 
 COUNT(TCP_INPUT);
        /*


@@ -72,12 +74,13 @@ COUNT(TCP_INPUT);
                ti->ti_next = ti->ti_prev = 0;
                ti->ti_x1 = 0;
                ti->ti_len = (u_short)tlen;
                ti->ti_next = ti->ti_prev = 0;
                ti->ti_x1 = 0;
                ti->ti_len = (u_short)tlen;

-#if vax
-               ti->ti_len = htons(ti->ti_len);
+#if vax || pdp11
+               ti->ti_len = htons((u_short)ti->ti_len);

 #endif
                if (ti->ti_sum = in_cksum(m, len)) {
                        tcpstat.tcps_badsum++;
 #endif
                if (ti->ti_sum = in_cksum(m, len)) {
                        tcpstat.tcps_badsum++;

-                       printf("tcp cksum %x\n", ti->ti_sum);
+                       if (tcpprintfs)
+                               printf("tcp cksum %x\n", ti->ti_sum);

                        goto drop;
                }
        }
                        goto drop;
                }
        }


@@ -91,7 +94,8 @@ COUNT(TCP_INPUT);
                tcpstat.tcps_badoff++;
                goto drop;
        }
                tcpstat.tcps_badoff++;
                goto drop;
        }

-       ti->ti_len = tlen - off;
+       tlen -= off;
+       ti->ti_len = tlen;

        if (off > sizeof (struct tcphdr)) {
                if ((m = m_pullup(m, sizeof (struct ip) + off)) == 0) {
                        tcpstat.tcps_hdrops++;
        if (off > sizeof (struct tcphdr)) {
                if ((m = m_pullup(m, sizeof (struct ip) + off)) == 0) {
                        tcpstat.tcps_hdrops++;


@@ -104,14 +108,22 @@ COUNT(TCP_INPUT);
                om->m_off = MMINOFF;
                om->m_len = off - sizeof (struct tcphdr);
                { caddr_t op = mtod(m, caddr_t) + sizeof (struct tcpiphdr);
                om->m_off = MMINOFF;
                om->m_len = off - sizeof (struct tcphdr);
                { caddr_t op = mtod(m, caddr_t) + sizeof (struct tcpiphdr);

-                 bcopy(op, mtod(om, caddr_t), om->m_len);
+                 bcopy(op, mtod(om, caddr_t), (unsigned)om->m_len);

                  m->m_len -= om->m_len;
                  m->m_len -= om->m_len;

-                 bcopy(op+om->m_len, op, m->m_len-sizeof (struct tcpiphdr));
+                 bcopy(op+om->m_len, op,
+                  (unsigned)(m->m_len-sizeof (struct tcpiphdr)));

                }
        }
        tiflags = ti->ti_flags;
 
                }
        }
        tiflags = ti->ti_flags;
 

-#if vax
+       /*
+        * Drop TCP and IP headers.
+        */
+       off += sizeof (struct ip);
+       m->m_off += off;
+       m->m_len -= off;
+
+#if vax || pdp11

        /*
         * Convert TCP protocol specific fields to host format.
         */
        /*
         * Convert TCP protocol specific fields to host format.
         */


@@ -122,10 +134,12 @@ COUNT(TCP_INPUT);
 #endif
 
        /*
 #endif
 
        /*

-        * Locate pcb for segment.
+        * Locate pcb for segment.  On match, update the local
+        * address stored in the block to reflect anchoring.

         */
        inp = in_pcblookup
         */
        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


@@ -188,11 +202,18 @@ COUNT(TCP_INPUT);
                        goto drop;
                tcp_in.sin_addr = ti->ti_src;
                tcp_in.sin_port = ti->ti_sport;
                        goto drop;
                tcp_in.sin_addr = ti->ti_src;
                tcp_in.sin_port = ti->ti_sport;

-               if (in_pcbconnect(inp, (struct sockaddr *)&tcp_in))
+               laddr = inp->inp_laddr;
+               if (inp->inp_laddr.s_addr == 0)
+                       inp->inp_laddr = ti->ti_dst;
+               if (in_pcbconnect(inp, (struct sockaddr_in *)&tcp_in)) {
+                       inp->inp_laddr = laddr;

                        goto drop;
                        goto drop;

+               }

                tp->t_template = tcp_template(tp);
                if (tp->t_template == 0) {
                        in_pcbdisconnect(inp);
                tp->t_template = tcp_template(tp);
                if (tp->t_template == 0) {
                        in_pcbdisconnect(inp);

+                       inp->inp_laddr = laddr;
+                       tp = 0;

                        goto drop;
                }
                tp->iss = tcp_iss; tcp_iss += TCP_ISSINCR/2;
                        goto drop;
                }
                tp->iss = tcp_iss; tcp_iss += TCP_ISSINCR/2;


@@ -222,8 +243,10 @@ COUNT(TCP_INPUT);
                     SEQ_GT(ti->ti_ack, tp->snd_max)))
                        goto dropwithreset;
                if (tiflags & TH_RST) {
                     SEQ_GT(ti->ti_ack, tp->snd_max)))
                        goto dropwithreset;
                if (tiflags & TH_RST) {

-                       if (tiflags & TH_ACK)
+                       if (tiflags & TH_ACK) {

                                tcp_drop(tp, ECONNREFUSED);
                                tcp_drop(tp, ECONNREFUSED);

+                               tp = 0;
+                       }

                        goto drop;
                }
                if ((tiflags & TH_SYN) == 0)
                        goto drop;
                }
                if ((tiflags & TH_SYN) == 0)


@@ -297,7 +320,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;


@@ -316,7 +340,7 @@ trimthenstep6:
                 */
                todrop = (ti->ti_seq+ti->ti_len) - (tp->rcv_nxt+tp->rcv_wnd);
                if (todrop > 0) {
                 */
                todrop = (ti->ti_seq+ti->ti_len) - (tp->rcv_nxt+tp->rcv_wnd);
                if (todrop > 0) {

-                       if (todrop > ti->ti_len)
+                       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;


@@ -324,6 +348,16 @@ trimthenstep6:
                }
        }
 
                }
        }
 

+       /*
+        * If a segment is received on a connection after the
+        * user processes are gone, then RST the other end.
+        */
+       if (so->so_state & SS_USERGONE) {
+               tcp_close(tp);
+               tp = 0;
+               goto dropwithreset;
+       }
+

        /*
         * If the RST bit is set examine the state:
         *    SYN_RECEIVED STATE:
        /*
         * If the RST bit is set examine the state:
         *    SYN_RECEIVED STATE:


@@ -344,9 +378,14 @@ trimthenstep6:
                        inp->inp_ppcb = 0;
                        tp = tcp_newtcpcb(inp);
                        tp->t_state = TCPS_LISTEN;
                        inp->inp_ppcb = 0;
                        tp = tcp_newtcpcb(inp);
                        tp->t_state = TCPS_LISTEN;

+                       inp->inp_faddr.s_addr = 0;
+                       inp->inp_fport = 0;
+                       inp->inp_laddr.s_addr = 0;      /* not quite right */
+                       tp = 0;

                        goto drop;
                }
                tcp_drop(tp, ECONNREFUSED);
                        goto drop;
                }
                tcp_drop(tp, ECONNREFUSED);

+               tp = 0;

                goto drop;
 
        case TCPS_ESTABLISHED:
                goto drop;
 
        case TCPS_ESTABLISHED:


@@ -354,12 +393,14 @@ trimthenstep6:
        case TCPS_FIN_WAIT_2:
        case TCPS_CLOSE_WAIT:
                tcp_drop(tp, ECONNRESET);
        case TCPS_FIN_WAIT_2:
        case TCPS_CLOSE_WAIT:
                tcp_drop(tp, ECONNRESET);

+               tp = 0;

                goto drop;
 
        case TCPS_CLOSING:
        case TCPS_LAST_ACK:
        case TCPS_TIME_WAIT:
                tcp_close(tp);
                goto drop;
 
        case TCPS_CLOSING:
        case TCPS_LAST_ACK:
        case TCPS_TIME_WAIT:
                tcp_close(tp);

+               tp = 0;

                goto drop;
        }
 
                goto drop;
        }
 


@@ -369,6 +410,7 @@ trimthenstep6:
         */
        if (tiflags & TH_SYN) {
                tcp_drop(tp, ECONNRESET);
         */
        if (tiflags & TH_SYN) {
                tcp_drop(tp, ECONNRESET);

+               tp = 0;

                goto dropwithreset;
        }
 
                goto dropwithreset;
        }
 


@@ -426,42 +468,44 @@ trimthenstep6:
                if (SEQ_GT(ti->ti_ack, tp->snd_max))
                        goto dropafterack;
                acked = ti->ti_ack - tp->snd_una;
                if (SEQ_GT(ti->ti_ack, tp->snd_max))
                        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;
+/* printf("rtt %d srtt*100 now %d\n", tp->t_rtt, (int)(tp->t_srtt*100)); */
+                       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);
                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_rtt = 0;
+                       tp->t_rtt = 1;

                        tp->t_rxtshift = 0;
                }
                if (acked > so->so_snd.sb_cc) {
                        sbdrop(&so->so_snd, so->so_snd.sb_cc);
                        tp->snd_wnd -= so->so_snd.sb_cc;
                } else {
                        tp->t_rxtshift = 0;
                }
                if (acked > so->so_snd.sb_cc) {
                        sbdrop(&so->so_snd, so->so_snd.sb_cc);
                        tp->snd_wnd -= so->so_snd.sb_cc;
                } else {

-                       sbdrop(&so->so_snd.sb_cc, acked);
+                       sbdrop(&so->so_snd, acked);

                        tp->snd_wnd -= acked;
                        acked = 0;
                }
                        tp->snd_wnd -= acked;
                        acked = 0;
                }

-               if (so->so_snd.sb_flags & SB_WAIT)
+               if ((so->so_snd.sb_flags & SB_WAIT) || so->so_snd.sb_sel)

                        sowwakeup(so);
                tp->snd_una = ti->ti_ack;
                if (SEQ_LT(tp->snd_nxt, tp->snd_una))
                        tp->snd_nxt = tp->snd_una;
 
                        sowwakeup(so);
                tp->snd_una = ti->ti_ack;
                if (SEQ_LT(tp->snd_nxt, tp->snd_una))
                        tp->snd_nxt = 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;
-               }
-

                switch (tp->t_state) {
 
                /*
                switch (tp->t_state) {
 
                /*


@@ -503,8 +547,10 @@ trimthenstep6:
                 * and return.
                 */
                case TCPS_LAST_ACK:
                 * and return.
                 */
                case TCPS_LAST_ACK:

-                       if (ourfinisacked)
+                       if (ourfinisacked) {

                                tcp_close(tp);
                                tcp_close(tp);

+                               tp = 0;
+                       }

                        goto drop;
 
                /*
                        goto drop;
 
                /*


@@ -526,9 +572,6 @@ step6:
        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)) {
        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)) {

-/*
-printf("wl1 %x seq %x wl2 %x ack %x win %x wnd %x\n", tp->snd_wl1, ti->ti_seq, 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;
                tp->snd_wnd = ti->ti_win;
                tp->snd_wl1 = ti->ti_seq;
                tp->snd_wl2 = ti->ti_ack;


@@ -580,9 +623,6 @@ printf("wl1 %x seq %x wl2 %x ack %x win %x wnd %x\n", tp->snd_wl1, ti->ti_seq, t
         */
        if ((ti->ti_len || (tiflags&TH_FIN)) &&
            TCPS_HAVERCVDFIN(tp->t_state) == 0) {
         */
        if ((ti->ti_len || (tiflags&TH_FIN)) &&
            TCPS_HAVERCVDFIN(tp->t_state) == 0) {

-               off += sizeof (struct ip);              /* drop IP header */
-               m->m_off += off;
-               m->m_len -= off;

                tiflags = tcp_reass(tp, ti);
                if (tcpnodelack == 0)
                        tp->t_flags |= TF_DELACK;
                tiflags = tcp_reass(tp, ti);
                if (tcpnodelack == 0)
                        tp->t_flags |= TF_DELACK;


@@ -648,22 +688,25 @@ printf("wl1 %x seq %x wl2 %x ack %x win %x wnd %x\n", tp->snd_wl1, ti->ti_seq, t
        /*
         * Return any desired output.
         */
        /*
         * Return any desired output.
         */

-       tcp_output(tp);
+       (void) tcp_output(tp);

        return;
 
 dropafterack:
        /*
        return;
 
 dropafterack:
        /*

-        * Generate an ACK dropping 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;

+       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:
        if (om)
        tcp_respond(tp, ti, tp->rcv_nxt, tp->snd_nxt, TH_ACK);
        return;
 
 dropwithreset:
        if (om)

-               m_free(om);
+               (void) m_free(om);

        /*
         * Generate a RST, dropping incoming segment.
         * Make ACK acceptable to originator of segment.
        /*
         * Generate a RST, dropping incoming segment.
         * Make ACK acceptable to originator of segment.


@@ -675,7 +718,8 @@ dropwithreset:
        else {
                if (tiflags & TH_SYN)
                        ti->ti_len++;
        else {
                if (tiflags & TH_SYN)
                        ti->ti_len++;

-               tcp_respond(tp, ti, ti->ti_seq+ti->ti_len, (tcp_seq)0, TH_RST|TH_ACK);
+               tcp_respond(tp, ti, ti->ti_seq+ti->ti_len, (tcp_seq)0,
+                   TH_RST|TH_ACK);

        }
        return;
 
        }
        return;
 


@@ -683,6 +727,8 @@ drop:
        /*
         * 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);
        return;
 }
        m_freem(m);
        return;
 }


@@ -713,8 +759,8 @@ tcp_dooptions(tp, om)
                        if (optlen != 4)
                                continue;
                        tp->t_maxseg = *(u_short *)(cp + 2);
                        if (optlen != 4)
                                continue;
                        tp->t_maxseg = *(u_short *)(cp + 2);

-#if vax
-                       tp->t_maxseg = ntohs(tp->t_maxseg);
+#if vax || pdp11
+                       tp->t_maxseg = ntohs((u_short)tp->t_maxseg);

 #endif
                        break;
                        
 #endif
                        break;
                        


@@ -743,7 +789,7 @@ printf("bad seq\n");
                        tp->t_iobseq = cp[2];
                        tp->t_iobc = cp[3];
                        mark = *(tcp_seq *)(cp + 4);
                        tp->t_iobseq = cp[2];
                        tp->t_iobc = cp[3];
                        mark = *(tcp_seq *)(cp + 4);

-#if vax
+#if vax || pdp11

                        mark = ntohl(mark);
 #endif
                        so->so_oobmark = so->so_rcv.sb_cc + (mark-tp->rcv_nxt);
                        mark = ntohl(mark);
 #endif
                        so->so_oobmark = so->so_rcv.sb_cc + (mark-tp->rcv_nxt);


@@ -771,7 +817,7 @@ printf("take oob ack %x and cancel rexmt\n", cp[2]);
 #endif TCPTRUEOOB
                }
        }
 #endif TCPTRUEOOB
                }
        }

-       m_free(om);
+       (void) m_free(om);

 }
 
 /*
 }
 
 /*


@@ -785,7 +831,7 @@ tcp_pulloutofband(so, ti)
        struct tcpiphdr *ti;
 {
        register struct mbuf *m;
        struct tcpiphdr *ti;
 {
        register struct mbuf *m;

-       int cnt = sizeof (struct tcpiphdr) + ti->ti_urp - 1;
+       int cnt = ti->ti_urp - 1;

        
        m = dtom(ti);
        while (cnt >= 0) {
        
        m = dtom(ti);
        while (cnt >= 0) {


@@ -795,7 +841,7 @@ tcp_pulloutofband(so, ti)
 
                        tp->t_iobc = *cp;
                        tp->t_oobflags |= TCPOOB_HAVEDATA;
 
                        tp->t_iobc = *cp;
                        tp->t_oobflags |= TCPOOB_HAVEDATA;

-                       bcopy(cp+1, cp, m->m_len - cnt - 1);
+                       bcopy(cp+1, cp, (unsigned)(m->m_len - cnt - 1));

                        m->m_len--;
                        return;
                }
                        m->m_len--;
                        return;
                }


@@ -901,7 +947,7 @@ present:
                m = dtom(ti);
                ti = (struct tcpiphdr *)ti->ti_next;
                if (so->so_state & SS_CANTRCVMORE)
                m = dtom(ti);
                ti = (struct tcpiphdr *)ti->ti_next;
                if (so->so_state & SS_CANTRCVMORE)

-                       (void) m_freem(m);
+                       m_freem(m);

                else
                        sbappend(&so->so_rcv, m);
        } while (ti != (struct tcpiphdr *)tp && ti->ti_seq == tp->rcv_nxt);
                else
                        sbappend(&so->so_rcv, m);
        } while (ti != (struct tcpiphdr *)tp && ti->ti_seq == tp->rcv_nxt);