From 9386ec4bc2efdae39b38770247e9f9af6276e99e Mon Sep 17 00:00:00 2001 From: vdutta Date: Mon, 3 Feb 2020 18:37:25 +0530 Subject: [PATCH] ieee1905: Updated readme --- ieee1905/Makefile | 4 +-- ieee1905/files/etc/config/ieee1905 | 15 ++++---- ieee1905/files/etc/init.d/ieee1905 | 57 ++++++++++++++++-------------- wfamap/Makefile | 4 +-- 4 files changed, 42 insertions(+), 38 deletions(-) diff --git a/ieee1905/Makefile b/ieee1905/Makefile index da11a317c..2860b67bb 100644 --- a/ieee1905/Makefile +++ b/ieee1905/Makefile @@ -5,10 +5,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ieee1905 -PKG_VERSION:=2.0.4 +PKG_VERSION:=2.0.5 PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=47d9c14a5bb3847889c7c7246a4d2a867531bb88 +PKG_SOURCE_VERSION:=49736f4ceb51f23495b973cf7d0a9ab99e074d1d PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/ieee1905.git PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz diff --git a/ieee1905/files/etc/config/ieee1905 b/ieee1905/files/etc/config/ieee1905 index 47f155634..cce69c3a4 100644 --- a/ieee1905/files/etc/config/ieee1905 +++ b/ieee1905/files/etc/config/ieee1905 @@ -2,21 +2,22 @@ config ieee1905 option enabled '1' option debug true -config meshcomms 'global' +config al option enabled '1' option basemacint 'wan' + # option almac '' option mapall true -# option registrar 'wl0' + # option registrar 'wl0' option debug_level 2 - option port 8888 - option cmdu_event false + option alme_port 8888 + option cmdu_event true option discovery_timer 60 option map_plugin false #config al-iface # option enabled '1' # option ifname 'br-lan' -# option media '802_3U' +# option media 'eth' # option manufacturer_name 'Broadcom' # option model_name 'Eth EG400' # option model_number '00002' @@ -26,7 +27,7 @@ config meshcomms 'global' #config al-iface # option enabled '1' # option ifname 'wl0' -# option media '802_11N5' +# option media 'wifi' # option manufacturer_name 'Broadcom' # option model_name 'WIFI EG400' # option model_number '00001' @@ -36,7 +37,7 @@ config meshcomms 'global' #config al-iface # option enabled '1' # option ifname 'wl1' -# option media '802_11N2' +# option media 'wifi' # option manufacturer_name 'Broadcom' # option model_name 'WIFI EG400' # option model_number '00001' diff --git a/ieee1905/files/etc/init.d/ieee1905 b/ieee1905/files/etc/init.d/ieee1905 index fdda1a440..e2142635a 100644 --- a/ieee1905/files/etc/init.d/ieee1905 +++ b/ieee1905/files/etc/init.d/ieee1905 @@ -5,24 +5,9 @@ STOP=10 USE_PROCD=1 PROG=/usr/sbin/ieee1905d -MESH_CONF=/tmp/meshcomms.config +AL_CONF=/tmp/ieee1905.config INTERFACE="" -validate_global_section() -{ - uci_validate_section ieee1905 meshcomms "${1}" \ - 'enabled:bool:false' \ - 'basemacint:string:wan' \ - 'almac:string' \ - 'registrar:string' \ - 'mapall:bool:true' \ - 'debug_level:uinteger:5' \ - 'port:port:8888' \ - 'cmdu_event:bool:true' \ - 'discovery_timer:uinteger:60' \ - 'map_plugin:bool:false' -} - validate_ieee1905_section() { uci_validate_section ieee1905 ieee1905 "${1}" \ @@ -57,7 +42,7 @@ get_interface_mac() { echo ${basemac} } -validate_al_section() +validate_al_iface_section() { uci_validate_section ieee1905 al-iface "${1}" \ 'enabled:bool:false' \ @@ -73,7 +58,7 @@ validate_al_section() configure_interface() { local ifname media enabled manufacturer_name model_name model_number device_name serial_number - validate_al_section ${1} || { + validate_al_iface_section ${1} || { echo "Validation of global section failed" return 1; } @@ -109,12 +94,28 @@ configure_interface() json_close_object } -configure_meshcomms() +validate_al_section() { - local enabled almac basemacint mapall debug_level port l3device basemac intf registrar cmdu_event discovery_timer - local map_plugin + uci_validate_section ieee1905 meshcomms "${1}" \ + 'enabled:bool:false' \ + 'basemacint:string:wan' \ + 'almac:string' \ + 'registrar:string' \ + 'mapall:bool:true' \ + 'debug_level:uinteger:1' \ + 'alme_port:port:8888' \ + 'cmdu_event:bool:true' \ + 'discovery_timer:uinteger:60' \ + 'map_plugin:bool:false' +} - validate_global_section global || { + +configure_al_entity() +{ + local enabled almac basemacint mapall debug_level alme_port l3device basemac intf + local registrar cmdu_event discovery_timer map_plugin + + validate_al_section ${1} || { echo "Validation of global section failed" return 1; } @@ -137,26 +138,28 @@ configure_meshcomms() json_add_array al-iface config_foreach configure_interface al-iface json_close_array + json_add_object deviceInfo json_add_string friendly_name ${fname} json_add_string manufacturer_name ${cname} json_add_string model ${model} json_add_string control_url ${cUrl} json_close_object - json_add_object meshcomms + + json_add_object al json_add_int enabled ${enabled} json_add_string mac ${basemac} json_add_string interfaces ${INTERFACE} json_add_int map ${mapall} json_add_string registrar ${registrar} json_add_int debug_level ${debug_level} - json_add_int port ${port} + json_add_int alme_port ${alme_port} json_add_int cmdu_event ${cmdu_event} json_add_int discovery_timer ${discovery_timer} json_add_int map_plugin ${map_plugin} json_close_object - json_dump >${MESH_CONF} + json_dump >${AL_CONF} } @@ -182,7 +185,7 @@ configure_ieee1905() } configure_network() { - [ -f ${MESH_CONF} ] && rm ${MESH_CONF} + [ -f ${AL_CONF} ] && rm ${AL_CONF} ebtables -L FORWARD|grep -iqE "1:80:C2:(0)+:(0)+:13.*-j.*DROP" if [ "$?" -ne 0 ]; then @@ -192,7 +195,7 @@ configure_network() { config_load ieee1905 config_foreach configure_ieee1905 ieee1905 - config_foreach configure_meshcomms meshcomms + config_foreach configure_al_entity al } start_service() { diff --git a/wfamap/Makefile b/wfamap/Makefile index 5e4f87e54..d9f6c686f 100644 --- a/wfamap/Makefile +++ b/wfamap/Makefile @@ -5,10 +5,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=wfamap -PKG_VERSION:=1.0.2 +PKG_VERSION:=1.0.3 PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=2debe86da58af1d90dd777dfe6d7d0e7fe33fb09 +PKG_SOURCE_VERSION:=ff61925f545d46bd096e287313680f215b8e1cef PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/wfamap.git PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz