proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-13 21:10:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

zebra: Allow 'show ip route...' to display uptime for all routes

Browse Source 
Display uptime for all route types instead of just for RIP,
OSPFv2, ISIS, NHRP, TABLE? and BGP routes.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2017-09-12 14:58:10 -04:00
parent eaf5150f58
commit 14a481d916
1 changed files with 44 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

114
zebra/zebra_vty.c
View File

@ -408,32 +408,26 @@ static void vty_show_ip_route_detail(struct vty *vty, struct route_node *rn,
vty_out(vty, ", best"); vty_out(vty, ", best");
vty_out(vty, "\n"); vty_out(vty, "\n");
if (re->type == ZEBRA_ROUTE_RIP || re->type == ZEBRA_ROUTE_OSPF time_t uptime;
|| re->type == ZEBRA_ROUTE_ISIS struct tm *tm;
|| re->type == ZEBRA_ROUTE_NHRP
|| re->type == ZEBRA_ROUTE_TABLE
|| re->type == ZEBRA_ROUTE_BGP) {
time_t uptime;
struct tm *tm;
uptime = time(NULL); uptime = time(NULL);
uptime -= re->uptime; uptime -= re->uptime;
tm = gmtime(&uptime); tm = gmtime(&uptime);
vty_out(vty, " Last update "); vty_out(vty, " Last update ");
if (uptime < ONE_DAY_SECOND) if (uptime < ONE_DAY_SECOND)
vty_out(vty, "%02d:%02d:%02d", tm->tm_hour, vty_out(vty, "%02d:%02d:%02d", tm->tm_hour,
tm->tm_min, tm->tm_sec); tm->tm_min, tm->tm_sec);
else if (uptime < ONE_WEEK_SECOND) else if (uptime < ONE_WEEK_SECOND)
vty_out(vty, "%dd%02dh%02dm", tm->tm_yday, vty_out(vty, "%dd%02dh%02dm", tm->tm_yday,
tm->tm_hour, tm->tm_min); tm->tm_hour, tm->tm_min);
else else
vty_out(vty, "%02dw%dd%02dh", tm->tm_yday / 7, vty_out(vty, "%02dw%dd%02dh", tm->tm_yday / 7,
tm->tm_yday - ((tm->tm_yday / 7) * 7), tm->tm_yday - ((tm->tm_yday / 7) * 7),
tm->tm_hour); tm->tm_hour);
vty_out(vty, " ago\n"); vty_out(vty, " ago\n");
}
for (ALL_NEXTHOPS(re->nexthop, nexthop)) { for (ALL_NEXTHOPS(re->nexthop, nexthop)) {
char addrstr[32]; char addrstr[32];
@ -557,6 +551,12 @@ static void vty_show_ip_route(struct vty *vty, struct route_node *rn,
json_object *json_nexthop = NULL; json_object *json_nexthop = NULL;
json_object *json_route = NULL; json_object *json_route = NULL;
json_object *json_labels = NULL; json_object *json_labels = NULL;
time_t uptime;
struct tm *tm;
uptime = time(NULL);
uptime -= re->uptime;
tm = gmtime(&uptime);
if (json) { if (json) {
json_route = json_object_new_object(); json_route = json_object_new_object();
@ -583,31 +583,18 @@ static void vty_show_ip_route(struct vty *vty, struct route_node *rn,
json_object_int_add(json_route, "metric", re->metric); json_object_int_add(json_route, "metric", re->metric);
} }
if (re->type == ZEBRA_ROUTE_RIP || re->type == ZEBRA_ROUTE_OSPF if (uptime < ONE_DAY_SECOND)
|| re->type == ZEBRA_ROUTE_ISIS sprintf(buf, "%02d:%02d:%02d", tm->tm_hour,
|| re->type == ZEBRA_ROUTE_NHRP tm->tm_min, tm->tm_sec);
|| re->type == ZEBRA_ROUTE_TABLE else if (uptime < ONE_WEEK_SECOND)
|| re->type == ZEBRA_ROUTE_BGP) { sprintf(buf, "%dd%02dh%02dm", tm->tm_yday,
time_t uptime; tm->tm_hour, tm->tm_min);
struct tm *tm; else
sprintf(buf, "%02dw%dd%02dh", tm->tm_yday / 7,
tm->tm_yday - ((tm->tm_yday / 7) * 7),
tm->tm_hour);
uptime = time(NULL); json_object_string_add(json_route, "uptime", buf);
uptime -= re->uptime;
tm = gmtime(&uptime);
if (uptime < ONE_DAY_SECOND)
sprintf(buf, "%02d:%02d:%02d", tm->tm_hour,
tm->tm_min, tm->tm_sec);
else if (uptime < ONE_WEEK_SECOND)
sprintf(buf, "%dd%02dh%02dm", tm->tm_yday,
tm->tm_hour, tm->tm_min);
else
sprintf(buf, "%02dw%dd%02dh", tm->tm_yday / 7,
tm->tm_yday - ((tm->tm_yday / 7) * 7),
tm->tm_hour);
json_object_string_add(json_route, "uptime", buf);
}
for (ALL_NEXTHOPS(re->nexthop, nexthop)) { for (ALL_NEXTHOPS(re->nexthop, nexthop)) {
json_nexthop = json_object_new_object(); json_nexthop = json_object_new_object();
@ -876,29 +863,16 @@ static void vty_show_ip_route(struct vty *vty, struct route_node *rn,
sizeof buf, 1)); sizeof buf, 1));
} }
if (re->type == ZEBRA_ROUTE_RIP || re->type == ZEBRA_ROUTE_OSPF if (uptime < ONE_DAY_SECOND)
|| re->type == ZEBRA_ROUTE_ISIS vty_out(vty, ", %02d:%02d:%02d", tm->tm_hour,
|| re->type == ZEBRA_ROUTE_NHRP tm->tm_min, tm->tm_sec);
|| re->type == ZEBRA_ROUTE_TABLE else if (uptime < ONE_WEEK_SECOND)
|| re->type == ZEBRA_ROUTE_BGP) { vty_out(vty, ", %dd%02dh%02dm", tm->tm_yday,
time_t uptime; tm->tm_hour, tm->tm_min);
struct tm *tm; else
vty_out(vty, ", %02dw%dd%02dh", tm->tm_yday / 7,
uptime = time(NULL); tm->tm_yday - ((tm->tm_yday / 7) * 7),
uptime -= re->uptime; tm->tm_hour);
tm = gmtime(&uptime);
if (uptime < ONE_DAY_SECOND)
vty_out(vty, ", %02d:%02d:%02d", tm->tm_hour,
tm->tm_min, tm->tm_sec);
else if (uptime < ONE_WEEK_SECOND)
vty_out(vty, ", %dd%02dh%02dm", tm->tm_yday,
tm->tm_hour, tm->tm_min);
else
vty_out(vty, ", %02dw%dd%02dh", tm->tm_yday / 7,
tm->tm_yday - ((tm->tm_yday / 7) * 7),
tm->tm_hour);
}
vty_out(vty, "\n"); vty_out(vty, "\n");
} }
} }