BSD 4_3_Reno release

[unix-history] / usr / src / sys / net / if_loop.c

diff --git a/usr/src/sys/net/if_loop.c b/usr/src/sys/net/if_loop.c
index 08c489e..919178c 100644 (file)
--- a/usr/src/sys/net/if_loop.c
+++ b/usr/src/sys/net/if_loop.c
@@ -1,9 +1,23 @@
 /*
  * Copyright (c) 1982, 1986 Regents of the University of California.
 /*
  * Copyright (c) 1982, 1986 Regents of the University of California.

- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * All rights reserved.

  *
  *

- *     @(#)if_loop.c   7.2 (Berkeley) %G%
+ * Redistribution is only permitted until one year after the first shipment
+ * of 4.4BSD by the Regents.  Otherwise, redistribution and use in source and
+ * binary forms are permitted provided that: (1) source distributions retain
+ * this entire copyright notice and comment, and (2) distributions including
+ * binaries display the following acknowledgement:  This product includes
+ * software developed by the University of California, Berkeley and its
+ * contributors'' in the documentation or other materials provided with the
+ * distribution and in all advertising materials mentioning features or use
+ * of this software.  Neither the name of the University nor the names of
+ * its contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ *     @(#)if_loop.c   7.10 (Berkeley) 6/28/90

  */
 
 /*
  */
 
 /*


@@ -18,10 +32,11 @@
 #include "ioctl.h"
 
 #include "../net/if.h"
 #include "ioctl.h"
 
 #include "../net/if.h"

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

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

-#include "../machine/mtpr.h"
+#include "machine/mtpr.h"

 
 #ifdef INET
 #include "../netinet/in.h"
 
 #ifdef INET
 #include "../netinet/in.h"


@@ -35,6 +50,11 @@
 #include "../netns/ns_if.h"
 #endif
 
 #include "../netns/ns_if.h"
 #endif
 

+#ifdef ISO
+#include "../netiso/iso.h"
+#include "../netiso/iso_var.h"
+#endif
+

 #define        LOMTU   (1024+512)
 
 struct ifnet loif;
 #define        LOMTU   (1024+512)
 
 struct ifnet loif;


@@ -49,38 +69,40 @@ loattach()
        ifp->if_flags = IFF_LOOPBACK;
        ifp->if_ioctl = loioctl;
        ifp->if_output = looutput;
        ifp->if_flags = IFF_LOOPBACK;
        ifp->if_ioctl = loioctl;
        ifp->if_output = looutput;

+       ifp->if_type = IFT_LOOP;
+       ifp->if_hdrlen = 0;
+       ifp->if_addrlen = 0;

        if_attach(ifp);
 }
 
        if_attach(ifp);
 }
 

-looutput(ifp, m0, dst)
+struct mbuf *Loop_Sanity;
+
+looutput(ifp, m, dst)

        struct ifnet *ifp;
        struct ifnet *ifp;

-       register struct mbuf *m0;
+       register struct mbuf *m;

        struct sockaddr *dst;
 {
        int s;
        register struct ifqueue *ifq;
        struct sockaddr *dst;
 {
        int s;
        register struct ifqueue *ifq;

-       struct mbuf *m;
-
-       /*
-        * Place interface pointer before the data
-        * for the receiving protocol.
-        */
-       if (m0->m_off <= MMAXOFF &&
-           m0->m_off >= MMINOFF + sizeof(struct ifnet *)) {
-               m0->m_off -= sizeof(struct ifnet *);
-               m0->m_len += sizeof(struct ifnet *);
-       } else {
-               MGET(m, M_DONTWAIT, MT_HEADER);
-               if (m == (struct mbuf *)0)
-                       return (ENOBUFS);
-               m->m_off = MMINOFF;
-               m->m_len = sizeof(struct ifnet *);
-               m->m_next = m0;
-               m0 = m;
-       }
-       *(mtod(m0, struct ifnet **)) = ifp;
+
+       if ((m->m_flags & M_PKTHDR) == 0)
+               panic("looutput no HDR");
+       m->m_pkthdr.rcvif = ifp;
+
+{struct mbuf *mm; int mlen = 0;
+for (mm = m; m; m = m->m_next) /* XXX debugging code -- sklower */
+    mlen += m->m_len;
+m = mm;
+if (mlen != m->m_pkthdr.len) {
+       if (Loop_Sanity)
+               m_freem(Loop_Sanity);
+       Loop_Sanity = m_copy(m, 0, (int)M_COPYALL);
+}
+}
+

        s = splimp();
        ifp->if_opackets++;
        s = splimp();
        ifp->if_opackets++;

+       ifp->if_obytes += m->m_pkthdr.len;

        switch (dst->sa_family) {
 
 #ifdef INET
        switch (dst->sa_family) {
 
 #ifdef INET


@@ -88,11 +110,11 @@ looutput(ifp, m0, dst)
                ifq = &ipintrq;
                if (IF_QFULL(ifq)) {
                        IF_DROP(ifq);
                ifq = &ipintrq;
                if (IF_QFULL(ifq)) {
                        IF_DROP(ifq);

-                       m_freem(m0);
+                       m_freem(m);

                        splx(s);
                        return (ENOBUFS);
                }
                        splx(s);
                        return (ENOBUFS);
                }

-               IF_ENQUEUE(ifq, m0);
+               IF_ENQUEUE(ifq, m);

                schednetisr(NETISR_IP);
                break;
 #endif
                schednetisr(NETISR_IP);
                break;
 #endif


@@ -101,22 +123,36 @@ looutput(ifp, m0, dst)
                ifq = &nsintrq;
                if (IF_QFULL(ifq)) {
                        IF_DROP(ifq);
                ifq = &nsintrq;
                if (IF_QFULL(ifq)) {
                        IF_DROP(ifq);

-                       m_freem(m0);
+                       m_freem(m);

                        splx(s);
                        return (ENOBUFS);
                }
                        splx(s);
                        return (ENOBUFS);
                }

-               IF_ENQUEUE(ifq, m0);
+               IF_ENQUEUE(ifq, m);

                schednetisr(NETISR_NS);
                break;
                schednetisr(NETISR_NS);
                break;

+#endif
+#ifdef ISO
+       case AF_ISO:
+               ifq = &clnlintrq;
+               if (IF_QFULL(ifq)) {
+                       IF_DROP(ifq);
+                       m_freem(m);
+                       splx(s);
+                       return (ENOBUFS);
+               }
+               IF_ENQUEUE(ifq, m);
+               schednetisr(NETISR_ISO);
+               break;

 #endif
        default:
                splx(s);
                printf("lo%d: can't handle af%d\n", ifp->if_unit,
                        dst->sa_family);
 #endif
        default:
                splx(s);
                printf("lo%d: can't handle af%d\n", ifp->if_unit,
                        dst->sa_family);

-               m_freem(m0);
+               m_freem(m);

                return (EAFNOSUPPORT);
        }
        ifp->if_ipackets++;
                return (EAFNOSUPPORT);
        }
        ifp->if_ipackets++;

+       ifp->if_ibytes += m->m_pkthdr.len;

        splx(s);
        return (0);
 }
        splx(s);
        return (0);
 }