mirrors/bird
mirrors/bird
0
0
Fork 0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2024-12-22 17:51:53 +00:00
Code Releases Activity

rt-show.c: fixed OBSREF_SET after cf_error(), changed message when 'show route export' called on static protocol

Browse Source
This commit is contained in:
Katerina Kubecova 2024-11-19 10:33:49 +01:00 committed by Maria Matejka
parent 3f4332f0bd
commit 99fa1f01a4
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nest/config.Y
View File

@ -735,7 +735,6 @@ r_args:
$$ = cfg_allocz(sizeof(struct rt_show_data)); $$ = cfg_allocz(sizeof(struct rt_show_data));
init_list(&($$->tables)); init_list(&($$->tables));
$$->filter = FILTER_ACCEPT; $$->filter = FILTER_ACCEPT;
OBSREF_SET($$->running_on_config, this_cli->main_config);
$$->cli = this_cli; $$->cli = this_cli;
$$->tf_route = this_cli->main_config->tf_route; $$->tf_route = this_cli->main_config->tf_route;
} }

13
nest/rt-show.c
View File

@ -361,14 +361,22 @@ rt_show_get_default_tables(struct rt_show_data *d)
if (d->export_protocol) if (d->export_protocol)
{ {
int seen_only_export_down = 1;
int tab_found = 0;
WALK_LIST(c, d->export_protocol->channels) WALK_LIST(c, d->export_protocol->channels)
{ {
tab_found = 1;
if (rt_export_get_state(&c->out_req) == TES_DOWN) if (rt_export_get_state(&c->out_req) == TES_DOWN)
continue; continue;
seen_only_export_down = 0;
tab = rt_show_add_table(d, c->table); tab = rt_show_add_table(d, c->table);
tab->export_channel = c; tab->export_channel = c;
} }
if (tab_found && seen_only_export_down)
cf_error("Requested 'show route export' to protocols which aren't accepting exports at all.");
return; return;
} }
@ -460,6 +468,11 @@ rt_show(struct rt_show_data *d)
d->tab = HEAD(d->tables); d->tab = HEAD(d->tables);
/* OBSREF_SET should not be called sooner than the last cf_error() may occur.
If cf_error() called after OBSREF_SET, the crreated obstacle may not be removed at all.
(cf_error() contains long jump.) */
OBSREF_SET(d->running_on_config, this_cli->main_config);
this_cli->cleanup = rt_show_cleanup; this_cli->cleanup = rt_show_cleanup;
this_cli->rover = d; this_cli->rover = d;
this_cli->cont = rt_show_cont; this_cli->cont = rt_show_cont;