From ed7c4b0cd530126b9a794f817f5d1d93556a1bce Mon Sep 17 00:00:00 2001 From: Ondrej Filip Date: Mon, 9 Apr 2012 14:19:28 +0200 Subject: [PATCH 1/2] Small bugfix in error message related to reconfiguration. --- sysdep/unix/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sysdep/unix/main.c b/sysdep/unix/main.c index 9219da9b..dfe0b89c 100644 --- a/sysdep/unix/main.c +++ b/sysdep/unix/main.c @@ -269,7 +269,7 @@ cmd_reconfig(char *name, int type) if (!unix_read_config(&conf, name)) { 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 cli_msg(8002, "%s: %m", name); config_free(conf); From d360f129e393298ff3e5309ec06a3baf170784fb Mon Sep 17 00:00:00 2001 From: Ondrej Zajicek Date: Sun, 15 Apr 2012 15:13:12 +0200 Subject: [PATCH 2/2] Fix static protocol w.r.t. some recent changes in protocol ahooks. --- proto/static/static.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/proto/static/static.c b/proto/static/static.c index aaa9bfad..6a027f50 100644 --- a/proto/static/static.c +++ b/proto/static/static.c @@ -224,6 +224,9 @@ static_start(struct proto *p) if (cf->igp_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) static_add(p, cf, r); return PS_UP;