decollector: 2.10.1.4

Add time sync along with DECT handset presence check

bbf/Makefile

@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libbbfdm
-PKG_VERSION:=6.8.9.35
+PKG_VERSION:=6.8.9.43
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bbf.git
-PKG_SOURCE_VERSION:=bce36468325a3cc4761a7c571583ec5d2b48a08d
+PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/bbfdm.git
+PKG_SOURCE_VERSION:=0f5ef9c5f62ba49420ad0ecef5268c8fd7b44aef
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 

dectmngr/Makefile

@@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dectmngr
 PKG_RELEASE:=3
-PKG_VERSION:=3.5.6
+PKG_VERSION:=3.5.20
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dectmngr.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=81450033d98fcdb68911e2148f48d190492090a6
+PKG_SOURCE_VERSION:=0863ab223679fe81da132829429b94f07a688953
 PKG_MIRROR_HASH:=skip
 endif
 

easy-soc-libs/Makefile

@@ -7,13 +7,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=easy-soc-libs
-PKG_VERSION:=6.5.60
+PKG_VERSION:=6.5.61
 PKG_RELEASE:=1
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=ec2e8d0341e246ff371481ae20418d8301dfcf12
+PKG_SOURCE_VERSION:=1f365cc51b784c8f580bcda2b31cd70be9efaf41
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/easy-soc-libs.git
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz

endptmngr/Makefile

@@ -7,13 +7,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=endptmngr
-PKG_VERSION:=0.7
+PKG_VERSION:=0.13
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/endptmngr.git
-PKG_SOURCE_VERSION:=e711227576cf876c1ae8139ebfa9170bae3c664e
+PKG_SOURCE_VERSION:=20e36fe5ae56122ffedace9497751a7d88bb53e9
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

icwmp/Makefile

@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=8.4.26.9
+PKG_VERSION:=8.4.26.10
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
-PKG_SOURCE_VERSION:=4775925cb4ee114446c66cadda4948590a2a9ee5
+PKG_SOURCE_VERSION:=ac7410a726a7269dcaef4c80061cab7a4447f6d1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 

ieee1905/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ieee1905
-PKG_VERSION:=4.10.39
+PKG_VERSION:=4.10.42
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=e7645011f1acdc6b9e472f9c1bbf56a438aea26a
+PKG_SOURCE_VERSION:=d3db999d63f05e42305759c7b6ca0bc4fccf65bf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/ieee1905.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip

map-agent/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-agent
-PKG_VERSION:=2.10.4.0
+PKG_VERSION:=2.10.4.10
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=a5d4152a17cfacae53ab2c3eadc0e438bd6b5fe7
+PKG_SOURCE_VERSION:=ca2e5837149234bd5b9b3df9ab1e4e798f1c1843
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 
 PKG_LICENSE:=BSD-3-Clause

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

@@ -10,10 +10,6 @@ IS_CFG_VALID=1
 MAP_DEV="map_dev"
 MAP_IF="map"
 
-create_dir() {
-        mkdir -p /etc/multiap
-}
-
 start_dynbhd_service() {
 	rm -f /tmp/multiap.backhaul
 	procd_open_instance
@@ -189,7 +185,6 @@ start_service() {
 	config_get_bool enabled agent enabled 1
 	[ "$enabled" -eq 0 ] && return 1
 
-	create_dir
 	procd_open_instance
 	procd_set_param command "/usr/sbin/mapagent" "-d"
 	procd_set_param respawn

map-agent/files/lib/wifi/traffic_separation

@@ -2,7 +2,6 @@
 
 . /lib/functions.sh
 
-MAPDIR="/etc/multiap/"
 AL_BRIDGE=${AL_BRIDGE-"br-lan"}
 PRIMARY_VID=${PRIMARY_VID-1}
 MAP_BH_FILE="/tmp/multiap.backhaul"
@@ -98,6 +97,25 @@ EOF
 		_network_cleanup $vid
 	}
 
+	net_get_albridge_ip() {
+		local section=$1
+
+		config_get device "$section" device
+
+		[ "${AL_BRIDGE}" = "$device" -o "${AL_BRIDGE}.${PRIMARY_VID}" = "$device" ] && {
+			ipaddr="$(uci -q get network.${section}.ipaddr)"
+			netmask="$(uci -q get network.${section}.netmask)"
+			break;
+		}
+	}
+
+	map_get_ports() {
+		local br_dev="${AL_BRIDGE/-/_}"
+		local all_ports=$(uci -q get network.${br_dev}.ports)
+
+		echo "$all_ports"
+	}
+
 	ts_create() {
 		_dhcp_setup() {
 			local name=$1
@@ -129,6 +147,11 @@ EOF
 			local subnet=$(($vid % 256))
 			local ipaddr="192.168.${subnet}.1"
 
+			config_foreach net_get_albridge_ip interface $PRIMARY_VID
+
+			# replace third octet of the ip with $subnet
+			ipaddr=$(echo $ipaddr | sed "s/\(\([0-9]\{1,3\}\.\)\{2\}\)[0-9]\{1,3\}/\1${subnet}/")
+
 			config_load firewall
 
 			_process_zone() {
@@ -147,9 +170,9 @@ EOF
 				uci -q add firewall zone
 				uci -q set firewall.@zone[-1].name="$name"
 				uci -q add_list firewall.@zone[-1].network="$network"
-				uci -q set firewall.@zone[-1].input='REJECT'
+				uci -q set firewall.@zone[-1].input='DROP'
 				uci -q set firewall.@zone[-1].output='ACCEPT'
-				uci -q set firewall.@zone[-1].forward='REJECT'
+				uci -q set firewall.@zone[-1].forward='DROP'
 				diff=1
 			}
 
@@ -224,81 +247,68 @@ EOF
 				}
 			}
 
-			net_set_primary() {
-				local section=$1
-				local pvid=$2
-
-				config_get device "$section" device
-
-				[ "${AL_BRIDGE}" = "$device" ] && {
-					uci -q set network.${section}.device="${AL_BRIDGE}.${pvid}"
-					uci -q commit network
-					diff="1"
-					break;
-				}
-			}
 			local vid=$1
 			diff=""
 
 			config_load network
 
-			[ ! -f $MAPDIR/network.old ] && cp /etc/config/network $MAPDIR/network.old
-
-			#[ -x "/usr/sbin/mapcontroller" ] && config_foreach net_set_primary interface $PRIMARY_VID
+			local name="vlan${vid}"
+			local br_dev="${AL_BRIDGE/-/_}"
+			local tag=":t"
+			local self_flags="untagged"
+			local map_ports="$(map_get_ports)"
 
+			# add bridge-vlan section for $vid if doesnt exist
 			exists=$(config_foreach net_check_for_vlan bridge-vlan $vid)
 			[ -z "$exists" ] && {
-				local name="vlan${vid}"
-				local br_dev="${AL_BRIDGE/-/_}"
-				local tag=":t"
-				local self_flags="untagged"
-
 				uci -q set network.${name}="bridge-vlan"
 				uci -q set network.${name}.name="${name}"
 				uci -q set network.${name}.device="$AL_BRIDGE"
 				uci -q set network.${name}.vlan="$vid"
-
-				[ "${vid}" = "${PRIMARY_VID}" ] && {
-#					self_flags="untagged pvid"
-					uci -q set network.${name}.flags="untagged pvid"
-					tag=":*"
-				}
-
-#				uci -q set network.${name}.flags="${self_flags}"
-				uci -q set network.${name}.local='1'
-
-				for port in $(uci -q get network.${br_dev}.ports) ; do
-					uci -q get network.${name}.ports | grep -q "${port}${tag}" && continue
-					uci -q add_list network.${name}.ports="${port}${tag}"
-				done
-
-				uci -q commit network
-				diff="1"
 			}
 
+			# guest vids are trunked
+			[ "${vid}" = "${PRIMARY_VID}" ] && {
+#				self_flags="untagged pvid"
+				uci -q set network.${name}.flags="untagged pvid"
+				tag=":*"
+			}
+			uci -q set network.${name}.local='1'
+
+
+			uci -q delete network.${name}.ports
+			# support tagging for all map_port
+			for port in $map_ports ; do
+				uci -q get network.${name}.ports | grep -q "${port}" && {
+					uci -q del_list network.${name}.ports="${port}"
+				}
+				uci -q add_list network.${name}.ports="${port}${tag}"
+			done
+
+			# non-map ports add PVID egress untagged
+			[ "${vid}" = "${PRIMARY_VID}" ] && {
+				for port in $(uci -q get network.${br_dev}.ports) ; do
+					uci -q get network.${name}.ports | grep -q "${port}" && continue
+					uci -q add_list network.${name}.ports="${port}"
+				done
+			}
+
+			uci -q commit network
+			diff="1"
+
+			# add interface sections for subinterface if doesnt exist
 			exists=$(config_foreach net_check_for_network interface $vid)
 			[ -z "$exists" -a "$PRIMARY_VID" != "$vid" -a -x "/usr/sbin/mapcontroller" ] && {
-				net_get_albridge_ip() {
-					local section=$1
-
-					config_get device "$section" device
-
-					[ "${AL_BRIDGE}" = "$device" -o "${AL_BRIDGE}.${PRIMARY_VID}" = "$device" ] && {
-						ipaddr="$(uci -q get network.${section}.ipaddr)"
-						netmask="$(uci -q get network.${section}.netmask)"
-						break;
-					}
-				}
 				local name="guest${vid}"
 				local br_dev="${AL_BRIDGE/-/_}"
 				local tag=":t"
 				local self_flags="untagged"
 				local subnet=$(($vid % 256))
+
 				netmask="255.255.255.0"
 				ipaddr="192.168.1.1"
 
 				config_load network
-
 				config_foreach net_get_albridge_ip interface $PRIMARY_VID
 
 				# replace third octet of the ip with $subnet
@@ -464,7 +474,45 @@ EOF
 		fcctl flush
 	}
 
-	ts_isolate() {
+	ts_isolate_wds() {
+		local action=$1 # add/del
+		local ifname=$2 # guest fbss name
+		local wds=$3 # 4addr interface name or prefix+
+		local br_dev="${AL_BRIDGE/-/_}"
+		local map_ports="$(map_get_ports)"
+		local all_ports=$(uci -q get network.${br_dev}.ports)
+
+		[ -z "$wds" -o -z "$ifname" ] && return
+
+		ebtables -D FORWARD -i $ifname -o $wds -j DROP > /dev/null 2>&1
+		ebtables -D FORWARD -i $wds -o $ifname -j DROP > /dev/null 2>&1
+		ebtables -D FORWARD -i $wds -o $wds -p 802_1Q --vlan-id ! $PRIMARY_VID  -j DROP > /dev/null 2>&1
+
+		# must not drop traffic to upstream
+		json_load "$(cat $MAP_BH_FILE)"
+		json_get_var bk_ifname ifname
+		json_cleanup
+
+		# isolate eth map ports
+		for port in $all_ports ; do
+			ebtables -D FORWARD -i $wds -o $port -j DROP > /dev/null 2>&1
+			ebtables -D FORWARD -i $port -o $wds -j DROP  > /dev/null 2>&1
+		done
+
+		[ "$action" != "add" ] && return
+
+		for port in $map_ports ; do
+			[ "$port" = "$bk_ifname" ] && continue
+			ebtables -A FORWARD -i $wds -o $port -j DROP > /dev/null 2>&1
+			ebtables -A FORWARD -i $port -o $wds -j DROP > /dev/null 2>&1
+		done
+
+		ebtables -A FORWARD -i $ifname -o $wds -j DROP > /dev/null 2>&1
+		ebtables -A FORWARD -i $wds -o $ifname -j DROP > /dev/null 2>&1
+		ebtables -A FORWARD -i $wds -o $wds -p 802_1Q --vlan-id ! $PRIMARY_VID  -j DROP > /dev/null 2>&1
+        }
+
+	ts_isolate_ap() {
 		ts_isolate_radio() {
 			local section=$1
 			local action=$2
@@ -481,11 +529,11 @@ EOF
 			config_get apifname "$section" ifname
 			[ "$ifname" = "$apifname" ] && continue # this should never happen
 
-			ebtables -D FORWARD -i $ifname --o $apifname -j DROP > /dev/null 2>&1
+			ebtables -D FORWARD -i $ifname -o $apifname -j DROP > /dev/null 2>&1
 
 			[ "$action" != "add" ] && continue
 
-			ebtables -A FORWARD -i $ifname --o $apifname -j DROP > /dev/null 2>&1
+			ebtables -A FORWARD -i $ifname -o $apifname -j DROP > /dev/null 2>&1
 		}
 		local action=$1
 		shift
@@ -497,10 +545,11 @@ EOF
 		shift
 		local ifname=$1 # guest fbss name
 		shift
-		local ifprefix=$1 # 4addr mode ifname prefix
 		local br_dev="${AL_BRIDGE/-/_}"
+		local map_ports="$(map_get_ports)"
+		local all_ports=$(uci -q get network.${br_dev}.ports)
 
-		[ -z "$pvid" -o -z "$ifprefix" -o -z "$ifname" ] && return
+		[ -z "$pvid" -o -z "$ifname" ] && return
 
 		config_load mapagent
 		config_foreach ts_isolate_radio ap $action $band $vid $ifname
@@ -510,23 +559,18 @@ EOF
 		json_get_var bk_ifname ifname
 		json_cleanup
 
-		for prefix in $@; do
-			ebtables -D FORWARD -i $ifname --o ${prefix}+ -j DROP > /dev/null 2>&1
-			ebtables -D FORWARD -i ${prefix}+ --o $ifname -j DROP > /dev/null 2>&1
+		# isolate eth map ports
+		for port in $all_ports ; do
+			ebtables -D FORWARD -i $ifname -o $port -j DROP > /dev/null 2>&1
+			ebtables -D FORWARD -i $port -o $ifname -j DROP  > /dev/null 2>&1
+		done
 
-			# isolate eth interfaces
-			for port in $(uci -q get network.${br_dev}.ports) ; do
-					ebtables -D FORWARD -i $ifname --o $port -j DROP > /dev/null 2>&1
-					ebtables -D FORWARD -i $port --o $ifname -j DROP  > /dev/null 2>&1
+		[ "$action" != "add" ] && return
 
-					[ "$action" != "add" -o "$port" = "$bk_ifname" ] && continue
-					ebtables -A FORWARD -i $ifname --o $port -j DROP > /dev/null 2>&1
-					ebtables -A FORWARD -i $port --o $ifname -j DROP > /dev/null 2>&1
-			done
-
-			[ "$action" != "add" ] && continue
-			ebtables -A FORWARD -i $ifname --o ${prefix}+ -j DROP > /dev/null 2>&1
-			ebtables -A FORWARD -i ${prefix}+ --o $ifname -j DROP > /dev/null 2>&1
+		for port in $map_ports ; do
+			[ "$port" = "$bk_ifname" ] && continue
+			ebtables -A FORWARD -i $ifname -o $port -j DROP > /dev/null 2>&1
+			ebtables -A FORWARD -i $port -o $ifname -j DROP > /dev/null 2>&1
 		done
 	}
 
@@ -538,7 +582,8 @@ EOF
 		keep) ts_dbg "keep $@"; ts_keep $@;;
 		reload) ts_dbg "reload $@"; ts_reload $@;;
 		cleanup) ts_dbg "cleanup $@"; ts_cleanup $@;;
-		isolate) ts_dbg "isolate $@"; ts_isolate $@;;
+		isolate_ap) ts_dbg "isolate_ap $@"; ts_isolate_ap $@;;
+		isolate_wds) ts_dbg "isolate_wds $@"; ts_isolate_wds $@;;
 		--help|help) ts_usage;;
 		*) ts_usage; exit 1;;
 	esac

map-controller/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-controller
-PKG_VERSION:=2.8.0.25
+PKG_VERSION:=2.8.0.29
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=209ffb0bb4932e29e3d4d05f515b71985491abce
+PKG_SOURCE_VERSION:=975ec3e88e0e134e29abdb85ec3bd798f13cc3bb
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)

map-topology/Makefile

@@ -6,11 +6,11 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=map-topology
-PKG_VERSION:=2.5.0.17
+PKG_VERSION:=2.5.0.20
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_VERSION:=c8928b4364eab3762ae94ecbd471a98f20c47462
+PKG_SOURCE_VERSION:=beebf849bf8553dd20ff898685007b2f0bdd0739
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/map-topology.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz

wfadatad/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wfadatad
-PKG_VERSION:=2.10.1.2
+PKG_VERSION:=2.10.1.4
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=40c8630ec755840e0ece16ab3102d056563daef3
+PKG_SOURCE_VERSION:=17ba4ab69b66e1f05d116ba9ddff7eb8498e8374
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/wfadatad.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip