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 fb20f7f..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.18    82/03/15        */
+/*     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"


@@ -94,10 +96,13 @@ tcp_respond(tp, ti, ack, seq, flags)
 {
        struct mbuf *m;
        int win = 0, tlen;
 {
        struct mbuf *m;
        int win = 0, tlen;

+       struct route *ro = 0;

 
 COUNT(TCP_RESPOND);
 
 COUNT(TCP_RESPOND);

-       if (tp)
+       if (tp) {

                win = sbspace(&tp->t_inpcb->inp_socket->so_rcv);
                win = sbspace(&tp->t_inpcb->inp_socket->so_rcv);

+               ro = &tp->t_inpcb->inp_route;
+       }

        if (flags == 0) {
                m = m_get(M_DONTWAIT);
                if (m == 0)
        if (flags == 0) {
                m = m_get(M_DONTWAIT);
                if (m == 0)


@@ -138,10 +143,10 @@ COUNT(TCP_RESPOND);
        ti->ti_win = htons(ti->ti_win);
 #endif
        ti->ti_urp = 0;
        ti->ti_win = htons(ti->ti_win);
 #endif
        ti->ti_urp = 0;

-       ti->ti_sum = in_cksum(m, sizeof(struct tcpiphdr));
+       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_len = sizeof (struct tcpiphdr) + tlen;
        ((struct ip *)ti)->ip_ttl = TCP_TTL;

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

 }
 
 /*
 }
 
 /*


@@ -161,8 +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_flags = TF_NOOPT;         /* until all TCP's take options */
+       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);


@@ -188,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


@@ -213,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()


@@ -223,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);
+       }

 }
 }