ospf6d: Fix Ambiguous Commands

[mirror_frr.git] / isisd / isis_adjacency.h

diff --git a/isisd/isis_adjacency.h b/isisd/isis_adjacency.h
index 04a92505928f55ab9a96b5a3c498bb2b0837296d..8539b03d6b9b3b22e1edb1a0c825928e2c506a1d 100644 (file)
--- a/isisd/isis_adjacency.h
+++ b/isisd/isis_adjacency.h
@@ -44,6 +44,7 @@ enum isis_system_type
 
 enum isis_adj_state
 {
+  ISIS_ADJ_UNKNOWN,
   ISIS_ADJ_INITIALIZING,
   ISIS_ADJ_UP,
   ISIS_ADJ_DOWN
@@ -83,9 +84,9 @@ struct isis_adjacency
   struct list *area_addrs;             /* areaAdressesOfNeighbour */
   struct nlpids nlpids;                        /* protocols spoken ... */
   struct list *ipv4_addrs;
-#ifdef HAVE_IPV6
+  struct in_addr router_address;
   struct list *ipv6_addrs;
-#endif                         /* HAVE_IPV6 */
+  struct in6_addr router_address6;
   u_char prio[ISIS_LEVELS];    /* priorityOfNeighbour for DIS */
   int circuit_t;               /* from hello PDU hdr */
   int level;                   /* level (1 or 2) */
@@ -98,10 +99,10 @@ struct isis_adjacency
   struct isis_circuit *circuit;        /* back pointer */
 };
 
-struct isis_adjacency *isis_adj_lookup (u_char * sysid, struct list *adjdb);
-struct isis_adjacency *isis_adj_lookup_snpa (u_char * ssnpa,
+struct isis_adjacency *isis_adj_lookup (const u_char * sysid, struct list *adjdb);
+struct isis_adjacency *isis_adj_lookup_snpa (const u_char * ssnpa,
                                             struct list *adjdb);
-struct isis_adjacency *isis_new_adj (u_char * id, u_char * snpa, int level,
+struct isis_adjacency *isis_new_adj (const u_char * id, const u_char * snpa, int level,
                                     struct isis_circuit *circuit);
 void isis_delete_adj (void *adj);
 void isis_adj_state_change (struct isis_adjacency *adj,