bgpd: update BFD config on update-source change

[mirror_frr.git] / bgpd / bgp_updgrp.c

diff --git a/bgpd/bgp_updgrp.c b/bgpd/bgp_updgrp.c
index 2600eda42eb27083993f0377851e74536e8a14c9..dd3309dad9c7b61242d3b1af2e0e70d7fce81a1d 100644 (file)
--- a/bgpd/bgp_updgrp.c
+++ b/bgpd/bgp_updgrp.c
@@ -339,6 +339,7 @@ static unsigned int updgrp_hash_key_make(const void *p)
                          key);
        key = jhash_1word(peer->v_routeadv, key);
        key = jhash_1word(peer->change_local_as, key);
+       key = jhash_1word(peer->max_packet_size, key);
 
        if (peer->group)
                key = jhash_1word(jhash(peer->group->name,
@@ -572,6 +573,7 @@ static int update_group_show_walkcb(struct update_group *updgrp, void *arg)
        struct update_subgroup *subgrp;
        struct peer_af *paf;
        struct bgp_filter *filter;
+       struct peer *peer = UPDGRP_PEER(updgrp);
        int match = 0;
 
        if (!ctx)
@@ -663,6 +665,9 @@ static int update_group_show_walkcb(struct update_group *updgrp, void *arg)
                        CHECK_FLAG(subgrp->flags, SUBGRP_FLAG_NEEDS_REFRESH)
                                ? "R"
                                : "");
+               if (peer)
+                       vty_out(vty, "    Max packet size: %d\n",
+                               peer->max_packet_size);
                if (subgrp->peer_count > 0) {
                        vty_out(vty, "    Peers:\n");
                        SUBGRP_FOREACH_PEER (subgrp, paf)
@@ -1705,13 +1710,13 @@ int update_group_adjust_soloness(struct peer *peer, int set)
 
        if (!CHECK_FLAG(peer->sflags, PEER_STATUS_GROUP)) {
                peer_lonesoul_or_not(peer, set);
-               if (peer->status == Established)
+               if (peer_established(peer))
                        bgp_announce_route_all(peer);
        } else {
                group = peer->group;
                for (ALL_LIST_ELEMENTS(group->peer, node, nnode, peer)) {
                        peer_lonesoul_or_not(peer, set);
-                       if (peer->status == Established)
+                       if (peer_established(peer))
                                bgp_announce_route_all(peer);
                }
        }
@@ -1901,7 +1906,7 @@ void subgroup_trigger_write(struct update_subgroup *subgrp)
         * will trigger a write job on the I/O thread.
         */
        SUBGRP_FOREACH_PEER (subgrp, paf)
-               if (paf->peer->status == Established)
+               if (peer_established(paf->peer))
                        thread_add_timer_msec(
                                bm->master, bgp_generate_updgrp_packets,
                                paf->peer, 0,