zebra, lib: fix the ZEBRA_INTERFACE_VRF_UPDATE zapi message

[mirror_frr.git] / isisd / isis_adjacency.h

diff --git a/isisd/isis_adjacency.h b/isisd/isis_adjacency.h
index 98bb9838fa5170fb9f4fef3c150b7668ca2fecb7..2a4cb6e6142849c409ace39815a89f6cac2808d3 100644 (file)
--- a/isisd/isis_adjacency.h
+++ b/isisd/isis_adjacency.h
@@ -25,6 +25,8 @@
 #ifndef _ZEBRA_ISIS_ADJACENCY_H
 #define _ZEBRA_ISIS_ADJACENCY_H
 
+#include "isisd/isis_tlvs.h"
+
 enum isis_adj_usage {
        ISIS_ADJ_NONE,
        ISIS_ADJ_LEVEL1,
@@ -66,10 +68,12 @@ struct isis_dis_record {
        time_t last_dis_change; /* timestamp for last dis change */
 };
 
+struct bfd_session;
+
 struct isis_adjacency {
-       u_char snpa[ETH_ALEN];             /* NeighbourSNPAAddress */
-       u_char sysid[ISIS_SYS_ID_LEN];     /* neighbourSystemIdentifier */
-       u_char lanid[ISIS_SYS_ID_LEN + 1]; /* LAN id on bcast circuits */
+       uint8_t snpa[ETH_ALEN];             /* NeighbourSNPAAddress */
+       uint8_t sysid[ISIS_SYS_ID_LEN];     /* neighbourSystemIdentifier */
+       uint8_t lanid[ISIS_SYS_ID_LEN + 1]; /* LAN id on bcast circuits */
        int dischanges[ISIS_LEVELS];       /* how many DIS changes ? */
        /* an array of N levels for M records */
        struct isis_dis_record dis_record[DIS_RECORDS * ISIS_LEVELS];
@@ -84,26 +88,36 @@ struct isis_adjacency {
        struct in6_addr *ipv6_addresses;
        unsigned int ipv6_address_count;
        struct in6_addr router_address6;
-       u_char prio[ISIS_LEVELS];       /* priorityOfNeighbour for DIS */
+       uint8_t prio[ISIS_LEVELS];      /* priorityOfNeighbour for DIS */
        int circuit_t;                  /* from hello PDU hdr */
        int level;                      /* level (1 or 2) */
        enum isis_system_type sys_type; /* neighbourSystemType */
-       u_int16_t hold_time;            /* entryRemainingTime */
-       u_int32_t last_upd;
-       u_int32_t last_flap;      /* last time the adj flapped */
+       uint16_t hold_time;             /* entryRemainingTime */
+       uint32_t last_upd;
+       uint32_t last_flap; /* last time the adj flapped */
+       enum isis_threeway_state threeway_state;
+       uint32_t ext_circuit_id;
        int flaps;                    /* number of adjacency flaps  */
        struct thread *t_expire;      /* expire after hold_time  */
        struct isis_circuit *circuit; /* back pointer */
        uint16_t *mt_set;      /* Topologies this adjacency is valid for */
        unsigned int mt_count; /* Number of entries in mt_set */
+       struct bfd_session *bfd_session;
 };
 
-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 isis_threeway_adj;
+
+struct isis_adjacency *isis_adj_lookup(const uint8_t *sysid,
+                                      struct list *adjdb);
+struct isis_adjacency *isis_adj_lookup_snpa(const uint8_t *ssnpa,
                                            struct list *adjdb);
-struct isis_adjacency *isis_new_adj(const u_char *id, const u_char *snpa,
+struct isis_adjacency *isis_new_adj(const uint8_t *id, const uint8_t *snpa,
                                    int level, struct isis_circuit *circuit);
 void isis_delete_adj(void *adj);
+void isis_adj_process_threeway(struct isis_adjacency *adj,
+                              struct isis_threeway_adj *tw_adj,
+                              enum isis_adj_usage adj_usage);
+DECLARE_HOOK(isis_adj_state_change_hook, (struct isis_adjacency *adj), (adj))
 void isis_adj_state_change(struct isis_adjacency *adj,
                           enum isis_adj_state state, const char *reason);
 void isis_adj_print(struct isis_adjacency *adj);