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

version 1.1.1.2, 2012/10/09 09:22:28 version 1.1.1.3, 2013/07/21 23:54:38
Line 59  struct bgp_master Line 59  struct bgp_master
 #define BGP_OPT_NO_FIB                   (1 << 0)  #define BGP_OPT_NO_FIB                   (1 << 0)
 #define BGP_OPT_MULTIPLE_INSTANCE        (1 << 1)  #define BGP_OPT_MULTIPLE_INSTANCE        (1 << 1)
 #define BGP_OPT_CONFIG_CISCO             (1 << 2)  #define BGP_OPT_CONFIG_CISCO             (1 << 2)
   #define BGP_OPT_NO_LISTEN                (1 << 3)
 };  };
   
 /* BGP instance structure.  */  /* BGP instance structure.  */
Line 259  struct bgp_filter Line 260  struct bgp_filter
   } usmap;    } usmap;
 };  };
   
   /* IBGP/EBGP identifier.  We also have a CONFED peer, which is to say,
      a peer who's AS is part of our Confederation.  */
   typedef enum
   {
     BGP_PEER_IBGP = 1,
     BGP_PEER_EBGP,
     BGP_PEER_INTERNAL,
     BGP_PEER_CONFED,
   } bgp_peer_sort_t;
   
 /* BGP neighbor structure. */  /* BGP neighbor structure. */
 struct peer  struct peer
 {  {
Line 282  struct peer Line 293  struct peer
   /* Peer's local AS number. */    /* Peer's local AS number. */
   as_t local_as;    as_t local_as;
   
     bgp_peer_sort_t sort;
   
   /* Peer's Change local AS number. */    /* Peer's Change local AS number. */
   as_t change_local_as;    as_t change_local_as;
   
Line 368  struct peer Line 381  struct peer
 #define PEER_FLAG_DYNAMIC_CAPABILITY        (1 << 5) /* dynamic capability */  #define PEER_FLAG_DYNAMIC_CAPABILITY        (1 << 5) /* dynamic capability */
 #define PEER_FLAG_DISABLE_CONNECTED_CHECK   (1 << 6) /* disable-connected-check */  #define PEER_FLAG_DISABLE_CONNECTED_CHECK   (1 << 6) /* disable-connected-check */
 #define PEER_FLAG_LOCAL_AS_NO_PREPEND       (1 << 7) /* local-as no-prepend */  #define PEER_FLAG_LOCAL_AS_NO_PREPEND       (1 << 7) /* local-as no-prepend */
   #define PEER_FLAG_LOCAL_AS_REPLACE_AS       (1 << 8) /* local-as no-prepend replace-as */
   
   /* NSF mode (graceful restart) */    /* NSF mode (graceful restart) */
   u_char nsf[AFI_MAX][SAFI_MAX];    u_char nsf[AFI_MAX][SAFI_MAX];
Line 749  struct bgp_nlri Line 763  struct bgp_nlri
 /* Check AS path loop when we send NLRI.  */  /* Check AS path loop when we send NLRI.  */
 /* #define BGP_SEND_ASPATH_CHECK */  /* #define BGP_SEND_ASPATH_CHECK */
   
 /* IBGP/EBGP identifier.  We also have a CONFED peer, which is to say,  
    a peer who's AS is part of our Confederation.  */  
 enum  
 {  
   BGP_PEER_IBGP,  
   BGP_PEER_EBGP,  
   BGP_PEER_INTERNAL,  
   BGP_PEER_CONFED  
 };  
   
 /* Flag for peer_clear_soft().  */  /* Flag for peer_clear_soft().  */
 enum bgp_clear_type  enum bgp_clear_type
 {  {
Line 811  enum bgp_clear_type Line 815  enum bgp_clear_type
 #define BGP_ERR_NO_EBGP_MULTIHOP_WITH_TTLHACK   -30  #define BGP_ERR_NO_EBGP_MULTIHOP_WITH_TTLHACK   -30
 #define BGP_ERR_NO_IBGP_WITH_TTLHACK            -31  #define BGP_ERR_NO_IBGP_WITH_TTLHACK            -31
 #define BGP_ERR_MAX                             -32  #define BGP_ERR_MAX                             -32
   #define BGP_ERR_CANNOT_HAVE_LOCAL_AS_SAME_AS_REMOTE_AS    -33
   
 extern struct bgp_master *bm;  extern struct bgp_master *bm;
   
Line 833  extern struct peer *peer_lookup_with_open (union socku Line 838  extern struct peer *peer_lookup_with_open (union socku
                                     int *);                                      int *);
 extern struct peer *peer_lock (struct peer *);  extern struct peer *peer_lock (struct peer *);
 extern struct peer *peer_unlock (struct peer *);  extern struct peer *peer_unlock (struct peer *);
extern int peer_sort (struct peer *peer);extern bgp_peer_sort_t peer_sort (struct peer *peer);
 extern int peer_active (struct peer *);  extern int peer_active (struct peer *);
 extern int peer_active_nego (struct peer *);  extern int peer_active_nego (struct peer *);
 extern struct peer *peer_create_accept (struct bgp *);  extern struct peer *peer_create_accept (struct bgp *);
Line 938  extern int peer_distribute_unset (struct peer *, afi_t Line 943  extern int peer_distribute_unset (struct peer *, afi_t
 extern int peer_allowas_in_set (struct peer *, afi_t, safi_t, int);  extern int peer_allowas_in_set (struct peer *, afi_t, safi_t, int);
 extern int peer_allowas_in_unset (struct peer *, afi_t, safi_t);  extern int peer_allowas_in_unset (struct peer *, afi_t, safi_t);
   
extern int peer_local_as_set (struct peer *, as_t, int);extern int peer_local_as_set (struct peer *, as_t, int, int);
 extern int peer_local_as_unset (struct peer *);  extern int peer_local_as_unset (struct peer *);
   
 extern int peer_prefix_list_set (struct peer *, afi_t, safi_t, int, const char *);  extern int peer_prefix_list_set (struct peer *, afi_t, safi_t, int, const char *);

Removed from v.1.1.1.2  
changed lines
  Added in v.1.1.1.3


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