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 82a1685..c97e0bf 100644 (file)
--- a/usr/src/sys/net/raw_cb.c
+++ b/usr/src/sys/net/raw_cb.c
@@ -1,14 +1,15 @@
-/*     raw_cb.c        4.17    83/05/27        */
-
-#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 "../netinet/in.h"
 #include "../netpup/pup.h"
 


@@ -120,8 +121,7 @@ raw_bind(so, nam)
 
                bzero((caddr_t)&inpup, (unsigned)sizeof(inpup));
                inpup.sin_family = AF_INET;
 
                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);