diff --git configure.ac configure.ac

index 78198cb..12e9729 100755

--- configure.ac

+++ configure.ac

@@ -197,6 +197,10 @@ AC_ARG_ENABLE(watchquagga,

 [  --disable-watchquagga   do not build watchquagga])

 AC_ARG_ENABLE(isisd,

 [  --enable-isisd          build isisd])

+AC_ARG_ENABLE(trill,

+[  --enable-trill          include TRILL support])

+AC_ARG_ENABLE(solaris,

+[  --enable-solaris          build solaris])

 AC_ARG_ENABLE(bgp-announce,

 [  --disable-bgp-announce, turn off BGP route announcement])

 AC_ARG_ENABLE(netlink,

@@ -311,6 +315,30 @@ AC_SUBST(ISIS_TOPOLOGY_INCLUDES)

 AC_SUBST(ISIS_TOPOLOGY_DIR)

 AC_SUBST(ISIS_TOPOLOGY_LIB)

+if test "${enable_trill}" = "yes"; then

+  AC_CHECK_HEADER(net/trill.h)

+  AC_CHECK_LIB(dladm, dladm_valid_bridgename, libdladm=yes)

+  AC_MSG_CHECKING(TRILL IS-IS support)

+  if test $ac_cv_header_net_trill_h = no || \

+    test $ac_cv_lib_dladm_dladm_valid_bridgename = no; then

+    AC_MSG_RESULT(none)

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

+    enable_trill=no

+  else

+    AC_MSG_RESULT(yes)

+    AC_DEFINE(HAVE_TRILL,,Enable TRILL support)

+  fi

+fi

+if test "${enable_trill}" = "yes"; then

+  ISIS_TARGETS="isisd trilld"

+  ISIS_LIBS=-ldladm

+else

+  ISIS_TARGETS="isisd"

+  ISIS_LIBS=

+fi

+AC_SUBST(ISIS_TARGETS)

+AC_SUBST(ISIS_LIBS)

+

 if test "${enable_user}" = "yes" || test x"${enable_user}" = x""; then

   enable_user="quagga"

 elif test "${enable_user}" = "no"; then

@@ -753,28 +781,31 @@ 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

+if test "${enable_isisd}" = "yes"; then

+  ISIS_METHOD=

+  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

-    AC_MSG_RESULT(BPF)

-    ISIS_METHOD="isis_bpf.o"

+    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

 fi

 AC_SUBST(ISIS_METHOD)

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

index 859facd..9adcc05 100644

--- isisd/Makefile.am

+++ isisd/Makefile.am

@@ -4,10 +4,11 @@ INCLUDES = @INCLUDES@ -I.. -I$(top_srcdir) -I$(top_srcdir)/lib \

 	   @ISIS_TOPOLOGY_INCLUDES@

 DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\"

 INSTALL_SDATA=@INSTALL@ -m 600

-LIBS = @LIBS@ 

+LIBS = @LIBS@ @ISIS_LIBS@

 noinst_LIBRARIES = libisis.a

-sbin_PROGRAMS = isisd 

+sbin_PROGRAMS = @ISIS_TARGETS@

 SUBDIRS = topology

+EXTRA_PROGRAMS = isisd trilld

 isis_method = @ISIS_METHOD@

@@ -23,16 +24,24 @@ noinst_HEADERS = \

 	isis_lsp.h dict.h isis_circuit.h isis_misc.h isis_network.h \

 	isis_zebra.h isis_dr.h isis_flags.h isis_dynhn.h isis_common.h \

 	iso_checksum.h isis_csm.h isis_events.h isis_spf.h isis_route.h \

+	isis_trill.h \

 	include-netbsd/clnp.h include-netbsd/esis.h include-netbsd/iso.h

 isisd_SOURCES = \

-	isis_main.c $(libisis_a_SOURCES)

+	isis_main.c $(libisis_a_SOURCES) isis_trilldummy.c

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

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

 isisd_DEPENDENCIES = $(isis_method)

-EXTRA_DIST = isis_bpf.c isis_dlpi.c isis_pfpacket.c

+trilld_SOURCES = \

+	isis_main.c $(libisis_a_SOURCES) isis_trill.c isis_trillio.c \

+	isis_trillvlans.c isis_trillbpdu.c

+

+trilld_LDADD = @ISIS_TOPOLOGY_LIB@ ../lib/libzebra.la @LIBCAP@ @LIBM@

+

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

+	isis_trillio.c isis_trillvlans.c isis_trillbpdu.c

 examplesdir = $(exampledir)

 dist_examples_DATA = isisd.conf.sample

diff --git isisd/bool.h isisd/bool.h

new file mode 100644

index 0000000..e713d65

--- /dev/null

+++ isisd/bool.h

@@ -0,0 +1,25 @@

+/*

+ * IS-IS Rout(e)ing protocol               - bool.h

+ *

+ * 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.

+ */

+

+#ifndef _ZEBRA_ISIS_BOOL_H

+#define _ZEBRA_ISIS_BOOL_H

+

+#define FALSE 0

+#define TRUE 1

+

+#endif

diff --git isisd/dict.h isisd/dict.h

index 9395d1c..0a5382c 100644

--- isisd/dict.h

+++ isisd/dict.h

@@ -124,6 +124,11 @@ extern void dict_load_next(dict_load_t *, dnode_t *, const void *);

 extern void dict_load_end(dict_load_t *);

 extern void dict_merge(dict_t *, dict_t *);

+#define ALL_DICT_NODES_RO(D,dnode,data) \

+  (dnode) = dict_first((D)); \

+  (dnode) != NULL && ((data) = dnode_get((dnode)), 1); \

+  (dnode) = dict_next((D),(dnode))

+

 #if defined(DICT_IMPLEMENTATION) || !defined(KAZLIB_OPAQUE_DEBUG)

 #ifdef KAZLIB_SIDEEFFECT_DEBUG

 #define dict_isfull(D) (SFX_CHECK(D)->dict_nodecount == (D)->dict_maxcount)

diff --git isisd/isis_adjacency.c isisd/isis_adjacency.c

index aab8d1a..4b2159b 100644

--- isisd/isis_adjacency.c

+++ isisd/isis_adjacency.c

@@ -43,6 +43,9 @@

 #include "isisd/isis_dr.h"

 #include "isisd/isis_dynhn.h"

 #include "isisd/isis_pdu.h"

+#include "isisd/isis_tlv.h"

+#include "isisd/isis_lsp.h"

+#include "isisd/isis_vlans.h"

 extern struct isis *isis;

@@ -53,6 +56,10 @@ adj_alloc (u_char * id)

   adj = XCALLOC (MTYPE_ISIS_ADJACENCY, sizeof (struct isis_adjacency));

   memcpy (adj->sysid, id, ISIS_SYS_ID_LEN);

+  adj->lsps = list_new();

+#ifdef HAVE_TRILL

+  adj->vlans = XCALLOC (MTYPE_ISIS_TRILL_ADJVLANS, sizeof (struct trill_adj_vlans));

+#endif

   return adj;

 }

@@ -127,6 +134,9 @@ isis_adj_lookup_snpa (u_char * ssnpa, struct list *adjdb)

 void

 isis_delete_adj (struct isis_adjacency *adj, struct list *adjdb)

 {

+  struct listnode *node;

+  struct isis_lsp *lsp;

+

   if (!adj)

     return;

   /* When we recieve a NULL list, we will know its p2p. */

@@ -141,7 +151,18 @@ isis_delete_adj (struct isis_adjacency *adj, struct list *adjdb)

   if (adj->ipv6_addrs)

     list_delete (adj->ipv6_addrs);

 #endif

-  

+

+  /* clear adj LSPs list (tracks LSPs recvd from the adj) */

+  if (adj->lsps)

+    {

+      for (ALL_LIST_ELEMENTS_RO (adj->lsps, node, lsp))

+        lsp->adj = NULL;

+      list_delete (adj->lsps);

+    }

+

+#ifdef HAVE_VLAN

+  XFREE (MTYPE_ISIS_TRILL_ADJVLANS, adj->vlans);

+#endif

   XFREE (MTYPE_ISIS_ADJACENCY, adj);

   return;

 }

@@ -179,6 +200,10 @@ isis_adj_state_change (struct isis_adjacency *adj, enum isis_adj_state state,

       list_delete_all_node (circuit->u.bc.lan_neighs[level - 1]);

       isis_adj_build_neigh_list (circuit->u.bc.adjdb[level - 1],

 				 circuit->u.bc.lan_neighs[level - 1]);

+

+      /* On adjacency state change send new pseudo LSP if we are the DR */

+      if (circuit->u.bc.is_dr[level - 1])

+        lsp_pseudo_regenerate (circuit, level);

     }

   else if (state == ISIS_ADJ_UP)

     {				/* p2p interface */

@@ -302,6 +327,11 @@ isis_adj_print_vty2 (struct isis_adjacency *adj, struct vty *vty, char detail)

   struct isis_dynhn *dyn;

   int level;

   struct listnode *node;

+#ifdef HAVE_TRILL

+  int vlan_count = 0;

+  int vlan_set;

+  int vlan;

+#endif

   dyn = dynhn_find_by_id (adj->sysid);

   if (dyn)

@@ -388,6 +418,38 @@ isis_adj_print_vty2 (struct isis_adjacency *adj, struct vty *vty, char detail)

 	    }

 	}

 #endif /* HAVE_IPV6 */

+

+#ifdef HAVE_TRILL

+      vty_out (vty, "    Designated VLAN: %d", adj->vlans->designated);

+      vty_out (vty, "%s    VLAN Forwarder: ", VTY_NEWLINE);

+      EACH_VLAN_SET(adj->vlans->forwarder, vlan, vlan_set)

+        {

+	   vlan_count++;

+	   if (vlan_count % 8 == 0)

+             vty_out(vty, "%s                     ", VTY_NEWLINE);

+           vty_out (vty, "%d ", vlan); 

+        }

+      vty_out (vty, "%s    Enabled VLANs: ", VTY_NEWLINE);

+      vlan_count = 0;

+      EACH_VLAN_SET(adj->vlans->enabled, vlan, vlan_set)

+        {

+	   vlan_count++;

+	   if (vlan_count % 8 == 0)

+             vty_out(vty, "%s                     ", VTY_NEWLINE);

+           vty_out (vty, "%d ", vlan); 

+        }

+      vty_out (vty, "%s    Rx VLANs: ", VTY_NEWLINE);

+      vlan_count = 0;

+      EACH_VLAN_SET(adj->vlans->seen, vlan, vlan_set)

+        {

+	   vlan_count++;

+	   if (vlan_count % 8 == 0)

+             vty_out(vty, "%s                     ", VTY_NEWLINE);

+           vty_out (vty, "%d ", vlan); 

+        }

+      vty_out (vty, "%s", VTY_NEWLINE);

+#endif /* HAVE_TRILL */

+

       vty_out (vty, "%s", VTY_NEWLINE);

     }

   return;

diff --git isisd/isis_adjacency.h isisd/isis_adjacency.h

index 99a8bb2..b966230 100644

--- isisd/isis_adjacency.h

+++ isisd/isis_adjacency.h

@@ -96,6 +96,11 @@ struct isis_adjacency

   int flaps;			/* number of adjacency flaps  */

   struct thread *t_expire;	/* expire after hold_time  */

   struct isis_circuit *circuit;	/* back pointer */

+  struct list *lsps;		/* LSPs marked with this adjacency */

+

+#ifdef HAVE_TRILL

+  struct trill_adj_vlans *vlans;

+#endif

 };

 struct isis_adjacency *isis_adj_lookup (u_char * sysid, struct list *adjdb);

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

index af24988..8de3622 100644

--- isisd/isis_circuit.c

+++ isisd/isis_circuit.c

@@ -58,6 +58,11 @@

 #include "isisd/isis_csm.h"

 #include "isisd/isis_events.h"

+#ifdef HAVE_TRILL

+#include "isisd/isis_vlans.h"

+#include "isisd/isis_trill.h"

+#endif

+

 extern struct thread_master *master;

 extern struct isis *isis;

@@ -87,6 +92,11 @@ isis_circuit_new ()

 	  circuit->metrics[i].metric_delay = METRICS_UNSUPPORTED;

 	  circuit->te_metric[i] = DEFAULT_CIRCUIT_METRICS;

 	}

+

+#ifdef HAVE_TRILL

+      circuit->vlans = XCALLOC (MTYPE_ISIS_TRILL_VLANS,

+          sizeof(struct trill_circuit_vlans));

+#endif

     }

   else

     {

@@ -126,6 +136,13 @@ isis_circuit_configure (struct isis_circuit *circuit, struct isis_area *area)

     }

   circuit->lsp_interval = LSP_INTERVAL;

+#ifdef HAVE_TRILL

+  circuit->vlans->pvid = DFLT_VLAN;

+  circuit->vlans->designated = DFLT_VLAN;

+  circuit->vlans->our_designated = DFLT_VLAN;

+  SET_VLAN(circuit->vlans->enabled, DFLT_VLAN);

+#endif

+

   /*

    * Add the circuit into area

    */

@@ -216,6 +233,26 @@ isis_circuit_del (struct isis_circuit *circuit)

     list_delete (circuit->ipv6_non_link);

 #endif /* HAVE_IPV6 */

+#ifdef HAVE_TRILL

+  if (circuit->vlans != NULL)

+    {

+      struct trill_circuit_vlans *cvlans = circuit->vlans;

+

+      if (cvlans->appvlanfwders != NULL)

+	list_delete (cvlans->appvlanfwders);

+      if (cvlans->enabled_vlans != NULL)

+	list_delete (cvlans->enabled_vlans);

+      if (cvlans->inhibit_vlans != NULL)

+	list_delete (cvlans->inhibit_vlans);

+      if (cvlans->inhibit_thread != NULL)

+	thread_cancel (cvlans->inhibit_thread);

+      XFREE (MTYPE_ISIS_TRILL_VLANS, cvlans);

+    }

+

+  if (circuit->tc_thread != NULL)

+    thread_cancel (circuit->tc_thread);

+#endif

+

   /* and lastly the circuit itself */

   XFREE (MTYPE_ISIS_CIRCUIT, circuit);

@@ -374,7 +411,7 @@ isis_circuit_if_add (struct isis_circuit *circuit, struct interface *ifp)

   circuit->interface = ifp;

   ifp->info = circuit;

-  circuit->circuit_id = ifp->ifindex % 255;	/* FIXME: Why not ? */

+  circuit->circuit_id = (ifp->ifindex % 255) + 1; /* FIXME: Why not ? */

   /*  isis_circuit_update_addrs (circuit, ifp); */

@@ -436,7 +473,7 @@ isis_circuit_update_params (struct isis_circuit *circuit,

     {

       zlog_warn ("changing circuit_id %d->%d", circuit->circuit_id,

 		 ifp->ifindex);

-      circuit->circuit_id = ifp->ifindex % 255;

+      circuit->circuit_id = (ifp->ifindex % 255) + 1;

     }

   /* FIXME: Why is this needed? shouldn't we compare to the area's mtu */

@@ -500,9 +537,10 @@ isis_circuit_if_del (struct isis_circuit *circuit)

   return;

 }

-void

+int

 isis_circuit_up (struct isis_circuit *circuit)

 {

+  int retv;

   if (circuit->circ_type == CIRCUIT_T_BROADCAST)

     {

@@ -565,43 +603,57 @@ isis_circuit_up (struct isis_circuit *circuit)

 		       isis_jitter (circuit->psnp_interval[1], PSNP_JITTER));

     }

-  /* initialize the circuit streams */

+  /* unified init for circuits; ignore warnings below this level */

+  retv = isis_sock_init (circuit);

+  if (retv == ISIS_ERROR)

+    {

+      isis_circuit_down (circuit);

+      return retv;

+    }

+

+  /* initialize the circuit streams after opening connection */

   if (circuit->rcv_stream == NULL)

     circuit->rcv_stream = stream_new (ISO_MTU (circuit));

   if (circuit->snd_stream == NULL)

     circuit->snd_stream = stream_new (ISO_MTU (circuit));

-  /* unified init for circuits */

-  isis_sock_init (circuit);

-

-#ifdef GNU_LINUX

+#if defined(GNU_LINUX) || defined(SUNOS_5)

   THREAD_READ_ON (master, circuit->t_read, isis_receive, circuit,

 		  circuit->fd);

 #else

   THREAD_TIMER_ON (master, circuit->t_read, isis_receive, circuit,

 		   circuit->fd);

 #endif

-  return;

+  return ISIS_OK;

 }

 void

 isis_circuit_down (struct isis_circuit *circuit)

 {

   /* Cancel all active threads -- FIXME: wrong place */

-  /* HT: Read thread if GNU_LINUX, TIMER thread otherwise. */

+  /* HT: Read thread if GNU_LINUX or SUNOS_5, TIMER thread otherwise. */

   THREAD_OFF (circuit->t_read);

+  THREAD_TIMER_OFF (circuit->t_send_csnp[0]);

+  THREAD_TIMER_OFF (circuit->t_send_csnp[1]);

+  THREAD_TIMER_OFF (circuit->t_send_psnp[0]);

+  THREAD_TIMER_OFF (circuit->t_send_psnp[1]);

   if (circuit->circ_type == CIRCUIT_T_BROADCAST)

     {

       THREAD_TIMER_OFF (circuit->u.bc.t_send_lan_hello[0]);

       THREAD_TIMER_OFF (circuit->u.bc.t_send_lan_hello[1]);

       THREAD_TIMER_OFF (circuit->u.bc.t_run_dr[0]);

       THREAD_TIMER_OFF (circuit->u.bc.t_run_dr[1]);

+      THREAD_TIMER_OFF (circuit->u.bc.t_refresh_pseudo_lsp[0]);

+      THREAD_TIMER_OFF (circuit->u.bc.t_refresh_pseudo_lsp[1]);

     }

   else if (circuit->circ_type == CIRCUIT_T_P2P)

     {

       THREAD_TIMER_OFF (circuit->u.p2p.t_send_p2p_hello);

     }

+#ifdef HAVE_TRILL

+  THREAD_TIMER_OFF (circuit->tc_thread);

+#endif

   /* close the socket */

   close (circuit->fd);

diff --git isisd/isis_circuit.h isisd/isis_circuit.h

index a7e719f..fd26a27 100644

--- isisd/isis_circuit.h

+++ isisd/isis_circuit.h

@@ -137,6 +137,14 @@ struct isis_circuit

   u_int32_t ctrl_pdus_txed;	/* controlPDUsSent */

   u_int32_t desig_changes[2];	/* lanLxDesignatedIntermediateSystemChanges */

   u_int32_t rej_adjacencies;	/* rejectedAdjacencies */

+

+#ifdef HAVE_TRILL

+  struct trill_circuit_vlans *vlans;	/* TRILL VLANs */

+  u_int8_t root_bridge[8];		/* STP Root Bridge */

+  time_t root_expire;			/* time when root expires */

+  int tc_count;

+  struct thread *tc_thread;

+#endif

 };

 void isis_circuit_init (void);

@@ -147,7 +155,7 @@ struct isis_circuit *circuit_scan_by_ifp (struct interface *ifp);

 void isis_circuit_del (struct isis_circuit *circuit);

 void isis_circuit_configure (struct isis_circuit *circuit,

 			     struct isis_area *area);

-void isis_circuit_up (struct isis_circuit *circuit);

+int isis_circuit_up (struct isis_circuit *circuit);

 void isis_circuit_deconfigure (struct isis_circuit *circuit,

 			       struct isis_area *area);

diff --git isisd/isis_common.h isisd/isis_common.h

index 2633855..29baf1e 100644

--- isisd/isis_common.h

+++ isisd/isis_common.h

@@ -21,6 +21,9 @@

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

  */

+#ifndef ISIS_COMMON_H

+#define ISIS_COMMON_H

+

 /*

  * Area Address