map-controller: disable logging by default

map-1905/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-1905
-PKG_VERSION:=0.0.14
+PKG_VERSION:=0.0.15
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=745a773b15f35275df63a20e1be342d24b7e7534
+PKG_SOURCE_VERSION:=405e44f14d623db7a5f03e76945315774d2b6deb
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/map-1905.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 endif

map-agent/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-agent
-PKG_VERSION:=2.0.3
+PKG_VERSION:=3.1.0
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=6bb0bba83e4c5189c93ed339ed061b86d7766f4d
+PKG_SOURCE_VERSION:=c59c1bd628989216e5167c8557f6bb114e8e21a0
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 
 PKG_LICENSE:=PROPRIETARY IOPSYS
@@ -23,7 +23,7 @@ define Package/map-agent
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=WiFi multi-AP Agent (EasyMesh R2)
-  DEPENDS:=+libwifi +libuci +libubox +ubus +libmaputils
+  DEPENDS:=+libwifi +libuci +libubox +ubus +libmaputils +libwsc
 endef
 
 define Package/map-agent/description
@@ -51,6 +51,7 @@ endef
 
 define Package/map-agent/install
 	$(INSTALL_DIR) $(1)/etc
+	$(CP) ./files/* $(1)/
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(CP) $(PKG_BUILD_DIR)/src/utils/*.so* $(1)/usr/lib/

map-agent/files/etc/config/agent

@@ -0,0 +1,62 @@
+config wifiagent
+	option enabled '1'
+	option debug '6'
+	option profile '2'
+
+config fh-iface
+	option ifname 'wl0'
+	option steer 'rssi bssload'
+	list exclude '00:11:22:33:44:55'
+	list exclude_btm '00:aa:bb:cc:dd:ee'
+	list assoc_ctrl '00:10:20:30:40:50'
+	option btm_retry '3'
+	option btm_retry_secs '180'
+	option fallback_legacy '1'
+	option steer_legacy_reassoc_secs '30'
+	option steer_legacy_retry_secs '3600'
+	option assoc_ctrl_secs '30'
+	option band '2'
+
+config fh-iface
+	option ifname 'wl1'
+	option steer 'rssi bssload'
+	list exclude '00:11:22:33:44:55'
+	list exclude_btm '00:aa:bb:cc:dd:ee'
+	option band '5'
+
+#config bk-iface
+#	option ifname 'apclii0'
+#	option enabled '1'
+#	option onboarded '0'
+#	option disallow_bsta '1		# bitmap, 1 for disallow p1, 2 to disallow p2, 3 to disallow both (probably never applicable)
+
+config steer-param 'rssi'
+	option priority '0'
+	option rssi_threshold '-68'
+	option hysteresis '5'
+	option margin '3'
+	option diffsnr '8'
+
+config steer-param 'bssload'
+	option priority '0'
+	option bssload_threshold '80'
+
+### custom rules follows ###
+config rule-custom
+	option action steer
+	option sta 'd8:32:e3:4d:35:d2'
+	option bss '00:22:07:11:22:33'
+
+config rule-custom
+	option action restrict
+	option sta 'd8:32:e3:4d:35:d2'
+	option bss '00:22:07:11:22:33'
+
+#config bk-iface
+#	option ifname 'wlan1_1'
+#
+#config fh-iface
+#	option ifname 'wlan0'
+#
+#config fh-iface
+#	option ifname 'wlan1'

map-agent/files/etc/init.d/mapagent

@@ -0,0 +1,25 @@
+#!/bin/sh /etc/rc.common
+
+START=98
+STOP=20
+
+USE_PROCD=1
+
+start_service() {
+	procd_open_instance
+        procd_set_param command "/usr/sbin/mapagent" "-d"
+	procd_set_param respawn
+#	procd_set_param stdout 1
+#	procd_set_param stderr 1
+	procd_close_instance
+}
+
+service_triggers()
+{
+	procd_add_reload_trigger "ieee1905"
+}
+
+reload_service() {
+	stop
+	start
+}

map-controller/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-controller
-PKG_VERSION:=1.0.3
+PKG_VERSION:=2.0.2
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=f1b50ed876f14347480e9e131ac6de76922e131a
+PKG_SOURCE_VERSION:=cc7b09ac52dc16cde697e439eb25f620934a8b30
 
 PKG_LICENSE:=PROPRIETARY IOPSYS
 PKG_LICENSE_FILES:=LICENSE
@@ -22,7 +22,7 @@ define Package/map-controller
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=WiFi Multi-AP Controller (EasyMesh R2)
-  DEPENDS:=+libuci +libubox +ubus +libmaputils
+  DEPENDS:=+libuci +libubox +ubus +libmaputils +libwsc
 endef
 
 define Package/map-controller/description
@@ -42,6 +42,7 @@ MAKE_PATH:=src
 
 define Package/map-controller/install
 	$(INSTALL_DIR) $(1)/etc
+	$(CP) ./files/* $(1)/
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/mapcontroller $(1)/usr/sbin/
 endef

map-controller/files/etc/config/controller

@@ -0,0 +1,111 @@
+config wificntlr
+	option enabled '1'
+	option registrar '5 2'	    #bands on which wps registrar supported
+	option debug '6'
+
+config fh-credentials
+	option band '5'
+	option encryption 'psk2'
+	option key '1234567890'
+	option ssid 'map-net5'
+	option vlan '101'
+
+config fh-credentials
+	option band '2'
+	option encryption 'psk2'
+	option key '1234567890'
+	option ssid 'map-net2'
+	option vlan '0'               # 0 - 2 rsvd, 3 - 4094 => vlan id
+
+config bk-credentials
+	option band '5'
+	option encryption 'psk2'
+	option key '5555555555'
+	option ssid 'map-bkhaul-5'
+	option multi_ap '2'
+#	option multi_ap_backhaul_sta '1'                        # possible future TODO
+#	option multi_ap_backhaul_key 'multiap_key123'           # possible future TODO
+#	option multi_ap_backhaul_ssid 'MultiAP-0022077E9CD6'    # possible future TODO
+	option disallow_bsta '1'		# bitmap, 1 for disallow p1, 2 to disallow p2, 3 to disallow both (probably never applicable)
+
+config bk-credentials
+	option band '2'
+	option encryption 'psk2'
+	option key '2222222222'
+	option ssid 'map-bkhaul-2'
+	option multi_ap '2'
+#	option multi_ap_backhaul_sta '1'                        # possible future TODO
+#	option multi_ap_backhaul_key 'multiap_key123'           # possible future TODO
+#	option multi_ap_backhaul_ssid 'MultiAP-0022077E9CD6'    # possible future TODO
+	option disallow_bsta '0'                # 0 or 1 profile-1 bSTA
+
+config agent-policy
+	option agent_id '00:22:07:7E:9C:D6'        # 1905al macaddress of agent
+	list steer_exclude '00:11:22:33:44:55'
+	list steer_exclude_btm '00:aa:bb:cc:dd:ee'
+	option steer_policy '2'                    # 0, 1, 2 - see MultiAP spec
+	option util_threshold '200'                # channel-util as in BSS load
+	option rcpi_threshold '30'                 # 0 - 220 valid range
+	option report_scan '0'                     # 0 or 1 for independent sc include_sta_metric '0'              # sta metric in AP metric resp
+	option pvid '100'                          # primary vlan id
+	option pcp_default '5'                     # default vlan pcp
+	option disallow_bsta_p1 '0'                # 0 or 1 profile20 valid range
+	option report_scan '0'                     # 0 or 1 for independent scans
+	option report_sta_assocfails '1'           # 0 or 1 - stas assoc failure
+	option report_metric_periodic '0'          # 0, or 1 - 255 in secs
+	option report_rcpi_threshold '30'                 # 0 - 220 valid range
+	option report_scan '0'                     # 0 or 1 for independent scans
+	option report_sta_assocfails '1'           # 0 or 1 - stas assoc failure
+	option report_metric_periodic '0'          # 0, or 1 - 255 in secs
+	option report_rcpi_threshold '0'           # 0, or 1 - 220
+	option report_util_threshold '0'           # 0, or  channel-util value
+	option include_sta_stats '0'               # sta stats in AP metric resp
+	option include_sta_metric '0'              # sta metric in AP metric resp
+	option pvid '100'                          # primary vlan id
+	option pcp_default '5'                     # default vlan pcp
+	option disallow_bsta_p1 '0'                # 0 or 1 profile-1 bSTA
+	option disallow_bsta_p2 '0'                # 0 or 1 profile-2 bSTA
+
+config agent-policy
+	option agent_id '00:00:00:00:00:00'
+	list steer_exclude '00:11:22:33:44:55'
+	list steer_exclude_btm '00:aa:bb:cc:dd:ee'
+	option steer_policy '2'                    # 0, 1, 2 - see MultiAP spec
+	option util_threshold '200'                # channel-util as in BSS load
+	option rcpi_threshold '30'                 # 0 - 220 valid range
+	option report_scan '0'                     # 0 or 1 for independent sc include_sta_metric '0'              # sta metric in AP metric resp
+	option pvid '100'                          # primary vlan id
+	option pcp_default '5'                     # default vlan pcp
+	option disallow_bsta_p1 '0'                # 0 or 1 profile20 valid range
+	option report_scan '0'                     # 0 or 1 for independent scans
+	option report_sta_assocfails '1'           # 0 or 1 - stas assoc failure
+	option report_metric_periodic '0'          # 0, or 1 - 255 in secs
+	option report_rcpi_threshold '30'                 # 0 - 220 valid range
+	option report_scan '0'                     # 0 or 1 for independent scans
+	option report_sta_assocfails '1'           # 0 or 1 - stas assoc failure
+	option report_metric_periodic '0'          # 0, or 1 - 255 in secs
+	option report_rcpi_threshold '0'           # 0, or 1 - 220
+	option report_util_threshold '0'           # 0, or  channel-util value
+	option include_sta_stats '0'               # sta stats in AP metric resp
+	option include_sta_metric '0'              # sta metric in AP metric resp
+	option pvid '100'                          # primary vlan id
+	option pcp_default '5'                     # default vlan pcp
+	option disallow_bsta_p1 '0'                # 0 or 1 profile-1 bSTA
+	option disallow_bsta_p2 '0'                # 0 or 1 profile-2 bSTA
+
+config agent-policy
+	option agent_id '00:22:07:A3:6C:DA'    # 1905al macaddress of agent
+	list steer_exclude '00:11:22:33:44:55'
+	list steer_exclude_btm '00:aa:bb:cc:dd:ee'
+	option steer_policy '2'                    # 0, 1, 2 - see MultiAP spec
+	option util_threshold '200'                # channel-util as in BSS load
+	option report_metric_periodic '0'          # 0, or 1 - 255 in secs
+	option report_rcpi_threshold '0'           # 0, or 1 - 220
+	option report_util_threshold '0'           # 0, or  channel-util value
+	option include_sta_stats '0'               # sta stats in 3:4d:35:d2'
+	option bss '00:22:07:11:22:33'
+
+config rule-custom
+	option action restrict
+	option sta 'd8:32:e3:4d:35:d2'
+	option bss '00:22:07:11:22:33'

map-controller/files/etc/init.d/mapcontroller

@@ -0,0 +1,25 @@
+#!/bin/sh /etc/rc.common
+
+START=98
+STOP=20
+
+USE_PROCD=1
+
+start_service() {
+	procd_open_instance
+        procd_set_param command "/usr/sbin/mapcontroller" "-d"
+	procd_set_param respawn
+#	procd_set_param stdout 1
+#	procd_set_param stderr 1
+	procd_close_instance
+}
+
+service_triggers()
+{
+	procd_add_reload_trigger "ieee1905"
+}
+
+reload_service() {
+	stop
+	start
+}

wifimngr/files/wifimngr.init

@@ -19,3 +19,7 @@ reload_service() {
         stop
         start
 }
+
+service_triggers() {
+	procd_add_reload_trigger "wireless"
+}