From 73ace6acad0b434849e0a9cd51603cd49c136cb3 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 11 Dec 2024 10:05:05 +0100
Subject: [PATCH] Proto show: show creation and last autorestart time

---
 nest/proto.c    | 41 +++++++++++++++++++++++++++++++----------
 nest/protocol.h |  1 +
 2 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/nest/proto.c b/nest/proto.c
index 5a46514b..1029957a 100644
--- a/nest/proto.c
+++ b/nest/proto.c
@@ -1334,6 +1334,7 @@ proto_new(struct proto_config *cf)
   p->proto = cf->protocol;
   p->proto_state = PS_DOWN_XX;
   p->last_state_change = current_time();
+  p->last_reconfiguration = current_time();
 
   p->net_type = cf->net_type;
   p->disabled = cf->disabled;
@@ -2183,14 +2184,17 @@ proto_restart_event_hook(void *_p)
   proto_rethink_goal(p);
 
   if (proto_restart)
-    if (current_time_now() - p->last_restart < p->restart_limit)
-      log(L_ERR "%s: too frequent restarts, disabling", p->name);
-    else
-      p->disabled = 0;
+  {
+    /* Store the last restart time */
+    p->last_restart = current_time();
+
+    /* Allow the protocol back again */
+    p->disabled = 0;
 
     /* No need to call proto_rethink_goal() here again as the proto_cleanup() routine will
      * call it after the protocol stops ... and both these routines are fixed to main_birdloop.
      */
+  }
 }
 
 static inline void
@@ -2306,8 +2310,16 @@ channel_limit_down(struct limit *l, void *data)
 
   channel_activate_limit(c, l, dir);
 
+  bool restart = (c->limit_actions[dir] == PLA_RESTART);
+
+  if (restart && (current_time_now() - p->last_restart < p->restart_limit))
+  {
+    log(L_ERR "%s: too frequent restarts, disabling", p->name);
+    restart = false;
+  }
+
   if (p->proto_state == PS_UP)
-    proto_schedule_down(p, c->limit_actions[dir] == PLA_RESTART, chl_dir_down[dir]);
+    proto_schedule_down(p, restart, chl_dir_down[dir]);
 
   return 1;
 }
@@ -2619,8 +2631,10 @@ proto_cmd_show(struct proto *p, uintptr_t verbose, int cnt)
     p->proto->get_status(p, buf);
 
   rcu_read_lock();
-  tm_format_time(tbuf, this_cli->tf ?: &atomic_load_explicit(&global_runtime, memory_order_acquire)->tf_proto, p->last_state_change);
+  struct timeformat *tf = this_cli->tf ?: &atomic_load_explicit(&global_runtime, memory_order_acquire)->tf_proto;
   rcu_read_unlock();
+
+  tm_format_time(tbuf, tf, p->last_state_change);
   cli_msg(-1002, "%-10s %-10s %-10s %-6s %-12s  %s",
 	  p->name,
 	  p->proto->name,
@@ -2632,13 +2646,20 @@ proto_cmd_show(struct proto *p, uintptr_t verbose, int cnt)
   if (verbose)
   {
     if (p->cf->dsc)
-      cli_msg(-1006, "  Description:    %s", p->cf->dsc);
+      cli_msg(-1006, "  Description:        %s", p->cf->dsc);
     if (p->message)
-      cli_msg(-1006, "  Message:        %s", p->message);
+      cli_msg(-1006, "  Message:            %s", p->message);
+    tm_format_time(tbuf, tf, p->last_reconfiguration);
+    cli_msg(-1006, "  Created:            %s", tbuf);
+    if (p->last_restart > p->last_reconfiguration)
+    {
+      tm_format_time(tbuf, tf, p->last_restart);
+      cli_msg(-1006, "  Last autorestart:   %s", tbuf);
+    }
     if (p->cf->router_id)
-      cli_msg(-1006, "  Router ID:      %R", p->cf->router_id);
+      cli_msg(-1006, "  Router ID:          %R", p->cf->router_id);
     if (p->vrf)
-      cli_msg(-1006, "  VRF:            %s", p->vrf->name);
+      cli_msg(-1006, "  VRF:                %s", p->vrf->name);
 
     if (p->proto->show_proto_info)
       p->proto->show_proto_info(p);
diff --git a/nest/protocol.h b/nest/protocol.h
index 171a0a5b..5e1098c2 100644
--- a/nest/protocol.h
+++ b/nest/protocol.h
@@ -170,6 +170,7 @@ struct proto {
   u32 hash_key;				/* Random key used for hashing of neighbors */
   btime last_state_change;		/* Time of last state transition */
   btime last_restart;			/* Time of last restart */
+  btime last_reconfiguration;		/* Time of last hard reconfiguration */
   btime restart_limit;			/* Minimum allowed time between limit restarts */
   char *last_state_name_announced;	/* Last state name we've announced to the user */
   char *message;			/* State-change message, allocated from proto_pool */