diff options
| author | Maria Matejka <mq@ucw.cz> | 2022-10-12 11:24:23 +0200 |
|---|---|---|
| committer | Maria Matejka <mq@ucw.cz> | 2022-10-12 11:24:23 +0200 |
| commit | c4957647b4b2d763ecf0c3d63f3dccec9188268b (patch) | |
| tree | 337d9aa652325cec1cc05b51c2c6f71686f2e149 /nest | |
| parent | 2b7829734af5717ea2328e330afa8621468f36df (diff) | |
| parent | 4ba991f19c2f8aa893a723f29775c50e1370ed07 (diff) | |
Merge commit '4ba991f1' into thread-next
Diffstat (limited to 'nest')
| -rw-r--r-- | nest/proto.c | 7 | ||||
| -rw-r--r-- | nest/rt-table.c | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/nest/proto.c b/nest/proto.c index e39fbdfe..48558865 100644 --- a/nest/proto.c +++ b/nest/proto.c @@ -624,6 +624,9 @@ channel_export_stopped(struct rt_export_request *req) mb_free(c->out_req.name); c->out_req.name = NULL; + bmap_free(&c->export_map); + bmap_free(&c->export_reject_map); + channel_check_stopped(c); } @@ -751,9 +754,6 @@ channel_do_pause(struct channel *c) rt_stop_export(&c->out_req, channel_export_stopped); channel_roa_unsubscribe_all(c); - - bmap_free(&c->export_map); - bmap_free(&c->export_reject_map); } static void @@ -778,7 +778,6 @@ channel_do_down(struct channel *c) c->proto->active_channels--; - // bmap_free(&c->export_map); memset(&c->import_stats, 0, sizeof(struct channel_import_stats)); memset(&c->export_stats, 0, sizeof(struct channel_export_stats)); diff --git a/nest/rt-table.c b/nest/rt-table.c index dad5d0cc..8980f147 100644 --- a/nest/rt-table.c +++ b/nest/rt-table.c @@ -799,7 +799,7 @@ export_filter(struct channel *c, rte *rt, int silent) stats->updates_rejected++; if (v == RIC_REJECT) channel_rte_trace_out(D_FILTERS, c, rt, "rejected by protocol"); - goto reject_noset; + goto reject; } if (v > 0) |