make kernel includes standard

[unix-history] / usr / src / sys / netiso / esis.c

diff --git a/usr/src/sys/netiso/esis.c b/usr/src/sys/netiso/esis.c
index 1a9bae2..6f6b462 100644 (file)
--- a/usr/src/sys/netiso/esis.c
+++ b/usr/src/sys/netiso/esis.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)esis.c      7.20 (Berkeley) %G%
+ *     @(#)esis.c      7.22 (Berkeley) %G%

  */
 
 /***********************************************************
  */
 
 /***********************************************************


@@ -36,31 +36,30 @@ SOFTWARE.
 
 #ifdef ISO
 
 
 #ifdef ISO
 

-#include "types.h"
-#include "param.h"
-#include "systm.h"
-#include "mbuf.h"
-#include "domain.h"
-#include "protosw.h"
-#include "socket.h"
-#include "socketvar.h"
-#include "errno.h"
-
-#include "../net/if.h"
-#include "../net/if_dl.h"
-#include "../net/route.h"
-#include "../net/raw_cb.h"
-
-#include "iso.h"
-#include "iso_pcb.h"
-#include "iso_var.h"
-#include "iso_snpac.h"
-#include "clnl.h"
-#include "clnp.h"
-#include "clnp_stat.h"
-#include "esis.h"
-#include "argo_debug.h"
-#include "kernel.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/mbuf.h>
+#include <sys/domain.h>
+#include <sys/protosw.h>
+#include <sys/socket.h>
+#include <sys/socketvar.h>
+#include <sys/errno.h>
+#include <sys/kernel.h>
+
+#include <net/if.h>
+#include <net/if_dl.h>
+#include <net/route.h>
+#include <net/raw_cb.h>
+
+#include <netiso/iso.h>
+#include <netiso/iso_pcb.h>
+#include <netiso/iso_var.h>
+#include <netiso/iso_snpac.h>
+#include <netiso/clnl.h>
+#include <netiso/clnp.h>
+#include <netiso/clnp_stat.h>
+#include <netiso/esis.h>
+#include <netiso/argo_debug.h>

 
 /*
  *     Global variables to esis implementation
 
 /*
  *     Global variables to esis implementation


@@ -417,7 +416,7 @@ struct rtentry              *rt;                    /* snpa cache info regarding next hop of
        siso.siso_nlen = 6 + 1; /* should be taken from snpa_hdr */
                                                                                /* +1 is for AFI */
        bcopy(inbound_shp->snh_shost, siso.siso_data + 1, 6);
        siso.siso_nlen = 6 + 1; /* should be taken from snpa_hdr */
                                                                                /* +1 is for AFI */
        bcopy(inbound_shp->snh_shost, siso.siso_data + 1, 6);

-       (ifp->if_output)(ifp, m0, &siso, 0);
+       (ifp->if_output)(ifp, m0, (struct sockaddr *)&siso, 0);

 }
 
 /*
 }
 
 /*


@@ -894,7 +893,7 @@ struct      iso_addr *isoa;
        siso.siso_data[0] = AFI_SNA;
        siso.siso_nlen = sn_len + 1;
        bcopy(sn_addr, siso.siso_data + 1, (unsigned)sn_len);
        siso.siso_data[0] = AFI_SNA;
        siso.siso_nlen = sn_len + 1;
        bcopy(sn_addr, siso.siso_data + 1, (unsigned)sn_len);

-       (ifp->if_output)(ifp, m0, &siso, 0);
+       (ifp->if_output)(ifp, m0, (struct sockaddr *)&siso, 0);

 }
 
 /*
 }
 
 /*


@@ -968,7 +967,7 @@ struct mbuf *m;
        int error = 0;
        unsigned sn_len;
 
        int error = 0;
        unsigned sn_len;
 

-       ifa = ifa_ifwithnet(sdl);       /* extract ifp from sockaddr_dl */
+       ifa = ifa_ifwithnet((struct sockaddr *)sdl);    /* get ifp from sdl */

        if (ifa == 0) {
                IFDEBUG(D_ISISOUTPUT)
                        printf("isis_output: interface not found\n");
        if (ifa == 0) {
                IFDEBUG(D_ISISOUTPUT)
                        printf("isis_output: interface not found\n");