first pass at function prototypes with cdefs.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 4434d8a..61e0d80 100644 (file)
--- a/usr/src/sys/net/if_loop.c
+++ b/usr/src/sys/net/if_loop.c
@@ -1,9 +1,10 @@
 /*
 /*

- * 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.9 (Berkeley) %G%
+ * %sccs.include.redist.c%
+ *
+ *     @(#)if_loop.c   7.12 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -18,18 +19,17 @@
 #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"
+

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

+#include "../netinet/in_var.h"

 #include "../netinet/ip.h"
 #include "../netinet/ip.h"

-#include "../netinet/ip_var.h"
-#endif
-
-#ifdef vax
-#include "../vax/mtpr.h"

 #endif
 
 #ifdef NS
 #endif
 
 #ifdef NS


@@ -37,6 +37,17 @@
 #include "../netns/ns_if.h"
 #endif
 
 #include "../netns/ns_if.h"
 #endif
 

+#ifdef ISO
+#include "../netiso/iso.h"
+#include "../netiso/iso_var.h"
+#endif
+
+#ifdef CCITT
+#include "../netccitt/x25.h"
+#include "../netccitt/hdlc.h"
+#include "../netccitt/hd_var.h"
+#endif
+

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


@@ -51,74 +62,75 @@ 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)
+looutput(ifp, m, dst, rt)

        struct ifnet *ifp;
        struct ifnet *ifp;

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

        struct sockaddr *dst;
        struct sockaddr *dst;

+       register struct rtentry *rt;

 {
 {

-       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;
+       int s, isr;
+       register struct ifqueue *ifq = 0;
+
+       if ((m->m_flags & M_PKTHDR) == 0)
+               panic("looutput no HDR");
+       m->m_pkthdr.rcvif = ifp;
+
+       if (rt && rt->rt_flags & RTF_REJECT) {
+               m_freem(m);
+               return (rt->rt_flags & RTF_HOST ? EHOSTUNREACH : ENETUNREACH);

        }
        }

-       *(mtod(m0, struct ifnet **)) = ifp;

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

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

        switch (dst->sa_family) {
 
 #ifdef INET
        case AF_INET:
                ifq = &ipintrq;
        switch (dst->sa_family) {
 
 #ifdef INET
        case AF_INET:
                ifq = &ipintrq;

-               if (IF_QFULL(ifq)) {
-                       IF_DROP(ifq);
-                       m_freem(m0);
-                       splx(s);
-                       return (ENOBUFS);
-               }
-               IF_ENQUEUE(ifq, m0);
-               schednetisr(NETISR_IP);
+               isr = NETISR_IP;

                break;
 #endif
 #ifdef NS
        case AF_NS:
                ifq = &nsintrq;
                break;
 #endif
 #ifdef NS
        case AF_NS:
                ifq = &nsintrq;

-               if (IF_QFULL(ifq)) {
-                       IF_DROP(ifq);
-                       m_freem(m0);
-                       splx(s);
-                       return (ENOBUFS);
-               }
-               IF_ENQUEUE(ifq, m0);
-               schednetisr(NETISR_NS);
+               isr = NETISR_NS;
+               break;
+#endif
+#ifdef ISO
+       case AF_ISO:
+               ifq = &clnlintrq;
+               isr = NETISR_ISO;
+               break;
+#endif
+#ifdef CCITT
+       case AF_CCITT:
+               ifq = &hdintrq;
+               isr = NETISR_CCITT;

                break;
 #endif
        default:
                splx(s);
                printf("lo%d: can't handle af%d\n", ifp->if_unit,
                        dst->sa_family);
                break;
 #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);
        }
                return (EAFNOSUPPORT);
        }

+       if (IF_QFULL(ifq)) {
+               IF_DROP(ifq);
+               m_freem(m);
+               splx(s);
+               return (ENOBUFS);
+       }
+       IF_ENQUEUE(ifq, m);
+       schednetisr(isr);

        ifp->if_ipackets++;
        ifp->if_ipackets++;

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

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


@@ -136,6 +148,9 @@ loioctl(ifp, cmd, data)
 
        switch (cmd) {
 
 
        switch (cmd) {
 

+#ifdef CCITT
+       case SIOCSIFCONF_X25:
+#endif

        case SIOCSIFADDR:
                ifp->if_flags |= IFF_UP;
                /*
        case SIOCSIFADDR:
                ifp->if_flags |= IFF_UP;
                /*