ieee1905: Added support for 1905 multiap extensions

This commit is contained in:
vdutta 2019-12-23 17:45:11 +05:30 committed by Sukru Senli
parent c476a8ec75
commit 45b8a62027
3 changed files with 31 additions and 16 deletions

View file

@ -5,10 +5,10 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=ieee1905
PKG_VERSION:=1.1.1
PKG_VERSION:=1.1.2
PKG_SOURCE_PROTO:=git
PKG_SOURCE_VERSION:=16211b2eb15c5fd0670f4bd93ded2139b002cc15
PKG_SOURCE_VERSION:=dfc91ea4420ae34a10af7ad3a021a3496b84d565
PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/ieee1905.git
PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
@ -20,7 +20,7 @@ define Package/ieee1905
SECTION:=utils
CATEGORY:=Utilities
TITLE:=IEEE1905 handler
DEPENDS:= +libwifi +ubox +libpicoevent +libpcap +libopenssl +libuci +libjson-c
DEPENDS:= +ubox +libpicoevent +libpcap +libopenssl +libuci +libjson-c
endef
define Package/ieee1905/description
@ -33,9 +33,9 @@ TARGET_CFLAGS += \
-DSEND_EMPTY_TLVS \
-DFIX_BROKEN_TLVS \
-DSPEED_UP_DISCOVERY \
-DREGISTER_MULTIAP_FEATURE
-DREGISTER_MULTIAP_FEATURE \
-DDO_NOT_ACCEPT_UNAUTHENTICATED_COMMANDS
#-DREGISTER_EXTENSION_BBF
#-DDO_NOT_ACCEPT_UNAUTHENTICATED_COMMANDS \
#define Build/Prepare
# $(CP) -rf ./ieee1905/* $(PKG_BUILD_DIR)/

View file

@ -14,26 +14,29 @@ config meshcomms 'global'
#config al-iface
# option enabled '1'
# option ifname 'br-lan'
# option media 'bridge'
# option media '802_3U'
# option manufacturer_name 'Broadcom'
# option model_name 'Eth EG400'
# option model_number '00002'
# option device_name 'EG400R1'
# option serial_number '1234'
#config al-iface
# option enabled '1'
# option ifname 'wl0'
# option media 'ap'
# option manufacturer_name 'Mediatek'
# option model_name 'WIFI EX400'
# option media '802_11N5'
# option manufacturer_name 'Broadcom'
# option model_name 'WIFI EG400'
# option model_number '00001'
# option device_name 'EX400R0'
# option device_name 'EG400R1'
# option serial_number '1235'
#config al-iface
# option enabled '1'
# option ifname 'wl1'
# option media 'ap'
# option manufacturer_name 'Mediatek'
# option model_name 'WIFI EX400'
# option media '802_11N2'
# option manufacturer_name 'Broadcom'
# option model_name 'WIFI EG400'
# option model_number '00001'
# option device_name 'EX400R0'
# option device_name 'EG400R1'
# option serial_number '1236'

View file

@ -64,12 +64,13 @@ validate_al_section()
'manufacturer_name:string:iopsys' \
'model_name:string' \
'model_number:string' \
'device_name:string'
'device_name:string' \
'serial_number:string'
}
configure_interface()
{
local ifname media enabled manufacturer_name model_name model_number device_name
local ifname media enabled manufacturer_name model_name model_number device_name serial_number
validate_al_section ${1} || {
echo "Validation of global section failed"
return 1;
@ -85,6 +86,14 @@ configure_interface()
INTERFACE="${INTERFACE},${ifname}"
fi
local uuid=$(cat /proc/sys/kernel/random/uuid)
local ifindex=$(cat /sys/class/net/${ifname}/upper_*/ifindex 2>/dev/null)
if [ -z ${ifindex} ]; then
ifindex=$(cat /sys/class/net/${ifname}/ifindex)
fi
echo "Interface ${ifname} ifindex |${ifindex}|" >>/dev/console
json_add_object
json_add_string ifname ${ifname}
json_add_string media ${media}
@ -92,6 +101,9 @@ configure_interface()
json_add_string model_name ${model_name}
json_add_string model_number ${model_number}
json_add_string device_name ${device_name}
json_add_string serial_number ${serial_number}
json_add_string uuid ${uuid}
json_add_int ifindex ${ifindex}
json_close_object
}