Jerry/bird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

OSPF: Fix formatting of 'show ospf neighbors'

Browse source 
The formatting was broken when too short router-id was used.
This commit is contained in:
Ondrej Zajicek (work) 2019-07-23 17:02:41 +02:00
parent 15b0a92294
commit 048c2f0e8c
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
proto/ospf/neighbor.c
View file

@ -857,7 +857,7 @@ ospf_sh_neigh_info(struct ospf_neighbor *n)
pos = "Other"; pos = "Other";
} }
cli_msg(-1013, "%-1R\t%3u\t%s/%s\t%7t\t%-10s %-1I", cli_msg(-1013, "%-12R\t%3u\t%s/%s\t%6t\t%-10s %I",
n->rid, n->priority, ospf_ns_names[n->state], pos, n->rid, n->priority, ospf_ns_names[n->state], pos,
tm_remains(n->inactim), ifa->ifname, n->ip); tm_remains(n->inactim), ifa->ifname, n->ip);
} }

2
proto/ospf/ospf.c
View file

@ -805,7 +805,7 @@ ospf_sh_neigh(struct proto *P, char *iff)
} }
cli_msg(-1013, "%s:", p->p.name); cli_msg(-1013, "%s:", p->p.name);
cli_msg(-1013, "%-12s\t%3s\t%-15s\t%-5s\t%-10s %-12s", "Router ID", "Pri", cli_msg(-1013, "%-12s\t%3s\t%-15s\t%-5s\t%-10s %s", "Router ID", "Pri",
" State", "DTime", "Interface", "Router IP"); " State", "DTime", "Interface", "Router IP");
WALK_LIST(ifa, p->iface_list) WALK_LIST(ifa, p->iface_list)
if ((iff == NULL) || patmatch(iff, ifa->ifname)) if ((iff == NULL) || patmatch(iff, ifa->ifname))