Nest: Fix filter reconfiguration

Function filter_same() must be called with arguments in proper order,
otherwise it breaks the new filter, causing crash during route
processing.
This commit is contained in:
Ondrej Zajicek (work) 2018-01-09 14:36:11 +01:00
parent 8f8671bcde
commit 94f9be80c3

View file

@ -513,8 +513,9 @@ channel_reconfigure(struct channel *c, struct channel_config *cf)
if ((c->table != cf->table->table) || (cf->ra_mode && (c->ra_mode != cf->ra_mode))) if ((c->table != cf->table->table) || (cf->ra_mode && (c->ra_mode != cf->ra_mode)))
return 0; return 0;
int import_changed = !filter_same(c->in_filter, cf->in_filter); /* Note that filter_same() requires arguments in (new, old) order */
int export_changed = !filter_same(c->out_filter, cf->out_filter); int import_changed = !filter_same(cf->in_filter, c->in_filter);
int export_changed = !filter_same(cf->out_filter, c->out_filter);
if (c->preference != cf->preference) if (c->preference != cf->preference)
import_changed = 1; import_changed = 1;