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/radv | |
| parent | 1b9bf4e192a252db861acadc7f800d7046435a3f (diff) | |
Nest: Clean up main channel handling
Remove assumption that main channel is the only channel.
Diffstat (limited to 'proto/radv')
| -rw-r--r-- | proto/radv/config.Y | 1 | ||||
| -rw-r--r-- | proto/radv/radv.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/proto/radv/config.Y b/proto/radv/config.Y index dda9cfcd..8d4a3ab9 100644 --- a/proto/radv/config.Y +++ b/proto/radv/config.Y @@ -46,6 +46,7 @@ proto: radv_proto ; radv_proto_start: proto_start RADV { this_proto = proto_config_new(&proto_radv, $1); + this_proto->net_type = NET_IP6; init_list(&RADV_CFG->patt_list); init_list(&RADV_CFG->pref_list); diff --git a/proto/radv/radv.c b/proto/radv/radv.c index b4235917..66e8eb4b 100644 --- a/proto/radv/radv.c +++ b/proto/radv/radv.c @@ -564,7 +564,7 @@ radv_postconfig(struct proto_config *CF) // struct radv_config *cf = (void *) CF; /* Define default channel */ - if (EMPTY_LIST(CF->channels)) + if (! proto_cf_main_channel(CF)) channel_config_new(NULL, net_label[NET_IP6], NET_IP6, CF); } |