Merge pull request #5081 from pguibert6WIND/show_brief_doc

[mirror_frr.git] / ospf6d / ospf6_interface.h

diff --git a/ospf6d/ospf6_interface.h b/ospf6d/ospf6_interface.h
index 3844132366e6ebe131cc82e1adb77f6ec0c4f21b..53a8910f4d54d8019ba27b0331423365acbbb5ba 100644 (file)
--- a/ospf6d/ospf6_interface.h
+++ b/ospf6d/ospf6_interface.h
@@ -48,50 +48,52 @@ struct ospf6_interface {
        /* Interface ID; use interface->ifindex */
 
        /* ospf6 instance id */
-       u_char instance_id;
+       uint8_t instance_id;
 
        /* I/F transmission delay */
-       u_int32_t transdelay;
+       uint32_t transdelay;
 
        /* Network Type */
-       u_char type;
+       uint8_t type;
+       bool type_cfg;
 
        /* Router Priority */
-       u_char priority;
+       uint8_t priority;
 
        /* Time Interval */
-       u_int16_t hello_interval;
-       u_int16_t dead_interval;
-       u_int32_t rxmt_interval;
+       uint16_t hello_interval;
+       uint16_t dead_interval;
+       uint32_t rxmt_interval;
 
-       u_int32_t state_change;
+       uint32_t state_change;
 
        /* Cost */
-       u_int32_t cost;
+       uint32_t cost;
 
        /* I/F MTU */
-       u_int32_t ifmtu;
+       uint32_t ifmtu;
 
        /* Configured MTU */
-       u_int32_t c_ifmtu;
+       uint32_t c_ifmtu;
 
        /* Interface State */
-       u_char state;
+       uint8_t state;
 
        /* Interface socket setting trial counter, resets on success */
-       u_char sso_try_cnt;
+       uint8_t sso_try_cnt;
+       struct thread *thread_sso;
 
        /* OSPF6 Interface flag */
        char flag;
 
        /* MTU mismatch check */
-       u_char mtu_ignore;
+       uint8_t mtu_ignore;
 
        /* Decision of DR Election */
-       u_int32_t drouter;
-       u_int32_t bdrouter;
-       u_int32_t prev_drouter;
-       u_int32_t prev_bdrouter;
+       uint32_t drouter;
+       uint32_t bdrouter;
+       uint32_t prev_drouter;
+       uint32_t prev_bdrouter;
 
        /* Linklocal LSA Database: includes Link-LSA */
        struct ospf6_lsdb *lsdb;
@@ -108,6 +110,7 @@ struct ospf6_interface {
        struct thread *thread_network_lsa;
        struct thread *thread_link_lsa;
        struct thread *thread_intra_prefix_lsa;
+       struct thread *thread_as_extern_lsa;
 
        struct ospf6_route_table *route_connected;
 
@@ -117,6 +120,19 @@ struct ospf6_interface {
        /* BFD information */
        void *bfd_info;
 
+       /* Statistics Fields */
+       uint32_t hello_in;
+       uint32_t hello_out;
+       uint32_t db_desc_in;
+       uint32_t db_desc_out;
+       uint32_t ls_req_in;
+       uint32_t ls_req_out;
+       uint32_t ls_upd_in;
+       uint32_t ls_upd_out;
+       uint32_t ls_ack_in;
+       uint32_t ls_ack_out;
+       uint32_t discarded;
+
        QOBJ_FIELDS
 };
 DECLARE_QOBJ_TYPE(ospf6_interface)
@@ -162,7 +178,6 @@ extern void ospf6_interface_enable(struct ospf6_interface *);
 extern void ospf6_interface_disable(struct ospf6_interface *);
 
 extern void ospf6_interface_if_add(struct interface *);
-extern void ospf6_interface_if_del(struct interface *);
 extern void ospf6_interface_state_update(struct interface *);
 extern void ospf6_interface_connected_route_update(struct interface *);