bgpd: Convert bgp_peer_sort_t to enum

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>

diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index a5a57bdc7ffb57cc70f12516d3004282afefc11d..e8ce021e07466f030bd840cc8bdd2e74db43ab0e 100644 (file)
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -565,8 +565,8 @@ static int bgp_path_info_cmp(struct bgp *bgp, struct bgp_path_info *new,
 {
        const struct prefix *new_p;
        struct attr *newattr, *existattr;
-       bgp_peer_sort_t new_sort;
-       bgp_peer_sort_t exist_sort;
+       enum bgp_peer_sort new_sort;
+       enum bgp_peer_sort exist_sort;
        uint32_t new_pref;
        uint32_t exist_pref;
        uint32_t new_med;

diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
index 6f06ad5a4079d2ddda9b0d241689d818278cde34..d7902838172a5b8bfa4fcdb533e49f910f59566c 100644 (file)
--- a/bgpd/bgpd.c
+++ b/bgpd/bgpd.c
@@ -565,7 +565,7 @@ void bgp_confederation_id_set(struct bgp *bgp, as_t as)
           AS change.  Just Reset EBGP sessions, not CONFED sessions.  If we
           were not doing confederation before, reset all EBGP sessions.  */
        for (ALL_LIST_ELEMENTS(bgp->peer, node, nnode, peer)) {
-               bgp_peer_sort_t ptype = peer_sort(peer);
+               enum bgp_peer_sort ptype = peer_sort(peer);
 
                /* We're looking for peers who's AS is not local or part of our
                   confederation.  */
@@ -1004,7 +1004,7 @@ void peer_af_flag_inherit(struct peer *peer, afi_t afi, safi_t safi,
 }
 
 /* Check peer's AS number and determines if this peer is IBGP or EBGP */
-static inline bgp_peer_sort_t peer_calc_sort(struct peer *peer)
+static inline enum bgp_peer_sort peer_calc_sort(struct peer *peer)
 {
        struct bgp *bgp;
 
@@ -1091,13 +1091,13 @@ static inline bgp_peer_sort_t peer_calc_sort(struct peer *peer)
 }
 
 /* Calculate and cache the peer "sort" */
-bgp_peer_sort_t peer_sort(struct peer *peer)
+enum bgp_peer_sort peer_sort(struct peer *peer)
 {
        peer->sort = peer_calc_sort(peer);
        return peer->sort;
 }
 
-bgp_peer_sort_t peer_sort_lookup(struct peer *peer)
+enum bgp_peer_sort peer_sort_lookup(struct peer *peer)
 {
        return peer->sort;
 }
@@ -1826,7 +1826,7 @@ int bgp_afi_safi_peer_exists(struct bgp *bgp, afi_t afi, safi_t safi)
 /* Change peer's AS number.  */
 void peer_as_change(struct peer *peer, as_t as, int as_specified)
 {
-       bgp_peer_sort_t origtype, newtype;
+       enum bgp_peer_sort origtype, newtype;
 
        /* Stop peer. */
        if (!CHECK_FLAG(peer->sflags, PEER_STATUS_GROUP)) {
@@ -1931,8 +1931,8 @@ int peer_remote_as(struct bgp *bgp, union sockunion *su, const char *conf_if,
                                return BGP_ERR_PEER_GROUP_MEMBER;
                        }
 
-                       bgp_peer_sort_t peer_sort_type =
-                                               peer_sort(peer->group->conf);
+                       enum bgp_peer_sort peer_sort_type =
+                               peer_sort(peer->group->conf);
 
                        /* Explicit AS numbers used, compare AS numbers */
                        if (as_type == AS_SPECIFIED) {
@@ -2898,7 +2898,7 @@ int peer_group_bind(struct bgp *bgp, union sockunion *su, struct peer *peer,
        int first_member = 0;
        afi_t afi;
        safi_t safi;
-       bgp_peer_sort_t ptype, gtype;
+       enum bgp_peer_sort ptype, gtype;
 
        /* Lookup the peer.  */
        if (!peer)
@@ -4542,7 +4542,7 @@ static int peer_af_flag_modify(struct peer *peer, afi_t afi, safi_t safi,
        struct peer *member;
        struct listnode *node, *nnode;
        struct peer_flag_action action;
-       bgp_peer_sort_t ptype;
+       enum bgp_peer_sort ptype;
 
        memset(&action, 0, sizeof(struct peer_flag_action));
        size = sizeof(peer_af_flag_action_list)
@@ -5909,7 +5909,7 @@ int peer_local_as_set(struct peer *peer, as_t as, bool no_prepend,
        struct bgp *bgp = peer->bgp;
        struct peer *member;
        struct listnode *node, *nnode;
-       bgp_peer_sort_t ptype = peer_sort(peer);
+       enum bgp_peer_sort ptype = peer_sort(peer);
 
        if (ptype != BGP_PEER_EBGP && ptype != BGP_PEER_INTERNAL)
                return BGP_ERR_LOCAL_AS_ALLOWED_ONLY_FOR_EBGP;

diff --git a/bgpd/bgpd.h b/bgpd/bgpd.h
index 360bcc39c42129c90068f2ef2783eb45b9e77366..8e353c176fbfe6b2a7c97256ee2446dfd1f30c80 100644 (file)
--- a/bgpd/bgpd.h
+++ b/bgpd/bgpd.h
@@ -901,13 +901,13 @@ struct bgp_filter {
 
 /* 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 {
+enum bgp_peer_sort {
        BGP_PEER_UNSPECIFIED,
        BGP_PEER_IBGP,
        BGP_PEER_EBGP,
        BGP_PEER_INTERNAL,
        BGP_PEER_CONFED,
-} bgp_peer_sort_t;
+};
 
 /* BGP message header and packet size.  */
 #define BGP_MARKER_SIZE                                16
@@ -1084,7 +1084,7 @@ struct peer {
        /* Peer's local AS number. */
        as_t local_as;
 
-       bgp_peer_sort_t sort;
+       enum bgp_peer_sort sort;
 
        /* Peer's Change local AS number. */
        as_t change_local_as;
@@ -2025,8 +2025,8 @@ extern struct peer *peer_unlock_with_caller(const char *, struct peer *);
 #define peer_unlock(A) peer_unlock_with_caller(__FUNCTION__, (A))
 #define peer_lock(B) peer_lock_with_caller(__FUNCTION__, (B))
 
-extern bgp_peer_sort_t peer_sort(struct peer *peer);
-extern bgp_peer_sort_t peer_sort_lookup(struct peer *peer);
+extern enum bgp_peer_sort peer_sort(struct peer *peer);
+extern enum bgp_peer_sort peer_sort_lookup(struct peer *peer);
 
 extern bool peer_active(struct peer *);
 extern bool peer_active_nego(struct peer *);