checkpoint further progress, still doesn't connect tho.

[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 3a42cce..6f6b462 100644 (file)
--- a/usr/src/sys/netiso/esis.c
+++ b/usr/src/sys/netiso/esis.c
@@ -1,3 +1,12 @@
+/*-
+ * Copyright (c) 1991 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * %sccs.include.redist.c%
+ *
+ *     @(#)esis.c      7.22 (Berkeley) %G%
+ */
+

 /***********************************************************
                Copyright IBM Corporation 1987
 
 /***********************************************************
                Copyright IBM Corporation 1987
 


@@ -24,51 +33,52 @@ SOFTWARE.
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */
 /*
  * ARGO Project, Computer Sciences Dept., University of Wisconsin - Madison
  */

-/*     @(#)esis.c      7.8 (Berkeley) %G% */
-#ifndef lint
-static char *rcsid = "$Header: esis.c,v 4.10 88/09/15 18:57:03 hagens Exp $";
-#endif

 
 #ifdef ISO
 
 
 #ifdef ISO
 

-#include "types.h"
-#include "param.h"
-#include "mbuf.h"
-#include "domain.h"
-#include "protosw.h"
-#include "user.h"
-#include "socket.h"
-#include "socketvar.h"
-#include "errno.h"
-#include "kernel.h"
-
-#include "../net/if.h"
-#include "../net/if_dl.h"
-#include "../net/route.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 <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
  *
  *     esis_holding_time - the holding time (sec) parameter for outgoing pdus
  *     esis_config_time  - the frequency (sec) that hellos are generated
 
 /*
  *     Global variables to esis implementation
  *
  *     esis_holding_time - the holding time (sec) parameter for outgoing pdus
  *     esis_config_time  - the frequency (sec) that hellos are generated

+ *     esis_esconfig_time - suggested es configuration time placed in the
+ *                                             ish.

  *
  */
  *
  */

-struct isopcb  esis_pcb;
+struct rawcb   esis_pcb;
+int                            esis_config(), snpac_age();

 int                            esis_sendspace = 2048;
 int                            esis_recvspace = 2048;
 short                  esis_holding_time = ESIS_HT;
 short                  esis_config_time = ESIS_CONFIG;
 int                            esis_sendspace = 2048;
 int                            esis_recvspace = 2048;
 short                  esis_holding_time = ESIS_HT;
 short                  esis_config_time = ESIS_CONFIG;

+short                  esis_esconfig_time = ESIS_CONFIG;

 extern int             iso_systype;
 extern int             iso_systype;

+struct sockaddr_dl     esis_dl = { sizeof(esis_dl), AF_LINK };

 extern char            all_es_snpa[], all_is_snpa[];
 
 #define EXTEND_PACKET(m, mhdr, cp)\
 extern char            all_es_snpa[], all_is_snpa[];
 
 #define EXTEND_PACKET(m, mhdr, cp)\


@@ -94,20 +104,19 @@ extern char                all_es_snpa[], all_is_snpa[];
 esis_init()
 {
        extern struct clnl_protosw clnl_protox[256];
 esis_init()
 {
        extern struct clnl_protosw clnl_protox[256];

-       int esis_input();
-       int snpac_age();
-       int     esis_config();
+       int     esis_input(), isis_input();

 #ifdef ISO_X25ESIS
 #ifdef ISO_X25ESIS

-       x25esis_input();
+       int     x25esis_input();

 #endif ISO_X25ESIS
 
 #endif ISO_X25ESIS
 

-       esis_pcb.isop_next = esis_pcb.isop_prev = &esis_pcb;
-
-       clnl_protox[ISO9542_ESIS].clnl_input = esis_input;
+       esis_pcb.rcb_next = esis_pcb.rcb_prev = &esis_pcb;

        llinfo_llc.lc_next = llinfo_llc.lc_prev = &llinfo_llc;
        llinfo_llc.lc_next = llinfo_llc.lc_prev = &llinfo_llc;

+

        timeout(snpac_age, (caddr_t)0, hz);
        timeout(esis_config, (caddr_t)0, hz);
 
        timeout(snpac_age, (caddr_t)0, hz);
        timeout(esis_config, (caddr_t)0, hz);
 

+       clnl_protox[ISO9542_ESIS].clnl_input = esis_input;
+       clnl_protox[ISO10589_ISIS].clnl_input = isis_input;

 #ifdef ISO_X25ESIS
        clnl_protox[ISO9542X25_ESIS].clnl_input = x25esis_input;
 #endif ISO_X25ESIS
 #ifdef ISO_X25ESIS
        clnl_protox[ISO9542X25_ESIS].clnl_input = x25esis_input;
 #endif ISO_X25ESIS


@@ -122,7 +131,6 @@ esis_init()
  *
  * SIDE EFFECTS:       
  *
  *
  * SIDE EFFECTS:       
  *

- * NOTES:                      This is here only so esis gets initialized.

  */
 /*ARGSUSED*/
 esis_usrreq(so, req, m, nam, control)
  */
 /*ARGSUSED*/
 esis_usrreq(so, req, m, nam, control)


@@ -132,10 +140,68 @@ struct mbuf               *m;                     /* data for request */
 struct mbuf            *nam;           /* optional name */
 struct mbuf            *control;       /* optional control */
 {
 struct mbuf            *nam;           /* optional name */
 struct mbuf            *control;       /* optional control */
 {

+       struct rawcb *rp = sotorawcb(so);
+       int error = 0;
+
+       if ((so->so_state & SS_PRIV) == 0) {
+               error = EACCES;
+               goto release;
+       }
+       if (rp == NULL && req != PRU_ATTACH) {
+               error = EINVAL;
+               goto release;
+       }
+
+       switch (req) {
+       case PRU_ATTACH:
+               if (rp != NULL) {
+                       error = EINVAL;
+                       break;
+               }
+               MALLOC(rp, struct rawcb *, sizeof(*rp), M_PCB, M_WAITOK);
+               if (so->so_pcb = (caddr_t)rp) {
+                       bzero(so->so_pcb, sizeof(*rp));
+                       insque(rp, &esis_pcb);
+                       rp->rcb_socket = so;
+                       error = soreserve(so, esis_sendspace, esis_recvspace);
+               } else
+                       error = ENOBUFS;
+               break;
+
+       case PRU_SEND:
+               if (nam == NULL) {
+                       error = EINVAL;
+                       break;
+               }
+               /* error checking here */
+               error = isis_output(mtod(nam,struct sockaddr_dl *), m);
+               m = NULL;
+               break;
+
+       case PRU_DETACH:
+               raw_detach(rp);
+               break;
+
+       case PRU_SHUTDOWN:
+               socantsendmore(so);
+               break;
+
+       case PRU_ABORT:
+               soisdisconnected(so);
+               raw_detach(rp);
+               break;
+
+       case PRU_SENSE:
+               return (0);
+
+       default:
+               return (EOPNOTSUPP);
+       }
+release:

        if (m != NULL)
                m_freem(m);
 
        if (m != NULL)
                m_freem(m);
 

-       return(EOPNOTSUPP);
+       return (error);

 }
 
 /*
 }
 
 /*


@@ -153,22 +219,9 @@ esis_input(m0, shp)
 struct mbuf            *m0;            /* ptr to first mbuf of pkt */
 struct snpa_hdr        *shp;   /* subnetwork header */
 {
 struct mbuf            *m0;            /* ptr to first mbuf of pkt */
 struct snpa_hdr        *shp;   /* subnetwork header */
 {

-       struct esis_fixed       *pdu = mtod(m0, struct esis_fixed *);
+       register struct esis_fixed      *pdu = mtod(m0, struct esis_fixed *);

        register int type;
 
        register int type;
 

-       IFDEBUG(D_ESISINPUT)
-               int i;
-
-               printf("esis_input: pdu on ifp x%x (%s%d): from:", shp->snh_ifp, 
-                       shp->snh_ifp->if_name, shp->snh_ifp->if_unit);
-               for (i=0; i<6; i++)
-                       printf("%x%c", shp->snh_shost[i]&0xff, (i<5) ? ':' : ' ');
-               printf(" to:");
-               for (i=0; i<6; i++)
-                       printf("%x%c", shp->snh_dhost[i]&0xff, (i<5) ? ':' : ' ');
-               printf("\n");
-       ENDDEBUG
-

        /*
         *      check checksum if necessary
         */
        /*
         *      check checksum if necessary
         */


@@ -182,29 +235,29 @@ struct snpa_hdr   *shp;   /* subnetwork header */
                esis_stat.es_badvers++;
                goto bad;
        }
                esis_stat.es_badvers++;
                goto bad;
        }

-

        type = pdu->esis_type & 0x1f;
        switch (type) {
                case ESIS_ESH:
                        esis_eshinput(m0, shp);
        type = pdu->esis_type & 0x1f;
        switch (type) {
                case ESIS_ESH:
                        esis_eshinput(m0, shp);

-                       return;
+                       break;

 
                case ESIS_ISH:
                        esis_ishinput(m0, shp);
 
                case ESIS_ISH:
                        esis_ishinput(m0, shp);

-                       return;
+                       break;

 
                case ESIS_RD:
                        esis_rdinput(m0, shp);
 
                case ESIS_RD:
                        esis_rdinput(m0, shp);

-                       return;
+                       break;

 
 

-               default: {
+               default:

                        esis_stat.es_badtype++;
                        esis_stat.es_badtype++;

-                       goto bad;
-               }

        }
 
 bad:
        }
 
 bad:

-       m_freem(m0);
+       if (esis_pcb.rcb_next != &esis_pcb)
+               isis_input(m0, shp);
+       else
+               m_freem(m0);

 }
 
 /*
 }
 
 /*


@@ -358,13 +411,12 @@ struct rtentry            *rt;                    /* snpa cache info regarding next hop of
        iso_gen_csum(m0, ESIS_CKSUM_OFF, (int)pdu->esis_hdr_len);
 
        bzero((caddr_t)&siso, sizeof(siso));
        iso_gen_csum(m0, ESIS_CKSUM_OFF, (int)pdu->esis_hdr_len);
 
        bzero((caddr_t)&siso, sizeof(siso));

-       siso.siso_len = 12;

        siso.siso_family = AF_ISO;
        siso.siso_data[0] = AFI_SNA;
        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_family = AF_ISO;
        siso.siso_data[0] = AFI_SNA;
        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);

 }
 
 /*
 }
 
 /*


@@ -404,7 +456,7 @@ int                                                 nsellen;
            if (b > buflim) {esis_stat.es_toosmall++; goto bad;}}
 #define ESIS_NEXT_OPTION(b)    { b += (2 + b[1]); \
            if (b > buflim) {esis_stat.es_toosmall++; goto bad;}}
            if (b > buflim) {esis_stat.es_toosmall++; goto bad;}}
 #define ESIS_NEXT_OPTION(b)    { b += (2 + b[1]); \
            if (b > buflim) {esis_stat.es_toosmall++; goto bad;}}

-int ESHonly = 1;
+int ESHonly = 0;

 /*
  
 /*
 /*
  
 /*


@@ -488,7 +540,6 @@ struct snpa_hdr     *shp;   /* subnetwork header */
                esis_shoutput(shp->snh_ifp, ESIS_ISH, esis_holding_time,
                                                shp->snh_shost, 6, (struct iso_addr *)0);
 bad:
                esis_shoutput(shp->snh_ifp, ESIS_ISH, esis_holding_time,
                                                shp->snh_shost, 6, (struct iso_addr *)0);
 bad:

-       m_freem(m);

        return;
 }
 
        return;
 }
 


@@ -508,7 +559,7 @@ struct mbuf         *m;     /* esh pdu */
 struct snpa_hdr        *shp;   /* subnetwork header */
 {
        struct esis_fixed       *pdu = mtod(m, struct esis_fixed *);
 struct snpa_hdr        *shp;   /* subnetwork header */
 {
        struct esis_fixed       *pdu = mtod(m, struct esis_fixed *);

-       u_short                         ht;                                     /* holding time */
+       u_short                         ht, newct;                      /* holding time */

        struct iso_addr         *nsap;                          /* Network Entity Title */
        register u_char         *buf = (u_char *) (pdu + 1);
        register u_char         *buflim = pdu->esis_hdr_len + (u_char *)pdu;
        struct iso_addr         *nsap;                          /* Network Entity Title */
        register u_char         *buf = (u_char *) (pdu + 1);
        register u_char         *buflim = pdu->esis_hdr_len + (u_char *)pdu;


@@ -528,9 +579,16 @@ struct snpa_hdr    *shp;   /* subnetwork header */
        while (buf < buflim) {
                switch (*buf) {
                case ESISOVAL_ESCT:
        while (buf < buflim) {
                switch (*buf) {
                case ESISOVAL_ESCT:

+                       if (iso_systype & SNPA_IS)
+                               break;

                        if (buf[1] != 2)
                                goto bad;
                        if (buf[1] != 2)
                                goto bad;

-                       CTOH(buf[2], buf[3], esis_config_time);
+                       CTOH(buf[2], buf[3], newct);
+                       if (esis_config_time != newct) {
+                               untimeout(esis_config,0);
+                               esis_config_time = newct;
+                               esis_config();
+                       }

                        break;
                
                default:
                        break;
                
                default:


@@ -549,7 +607,6 @@ struct snpa_hdr     *shp;   /* subnetwork header */
                        iso_systype & SNPA_ES ? ESIS_ESH : ESIS_ISH,
                        esis_holding_time, shp->snh_shost, 6, (struct iso_addr *)0);
 bad:
                        iso_systype & SNPA_ES ? ESIS_ESH : ESIS_ISH,
                        esis_holding_time, shp->snh_shost, 6, (struct iso_addr *)0);
 bad:

-       m_freem(m);

        return;
 }
 
        return;
 }
 


@@ -579,13 +636,13 @@ struct snpa_hdr   *shp;   /* subnetwork header */
 
        /* intermediate systems ignore redirects */
        if (iso_systype & SNPA_IS)
 
        /* intermediate systems ignore redirects */
        if (iso_systype & SNPA_IS)

-               goto bad;
+               return;

        if (ESHonly)
        if (ESHonly)

-               goto bad;
+               return;

 
        CTOH(pdu->esis_ht_msb, pdu->esis_ht_lsb, ht);
        if (buf >= buflim)
 
        CTOH(pdu->esis_ht_msb, pdu->esis_ht_lsb, ht);
        if (buf >= buflim)

-               goto bad;
+               return;

 
        /* Extract DA */
        ESIS_EXTRACT_ADDR(da, buf);
 
        /* Extract DA */
        ESIS_EXTRACT_ADDR(da, buf);


@@ -606,13 +663,13 @@ struct snpa_hdr   *shp;   /* subnetwork header */
                switch (*buf) {
                case ESISOVAL_SNPAMASK:
                        if (snpamask) /* duplicate */
                switch (*buf) {
                case ESISOVAL_SNPAMASK:
                        if (snpamask) /* duplicate */

-                               goto bad;
+                               return;

                        snpamask = (struct iso_addr *)(buf + 1);
                        break;
 
                case ESISOVAL_NETMASK:
                        if (netmask) /* duplicate */
                        snpamask = (struct iso_addr *)(buf + 1);
                        break;
 
                case ESISOVAL_NETMASK:
                        if (netmask) /* duplicate */

-                               goto bad;
+                               return;

                        netmask = (struct iso_addr *)(buf + 1);
                        break;
 
                        netmask = (struct iso_addr *)(buf + 1);
                        break;
 


@@ -645,8 +702,7 @@ struct snpa_hdr     *shp;   /* subnetwork header */
                                bsnpa->isoa_genaddr, SNPA_IS, ht, 0);
                snpac_addrt(shp->snh_ifp, da, net, netmask);
        }
                                bsnpa->isoa_genaddr, SNPA_IS, ht, 0);
                snpac_addrt(shp->snh_ifp, da, net, netmask);
        }

-bad:
-       m_freem(m0);
+bad: ;    /* Needed by ESIS_NEXT_OPTION */

 }
 
 /*
 }
 
 /*


@@ -669,15 +725,18 @@ esis_config()
        /* 
         *      Report configuration for each interface that 
         *      - is UP
        /* 
         *      Report configuration for each interface that 
         *      - is UP

-        *      - is not loopback
-        *      - has broadcast capabilities
+        *      - has BROADCAST capability

         *      - has an ISO address
         */
         *      - has an ISO address
         */

+       /* Todo: a better way would be to construct the esh or ish
+        * once and copy it out for all devices, possibly calling
+        * a method in the iso_ifaddr structure to encapsulate and
+        * transmit it.  This could work to advantage for non-broadcast media
+        */

        
        for (ifp = ifnet; ifp; ifp = ifp->if_next) {
                if ((ifp->if_flags & IFF_UP) &&
        
        for (ifp = ifnet; ifp; ifp = ifp->if_next) {
                if ((ifp->if_flags & IFF_UP) &&

-                       (ifp->if_flags & IFF_BROADCAST) &&
-                       ((ifp->if_flags & IFF_LOOPBACK) == 0)) {
+                   (ifp->if_flags & IFF_BROADCAST)) {

                        /* search for an ISO address family */
                        struct ifaddr   *ia;
 
                        /* search for an ISO address family */
                        struct ifaddr   *ia;
 


@@ -808,6 +867,22 @@ struct     iso_addr *isoa;
 
        if (type == ESIS_ESH)
                *naddrp = naddr;
 
        if (type == ESIS_ESH)
                *naddrp = naddr;

+       else {
+               /* add suggested es config timer option to ISH */
+               if (M_TRAILINGSPACE(m) < 4) {
+                       printf("esis_shoutput: extending packet\n");
+                       EXTEND_PACKET(m, m0, cp);
+               }
+               *cp++ = ESISOVAL_ESCT;
+               *cp++ = 2;
+               HTOC(*cp, *(cp+1), esis_esconfig_time);
+               len += 4;
+               m->m_len += 4;
+               IFDEBUG(D_ESISOUTPUT)
+                       printf("m0 0x%x, m 0x%x, data 0x%x, len %d, cp 0x%x\n",
+                       m0, m, m->m_data, m->m_len, cp);
+               ENDDEBUG
+       }

 
        m0->m_pkthdr.len = len;
        pdu->esis_hdr_len = len;
 
        m0->m_pkthdr.len = len;
        pdu->esis_hdr_len = len;


@@ -817,11 +892,121 @@ struct   iso_addr *isoa;
        siso.siso_family = AF_ISO;
        siso.siso_data[0] = AFI_SNA;
        siso.siso_nlen = sn_len + 1;
        siso.siso_family = AF_ISO;
        siso.siso_data[0] = AFI_SNA;
        siso.siso_nlen = sn_len + 1;

-       siso.siso_len  = sn_len + 6;

        bcopy(sn_addr, siso.siso_data + 1, (unsigned)sn_len);
        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);
+}
+
+/*
+ * FUNCTION:           isis_input
+ *
+ * PURPOSE:                    Process an incoming isis packet
+ *
+ * RETURNS:                    nothing
+ *
+ * SIDE EFFECTS:       
+ *
+ * NOTES:                      
+ */
+isis_input(m0, shp)
+struct mbuf            *m0;            /* ptr to first mbuf of pkt */
+struct snpa_hdr        *shp;   /* subnetwork header */
+{
+       register int type;
+       register struct rawcb *rp, *first_rp = 0;
+       struct ifnet *ifp = shp->snh_ifp;
+       char workbuf[16];
+       struct mbuf *mm;
+
+       IFDEBUG(D_ISISINPUT)
+               int i;
+
+               printf("isis_input: pkt on ifp x%x (%s%d): from:", ifp, 
+                       ifp->if_name, ifp->if_unit);
+               for (i=0; i<6; i++)
+                       printf("%x%c", shp->snh_shost[i]&0xff, (i<5) ? ':' : ' ');
+               printf(" to:");
+               for (i=0; i<6; i++)
+                       printf("%x%c", shp->snh_dhost[i]&0xff, (i<5) ? ':' : ' ');
+               printf("\n");
+       ENDDEBUG
+       esis_dl.sdl_alen = ifp->if_addrlen;
+       esis_dl.sdl_index = ifp->if_index;
+       bcopy(shp->snh_shost, (caddr_t)esis_dl.sdl_data, esis_dl.sdl_alen);
+       for (rp = esis_pcb.rcb_next; rp != &esis_pcb; rp = rp->rcb_next) {
+               if (first_rp == 0) {
+                       first_rp = rp;
+                       continue;
+               }
+               if (mm = m_copy(m0, 0, M_COPYALL)) { /*can't block at interrupt level */
+                       if (sbappendaddr(&rp->rcb_socket->so_rcv,
+                                                         &esis_dl, mm, (struct mbuf *)0) != 0) {
+                               sorwakeup(rp->rcb_socket);
+                        } else {
+                               IFDEBUG(D_ISISINPUT)
+                                       printf("Error in sbappenaddr, mm = 0x%x\n", mm);
+                               ENDDEBUG
+                               m_freem(mm);
+                       }
+               }
+       }
+       if (first_rp && sbappendaddr(&first_rp->rcb_socket->so_rcv,
+                                                         &esis_dl, m0, (struct mbuf *)0) != 0) {
+               sorwakeup(first_rp->rcb_socket);
+               return;
+       }
+       m_freem(m0);
+}
+
+isis_output(sdl, m)
+register struct sockaddr_dl    *sdl;
+struct mbuf *m;
+{
+       register struct ifnet *ifp;
+       struct ifaddr *ifa, *ifa_ifwithnet();
+       struct sockaddr_iso siso;
+       int error = 0;
+       unsigned sn_len;
+
+       ifa = ifa_ifwithnet((struct sockaddr *)sdl);    /* get ifp from sdl */
+       if (ifa == 0) {
+               IFDEBUG(D_ISISOUTPUT)
+                       printf("isis_output: interface not found\n");
+               ENDDEBUG
+               error = EINVAL;
+               goto release;
+       }
+       ifp = ifa->ifa_ifp;
+       sn_len = sdl->sdl_alen;
+       IFDEBUG(D_ISISOUTPUT)
+               u_char *cp = (u_char *)LLADDR(sdl), *cplim = cp + sn_len;
+               printf("isis_output: ifp 0x%x (%s%d), to: ",
+                       ifp, ifp->if_name, ifp->if_unit);
+               while (cp < cplim) {
+                       printf("%x", *cp++);
+                       printf("%c", (cp < cplim) ? ':' : ' ');
+               }
+               printf("\n");
+       ENDDEBUG
+       bzero((caddr_t)&siso, sizeof(siso));
+       siso.siso_family = AF_ISO; /* This convention may be useful for X.25 */
+       siso.siso_data[0] = AFI_SNA;
+       siso.siso_nlen = sn_len + 1;
+       bcopy(LLADDR(sdl), siso.siso_data + 1, sn_len);
+       error = (ifp->if_output)(ifp, m, (struct sockaddr *)&siso, 0);
+       if (error) {
+               IFDEBUG(D_ISISOUTPUT)
+                       printf("isis_output: error from ether_output is %d\n", error);
+               ENDDEBUG
+       }
+       return (error);
+
+release:
+       if (m != NULL)
+               m_freem(m);
+       return(error);

 }
 
 }
 

+

 /*
  * FUNCTION:           esis_ctlinput
  *
 /*
  * FUNCTION:           esis_ctlinput
  *