Merge pull request #14463 from mjstapp/fix_bgp_ctime_r

bgpd: fix return of local from ctime_r
FRRouting · Sep 22, 2023 · f327f2e · f327f2e
2 parents 45c2d51 + 8f338b1
commit f327f2e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/bgpd/bgp_updgrp.c b/bgpd/bgp_updgrp.c
@@ -734,7 +734,8 @@ static int update_group_show_walkcb(struct update_group *updgrp, void *arg)
 				       safi2str(updgrp->safi));
 	} else {
 		vty_out(vty, "Update-group %" PRIu64 ":\n", updgrp->id);
-		vty_out(vty, "  Created: %s", timestamp_string(updgrp->uptime));
+		vty_out(vty, "  Created: %s",
+			timestamp_string(updgrp->uptime, timebuf));
 	}
 
 	filter = &updgrp->conf->filter[updgrp->afi][updgrp->safi];
@@ -803,7 +804,7 @@ static int update_group_show_walkcb(struct update_group *updgrp, void *arg)
 			vty_out(vty, "  Update-subgroup %" PRIu64 ":\n",
 				subgrp->id);
 			vty_out(vty, "    Created: %s",
-				timestamp_string(subgrp->uptime));
+				timestamp_string(subgrp->uptime, timebuf));
 		}
 
 		if (subgrp->split_from.update_group_id

diff --git a/bgpd/bgpd.h b/bgpd/bgpd.h
@@ -2595,10 +2595,9 @@ static inline int peer_group_af_configured(struct peer_group *group)
 	return 0;
 }
 
-static inline char *timestamp_string(time_t ts)
+static inline char *timestamp_string(time_t ts, char *timebuf)
 {
 	time_t tbuf;
-	char timebuf[32];
 
 	tbuf = time(NULL) - (monotime(NULL) - ts);
 	return ctime_r(&tbuf, timebuf);