map-agent: ts: use one sink interface/device

By default create br-sink and run there
dhcp server and NAT.

We put all sinkX interfaces (untagged vlans) into
br-sink and configure port isolation.

Signed-off-by: Janusz Dziedzic <janusz.dziedzic@iopsys.eu>

bbf/Makefile

@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libbbfdm
-PKG_VERSION:=6.8.7
+PKG_VERSION:=6.8.9.1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bbf.git
-PKG_SOURCE_VERSION:=28ed108048c4d63bd0dc16dbf37ad52ea60c57b6
+PKG_SOURCE_VERSION:=38399ab501195c9585b46fcdbf47871c483fba29
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 

icwmp/Makefile

@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=8.4.25
+PKG_VERSION:=8.4.25.1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git

icwmp/files/etc/init.d/icwmpd

@@ -173,10 +173,13 @@ validate_defaults() {
 		return 1;
 	}
 
+	ssl_capath="${ssl_capath%/}"
 	# Put the cert pem file in keep list
 	if [ -d "${ssl_capath}" ]; then
-		if ! grep "${ssl_capath}" /lib/upgrade/keep.d/icwmp; then
+		if ! grep "*.pem\|*.crt" /lib/upgrade/keep.d/icwmp; then
 			echo "${ssl_capath}"'/*.pem' >> /lib/upgrade/keep.d/icwmp
+			echo "${ssl_capath}"'/*.crt' >> /lib/upgrade/keep.d/icwmp
+			echo "${ssl_capath}"'/*.0' >> /lib/upgrade/keep.d/icwmp
 		fi
 	fi
 
@@ -248,20 +251,25 @@ service_stopped()
 }
 
 reload_service() {
+	local ret
+
 	config_load cwmp
 	config_get_bool enable_cwmp cpe enable 1
 
+	ret="0"
 	if [ "$enable_cwmp" = "0" ]; then
 		stop
 		return 0
 	fi
 
 	status="$(ubus -t 1 call tr069 status |jsonfilter -qe '@.cwmp.status')"
+	ret="$?"
 	if [ "$status" = "up" ]; then
 		ubus -t 1 call tr069 command '{"command":"reload"}'
+		ret="$?"
 	fi
 
-	if [ "$status" = "init" ] || [ "$?" -ne "0" ]; then
+	if [ "$status" = "init" ] || [ "$ret" -ne "0" ]; then
 		log "Restarting CWMP client"
 		stop
 		start

icwmp/files/lib/upgrade/keep.d/icwmp

@@ -1 +1,2 @@
 /var/run/icwmpd/icwmpd_backup_session.xml
+/etc/icwmpd/cwmp

ieee1905/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ieee1905
-PKG_VERSION:=4.10.3
+PKG_VERSION:=4.10.5
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=3781ec6784f4186a6b7e93c83dcccbbf63ebe465
+PKG_SOURCE_VERSION:=287aeb7120b9904d4c481ceb6ba2fa6c73d4f8a2
 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.9.0.4
+PKG_VERSION:=2.9.0.5
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=6b3db98e4ff39f13daf41e3e8247947a4934f6cb
+PKG_SOURCE_VERSION:=10f6f6dc3c149ed5de375b971c685f37554c3a64
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 
 PKG_LICENSE:=BSD-3-Clause

map-agent/files/lib/wifi/traffic_separation

@@ -3,6 +3,8 @@
 . /lib/functions.sh
 
 AL_BRIDGE=${AL_BRIDGE-"br-lan"}
+SINK_BRIDGE=${SINK_BRIDGE-"br-sink"}
+SINK_IFACE=${SINK_IFACE-"sink"}
 PRIMARY_VID=${PRIMARY_VID-1}
 
 ### Traffic Separation ###
@@ -30,10 +32,12 @@ EOF
 			local dev=$4
 			local port_dev=$5
 
-			[ -z "$(uci -q get network.${name})" ] || return
+			[ -z "$(uci -q get network.${dev})" ] || return
 
 			local ip_addr="192.168.${vid}.1"
 			local br_dev="${AL_BRIDGE/-/_}"
+			local sink_dev="${SINK_BRIDGE/-/_}"
+			local sink_iface="${SINK_IFACE/-/_}"
 			local tag=":t"
 
 			[ "${vid}" = "${PRIMARY_VID}" ] && {
@@ -50,19 +54,26 @@ EOF
 				uci -q delete network.lan.ip6assign
 			}
 
-			uci -q set network.${name}="interface"
-			uci -q set network.${name}.device="$dev"
-			uci -q set network.${name}.is_lan="1"
+			[ -x "/usr/sbin/mapcontroller" ] && {
+				[ -z "$(uci -q get network.${sink_dev})" ] && {
+					uci -q set network.${sink_dev}="device"
+					uci -q set network.${sink_dev}.type="bridge"
+					uci -q set network.${sink_dev}.name="${SINK_BRIDGE}"
 
-			if [ "$proto" = "static" ] ; then
-				uci -q set network.${name}.proto="static"
-				# TODO vid > 255
-				uci -q set network.${name}.ipaddr="${ip_addr}"
-				uci -q set network.${name}.netmask="255.255.255.0"
-				uci -q set network.${name}.ip6assign '60'
-			else
-				uci -q set network.${name}.proto="dhcp"
-			fi
+					uci -q set network.${sink_iface}="interface"
+					uci -q set network.${sink_iface}.device="${SINK_BRIDGE}"
+					uci -q set network.${sink_iface}.proto="static"
+					uci -q set network.${sink_iface}.ipaddr="192.168.1.1"
+					uci -q set network.${sink_iface}.netmask="255.255.255.0"
+					uci -q set network.${sink_iface}.ip6assign="60"
+				}
+
+				uci -q add_list network.${sink_dev}.ports="$dev"
+			}
+
+			uci -q set network.${dev}="device"
+			uci -q set network.${dev}.name="${dev}"
+			uci -q set network.${dev}.isolate="1"
 
 			uci -q add network bridge-vlan
 			uci -q set network.@bridge-vlan[-1].device="$AL_BRIDGE"
@@ -160,14 +171,14 @@ EOF
 		_net_setup "vlan${vid}" ${vid} ${proto} "sink${vid}" "sink_peer${vid}"
 
 		[ -x "/usr/sbin/mapcontroller" ] && {
-			_dhcp_setup vlan${vid}
-			_firewall_setup vlan${vid} ${vid}
+			_dhcp_setup "${SINK_IFACE}"
+			_firewall_setup "${SINK_IFACE}" ${vid}
 		}
 	}
 
 	ts_reload() {
 		local dhcp_reload=$1
-
+		restart=""
 		# workaround for missing backhaul wifi.ap.* ubus obj's:
 		# iterate in config and setup bh
 #		config_load wireless
@@ -188,8 +199,41 @@ EOF
 
 #		config_foreach _setup_bh_iface wifi-iface
 
+		bridge_verify_vid_mapping() {
+			local section=$1
+
+			check__port_vid() {
+				local port="$1"
+				local vlan="$2"
+
+				added=$(bridge vlan show dev $port | grep -w "$vlan")
+				if [ "$added" = "" ]; then
+					restart="1"
+					break
+				fi
+			}
+
+			config_get vlan "$section" vlan "0"
+
+			[ "$vlan" = "0" ] && continue
+
+			config_list_foreach "$section" "ports" check_port_vid "$vlan"
+			[ "$restart" = "1" ] && break
+		}
+
+
+
+		config_load network
+		config_foreach bridge_verify_vid_mapping bridge-vlan
+
+
 		[ -n "dhcp_reload" ] && /etc/init.d/dnsmasq reload
-		ubus call uci commit '{"config":"network"}'
+		if [ "$restart" = "1" ]; then
+			dbg "trigger network restart"
+			/etc/init.d/network restart
+		else
+			ubus call uci commit '{"config":"network"}'
+		fi
 		/etc/init.d/firewall reload
 
 

map-controller/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-controller
-PKG_VERSION:=2.8.0.5
+PKG_VERSION:=2.8.0.6
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=da283946e96e2d8b982b0b0518fa84102f0ef4df
+PKG_SOURCE_VERSION:=93caf3a7e69e14929d7e99d197a2b0f9e25c78bc
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)

map-controller/files/etc/config/mapcontroller

@@ -6,8 +6,9 @@ config controller 'controller'
 	option enable_bsta_steer '0'
 	option use_bcn_metrics '0'
 	option use_usta_metrics '0'
-	option primary_vid '0'
+	option primary_vid '1'
 	option primary_pcp '0'
+	option enable_ts '0'
 	option allow_bgdfs '0'
 	option channel_plan '0'
 

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

@@ -25,7 +25,8 @@ validate_controller_section() {
 		'use_bcn_metrics:bool:false' \
 		'use_usta_metrics:bool:false' \
 		'allow_bgdfs:range(0,2629744)' \
-		'channel_plan:range(0,2629744)'
+		'channel_plan:range(0,2629744)' \
+		'enable_ts:bool:false'
 
 	[ "$?" -ne 0 ] && {
 		logger -s -t "mapcontroller" "Validation of controller section failed"

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.7
+PKG_VERSION:=2.5.0.8
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_VERSION:=601f5fdc8b4051811593efa714954d4cb3d7b7dd
+PKG_SOURCE_VERSION:=8fedad83542c451c6dd74da30668edc6f50eafe8
 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

map-topology/files/etc/config/hosts

@@ -2,3 +2,4 @@
 config global 'global'
 	option ageing_timer '1440'
 	option reboot_persistent '0'
+	option ifname 'br-lan'

map-topology/files/etc/init.d/topologyd

@@ -24,7 +24,8 @@ validate_topology_config() {
 validate_global_section() {
 	uci_validate_section hosts global "global" \
 		'ageing_timer:uinteger' \
-		'reboot_persistent:bool'
+		'reboot_persistent:bool' \
+		'ifname:string'
 
 	[ "$?" -ne 0 ] && {
 		logger -s -t "hosts" "Validation of global section failed"

ponmngr/files/etc/init.d/xpon

@@ -15,8 +15,6 @@ start_service() {
 }
 
 stop_service() {
-	# stopping omcid does not bring down the pon link, which should happen
-	# if ANI is disabled or stopped (go to O1)
 	deinit_xpon
 }
 

ponmngr/files/lib/xpon/broadcom.sh

@@ -10,11 +10,13 @@ init_xpon() {
 	procd_close_instance
 	procd_open_instance pon_daemon
 	procd_set_param command omcid start -n
+	procd_set_param respawn
 	procd_close_instance
 
 }
 
 deinit_xpon() {
+	# stopping omcid does not bring down the pon link, which should happen
+	# if ANI is disabled or stopped (go to O1)
 	gponctl stop
 }
-

stunc/Makefile

@@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=stunc
 PKG_RELEASE:=1
-PKG_VERSION:=1.1.11
+PKG_VERSION:=1.1.12
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/stunc.git
-PKG_SOURCE_VERSION:=5afef8d2040fa31a73e6320c8a65b891a88518de
+PKG_SOURCE_VERSION:=5b65364709a921db0956bf74a4f126217cfb1775
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -64,19 +64,16 @@ TARGET_CFLAGS += \
 	-Wall -Werror
 
 ifeq ($(BUILD_VARIANT),wolfssl)
-  TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/wolfssl
   MAKE_FLAGS += \
 	USE_WOLFSSL="yes"
 endif
 
 ifeq ($(BUILD_VARIANT),mbedtls)
-  TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/mbedtls
   MAKE_FLAGS += \
 	USE_MBEDTLS="yes"
 endif
 
 ifeq ($(BUILD_VARIANT),openssl)
-  TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/
   MAKE_FLAGS += \
 	USE_OPENSSL="yes"
 endif

uspd/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=uspd
-PKG_VERSION:=2.2.11
+PKG_VERSION:=2.2.12
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/uspd.git
-PKG_SOURCE_VERSION:=1bfd9937ae31c6878aff77fca25f9265d822b57d
+PKG_SOURCE_VERSION:=b18e7cbad2c295a1dcea64fca42439f0c9cd73a2
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif