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 dca1d80..919178c 100644 (file)
--- a/usr/src/sys/net/if_loop.c
+++ b/usr/src/sys/net/if_loop.c
@@ -2,19 +2,22 @@
  * Copyright (c) 1982, 1986 Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1982, 1986 Regents of the University of California.
  * All rights reserved.
  *

- * 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.
+ * 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.5 (Berkeley) %G%
+ *     @(#)if_loop.c   7.10 (Berkeley) 6/28/90

  */
 
 /*
  */
 
 /*


@@ -29,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"


@@ -46,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;


@@ -60,6 +69,9 @@ 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);
 }
 


@@ -78,18 +90,19 @@ looutput(ifp, m, dst)
        m->m_pkthdr.rcvif = ifp;
 
 {struct mbuf *mm; int mlen = 0;
        m->m_pkthdr.rcvif = ifp;
 
 {struct mbuf *mm; int mlen = 0;

-for (mm = m; m; m = m->m_next) /* XXX debugging code -- sklwoer */
+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);
     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, M_COPYALL);
+       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


@@ -117,6 +130,19 @@ if (mlen != m->m_pkthdr.len) {
                IF_ENQUEUE(ifq, m);
                schednetisr(NETISR_NS);
                break;
                IF_ENQUEUE(ifq, m);
                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);
 #endif
        default:
                splx(s);


@@ -126,6 +152,7 @@ if (mlen != m->m_pkthdr.len) {
                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);
 }