Include file changes. No more ../h

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

diff --git a/usr/src/sys/net/raw_cb.c b/usr/src/sys/net/raw_cb.c
index 818f768..c97e0bf 100644 (file)
--- a/usr/src/sys/net/raw_cb.c
+++ b/usr/src/sys/net/raw_cb.c
@@ -1,14 +1,17 @@
-/*     raw_cb.c        4.16    83/02/10        */
-
-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/mbuf.h"
-#include "../h/socket.h"
-#include "../h/socketvar.h"
-#include "../h/errno.h"
-
-#include "../net/if.h"
-#include "../net/raw_cb.h"
+/*     raw_cb.c        6.2     84/08/29        */
+
+#include "param.h"
+#include "systm.h"
+#include "mbuf.h"
+#include "socket.h"
+#include "socketvar.h"
+#include "errno.h"
+
+#include "if.h"
+#include "route.h"
+#include "raw_cb.h"
+#include "../netinet/in.h"
+#include "../netpup/pup.h"

 
 #include "../vax/mtpr.h"
 
 
 #include "../vax/mtpr.h"
 


@@ -87,10 +90,6 @@ raw_bind(so, nam)
 
        if (ifnet == 0)
                return (EADDRNOTAVAIL);
 
        if (ifnet == 0)
                return (EADDRNOTAVAIL);

-{
-#include "../h/domain.h"
-#include "../netinet/in.h"
-#include "../netinet/in_systm.h"

 /* BEGIN DUBIOUS */
        /*
         * Should we verify address not already in use?
 /* BEGIN DUBIOUS */
        /*
         * Should we verify address not already in use?


@@ -98,12 +97,15 @@ raw_bind(so, nam)
         */
        switch (addr->sa_family) {
 
         */
        switch (addr->sa_family) {
 

+#ifdef INET

        case AF_IMPLINK:
        case AF_IMPLINK:

-       case AF_INET:
+       case AF_INET: {

                if (((struct sockaddr_in *)addr)->sin_addr.s_addr &&
                    if_ifwithaddr(addr) == 0)
                        return (EADDRNOTAVAIL);
                break;
                if (((struct sockaddr_in *)addr)->sin_addr.s_addr &&
                    if_ifwithaddr(addr) == 0)
                        return (EADDRNOTAVAIL);
                break;

+       }
+#endif

 
 #ifdef PUP
        /*
 
 #ifdef PUP
        /*


@@ -114,14 +116,12 @@ raw_bind(so, nam)
         * converting internet to PUP would be very expensive.
         */
        case AF_PUP: {
         * converting internet to PUP would be very expensive.
         */
        case AF_PUP: {

-#include "../netpup/pup.h"

                struct sockaddr_pup *spup = (struct sockaddr_pup *)addr;
                struct sockaddr_in inpup;
 
                bzero((caddr_t)&inpup, (unsigned)sizeof(inpup));
                inpup.sin_family = AF_INET;
                struct sockaddr_pup *spup = (struct sockaddr_pup *)addr;
                struct sockaddr_in inpup;
 
                bzero((caddr_t)&inpup, (unsigned)sizeof(inpup));
                inpup.sin_family = AF_INET;

-               inpup.sin_addr.s_net = spup->sp_net;
-               inpup.sin_addr.s_impno = spup->sp_host;
+               inpup.sin_addr = if_makeaddr(spup->spup_net, spup->spup_host);

                if (inpup.sin_addr.s_addr &&
                    if_ifwithaddr((struct sockaddr *)&inpup) == 0)
                        return (EADDRNOTAVAIL);
                if (inpup.sin_addr.s_addr &&
                    if_ifwithaddr((struct sockaddr *)&inpup) == 0)
                        return (EADDRNOTAVAIL);


@@ -132,7 +132,6 @@ raw_bind(so, nam)
        default:
                return (EAFNOSUPPORT);
        }
        default:
                return (EAFNOSUPPORT);
        }

-}

 /* END DUBIOUS */
        rp = sotorawcb(so);
        bcopy((caddr_t)addr, (caddr_t)&rp->rcb_laddr, sizeof (*addr));
 /* END DUBIOUS */
        rp = sotorawcb(so);
        bcopy((caddr_t)addr, (caddr_t)&rp->rcb_laddr, sizeof (*addr));