[BACK]Return to ospf_interface.h CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / quagga / ospfd

Diff for /embedaddon/quagga/ospfd/ospf_interface.h between versions 1.1.1.2 and 1.1.1.3

version 1.1.1.2, 2013/07/21 23:54:40 version 1.1.1.3, 2016/11/02 10:09:12
Line 30 Line 30
 #define IF_DEF_PARAMS(I) (IF_OSPF_IF_INFO (I)->def_params)  #define IF_DEF_PARAMS(I) (IF_OSPF_IF_INFO (I)->def_params)
 #define IF_OIFS(I)  (IF_OSPF_IF_INFO (I)->oifs)  #define IF_OIFS(I)  (IF_OSPF_IF_INFO (I)->oifs)
 #define IF_OIFS_PARAMS(I) (IF_OSPF_IF_INFO (I)->params)  #define IF_OIFS_PARAMS(I) (IF_OSPF_IF_INFO (I)->params)
                            
 /* Despite the name, this macro probably is for specialist use only */
 #define OSPF_IF_PARAM_CONFIGURED(S, P) ((S) && (S)->P##__config)  #define OSPF_IF_PARAM_CONFIGURED(S, P) ((S) && (S)->P##__config)
   
   /* Test whether an OSPF interface parameter is set, generally, given some
    * existing ospf interface
    */
   #define OSPF_IF_PARAM_IS_SET(O,P) \
         (OSPF_IF_PARAM_CONFIGURED ((O)->params, P) || \
         OSPF_IF_PARAM_CONFIGURED(IF_DEF_PARAMS((O)->ifp)->P))
   
 #define OSPF_IF_PARAM(O, P) \  #define OSPF_IF_PARAM(O, P) \
         (OSPF_IF_PARAM_CONFIGURED ((O)->params, P)?\          (OSPF_IF_PARAM_CONFIGURED ((O)->params, P)?\
                         (O)->params->P:IF_DEF_PARAMS((O)->ifp)->P)                          (O)->params->P:IF_DEF_PARAMS((O)->ifp)->P)
Line 47  struct ospf_if_params Line 56  struct ospf_if_params
   DECLARE_IF_PARAM (u_int32_t, retransmit_interval); /* Retransmission Interval */    DECLARE_IF_PARAM (u_int32_t, retransmit_interval); /* Retransmission Interval */
   DECLARE_IF_PARAM (u_char, passive_interface);      /* OSPF Interface is passive: no sending or receiving (no need to join multicast groups) */    DECLARE_IF_PARAM (u_char, passive_interface);      /* OSPF Interface is passive: no sending or receiving (no need to join multicast groups) */
   DECLARE_IF_PARAM (u_char, priority);               /* OSPF Interface priority */    DECLARE_IF_PARAM (u_char, priority);               /* OSPF Interface priority */
     DECLARE_IF_PARAM (struct in_addr, if_area);        /* Enable OSPF on this interface with area if_area */
   DECLARE_IF_PARAM (u_char, type);                   /* type of interface */    DECLARE_IF_PARAM (u_char, type);                   /* type of interface */
 #define OSPF_IF_ACTIVE                  0  #define OSPF_IF_ACTIVE                  0
 #define OSPF_IF_PASSIVE                 1  #define OSPF_IF_PASSIVE                 1
Line 140  struct ospf_interface Line 150  struct ospf_interface
   
   /* OSPF Network Type. */    /* OSPF Network Type. */
   u_char type;    u_char type;
 #define OSPF_IFTYPE_NONE                0  
 #define OSPF_IFTYPE_POINTOPOINT         1  
 #define OSPF_IFTYPE_BROADCAST           2  
 #define OSPF_IFTYPE_NBMA                3  
 #define OSPF_IFTYPE_POINTOMULTIPOINT    4  
 #define OSPF_IFTYPE_VIRTUALLINK         5  
 #define OSPF_IFTYPE_LOOPBACK            6  
 #define OSPF_IFTYPE_MAX                 7  
   
   /* State of Interface State Machine. */    /* State of Interface State Machine. */
   u_char state;    u_char state;
Line 191  struct ospf_interface Line 193  struct ospf_interface
   
   /* self-originated LSAs. */    /* self-originated LSAs. */
   struct ospf_lsa *network_lsa_self;    /* network-LSA. */    struct ospf_lsa *network_lsa_self;    /* network-LSA. */
 #ifdef HAVE_OPAQUE_LSA  
   struct list *opaque_lsa_self;                 /* Type-9 Opaque-LSAs */    struct list *opaque_lsa_self;                 /* Type-9 Opaque-LSAs */
 #endif /* HAVE_OPAQUE_LSA */  
   
   struct route_table *ls_upd_queue;    struct route_table *ls_upd_queue;
   
Line 214  struct ospf_interface Line 214  struct ospf_interface
   struct thread *t_ls_ack;              /* timer */    struct thread *t_ls_ack;              /* timer */
   struct thread *t_ls_ack_direct;       /* event */    struct thread *t_ls_ack_direct;       /* event */
   struct thread *t_ls_upd_event;        /* event */    struct thread *t_ls_upd_event;        /* event */
 #ifdef HAVE_OPAQUE_LSA  
   struct thread *t_opaque_lsa_self;     /* Type-9 Opaque-LSAs */    struct thread *t_opaque_lsa_self;     /* Type-9 Opaque-LSAs */
 #endif /* HAVE_OPAQUE_LSA */  
   
   int on_write_q;    int on_write_q;
       
Removed from v.1.1.1.2  
changed lines
  Added in v.1.1.1.3

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>