remove /usr/include dependencies

[unix-history] / usr / src / sys / netinet / ip_output.c

diff --git a/usr/src/sys/netinet/ip_output.c b/usr/src/sys/netinet/ip_output.c
index 6468758..034d856 100644 (file)
--- a/usr/src/sys/netinet/ip_output.c
+++ b/usr/src/sys/netinet/ip_output.c
@@ -1,17 +1,20 @@
-/*     ip_output.c     1.44    83/01/08        */
+/*     ip_output.c     1.46    83/02/10        */

 
 #include "../h/param.h"
 #include "../h/mbuf.h"
 
 #include "../h/param.h"
 #include "../h/mbuf.h"

-#include "../vax/mtpr.h"
+#include "../h/errno.h"

 #include "../h/socket.h"
 #include "../h/socketvar.h"
 #include "../h/socket.h"
 #include "../h/socketvar.h"

+
+#include "../net/if.h"
+#include "../net/route.h"
+

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

-#include "../net/if.h"

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

-#include "../net/route.h"
-#include <errno.h>
+
+#include "../machine/mtpr.h"

 
 int    ipnorouteprint = 0;
 
 
 int    ipnorouteprint = 0;
 


@@ -66,22 +69,22 @@ ip_output(m, opt, ro, allowbroadcast)
        if (ro->ro_rt->rt_flags & RTF_GATEWAY)
                dst = &ro->ro_rt->rt_gateway;
 gotif:
        if (ro->ro_rt->rt_flags & RTF_GATEWAY)
                dst = &ro->ro_rt->rt_gateway;
 gotif:

+#ifndef notdef

        /*
         * If source address not specified yet, use address
         * of outgoing interface.
         */
        /*
         * If source address not specified yet, use address
         * of outgoing interface.
         */

-       if (ip->ip_src.s_addr == INADDR_ANY)
+       if (in_lnaof(ip->ip_src) == INADDR_ANY)

                ip->ip_src.s_addr =
                    ((struct sockaddr_in *)&ifp->if_addr)->sin_addr.s_addr;
                ip->ip_src.s_addr =
                    ((struct sockaddr_in *)&ifp->if_addr)->sin_addr.s_addr;

+#endif

 
        /*
 
        /*

-        * Map broadcast address to hardware's broadcast
-        * address and verify user is allowed to send
+        * Look for broadcast address and
+        * and verify user is allowed to send

         * such a packet.
         */
        if (in_lnaof(dst) == INADDR_ANY) {
         * such a packet.
         */
        if (in_lnaof(dst) == INADDR_ANY) {

-               struct sockaddr_in *sin;
-

                if ((ifp->if_flags & IFF_BROADCAST) == 0) {
                        error = EADDRNOTAVAIL;
                        goto bad;
                if ((ifp->if_flags & IFF_BROADCAST) == 0) {
                        error = EADDRNOTAVAIL;
                        goto bad;


@@ -95,8 +98,6 @@ gotif:
                        error = EMSGSIZE;
                        goto bad;
                }
                        error = EMSGSIZE;
                        goto bad;
                }

-               sin = (struct sockaddr_in *)&ifp->if_broadaddr;
-               ((struct sockaddr_in *)dst)->sin_addr = sin->sin_addr;

        }
 
        /*
        }
 
        /*