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

Merge branch 'master' into rt-accepted

Browse source
This commit is contained in:
Ondrej Zajicek 2012-04-15 15:17:03 +02:00
commit 3e17e38059
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
proto/static/static.c
View file

@ -224,6 +224,9 @@ static_start(struct proto *p)
if (cf->igp_table) if (cf->igp_table)
rt_lock_table(cf->igp_table->table); rt_lock_table(cf->igp_table->table);
/* We have to go UP before routes could be installed */
proto_notify_state(p, PS_UP);
WALK_LIST(r, cf->other_routes) WALK_LIST(r, cf->other_routes)
static_add(p, cf, r); static_add(p, cf, r);
return PS_UP; return PS_UP;

2
sysdep/unix/main.c
View file

@ -269,7 +269,7 @@ cmd_reconfig(char *name, int type)
if (!unix_read_config(&conf, name)) if (!unix_read_config(&conf, name))
{ {
if (conf->err_msg) if (conf->err_msg)
cli_msg(8002, "%s, line %d: %s", name, conf->err_lino, conf->err_msg); cli_msg(8002, "%s, line %d: %s", conf->err_file_name, conf->err_lino, conf->err_msg);
else else
cli_msg(8002, "%s: %m", name); cli_msg(8002, "%s: %m", name);
config_free(conf); config_free(conf);