diff --git a/ChangeLog b/ChangeLog

index 38ea66d..ad1c40c 100644

--- ChangeLog

+++ ChangeLog

@@ -1,3 +1,8 @@

+2007-08-07 James Carlson <[email protected]>

+

+	* configure.ac: Added support for separate link-layer access

+	  mechanisms in isisd.

+

 2007-07-27 Paul Jakma <[email protected]>

 	* configure.ac: Bump version to 0.99.8

diff --git a/configure.ac b/configure.ac

index 857f415..437767e 100755

--- configure.ac

+++ configure.ac

@@ -750,6 +750,35 @@

 AC_SUBST(KERNEL_METHOD)

 AC_SUBST(OTHER_METHOD)

+dnl --------------------------

+dnl Determine IS-IS I/O method

+dnl --------------------------

+AC_CHECK_HEADER(net/bpf.h)

+AC_CHECK_HEADER(sys/dlpi.h)

+AC_MSG_CHECKING(zebra IS-IS I/O method)

+if test x"$opsys" = x"gnu-linux"; then

+  AC_MSG_RESULT(pfpacket)

+  ISIS_METHOD=isis_pfpacket.o

+elif test x"$opsys" = x"sol2-6" -o x"$opsys" = x"sol8"; then

+  AC_MSG_RESULT(DLPI)

+  ISIS_METHOD="isis_dlpi.o"

+else

+  if test $ac_cv_header_net_bpf_h = no; then

+    if test $ac_cv_header_sys_dlpi_h = no; then

+      AC_MSG_RESULT(none)

+      AC_MSG_WARN([*** IS-IS support will not be built ***])

+      ISISD=""

+    else

+      AC_MSG_RESULT(DLPI)

+    fi

+    ISIS_METHOD="isis_dlpi.o"

+  else

+    AC_MSG_RESULT(BPF)

+    ISIS_METHOD="isis_bpf.o"

+  fi

+fi

+AC_SUBST(ISIS_METHOD)

+

 dnl ------------------------------------

 dnl check for broken CMSG_FIRSTHDR macro

 dnl ------------------------------------

diff --git a/isisd/ChangeLog b/isisd/ChangeLog

index 8797af1..c2482f0 100644

--- isisd/ChangeLog

+++ isisd/ChangeLog

@@ -1,3 +1,20 @@

+2008-01-29 James Carlson <[email protected]>

+

+	* Fix bug #437, assert due to bogus index management 

+	* isis_flags.c: (flags_initialize) new

+	* (flags_get_index) fix off by one, leading to list assert

+	  on null node data.

+	  (flags_free_index) ditto.

+	* isisd.c: (isis_area_create) use flags_initialize

+	  (isis_area_destroy) deconfigure circuits when

+	  taking down area.

+

+2007-07-18 James Carlson <[email protected]>

+

+	* isis_network.c: split up into isis_bpf.c, isis_dlpi.c, and

+	  isis_pfpacket.c, selected by autoconf, and added DLPI support.

+	* (general) Fixed to allow compilation and use on Solaris.

+

 2006-12-08 Hannes Gredler <[email protected]>

 	* isis_adjacency.c: (isis_new_adj) Allow NULL snpa argument.

diff --git a/isisd/Makefile.am b/isisd/Makefile.am

index 1dd5493..859facd 100644

--- isisd/Makefile.am

+++ isisd/Makefile.am

@@ -9,9 +9,11 @@ noinst_LIBRARIES = libisis.a

 sbin_PROGRAMS = isisd 

 SUBDIRS = topology

+isis_method = @ISIS_METHOD@

+

 libisis_a_SOURCES = \

 	isis_adjacency.c isis_lsp.c dict.c isis_circuit.c isis_pdu.c \

-	isis_tlv.c isisd.c isis_misc.c isis_network.c isis_zebra.c isis_dr.c \

+	isis_tlv.c isisd.c isis_misc.c isis_zebra.c isis_dr.c \

 	isis_flags.c isis_dynhn.c iso_checksum.c isis_csm.c isis_events.c \

 	isis_spf.c isis_route.c isis_routemap.c

@@ -26,7 +28,11 @@ noinst_HEADERS = \

 isisd_SOURCES = \

 	isis_main.c $(libisis_a_SOURCES)

-isisd_LDADD = @ISIS_TOPOLOGY_LIB@ ../lib/libzebra.la @LIBCAP@

+isisd_LDADD = $(isis_method) @ISIS_TOPOLOGY_LIB@ ../lib/libzebra.la @LIBCAP@

+

+isisd_DEPENDENCIES = $(isis_method)

+

+EXTRA_DIST = isis_bpf.c isis_dlpi.c isis_pfpacket.c

 examplesdir = $(exampledir)

 dist_examples_DATA = isisd.conf.sample

diff --git a/isisd/dict.c b/isisd/dict.c

index a333d3e..6c3e1e7 100644

--- isisd/dict.c

+++ isisd/dict.c

@@ -14,12 +14,13 @@

  * into proprietary software; there is no requirement for such software to

  * contain a copyright notice related to this source.

  *

- * $Id: dict.c,v 1.4 2005/09/25 12:04:25 hasso Exp $

- * $Name:  $

+ * $Id$

+ * $Name$

  */

 #include <stdlib.h>

 #include <stddef.h>

+#include "zebra.h"

 #include "zassert.h"

 #define DICT_IMPLEMENTATION

 #include "dict.h"

diff --git a/isisd/include-netbsd/iso.h b/isisd/include-netbsd/iso.h

index 714b42d..1a80aec 100644

--- isisd/include-netbsd/iso.h

+++ isisd/include-netbsd/iso.h

@@ -192,7 +192,13 @@ extern struct protosw isosw[];

 #else

 /* user utilities definitions from the iso library */

+#ifdef SUNOS_5

+#define	__P(x)	x

+#define	__BEGIN_DECLS

+#define	__END_DECLS

+#else

 #include <sys/cdefs.h>

+#endif

 __BEGIN_DECLS

 struct iso_addr *iso_addr __P((const char *));

diff --git a/isisd/isisd.c b/isisd/isisd.c

index 714b42d..1a80aec 100644

--- isisd/isisd.c

+++ isisd/isisd.c

@@ -130,7 +130,7 @@

   area->circuit_list = list_new ();

   area->area_addrs = list_new ();

   THREAD_TIMER_ON (master, area->t_tick, lsp_tick, area, 1);

-  area->flags.maxindex = -1;

+  flags_initialize (&area->flags);

   /*

    * Default values

    */

@@ -215,7 +215,11 @@

   if (area->circuit_list)

     {

       for (ALL_LIST_ELEMENTS (area->circuit_list, node, nnode, circuit))

-        isis_circuit_del (circuit);

+	{

+	  /* The fact that it's in circuit_list means that it was configured */

+	  isis_circuit_deconfigure (circuit, area);

+	  isis_circuit_del (circuit);

+	}

       list_delete (area->circuit_list);

     }

diff --git a/isisd/isis_bpf.c b/isisd/isis_bpf.c

new file mode 100644

index 0000000..e66ac98

--- /dev/null

+++ isisd/isis_bpf.c

@@ -0,0 +1,340 @@

+/*

+ * IS-IS Rout(e)ing protocol - isis_bpf.c

+ *

+ * Copyright (C) 2001,2002    Sampo Saaristo

+ *                            Tampere University of Technology      

+ *                            Institute of Communications Engineering

+ *

+ * This program is free software; you can redistribute it and/or modify it 

+ * under the terms of the GNU General Public Licenseas published by the Free 

+ * Software Foundation; either version 2 of the License, or (at your option) 

+ * any later version.

+ *

+ * This program is distributed in the hope that it will be useful,but WITHOUT 

+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 

+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for 

+ * more details.

+

+ * You should have received a copy of the GNU General Public License along 

+ * with this program; if not, write to the Free Software Foundation, Inc., 

+ * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

+ */

+

+#include <zebra.h>

+#include <net/if.h>

+#include <netinet/if_ether.h>

+#include <sys/time.h>

+#include <sys/ioctl.h>

+#include <net/bpf.h>

+

+#include "log.h"

+#include "stream.h"

+#include "if.h"

+

+#include "isisd/dict.h"

+#include "isisd/include-netbsd/iso.h"

+#include "isisd/isis_constants.h"

+#include "isisd/isis_common.h"

+#include "isisd/isis_circuit.h"

+#include "isisd/isis_flags.h"

+#include "isisd/isisd.h"

+#include "isisd/isis_constants.h"

+#include "isisd/isis_circuit.h"

+#include "isisd/isis_network.h"

+

+#include "privs.h"

+

+extern struct zebra_privs_t isisd_privs;

+

+struct bpf_insn llcfilter[] = {

+  BPF_STMT (BPF_LD + BPF_B + BPF_ABS, ETHER_HDR_LEN),	/* check first byte */

+  BPF_JUMP (BPF_JMP + BPF_JEQ + BPF_K, ISO_SAP, 0, 5),

+  BPF_STMT (BPF_LD + BPF_B + BPF_ABS, ETHER_HDR_LEN + 1),

+  BPF_JUMP (BPF_JMP + BPF_JEQ + BPF_K, ISO_SAP, 0, 3),	/* check second byte */

+  BPF_STMT (BPF_LD + BPF_B + BPF_ABS, ETHER_HDR_LEN + 2),

+  BPF_JUMP (BPF_JMP + BPF_JEQ + BPF_K, 0x03, 0, 1),	/* check third byte */

+  BPF_STMT (BPF_RET + BPF_K, (u_int) - 1),

+  BPF_STMT (BPF_RET + BPF_K, 0)

+};

+int readblen = 0;

+u_char *readbuff = NULL;

+

+/*

+ * Table 9 - Architectural constants for use with ISO 8802 subnetworks

+ * ISO 10589 - 8.4.8

+ */

+

+u_char ALL_L1_ISS[6] = { 0x01, 0x80, 0xC2, 0x00, 0x00, 0x14 };

+u_char ALL_L2_ISS[6] = { 0x01, 0x80, 0xC2, 0x00, 0x00, 0x15 };

+u_char ALL_ISS[6] = { 0x09, 0x00, 0x2B, 0x00, 0x00, 0x05 };

+u_char ALL_ESS[6] = { 0x09, 0x00, 0x2B, 0x00, 0x00, 0x04 };

+

+static char sock_buff[8192];

+

+static int

+open_bpf_dev (struct isis_circuit *circuit)

+{

+  int i = 0, fd;

+  char bpfdev[128];

+  struct ifreq ifr;

+  u_int16_t blen;

+  int true = 1, false = 0;

+  struct timeval timeout;

+  struct bpf_program bpf_prog;

+

+  do

+    {

+      (void) snprintf (bpfdev, sizeof (bpfdev), "/dev/bpf%d", i++);

+      fd = open (bpfdev, O_RDWR);

+    }

+  while (fd < 0 && errno == EBUSY);

+

+  if (fd < 0)

+    {

+      zlog_warn ("open_bpf_dev(): failed to create bpf socket: %s",

+		 safe_strerror (errno));

+      return ISIS_WARNING;

+    }

+

+  zlog_debug ("Opened BPF device %s", bpfdev);

+

+  memcpy (ifr.ifr_name, circuit->interface->name, sizeof (ifr.ifr_name));

+  if (ioctl (fd, BIOCSETIF, (caddr_t) & ifr) < 0)

+    {

+      zlog_warn ("open_bpf_dev(): failed to bind to interface: %s",

+		 safe_strerror (errno));

+      return ISIS_WARNING;

+    }

+

+  if (ioctl (fd, BIOCGBLEN, (caddr_t) & blen) < 0)

+    {

+      zlog_warn ("failed to get BPF buffer len");

+      blen = circuit->interface->mtu;

+    }

+

+  readblen = blen;

+

+  if (readbuff == NULL)

+    readbuff = malloc (blen);

+

+  zlog_debug ("BPF buffer len = %u", blen);

+

+  /*  BPF(4): reads return immediately upon packet reception.

+   *  Otherwise, a read will block until either the kernel

+   *  buffer becomes full or a timeout occurs. 

+   */

+  if (ioctl (fd, BIOCIMMEDIATE, (caddr_t) & true) < 0)

+    {

+      zlog_warn ("failed to set BPF dev to immediate mode");

+    }

+

+#ifdef BIOCSSEESENT

+  /*

+   * We want to see only incoming packets

+   */

+  if (ioctl (fd, BIOCSSEESENT, (caddr_t) & false) < 0)

+    {

+      zlog_warn ("failed to set BPF dev to incoming only mode");

+    }

+#endif

+

+  /*

+   * ...but all of them

+   */

+  if (ioctl (fd, BIOCPROMISC, (caddr_t) & true) < 0)

+    {

+      zlog_warn ("failed to set BPF dev to promiscuous mode");

+    }

+

+  /*

+   * If the buffer length is smaller than our mtu, lets try to increase it

+   */

+  if (blen < circuit->interface->mtu)

+    {

+      if (ioctl (fd, BIOCSBLEN, &circuit->interface->mtu) < 0)

+	{

+	  zlog_warn ("failed to set BPF buffer len (%u to %u)", blen,

+		     circuit->interface->mtu);

+	}

+    }

+

+  /*

+   * Set a timeout parameter - hope this helps select()

+   */

+  timeout.tv_sec = 600;

+  timeout.tv_usec = 0;

+  if (ioctl (fd, BIOCSRTIMEOUT, (caddr_t) & timeout) < 0)

+    {

+      zlog_warn ("failed to set BPF device timeout");

+    }

+

+  /*

+   * And set the filter

+   */

+  memset (&bpf_prog, 0, sizeof (struct bpf_program));

+  bpf_prog.bf_len = 8;

+  bpf_prog.bf_insns = &(llcfilter[0]);

+  if (ioctl (fd, BIOCSETF, (caddr_t) & bpf_prog) < 0)

+    {

+      zlog_warn ("open_bpf_dev(): failed to install filter: %s",

+		 safe_strerror (errno));

+      return ISIS_WARNING;

+    }

+

+  assert (fd > 0);

+

+  circuit->fd = fd;

+

+  return ISIS_OK;

+}

+

+/*

+ * Create the socket and set the tx/rx funcs

+ */

+int

+isis_sock_init (struct isis_circuit *circuit)

+{

+  int retval = ISIS_OK;

+

+  if (isisd_privs.change (ZPRIVS_RAISE))

+    zlog_err ("%s: could not raise privs, %s", __func__, safe_strerror (errno));

+

+  retval = open_bpf_dev (circuit);

+

+  if (retval != ISIS_OK)

+    {

+      zlog_warn ("%s: could not initialize the socket", __func__);

+      goto end;

+    }

+

+  if (circuit->circ_type == CIRCUIT_T_BROADCAST)

+    {

+      circuit->tx = isis_send_pdu_bcast;

+      circuit->rx = isis_recv_pdu_bcast;

+    }

+  else if (circuit->circ_type == CIRCUIT_T_P2P)

+    {

+      circuit->tx = isis_send_pdu_p2p;

+      circuit->rx = isis_recv_pdu_p2p;

+    }

+  else

+    {

+      zlog_warn ("isis_sock_init(): unknown circuit type");

+      retval = ISIS_WARNING;

+      goto end;

+    }

+

+end:

+  if (isisd_privs.change (ZPRIVS_LOWER))

+    zlog_err ("%s: could not lower privs, %s", __func__, safe_strerror (errno));

+

+  return retval;

+}

+

+int

+isis_recv_pdu_bcast (struct isis_circuit *circuit, u_char * ssnpa)

+{

+  int bytesread = 0, bytestoread, offset, one = 1;

+  struct bpf_hdr *bpf_hdr;

+

+  assert (circuit->fd > 0);

+

+  if (ioctl (circuit->fd, FIONREAD, (caddr_t) & bytestoread) < 0)

+    {

+      zlog_warn ("ioctl() FIONREAD failed: %s", safe_strerror (errno));

+    }

+

+  if (bytestoread)

+    {

+      bytesread = read (circuit->fd, readbuff, readblen);

+    }

+  if (bytesread < 0)

+    {

+      zlog_warn ("isis_recv_pdu_bcast(): read() failed: %s",

+		 safe_strerror (errno));

+      return ISIS_WARNING;

+    }

+

+  if (bytesread == 0)

+    return ISIS_WARNING;

+

+  bpf_hdr = (struct bpf_hdr *) readbuff;

+

+  assert (bpf_hdr->bh_caplen == bpf_hdr->bh_datalen);

+

+  offset = bpf_hdr->bh_hdrlen + LLC_LEN + ETHER_HDR_LEN;

+

+  /* then we lose the BPF, LLC and ethernet headers */

+  stream_write (circuit->rcv_stream, readbuff + offset, 

+                bpf_hdr->bh_caplen - LLC_LEN - ETHER_HDR_LEN);

+  stream_set_getp (circuit->rcv_stream, 0);

+

+  memcpy (ssnpa, readbuff + bpf_hdr->bh_hdrlen + ETHER_ADDR_LEN,

+	  ETHER_ADDR_LEN);

+

+  if (ioctl (circuit->fd, BIOCFLUSH, &one) < 0)

+    zlog_warn ("Flushing failed: %s", safe_strerror (errno));

+

+  return ISIS_OK;

+}

+

+int

+isis_recv_pdu_p2p (struct isis_circuit *circuit, u_char * ssnpa)

+{

+  int bytesread;

+

+  bytesread = stream_read (circuit->rcv_stream, circuit->fd, 

+                           circuit->interface->mtu);

+

+  if (bytesread < 0)

+    {

+      zlog_warn ("isis_recv_pdu_p2p(): read () failed: %s", safe_strerror (errno));

+      return ISIS_WARNING;

+    }

+

+  return ISIS_OK;

+}

+

+int

+isis_send_pdu_bcast (struct isis_circuit *circuit, int level)

+{

+  struct ether_header *eth;

+  int written;

+

+  stream_set_getp (circuit->snd_stream, 0);

+

+  /*

+   * First the eth header

+   */

+  eth = (struct ether_header *) sock_buff;

+  if (level == 1)

+    memcpy (eth->ether_dhost, ALL_L1_ISS, ETHER_ADDR_LEN);

+  else

+    memcpy (eth->ether_dhost, ALL_L2_ISS, ETHER_ADDR_LEN);

+  memcpy (eth->ether_shost, circuit->u.bc.snpa, ETHER_ADDR_LEN);

+  eth->ether_type = htons (stream_get_endp (circuit->snd_stream) + LLC_LEN);

+

+  /*

+   * Then the LLC

+   */

+  sock_buff[ETHER_HDR_LEN] = ISO_SAP;

+  sock_buff[ETHER_HDR_LEN + 1] = ISO_SAP;

+  sock_buff[ETHER_HDR_LEN + 2] = 0x03;

+

+  /* then we copy the data */

+  memcpy (sock_buff + (LLC_LEN + ETHER_HDR_LEN), circuit->snd_stream->data,

+	  stream_get_endp (circuit->snd_stream));

+

+  /* now we can send this */

+  written = write (circuit->fd, sock_buff,

+		   stream_get_endp (circuit->snd_stream) 

+		    + LLC_LEN + ETHER_HDR_LEN);

+

+  return ISIS_OK;

+}

+

+int

+isis_send_pdu_p2p (struct isis_circuit *circuit, int level)

+{

+  return ISIS_OK;

+}

diff --git a/isisd/isis_circuit.c b/isisd/isis_circuit.c

index fe3eb82..af24988 100644

--- isisd/isis_circuit.c

+++ isisd/isis_circuit.c

@@ -26,6 +26,10 @@

 #include <netinet/if_ether.h>

 #endif

+#ifndef ETHER_ADDR_LEN

+#define	ETHER_ADDR_LEN	ETHERADDRL