From f05b613672e506149d5ddd0e0848c6eabec0f96a Mon Sep 17 00:00:00 2001 From: Janusz Dziedzic <janusz.dziedzic@iopsys.eu> Date: Fri, 15 Sep 2023 12:54:51 +0200 Subject: [PATCH] send CSR (all prefered) when adding radio --- src/cntlr.c | 2 ++ src/cntlr_cmdu.c | 2 +- src/cntlr_tlv.c | 6 +++++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/cntlr.c b/src/cntlr.c index a40bdec4..7297fa1a 100644 --- a/src/cntlr.c +++ b/src/cntlr.c @@ -1072,6 +1072,8 @@ struct netif_radio *cntlr_node_add_radio(struct controller *c, struct node *n, allmac_insert(&c->mac_table, radio, MAC_ENTRY_RADIO, (void *)r); + cntrl_send_channel_selection(c, n->alid, radio, 0, 0, 0); + return r; } diff --git a/src/cntlr_cmdu.c b/src/cntlr_cmdu.c index 0731b2db..f96e3a4a 100644 --- a/src/cntlr_cmdu.c +++ b/src/cntlr_cmdu.c @@ -796,7 +796,7 @@ int cntrl_send_channel_selection(struct controller *c, uint8_t *agent, uint8_t * return -1; memcpy(cmdu->origin, agent, 6); - if (cntlr_gen_channel_pref(c, cmdu, radio, opclass, ARRAY_SIZE(chanlist), chanlist, pref)) { + if (cntlr_gen_channel_pref(c, cmdu, radio, opclass, channel ? ARRAY_SIZE(chanlist) : 0, chanlist, pref)) { cmdu_free(cmdu); return -1; } diff --git a/src/cntlr_tlv.c b/src/cntlr_tlv.c index a5a7eeab..27130e17 100644 --- a/src/cntlr_tlv.c +++ b/src/cntlr_tlv.c @@ -1501,7 +1501,7 @@ int cntlr_gen_channel_pref(struct controller *c, struct cmdu_buff *frm, if (!radio->radio_el) return -1; - if (!radio->radio_el->supp_opclass.num_opclass) + if (!radio->radio_el->supp_opclass.num_opclass && channel_nr) return -1; /* Build opclass we would like to send */ @@ -1518,6 +1518,10 @@ int cntlr_gen_channel_pref(struct controller *c, struct cmdu_buff *frm, if (!t) return -1; + /* Prefer all supported - don't include any opclass */ + if (!channel_nr) + opclass.num_opclass = 0; + t->type = MAP_TLV_CHANNEL_PREFERENCE; memcpy(&t->data[offset], radio_id, 6); /* radio id */ -- GitLab