fix per Jeffrey Jongeward

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

diff --git a/usr/src/sys/netinet/tcp_subr.c b/usr/src/sys/netinet/tcp_subr.c
index 430db0f..dff4dad 100644 (file)
--- a/usr/src/sys/netinet/tcp_subr.c
+++ b/usr/src/sys/netinet/tcp_subr.c
@@ -1,4 +1,4 @@
-/* tcp_subr.c 4.10 81/12/20 */
+/*     tcp_subr.c      4.26    82/04/30        */

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


@@ -7,11 +7,13 @@
 #include "../h/socketvar.h"
 #include "../h/protosw.h"
 #include "../net/in.h"
 #include "../h/socketvar.h"
 #include "../h/protosw.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/ip.h"
 #include "../net/ip_var.h"
 #include "../net/in_pcb.h"
 #include "../net/in_systm.h"
 #include "../net/if.h"
 #include "../net/ip.h"
 #include "../net/ip_var.h"

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

 #include "../net/tcp.h"
 #include "../net/tcp_fsm.h"
 #include "../net/tcp_seq.h"
 #include "../net/tcp.h"
 #include "../net/tcp_fsm.h"
 #include "../net/tcp_seq.h"


@@ -48,7 +50,7 @@ tcp_template(tp)
        register struct tcpiphdr *n;
 
 COUNT(TCP_TEMPLATE);
        register struct tcpiphdr *n;
 
 COUNT(TCP_TEMPLATE);

-       m = m_get(1);
+       m = m_get(M_WAIT);

        if (m == 0)
                return (0);
        m->m_off = MMAXOFF - sizeof (struct tcpiphdr);
        if (m == 0)
                return (0);
        m->m_off = MMAXOFF - sizeof (struct tcpiphdr);


@@ -86,51 +88,65 @@ COUNT(TCP_TEMPLATE);
  * In any case the ack and sequence number of the transmitted
  * segment are as specified by the parameters.
  */
  * In any case the ack and sequence number of the transmitted
  * segment are as specified by the parameters.
  */

-tcp_respond(ti, ack, seq, flags)
+tcp_respond(tp, ti, ack, seq, flags)
+       struct tcpcb *tp;

        register struct tcpiphdr *ti;
        tcp_seq ack, seq;
        int flags;
 {
        struct mbuf *m;
        register struct tcpiphdr *ti;
        tcp_seq ack, seq;
        int flags;
 {
        struct mbuf *m;

+       int win = 0, tlen;
+       struct route *ro = 0;

 
 COUNT(TCP_RESPOND);
 
 COUNT(TCP_RESPOND);

+       if (tp) {
+               win = sbspace(&tp->t_inpcb->inp_socket->so_rcv);
+               ro = &tp->t_inpcb->inp_route;
+       }

        if (flags == 0) {
        if (flags == 0) {

-               m = m_get(0);
+               m = m_get(M_DONTWAIT);

                if (m == 0)
                        return;
                m->m_off = MMINOFF;
                if (m == 0)
                        return;
                m->m_off = MMINOFF;

-               m->m_len = sizeof (struct tcpiphdr);
+               m->m_len = sizeof (struct tcpiphdr) + 1;

                *mtod(m, struct tcpiphdr *) = *ti;
                ti = mtod(m, struct tcpiphdr *);
                flags = TH_ACK;
                *mtod(m, struct tcpiphdr *) = *ti;
                ti = mtod(m, struct tcpiphdr *);
                flags = TH_ACK;

+               tlen = 1;

        } else {
                m = dtom(ti);
                m_freem(m->m_next);
                m->m_next = 0;
        } else {
                m = dtom(ti);
                m_freem(m->m_next);
                m->m_next = 0;

+               m->m_off = (int)ti - (int)m;

                m->m_len = sizeof (struct tcpiphdr);
 #define xchg(a,b,type) { type t; t=a; a=b; b=t; }
                xchg(ti->ti_dst.s_addr, ti->ti_src.s_addr, u_long);
                xchg(ti->ti_dport, ti->ti_sport, u_short);
 #undef xchg
                m->m_len = sizeof (struct tcpiphdr);
 #define xchg(a,b,type) { type t; t=a; a=b; b=t; }
                xchg(ti->ti_dst.s_addr, ti->ti_src.s_addr, u_long);
                xchg(ti->ti_dport, ti->ti_sport, u_short);
 #undef xchg

+               tlen = 0;

        }
        ti->ti_next = ti->ti_prev = 0;
        ti->ti_x1 = 0;
        }
        ti->ti_next = ti->ti_prev = 0;
        ti->ti_x1 = 0;

-       ti->ti_len = sizeof (struct tcphdr);
+       ti->ti_len = sizeof (struct tcphdr) + tlen;

        ti->ti_seq = seq;
        ti->ti_ack = ack;
 #if vax
        ti->ti_seq = seq;
        ti->ti_ack = ack;
 #if vax

-       ti->ti_len = htons(ti->ti_len);
+       ti->ti_len = htons((u_short)ti->ti_len);

        ti->ti_seq = htonl(ti->ti_seq);
        ti->ti_ack = htonl(ti->ti_ack);
 #endif
        ti->ti_x2 = 0;
        ti->ti_off = sizeof (struct tcphdr) >> 2;
        ti->ti_flags = flags;
        ti->ti_seq = htonl(ti->ti_seq);
        ti->ti_ack = htonl(ti->ti_ack);
 #endif
        ti->ti_x2 = 0;
        ti->ti_off = sizeof (struct tcphdr) >> 2;
        ti->ti_flags = flags;

-       ti->ti_win = ti->ti_urp = 0;
-       ti->ti_sum = in_cksum(m, sizeof(struct tcpiphdr));
-       ((struct ip *)ti)->ip_len = sizeof(struct tcpiphdr);
+       ti->ti_win = win;
+#if vax
+       ti->ti_win = htons(ti->ti_win);
+#endif
+       ti->ti_urp = 0;
+       ti->ti_sum = in_cksum(m, sizeof (struct tcpiphdr) + tlen);
+       ((struct ip *)ti)->ip_len = sizeof (struct tcpiphdr) + tlen;

        ((struct ip *)ti)->ip_ttl = TCP_TTL;
        ((struct ip *)ti)->ip_ttl = TCP_TTL;

-       (void) ip_output(m, (struct mbuf *)0);
+       (void) ip_output(m, (struct mbuf *)0, ro, 0);

 }
 
 /*
 }
 
 /*


@@ -142,7 +158,7 @@ struct tcpcb *
 tcp_newtcpcb(inp)
        struct inpcb *inp;
 {
 tcp_newtcpcb(inp)
        struct inpcb *inp;
 {

-       struct mbuf *m = m_getclr(0);
+       struct mbuf *m = m_getclr(M_DONTWAIT);

        register struct tcpcb *tp;
 COUNT(TCP_NEWTCPCB);
 
        register struct tcpcb *tp;
 COUNT(TCP_NEWTCPCB);
 


@@ -150,7 +166,8 @@ COUNT(TCP_NEWTCPCB);
                return (0);
        tp = mtod(m, struct tcpcb *);
        tp->seg_next = tp->seg_prev = (struct tcpiphdr *)tp;
                return (0);
        tp = mtod(m, struct tcpcb *);
        tp->seg_next = tp->seg_prev = (struct tcpiphdr *)tp;

-       tp->t_maxseg = 1024;
+       tp->t_maxseg = 576;             /* satisfy the rest of the world */
+       tp->t_flags = 0;                /* sends options! */

        tp->t_inpcb = inp;
        inp->inp_ppcb = (caddr_t)tp;
        return (tp);
        tp->t_inpcb = inp;
        inp->inp_ppcb = (caddr_t)tp;
        return (tp);


@@ -168,8 +185,7 @@ tcp_drop(tp, errno)
        struct socket *so = tp->t_inpcb->inp_socket;
 
 COUNT(TCP_DROP);
        struct socket *so = tp->t_inpcb->inp_socket;
 
 COUNT(TCP_DROP);

-       if (TCPS_HAVERCVDSYN(tp->t_state) &&
-           TCPS_OURFINNOTACKED(tp->t_state)) {
+       if (TCPS_HAVERCVDSYN(tp->t_state)) {

                tp->t_state = TCPS_CLOSED;
                tcp_output(tp);
        }
                tp->t_state = TCPS_CLOSED;
                tcp_output(tp);
        }


@@ -177,6 +193,12 @@ COUNT(TCP_DROP);
        tcp_close(tp);
 }
 
        tcp_close(tp);
 }
 

+tcp_abort(inp)
+       struct inpcb *inp;
+{
+       tcp_close(inp->inp_ppcb);
+}
+

 /*
  * Close a TCP control block:
  *     discard all space held by the tcp
 /*
  * Close a TCP control block:
  *     discard all space held by the tcp


@@ -202,8 +224,8 @@ COUNT(TCP_CLOSE);
                (void) m_free(dtom(tp->t_ipopt));
        (void) m_free(dtom(tp));
        inp->inp_ppcb = 0;
                (void) m_free(dtom(tp->t_ipopt));
        (void) m_free(dtom(tp));
        inp->inp_ppcb = 0;

-       in_pcbdetach(inp);

        soisdisconnected(so);
        soisdisconnected(so);

+       in_pcbdetach(inp);

 }
 
 tcp_drain()
 }
 
 tcp_drain()


@@ -212,10 +234,32 @@ tcp_drain()
 COUNT(TCP_DRAIN);
 }
 
 COUNT(TCP_DRAIN);
 }
 

-tcp_ctlinput(m)
-       struct mbuf *m;
+tcp_ctlinput(cmd, arg)
+       int cmd;
+       caddr_t arg;

 {
 {

-
+       struct in_addr *sin;
+       extern u_char inetctlerrmap[];

 COUNT(TCP_CTLINPUT);
 COUNT(TCP_CTLINPUT);

-       m_freem(m);
+
+       if (cmd < 0 || cmd > PRC_NCMDS)
+               return;
+       switch (cmd) {
+
+       case PRC_ROUTEDEAD:
+               break;
+
+       case PRC_QUENCH:
+               break;
+
+       /* these are handled by ip */
+       case PRC_IFDOWN:
+       case PRC_HOSTDEAD:
+       case PRC_HOSTUNREACH:
+               break;
+
+       default:
+               sin = &((struct icmp *)arg)->icmp_ip.ip_dst;
+               in_pcbnotify(&tcb, sin, inetctlerrmap[cmd], tcp_abort);
+       }

 }
 }