diff options
| author | Ondrej Zajicek (work) <santiago@crfreenet.org> | 2021-06-17 16:56:51 +0200 |
|---|---|---|
| committer | Ondrej Zajicek (work) <santiago@crfreenet.org> | 2021-06-17 16:56:51 +0200 |
| commit | f761be6b30633054a54369eee7d08b951a366e5e (patch) | |
| tree | 9ecf47c42ae7542ba33515c38913d6126819bd1f /proto/ospf | |
| parent | 1b9bf4e192a252db861acadc7f800d7046435a3f (diff) | |
Nest: Clean up main channel handling
Remove assumption that main channel is the only channel.
Diffstat (limited to 'proto/ospf')
| -rw-r--r-- | proto/ospf/config.Y | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/proto/ospf/config.Y b/proto/ospf/config.Y index fd2cfe8a..4b7d5a36 100644 --- a/proto/ospf/config.Y +++ b/proto/ospf/config.Y @@ -85,7 +85,7 @@ ospf_proto_finish(void) struct ospf_iface_patt *ic; /* Define default channel */ - if (EMPTY_LIST(this_proto->channels)) + if (! proto_cf_main_channel(this_proto)) { uint net_type = this_proto->net_type = ospf_cfg_is_v2() ? NET_IP4 : NET_IP6; channel_config_new(NULL, net_label[net_type], net_type, this_proto); @@ -248,8 +248,7 @@ ospf_channel_start: net_type ospf_af_mc $$ = this_channel = channel_config_get(NULL, net_label[$1], $1, this_proto); /* Save the multicast flag */ - if (this_channel == proto_cf_main_channel(this_proto)) - OSPF_CFG->af_mc = $2; + OSPF_CFG->af_mc = $2; }; ospf_channel: ospf_channel_start channel_opt_list channel_end; |