Revert "bgpd: code review comments addressed"

This reverts commit 80f6ea8b99188b9d8e79fe4fc1740cc92375d7bc.

diff --git a/bgpd/bgp_debug.c b/bgpd/bgp_debug.c
index 0b939f6acabc962d6035dcf9781c8947d4295d4f..48b9205a0acd44f33643873dd9b3b1784b554e6d 100644 (file)
--- a/bgpd/bgp_debug.c
+++ b/bgpd/bgp_debug.c
@@ -2386,7 +2386,7 @@ static int bgp_config_write_debug(struct vty *vty)
 
        if (CONF_BGP_DEBUG(cond_adv, COND_ADV)) {
                vty_out(vty, "debug bgp conditional-advertisement\n");
-               write++;
+               write++
        }
 
        if (CONF_BGP_DEBUG(optimal_route_reflection, ORR)) {

diff --git a/bgpd/bgp_orr.c b/bgpd/bgp_orr.c
index 7fed6b775eadae96d732517e2fc1433ba12a218a..81e6da2449111626419675b95914c816e04fc42d 100644 (file)
--- a/bgpd/bgp_orr.c
+++ b/bgpd/bgp_orr.c
@@ -555,7 +555,7 @@ int peer_orr_group_unset(struct peer *peer, afi_t afi, safi_t safi,
 int bgp_afi_safi_orr_group_set_vty(struct vty *vty, afi_t afi, safi_t safi,
                                   const char *name, const char *primary_str,
                                   const char *secondary_str,
-                                  const char *tertiary_str, bool unset)
+                                  const char *tertiary_str, bool set)
 {
        int ret = CMD_WARNING_CONFIG_FAILED;
        struct bgp *bgp;
@@ -567,7 +567,7 @@ int bgp_afi_safi_orr_group_set_vty(struct vty *vty, afi_t afi, safi_t safi,
                return ret;
        }
 
-       if (unset) {
+       if (!set) {
                ret = bgp_afi_safi_orr_group_unset(bgp, afi, safi, name);
                if (ret != CMD_SUCCESS)
                        vty_out(vty,
@@ -611,7 +611,7 @@ int bgp_afi_safi_orr_group_set_vty(struct vty *vty, afi_t afi, safi_t safi,
 
 /* Set optimal route reflection group name to the peer. */
 int peer_orr_group_set_vty(struct vty *vty, const char *ip_str, afi_t afi,
-                          safi_t safi, const char *orr_group_name, bool unset)
+                          safi_t safi, const char *orr_group_name, bool set)
 {
        int ret = CMD_WARNING_CONFIG_FAILED;
        struct peer *peer;
@@ -626,7 +626,7 @@ int peer_orr_group_set_vty(struct vty *vty, const char *ip_str, afi_t afi,
                return ret;
        }
 
-       if (!unset) {
+       if (set) {
                ret = peer_orr_group_set(peer, afi, safi, orr_group_name);
                if (ret != CMD_SUCCESS)
                        vty_out(vty, "%% ORR Group '%s' is not configured\n",
@@ -763,9 +763,13 @@ bool peer_orr_rrclient_check(struct peer *peer, afi_t afi, safi_t safi)
                return false;
 
        for (ALL_LIST_ELEMENTS_RO(orr_group_list, node, orr_group)) {
-               /* Check if peer configured as primary/secondary/tertiary root
-                */
-               if (is_orr_root_node(orr_group, peer->host))
+               /*Check if peer configured as primary/secondary/tertiary root */
+               if ((orr_group->primary &&
+                    strmatch(peer->host, orr_group->primary->host)) ||
+                   (orr_group->secondary &&
+                    strmatch(peer->host, orr_group->secondary->host)) ||
+                   (orr_group->tertiary &&
+                    strmatch(peer->host, orr_group->tertiary->host)))
                        return true;
                /*
                 * Check if peer is mapped to any ORR Group in this

diff --git a/bgpd/bgp_orr.h b/bgpd/bgp_orr.h
index 158de30342138cc2f2abfff3736e0eea36d0d296..fc9116a52e7c8345fffe6893935e60a90de7764a 100644 (file)
--- a/bgpd/bgp_orr.h
+++ b/bgpd/bgp_orr.h
@@ -67,12 +67,12 @@ extern int bgp_afi_safi_orr_group_set_vty(struct vty *vty, afi_t afi,
                                          safi_t safi, const char *name,
                                          const char *primary_str,
                                          const char *secondary_str,
-                                         const char *tertiary_str, bool unset);
+                                         const char *tertiary_str, bool set);
 extern int peer_orr_group_unset(struct peer *peer, afi_t afi, safi_t safi,
                                const char *orr_group_name);
 extern int peer_orr_group_set_vty(struct vty *vty, const char *ip_str,
                                  afi_t afi, safi_t safi,
-                                 const char *orr_group_name, bool unset);
+                                 const char *orr_group_name, bool set);
 extern bool peer_orr_rrclient_check(struct peer *peer, afi_t afi, safi_t safi);
 
 extern int bgp_show_orr(struct vty *vty, struct bgp *bgp, afi_t afi,

diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index 9724c3533a40d8155117ae3aaaaf8a91bf2f8e12..786f5de078ddebebd7009a6d1352a3926bb6c6ae 100644 (file)
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -6274,7 +6274,7 @@ DEFPY (optimal_route_reflection,
        }
        return bgp_afi_safi_orr_group_set_vty(
                vty, bgp_node_afi(vty), bgp_node_safi(vty), orr_group,
-               primary_str, secondary_str, tertiary_str, !!no);
+               primary_str, secondary_str, tertiary_str, !no);
 }
 
 /* neighbor optimal-route-reflection group*/
@@ -6288,7 +6288,7 @@ DEFPY (neighbor_optimal_route_reflection,
        "ORR group name\n")
 {
        return peer_orr_group_set_vty(vty, neighbor, bgp_node_afi(vty),
-                                     bgp_node_safi(vty), orr_group, !!no);
+                                     bgp_node_safi(vty), orr_group, !no);
 }
 
 /* neighbor route-server-client. */

diff --git a/ospfd/ospf_orr.c b/ospfd/ospf_orr.c
index eed948b1902293c7ef69ba01bd7e6bc123db8677..09dd5970ee573af7e3502f081bfa55ce68aded6e 100644 (file)
--- a/ospfd/ospf_orr.c
+++ b/ospfd/ospf_orr.c
@@ -325,7 +325,7 @@ void ospf_orr_igp_metric_send_update_delete(struct orr_root *root,
        int ret;
        uint8_t count = 0;
        struct route_node *rn;
-       struct ospf_route *or;
+       struct ospf_route *or ;
        struct orr_igp_metric_info msg;
 
        if (!root->old_table)