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

Adds asterisk to the primary route in 'show route' cmd.

Browse source 
And also fixes a minor bug.
This commit is contained in:
Ondrej Zajicek 2010-02-08 12:42:09 +01:00
parent aa80826e4a
commit 5a56f27cd0
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
nest/proto.c
View file

@ -311,6 +311,7 @@ proto_reconfigure(struct proto *p, struct proto_config *oc, struct proto_config
p->name = nc->name; p->name = nc->name;
p->in_filter = nc->in_filter; p->in_filter = nc->in_filter;
p->out_filter = nc->out_filter; p->out_filter = nc->out_filter;
p->preference = nc->preference;
if (import_changed || export_changed) if (import_changed || export_changed)
log(L_INFO "Reloading protocol %s", p->name); log(L_INFO "Reloading protocol %s", p->name);

4
nest/rt-table.c
View file

@ -1116,6 +1116,7 @@ rt_show_rte(struct cli *c, byte *ia, rte *e, struct rt_show_data *d, ea_list *tm
byte via[STD_ADDRESS_P_LENGTH+32], from[STD_ADDRESS_P_LENGTH+6]; byte via[STD_ADDRESS_P_LENGTH+32], from[STD_ADDRESS_P_LENGTH+6];
byte tm[TM_DATETIME_BUFFER_SIZE], info[256]; byte tm[TM_DATETIME_BUFFER_SIZE], info[256];
rta *a = e->attrs; rta *a = e->attrs;
int primary = (e->net->routes == e);
rt_format_via(e, via); rt_format_via(e, via);
tm_format_datetime(tm, &config->tf_route, e->lastmod); tm_format_datetime(tm, &config->tf_route, e->lastmod);
@ -1136,7 +1137,8 @@ rt_show_rte(struct cli *c, byte *ia, rte *e, struct rt_show_data *d, ea_list *tm
a->proto->proto->get_route_info(e, info, tmpa); a->proto->proto->get_route_info(e, info, tmpa);
else else
bsprintf(info, " (%d)", e->pref); bsprintf(info, " (%d)", e->pref);
cli_printf(c, -1007, "%-18s %s [%s %s%s]%s", ia, via, a->proto->name, tm, from, info); cli_printf(c, -1007, "%-18s %s [%s %s%s]%s%s", ia, via, a->proto->name,
tm, from, primary ? " *" : "", info);
if (d->verbose) if (d->verbose)
rta_show(c, a, tmpa); rta_show(c, a, tmpa);
} }