bgpd: Set last reset reason to admin shutdown if it was manually

Before this patch, we always printed the last reason "Waiting for OPEN", but
if it's a manual shutdown, then we technically are not waiting for OPEN.

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

diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index cd7ff6e9afe5ea853dad4f48afc5e8d4a41a6cd4..6cbb0ef66f7f809404ba0bb6c67f5fb0db469f7c 100644 (file)
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -11081,7 +11081,8 @@ static void bgp_show_peer_reset(struct vty * vty, struct peer *peer,
                } else {
                        vty_out(vty, " %s (%s)\n",
                                peer_down_str[(int)peer->last_reset],
-                               peer->soft_version ? peer->soft_version : "n/a");
+                               peer->soft_version ? peer->soft_version
+                                                  : "n/a");
                }
        }
 }

diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
index c13cfd55c538a640ac404a12bffdf268acf57a3d..bce23930454bf9b7502ffe3aee32131501e726a5 100644 (file)
--- a/bgpd/bgpd.c
+++ b/bgpd/bgpd.c
@@ -4645,6 +4645,8 @@ void bgp_shutdown_enable(struct bgp *bgp, const char *msg)
 
        /* iterate through peers of BGP instance */
        for (ALL_LIST_ELEMENTS_RO(bgp->peer, node, peer)) {
+               peer->last_reset = PEER_DOWN_USER_SHUTDOWN;
+
                /* continue, if peer is already in administrative shutdown. */
                if (CHECK_FLAG(peer->flags, PEER_FLAG_SHUTDOWN))
                        continue;
@@ -4699,8 +4701,10 @@ void bgp_shutdown_disable(struct bgp *bgp)
        /* clear the BGP instances shutdown flag */
        UNSET_FLAG(bgp->flags, BGP_FLAG_SHUTDOWN);
 
-       for (ALL_LIST_ELEMENTS_RO(bgp->peer, node, peer))
+       for (ALL_LIST_ELEMENTS_RO(bgp->peer, node, peer)) {
                bgp_timer_set(peer);
+               peer->last_reset = PEER_DOWN_WAITING_OPEN;
+       }
 }
 
 /* Change specified peer flag. */
@@ -4772,6 +4776,10 @@ static int peer_flag_modify(struct peer *peer, uint64_t flag, int set)
                                bgp_zebra_terminate_radv(peer->bgp, peer);
                }
 
+               if (flag == PEER_FLAG_SHUTDOWN)
+                       peer->last_reset = set ? PEER_DOWN_USER_SHUTDOWN
+                                              : PEER_DOWN_WAITING_OPEN;
+
                /* Execute flag action on peer. */
                if (action.type == peer_change_reset)
                        peer_flag_modify_action(peer, flag);
@@ -4807,6 +4815,10 @@ static int peer_flag_modify(struct peer *peer, uint64_t flag, int set)
                        set ? bgp_zebra_initiate_radv(member->bgp, member)
                            : bgp_zebra_terminate_radv(member->bgp, member);
 
+               if (flag == PEER_FLAG_SHUTDOWN)
+                       member->last_reset = set ? PEER_DOWN_USER_SHUTDOWN
+                                                : PEER_DOWN_WAITING_OPEN;
+
                /* Execute flag action on peer-group member. */
                if (action.type == peer_change_reset)
                        peer_flag_modify_action(member, flag);