Commit 3e17e380 authored by Ondrej Zajicek's avatar Ondrej Zajicek
Browse files

Merge branch 'master' into rt-accepted

parents 00a09f3c ae8b3001

proto/static/static.c

+3 −0
Original line number Diff line number Diff line
@@ -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;

sysdep/unix/main.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE