remove /usr/include dependencies

[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 8c0455d..7ee72ab 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.86    83/01/08        */
+/*     tcp_input.c     1.89    83/02/10        */

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


@@ -6,11 +6,14 @@
 #include "../h/protosw.h"
 #include "../h/socket.h"
 #include "../h/socketvar.h"
 #include "../h/protosw.h"
 #include "../h/socket.h"
 #include "../h/socketvar.h"

-#include "../netinet/in.h"
+#include "../h/errno.h"
+
+#include "../net/if.h"

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

+
+#include "../netinet/in.h"

 #include "../netinet/in_pcb.h"
 #include "../netinet/in_systm.h"
 #include "../netinet/in_pcb.h"
 #include "../netinet/in_systm.h"

-#include "../net/if.h"

 #include "../netinet/ip.h"
 #include "../netinet/ip_var.h"
 #include "../netinet/tcp.h"
 #include "../netinet/ip.h"
 #include "../netinet/ip_var.h"
 #include "../netinet/tcp.h"


@@ -20,7 +23,6 @@
 #include "../netinet/tcp_var.h"
 #include "../netinet/tcpip.h"
 #include "../netinet/tcp_debug.h"
 #include "../netinet/tcp_var.h"
 #include "../netinet/tcpip.h"
 #include "../netinet/tcp_debug.h"

-#include <errno.h>

 
 int    tcpprintfs = 0;
 int    tcpcksum = 1;
 
 int    tcpprintfs = 0;
 int    tcpcksum = 1;


@@ -46,6 +48,7 @@ tcp_input(m0)
        int todrop, acked;
        short ostate;
        struct in_addr laddr;
        int todrop, acked;
        short ostate;
        struct in_addr laddr;

+       int dropsocket = 0;

 
        /*
         * Get IP and TCP header together in first mbuf.
 
        /*
         * Get IP and TCP header together in first mbuf.


@@ -151,6 +154,18 @@ tcp_input(m0)
                so = sonewconn(so);
                if (so == 0)
                        goto drop;
                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 = (struct inpcb *)so->so_pcb;
                inp->inp_laddr = ti->ti_dst;
                inp->inp_lport = ti->ti_dport;


@@ -235,6 +250,7 @@ tcp_input(m0)
                tcp_rcvseqinit(tp);
                tp->t_state = TCPS_SYN_RECEIVED;
                tp->t_timer[TCPT_KEEP] = TCPTV_KEEP;
                tcp_rcvseqinit(tp);
                tp->t_state = TCPS_SYN_RECEIVED;
                tp->t_timer[TCPT_KEEP] = TCPTV_KEEP;

+               dropsocket = 0;         /* committed to socket */

                goto trimthenstep6;
                }
 
                goto trimthenstep6;
                }
 


@@ -257,10 +273,8 @@ tcp_input(m0)
                     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) {
-                               tcp_drop(tp, ECONNREFUSED);
-                               tp = 0;
-                       }
+                       if (tiflags & TH_ACK)
+                               tp = tcp_drop(tp, ECONNREFUSED);

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


@@ -364,10 +378,9 @@ trimthenstep6:
         * If data is received on a connection after the
         * user processes are gone, then RST the other end.
         */
         * 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 &&
+       if ((so->so_state & SS_NOFDREF) && tp->t_state > TCPS_CLOSE_WAIT &&

            ti->ti_len) {
            ti->ti_len) {

-               tcp_close(tp);
-               tp = 0;
+               tp = tcp_close(tp);

                goto dropwithreset;
        }
 
                goto dropwithreset;
        }
 


@@ -384,23 +397,20 @@ trimthenstep6:
        if (tiflags&TH_RST) switch (tp->t_state) {
 
        case TCPS_SYN_RECEIVED:
        if (tiflags&TH_RST) switch (tp->t_state) {
 
        case TCPS_SYN_RECEIVED:

-               tcp_drop(tp, ECONNREFUSED);
-               tp = 0;
+               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 = 0;
+               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 = 0;
+               tp = tcp_close(tp);

                goto drop;
        }
 
                goto drop;
        }
 


@@ -409,8 +419,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, ECONNRESET);
-               tp = 0;
+               tp = tcp_drop(tp, ECONNRESET);

                goto dropwithreset;
        }
 
                goto dropwithreset;
        }
 


@@ -544,10 +553,8 @@ trimthenstep6:
                 * and return.
                 */
                case TCPS_LAST_ACK:
                 * and return.
                 */
                case TCPS_LAST_ACK:

-                       if (ourfinisacked) {
-                               tcp_close(tp);
-                               tp = 0;
-                       }
+                       if (ourfinisacked)
+                               tp = tcp_close(tp);

                        goto drop;
 
                /*
                        goto drop;
 
                /*


@@ -715,6 +722,9 @@ dropwithreset:
                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);
        }

+       /* destroy temporarily created socket */
+       if (dropsocket)
+               (void) soabort(so);

        return;
 
 drop:
        return;
 
 drop:


@@ -724,6 +734,9 @@ drop:
        if (tp && (tp->t_inpcb->inp_socket->so_options & SO_DEBUG))
                tcp_trace(TA_DROP, ostate, tp, &tcp_saveti, 0);
        m_freem(m);
        if (tp && (tp->t_inpcb->inp_socket->so_options & SO_DEBUG))
                tcp_trace(TA_DROP, ostate, tp, &tcp_saveti, 0);
        m_freem(m);

+       /* destroy temporarily created socket */
+       if (dropsocket)
+               (void) soabort(so);

        return;
 }
 
        return;
 }