diff options
| author | Ondrej Zajicek <santiago@crfreenet.org> | 2009-11-09 22:54:39 +0100 |
|---|---|---|
| committer | Ondrej Zajicek <santiago@crfreenet.org> | 2009-11-09 22:54:39 +0100 |
| commit | 3f22fa9e74c8643d3e4f7e3a7b4f2aa992ad09f5 (patch) | |
| tree | 703e2606e1f01118098ad662f0ecc54c0c48fcd6 /nest/proto.c | |
| parent | a6bc04d59130c49a1dbfadffa4285b11e2ff4939 (diff) | |
| parent | b7c0e93ebd40cdc4f6e89067a3e5f7293263c7f9 (diff) | |
| download | bird-3f22fa9e74c8643d3e4f7e3a7b4f2aa992ad09f5.tar bird-3f22fa9e74c8643d3e4f7e3a7b4f2aa992ad09f5.zip | |
Merge branch 'dev' into ospf3
Diffstat (limited to 'nest/proto.c')
| -rw-r--r-- | nest/proto.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/nest/proto.c b/nest/proto.c index 2af077b..7bb1286 100644 --- a/nest/proto.c +++ b/nest/proto.c @@ -313,6 +313,7 @@ protos_commit(struct config *new, struct config *old, int force_reconfig, int ty && nc->preference == oc->preference && nc->disabled == oc->disabled && nc->table->table == oc->table->table + && proto_get_router_id(nc) == proto_get_router_id(oc) && ((type == RECONFIG_SOFT) || filter_same(nc->in_filter, oc->in_filter)) && ((type == RECONFIG_SOFT) || filter_same(nc->out_filter, oc->out_filter)) && p->proto_state != PS_DOWN) @@ -515,7 +516,9 @@ static void proto_fell_down(struct proto *p) { DBG("Protocol %s down\n", p->name); - ASSERT(p->stats.imp_routes == 0); + + if (p->stats.imp_routes != 0) + log(L_ERR "Protocol %s is down but still has %d routes", p->name, p->stats.imp_routes); bzero(&p->stats, sizeof(struct proto_stats)); rt_unlock_table(p->table); |