get rid of unnedded include of dir.h

[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 b01e4e5..bd06c5c 100644 (file)
--- a/usr/src/sys/net/if_loop.c
+++ b/usr/src/sys/net/if_loop.c
@@ -1,9 +1,20 @@
 /*
 /*

- * Copyright (c) 1982 Regents of the University of California.
- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * Copyright (c) 1982, 1986 Regents of the University of California.
+ * All rights reserved.

  *
  *

- *     @(#)if_loop.c   6.6 (Berkeley) %G%
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley.  The name of the
+ * University may not 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 MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ *     @(#)if_loop.c   7.7 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -18,16 +29,17 @@
 #include "ioctl.h"
 
 #include "../net/if.h"
 #include "ioctl.h"
 
 #include "../net/if.h"

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

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

-#include "in.h"
-#include "in_systm.h"
-#include "ip.h"
-#include "ip_var.h"
+#include "machine/mtpr.h"

 
 

-#ifdef vax
-#include "../vax/mtpr.h"
+#ifdef INET
+#include "../netinet/in.h"
+#include "../netinet/in_systm.h"
+#include "../netinet/in_var.h"
+#include "../netinet/ip.h"

 #endif
 
 #ifdef NS
 #endif
 
 #ifdef NS


@@ -35,6 +47,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;


@@ -43,23 +60,44 @@ int looutput(), loioctl();
 loattach()
 {
        register struct ifnet *ifp = &loif;
 loattach()
 {
        register struct ifnet *ifp = &loif;

-       register struct sockaddr_in *sin;

 
        ifp->if_name = "lo";
        ifp->if_mtu = LOMTU;
 
        ifp->if_name = "lo";
        ifp->if_mtu = LOMTU;

+       ifp->if_flags = IFF_LOOPBACK;

        ifp->if_ioctl = loioctl;
        ifp->if_output = looutput;
        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;

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

        struct sockaddr *dst;
 {
        struct sockaddr *dst;
 {

-       int s = splimp();
+       int s;

        register struct ifqueue *ifq;
 
        register struct ifqueue *ifq;
 

+       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++;
        switch (dst->sa_family) {
 
        ifp->if_opackets++;
        switch (dst->sa_family) {
 


@@ -68,11 +106,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


@@ -81,19 +119,32 @@ 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++;