diff --git a/gitlab-ci/install-dependencies.sh b/gitlab-ci/install-dependencies.sh index b3217faa1dc5bd7e5d2930afcb503c577d399bd5..d3ac021e96fb50d26a517cf66ee5bcc70f796afc 100755 --- a/gitlab-ci/install-dependencies.sh +++ b/gitlab-ci/install-dependencies.sh @@ -47,7 +47,7 @@ exec_cmd cp wifimngr /usr/sbin/ cd /opt/dev export CFLAGS="${CFLAGS} -g -Wall -g -O0 -DHAS_WIFI -DDYNAMIC_CNTLR_SYNC_CONFIG" rm -fr ieee1905 -exec_cmd git clone --depth 1 -b devel https://dev.iopsys.eu/iopsys/ieee1905.git +exec_cmd git clone --depth 1 -b release-6.5 https://dev.iopsys.eu/iopsys/ieee1905.git cd ieee1905 exec_cmd ./gitlab-ci/install-dependencies.sh exec_cmd ./gitlab-ci/setup.sh @@ -68,7 +68,6 @@ exec_cmd cp -a extensions/map/map.so /usr/lib exec_cmd cp -a extensions/map/map_module.h /usr/include/ exec_cmd cp -a extensions/map/map2.h /usr/include/ exec_cmd cp -a extensions/map/cntlrsync.h /usr/include/ -exec_cmd cp -a extensions/map/easymesh.h /usr/include/ ldconfig diff --git a/src/config.c b/src/config.c index 328305a768d2ef6085b3a17ddd5ca3e00dd93861..e136b7d58ccb988fc4b47199530d6a0f7a1f7fcb 100644 --- a/src/config.c +++ b/src/config.c @@ -1062,6 +1062,8 @@ static int cntlr_config_get_agent_node(struct controller_config *c, { .name = "backhaul_ul_macaddr", .type = UCI_TYPE_STRING }, { .name = "backhaul_dl_macaddr", .type = UCI_TYPE_STRING }, { .name = "backhaul_type", .type = UCI_TYPE_STRING }, + { .name = "primary_vid", .type = UCI_TYPE_STRING }, + { .name = "primary_pcp", .type = UCI_TYPE_STRING }, { .name = "report_sta_assocfails", .type = UCI_TYPE_STRING }, { .name = "report_sta_assocfails_rate", .type = UCI_TYPE_STRING }, { .name = "report_metric_periodic", .type = UCI_TYPE_STRING },