interfac queueing, restrictions on packets, tcp keep alives done

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

diff --git a/usr/src/sys/netinet/ip_output.c b/usr/src/sys/netinet/ip_output.c
index a02b6b1..68a9d19 100644 (file)
--- a/usr/src/sys/netinet/ip_output.c
+++ b/usr/src/sys/netinet/ip_output.c
@@ -1,39 +1,60 @@
-/*     ip_output.c     1.14    81/11/18        */
+/*     ip_output.c     1.26    82/03/15        */

 
 #include "../h/param.h"
 #include "../h/mbuf.h"
 #include "../h/mtpr.h"
 #include "../h/socket.h"
 #include "../h/socketvar.h"
 
 #include "../h/param.h"
 #include "../h/mbuf.h"
 #include "../h/mtpr.h"
 #include "../h/socket.h"
 #include "../h/socketvar.h"

-#include "../net/inet.h"
-#include "../net/inet_systm.h"
-#include "../net/imp.h"
-#include "../net/inet_host.h"
+#include "../net/in.h"
+#include "../net/in_systm.h"
+#include "../net/if.h"

 #include "../net/ip.h"
 #include "../net/ip_var.h"
 
 #include "../net/ip.h"
 #include "../net/ip_var.h"
 

-ip_output(m)
+ip_output(m, opt, allowbroadcast)

        struct mbuf *m;
        struct mbuf *m;

+       struct mbuf *opt;
+       int allowbroadcast;

 {
        register struct ip *ip = mtod(m, struct ip *);
 {
        register struct ip *ip = mtod(m, struct ip *);

-       int len, hlen = ip->ip_hl << 2, off;
+       register struct ifnet *ifp;
+       int len, hlen = sizeof (struct ip), off;

 
 COUNT(IP_OUTPUT);
 
 COUNT(IP_OUTPUT);

+       if (opt)                                /* XXX */
+               (void) m_free(opt);             /* XXX */

        /*
         * Fill in IP header.
         */
        ip->ip_v = IPVERSION;
        ip->ip_hl = hlen >> 2;
        ip->ip_off &= IP_DF;
        /*
         * Fill in IP header.
         */
        ip->ip_v = IPVERSION;
        ip->ip_hl = hlen >> 2;
        ip->ip_off &= IP_DF;

-       ip->ip_ttl = MAXTTL;
-       ip->ip_id = ip_id++;
+       ip->ip_id = htons(ip_id++);
+
+       /*
+        * Find interface for this packet.
+        */
+       ifp = if_ifonnetof(ip->ip_dst);
+       if (ifp == 0) {
+               ifp = if_gatewayfor(ip->ip_dst);
+               if (ifp == 0)
+                       goto bad;
+       }
+       if (!allowbroadcast && ifp->if_broadaddr.s_addr != 0 &&
+           ifp->if_broadaddr.s_addr == ip->ip_dst.s_addr)
+               goto bad;

 
        /*
         * If small enough for interface, can just send directly.
         */
 
        /*
         * If small enough for interface, can just send directly.
         */

-       if (ip->ip_len <= MTU) {
-               ip_send(ip);
-               return;
+       if (ip->ip_len <= ifp->if_mtu) {
+#if vax
+               ip->ip_len = htons((u_short)ip->ip_len);
+               ip->ip_off = htons((u_short)ip->ip_off);
+#endif
+               ip->ip_sum = 0;
+               ip->ip_sum = in_cksum(m, hlen);
+               return ((*ifp->if_output)(ifp, m, PF_INET));

        }
 
        /*
        }
 
        /*


@@ -42,7 +63,7 @@ COUNT(IP_OUTPUT);
         */
        if (ip->ip_off & IP_DF)
                goto bad;
         */
        if (ip->ip_off & IP_DF)
                goto bad;

-       len = (MTU-hlen) &~ 7;
+       len = (ifp->if_mtu - hlen) &~ 7;

        if (len < 8)
                goto bad;
 
        if (len < 8)
                goto bad;
 


@@ -53,8 +74,8 @@ COUNT(IP_OUTPUT);
         */
        m->m_len -= sizeof (struct ip);
        m->m_off += sizeof (struct ip);
         */
        m->m_len -= sizeof (struct ip);
        m->m_off += sizeof (struct ip);

-       for (off = 0; off < ip->ip_len; off += len) {
-               struct mbuf *mh = m_get(0);
+       for (off = 0; off < ip->ip_len-hlen; off += len) {
+               struct mbuf *mh = m_get(M_DONTWAIT);

                struct ip *mhip;
 
                if (mh == 0)
                struct ip *mhip;
 
                if (mh == 0)


@@ -62,32 +83,45 @@ COUNT(IP_OUTPUT);
                mh->m_off = MMAXOFF - hlen;
                mhip = mtod(mh, struct ip *);
                *mhip = *ip;
                mh->m_off = MMAXOFF - hlen;
                mhip = mtod(mh, struct ip *);
                *mhip = *ip;

-               if (ip->ip_hl > sizeof (struct ip) >> 2) {
+               if (hlen > sizeof (struct ip)) {

                        int olen = ip_optcopy(ip, mhip, off);
                        mh->m_len = sizeof (struct ip) + olen;
                } else
                        mh->m_len = sizeof (struct ip);
                        int olen = ip_optcopy(ip, mhip, off);
                        mh->m_len = sizeof (struct ip) + olen;
                } else
                        mh->m_len = sizeof (struct ip);

-               mhip->ip_off = off;
-               if (off + len >= ip->ip_len)
-                       mhip->ip_len = ip->ip_len - off;
+               mhip->ip_off = off >> 3;
+               if (off + len >= ip->ip_len-hlen)
+                       len = mhip->ip_len = ip->ip_len - hlen - off;

                else {
                        mhip->ip_len = len;
                        mhip->ip_off |= IP_MF;
                }
                else {
                        mhip->ip_len = len;
                        mhip->ip_off |= IP_MF;
                }

+               mhip->ip_len += sizeof (struct ip);
+#if vax
+               mhip->ip_len = htons((u_short)mhip->ip_len);
+#endif

                mh->m_next = m_copy(m, off, len);
                if (mh->m_next == 0) {
                mh->m_next = m_copy(m, off, len);
                if (mh->m_next == 0) {

-                       m_free(mh);
+                       (void) m_free(mh);

                        goto bad;
                }
                        goto bad;
                }

-               ip_send(mh);
+#if vax
+               mhip->ip_off = htons((u_short)mhip->ip_off);
+#endif
+               mhip->ip_sum = 0;
+               mhip->ip_sum = in_cksum(mh, hlen);
+               if ((*ifp->if_output)(ifp, mh, PF_INET) == 0)
+                       goto bad;

        }
        }

+       m_freem(m);
+       return (1);

 bad:
        m_freem(m);
 bad:
        m_freem(m);

+       return (0);

 }
 
 /*
  * Copy options from ip to jp.
 }
 
 /*
  * Copy options from ip to jp.

- * If off is 0 all options are copies
+ * If off is 0 all options are copied

  * otherwise copy selectively.
  */
 ip_optcopy(ip, jp, off)
  * otherwise copy selectively.
  */
 ip_optcopy(ip, jp, off)


@@ -97,6 +131,7 @@ ip_optcopy(ip, jp, off)
        register u_char *cp, *dp;
        int opt, optlen, cnt;
 
        register u_char *cp, *dp;
        int opt, optlen, cnt;
 

+COUNT(IP_OPTCOPY);

        cp = (u_char *)(ip + 1);
        dp = (u_char *)(jp + 1);
        cnt = (ip->ip_hl << 2) - sizeof (struct ip);
        cp = (u_char *)(ip + 1);
        dp = (u_char *)(jp + 1);
        cnt = (ip->ip_hl << 2) - sizeof (struct ip);


@@ -111,7 +146,7 @@ ip_optcopy(ip, jp, off)
                if (optlen > cnt)                       /* XXX */
                        optlen = cnt;                   /* XXX */
                if (off == 0 || IPOPT_COPIED(opt)) {
                if (optlen > cnt)                       /* XXX */
                        optlen = cnt;                   /* XXX */
                if (off == 0 || IPOPT_COPIED(opt)) {

-                       bcopy(cp, dp, optlen);
+                       bcopy((caddr_t)cp, (caddr_t)dp, (unsigned)optlen);

                        dp += optlen;
                }
        }
                        dp += optlen;
                }
        }


@@ -119,45 +154,3 @@ ip_optcopy(ip, jp, off)
                *dp++ = IPOPT_EOL;
        return (optlen);
 }
                *dp++ = IPOPT_EOL;
        return (optlen);
 }

-
-ip_send(ip)
-       register struct ip *ip;
-{
-       register struct mbuf *m;
-       register struct imp *l;
-       int hlen = ip->ip_hl << 2;
-       int s;
-COUNT(IP_SEND);
-
-       m = dtom(ip);
-       l = (struct imp *)(mtod(m, caddr_t) - L1822);
-       l->i_shost = ip->ip_src.s_host;
-       l->i_dhost = ip->ip_dst.s_host;
-       l->i_type = IPTYPE;
-       ip->ip_sum = 0;
-       ip->ip_len = htons((u_short)ip->ip_len);
-       ip->ip_id = htons(ip->ip_id);
-       ip->ip_off = htons((u_short)ip->ip_off);
-       ip->ip_sum = inet_cksum(m, hlen);
-       m->m_off -= L1822;
-       m->m_len += L1822;
-       m->m_act = NULL;
-#ifndef IMPLOOP
-       s = splimp();
-       if (imp_stat.outq_head != NULL)
-               imp_stat.outq_tail->m_act = m;
-       else
-               imp_stat.outq_head = m;
-       imp_stat.outq_tail = m;
-       splx(s);
-       if (!imp_stat.outactive)
-               enstart(0);
-#else
-       if (imp_stat.inq_head != NULL)
-               imp_stat.inq_tail->m_act = m;
-       else
-               imp_stat.inq_head = m;
-       imp_stat.inq_tail = m;
-       setsoftnet();
-#endif IMPLOOP
-}