mcastmngr: Handled max multicast snoop entry

* removed +2 logic as multicast snoop entry handled in mcproxy
 with logic to exclude count of reserve mcast ip address subnet

bbfdm/Config_bbfdm.in

@@ -10,14 +10,168 @@ config BBF_VENDOR_PREFIX
 	string "Vendor Prefix"
 	default "X_IOPSYS_EU_"
 
-config BBF_TR143
-	bool "Enable TR-143 Data Model Support"
-	default y
-
-config BBF_TR471
-	bool "Enable TR-471 Data Model Support"
-	default y
-
 config BBF_MAX_OBJECT_INSTANCES
 	int "Maximum number of instances per object"
 	default 255
+
+menu "TR181 Datamodels"
+	depends on PACKAGE_libbbfdm
+
+	config BBF_TR143
+		bool "Enable TR-143 Data Model Support"
+		default y
+
+	config BBF_TR471
+		bool "Enable TR-471 Data Model Support"
+		default y
+
+	config BBFDM_TR181_ATM
+		bool "Include Device.ATM."
+		default y
+
+	config BBFDM_TR181_BRIDGING
+		bool "Include Device.Bridging."
+		default y
+
+	config BBFDM_TR181_DDNS
+		bool "Include Device.DynamicDNS."
+		default y
+
+	config BBFDM_TR181_DEVICEINFO
+		bool "Include Device.DeviceInfo."
+		default y
+
+	config BBFDM_TR181_DEVICEINFO_PROCESSSTATUS
+		bool "Include Device.DeviceInfo.ProcessStatus."
+		default y
+
+	config BBFDM_TR181_DHCPv4
+		bool "Include Device.DHCPv4."
+		default y
+
+	config BBFDM_TR181_DHCPv6
+		bool "Include Device.DHCPv6."
+		default y
+
+	config BBFDM_TR181_DNS
+		bool "Include Device.DNS."
+		default y
+
+	config BBFDM_TR181_DSL
+		bool "Include Device.DSL."
+		default y
+
+	config BBFDM_TR181_ETHERNET
+		bool "Include Device.Ethenet."
+		default y
+
+	config BBFDM_TR181_FAST
+		bool "Include Device.FAST."
+		default y
+
+	config BBFDM_TR181_FIREWALL
+		bool "Include Device.Firewall."
+		default y
+
+	config BBFDM_TR181_GATEWAYINFO
+		bool "Include Device.GatewayInfo."
+		default y
+
+	config BBFDM_TR181_GRE
+		bool "Include Device.GRE."
+		default y
+
+	config BBFDM_TR181_IEEE1905
+		bool "Include Device.IEEE1905."
+		default y
+
+	config BBFDM_TR181_INTERFACESTACK
+		bool "Include Device.InterfaceStack."
+		default y
+
+	config BBFDM_TR181_IP
+		bool "Include Device.IP."
+		default y
+
+	config BBFDM_TR181_LANCONFSEC
+		bool "Include Device.LANonfigSecurity."
+		default y
+
+	config BBFDM_TR181_MQTT
+		bool "Include Device.MQTT."
+		default y
+
+	config BBFDM_TR181_NAT
+		bool "Include Device.NAT."
+		default y
+
+	config BBFDM_TR181_PACKETCAPTURE
+		bool "Include Device.PacketCaptureDiagnostics."
+		default y
+
+	config BBFDM_TR181_PPP
+		bool "Include Device.PPP."
+		default y
+
+	config BBFDM_TR181_PTM
+		bool "Include Device.PTM."
+		default y
+
+	config BBFDM_TR181_QOS
+		bool "Include Device.QoS."
+		default y
+
+	config BBFDM_TR181_ROUTERADVERTISEMENT
+		bool "Include Device.RouterAdvertisement."
+		default y
+
+	config BBFDM_TR181_ROUTING
+		bool "Include Device.Routing."
+		default y
+
+	config BBFDM_TR181_SECURITY
+		bool "Include Device.Security."
+		default y
+
+	config BBFDM_TR181_SELFTEST
+		bool "Include Device.SelfTestDiagnostics."
+		default y
+
+	config BBFDM_TR181_SSH
+		bool "Include Device.SSH."
+		default y
+
+	config BBFDM_TR181_TIME
+		bool "Include Device.Time."
+		default y
+
+	config BBFDM_TR181_UPNP
+		bool "Include Device.UPnP."
+		default y
+
+	config BBFDM_TR181_USB
+		bool "Include Device.USB."
+		default y
+
+	config BBFDM_TR181_USERINTERFACE
+		bool "Include Device.UserInterface."
+		default y
+
+	config BBFDM_TR181_WIFI
+		bool "Include Device.WiFi."
+		default y
+
+	config BBFDM_TR181_WIFI_DATAELEMENTS
+		bool "Include Device.WiFi.DataElements."
+		default y
+
+	config BBFDM_TR181_WIFI_DATAELEMENTS_ASSOCEVENTS
+		bool "Include deprecated AssociationEventData/DisassociationEventData tables"
+		default n
+		help
+		  TR181-2.17 deprecates below dataelements tables
+		  - Device.WiFi.DataElements.AssociationEvent.AssociationEventData.{i}.
+		  - Device.WiFi.DataElements.DisassociationEvent.DisassociationEventData.{i}.
+		  If this option is selected, above mentioned tables shall be added in datamodel.
+
+endmenu

bbfdm/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bbfdm
-PKG_VERSION:=1.4.23.19
+PKG_VERSION:=1.4.23.22
 
 USE_LOCAL:=0
 ifneq ($(USE_LOCAL),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/bbfdm.git
-PKG_SOURCE_VERSION:=bfd50fe626d97f325bda6ea66fd57b0e9dd97ba9
+PKG_SOURCE_VERSION:=73d49e600e2cdf2aadcc23133b922916c6cd8c69
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -38,6 +38,7 @@ define Package/libbbfdm/default
   TITLE:=Library for broadband forum data model support
   DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libcurl +libbbfdm-api \
 	    +BBF_TR471:obudpst
+  MENU:=1
 endef
 
 define Package/libbbfdm
@@ -112,8 +113,153 @@ endef
 endif
 
 CMAKE_OPTIONS += \
-	-DBBF_TR181=ON
-	-DBBF_WIFI_DATAELEMENTS=ON
+	-DBBF_TR181=ON \
+	-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
+
+
+ifeq ($(CONFIG_BBFDM_TR181_ATM),y)
+TARGET_CFLAGS += -DBBFDM_TR181_ATM
+endif
+
+ifeq ($(CONFIG_BBFDM_TR181_BRIDGING),y)
+TARGET_CFLAGS += -DBBFDM_TR181_BRIDGING
+endif
+
+ifeq ($(CONFIG_BBFDM_TR181_DDNS),y)
+TARGET_CFLAGS += -DBBFDM_TR181_DDNS
+endif
+
+ifeq ($(CONFIG_BBFDM_TR181_DEVICEINFO),y)
+TARGET_CFLAGS += -DBBFDM_TR181_DEVICEINFO
+endif
+
+ifeq ($(CONFIG_BBFDM_TR181_DEVICEINFO_PROCESSSTATUS),y)
+TARGET_CFLAGS += -DBBFDM_TR181_DEVICEINFO_PROCESSSTATUS
+endif
+
+ifeq ($(CONFIG_BBFDM_TR181_DHCPv4),y)
+TARGET_CFLAGS += -DBBFDM_TR181_DHCPv4
+endif
+
+ifeq ($(CONFIG_BBFDM_TR181_DHCPv6),y)
+TARGET_CFLAGS += -DBBFDM_TR181_DHCPv6
+endif
+
+ifeq ($(CONFIG_BBFDM_TR181_DNS),y)
+TARGET_CFLAGS += -DBBFDM_TR181_DNS
+endif
+
+ifeq ($(CONFIG_BBFDM_TR181_DSL),y)
+TARGET_CFLAGS += -DBBFDM_TR181_DSL
+endif
+
+ifeq ($(CONFIG_BBFDM_TR181_ETHERNET),y)
+TARGET_CFLAGS += -DBBFDM_TR181_ETHERNET
+endif
+
+ifeq ($(CONFIG_BBFDM_TR181_FAST),y)
+TARGET_CFLAGS += -DBBFDM_TR181_FAST
+endif
+
+ifeq ($(CONFIG_BBFDM_TR181_FIREWALL),y)
+TARGET_CFLAGS += -DBBFDM_TR181_FIREWALL
+endif
+
+ifeq ($(CONFIG_BBFDM_TR181_GATEWAYINFO),y)
+TARGET_CFLAGS += -DBBFDM_TR181_GATEWAYINFO
+endif
+
+ifeq ($(CONFIG_BBFDM_TR181_GRE),y)
+TARGET_CFLAGS += -DBBFDM_TR181_GRE
+endif
+
+ifeq ($(CONFIG_BBFDM_TR181_IEEE1905),y)
+TARGET_CFLAGS += -DBBFDM_TR181_IEEE1905
+endif
+
+ifeq ($(CONFIG_BBFDM_TR181_INTERFACESTACK),y)
+TARGET_CFLAGS += -DBBFDM_TR181_INTERFACESTACK
+endif
+
+ifeq ($(CONFIG_BBFDM_TR181_IP),y)
+TARGET_CFLAGS += -DBBFDM_TR181_IP
+endif
+
+ifeq ($(CONFIG_BBFDM_TR181_LANCONFSEC),y)
+TARGET_CFLAGS += -DBBFDM_TR181_LANCONFSEC
+endif
+
+ifeq ($(CONFIG_BBFDM_TR181_MQTT),y)
+TARGET_CFLAGS += -DBBFDM_TR181_MQTT
+endif
+
+ifeq ($(CONFIG_BBFDM_TR181_NAT),y)
+TARGET_CFLAGS += -DBBFDM_TR181_NAT
+endif
+
+ifeq ($(CONFIG_BBFDM_TR181_PACKETCAPTURE),y)
+TARGET_CFLAGS += -DBBFDM_TR181_PACKETCAPTURE
+endif
+
+ifeq ($(CONFIG_BBFDM_TR181_PPP),y)
+TARGET_CFLAGS += -DBBFDM_TR181_PPP
+endif
+
+ifeq ($(CONFIG_BBFDM_TR181_PTM),y)
+TARGET_CFLAGS += -DBBFDM_TR181_PTM
+endif
+
+ifeq ($(CONFIG_BBFDM_TR181_QOS),y)
+TARGET_CFLAGS += -DBBFDM_TR181_QOS
+endif
+
+ifeq ($(CONFIG_BBFDM_TR181_ROUTERADVERTISEMENT),y)
+TARGET_CFLAGS += -DBBFDM_TR181_ROUTERADVERTISEMENT
+endif
+
+ifeq ($(CONFIG_BBFDM_TR181_ROUTING),y)
+TARGET_CFLAGS += -DBBFDM_TR181_ROUTING
+endif
+
+ifeq ($(CONFIG_BBFDM_TR181_SECURITY),y)
+TARGET_CFLAGS += -DBBFDM_TR181_SECURITY
+endif
+
+ifeq ($(CONFIG_BBFDM_TR181_SELFTEST),y)
+TARGET_CFLAGS += -DBBFDM_TR181_SELFTEST
+endif
+
+ifeq ($(CONFIG_BBFDM_TR181_SSH),y)
+TARGET_CFLAGS += -DBBFDM_TR181_SSH
+endif
+
+ifeq ($(CONFIG_BBFDM_TR181_TIME),y)
+TARGET_CFLAGS += -DBBFDM_TR181_TIME
+endif
+
+ifeq ($(CONFIG_BBFDM_TR181_UPNP),y)
+TARGET_CFLAGS += -DBBFDM_TR181_UPNP
+endif
+
+ifeq ($(CONFIG_BBFDM_TR181_USB),y)
+TARGET_CFLAGS += -DBBFDM_TR181_USB
+endif
+
+ifeq ($(CONFIG_BBFDM_TR181_USERINTERFACE),y)
+TARGET_CFLAGS += -DBBFDM_TR181_USERINTERFACE
+endif
+
+ifeq ($(CONFIG_BBFDM_TR181_WIFI),y)
+TARGET_CFLAGS += -DBBFDM_TR181_WIFI
+endif
+
+ifeq ($(CONFIG_BBFDM_TR181_WIFI_DATAELEMENTS),y)
+TARGET_CFLAGS += -DBBFDM_TR181_WIFI_DATAELEMENTS
+endif
+
+ifeq ($(CONFIG_BBFDM_TR181_WIFI_DATAELEMENTS_ASSOCEVENTS),y)
+TARGET_CFLAGS += -DBBFDM_TR181_WIFI_DATAELEMENTS_ASSOCEVENTS
+endif
 
 ifeq ($(CONFIG_BBF_TR143),y)
 CMAKE_OPTIONS += \

bbfdm/files/etc/config/bbfdm

@@ -2,7 +2,7 @@
 config bbfdmd 'bbfdmd'
 	option enabled '1'
 	option loglevel '1'
-	option refresh_time '10'
+	option refresh_time '120'
 	option transaction_timeout '30'
 	option subprocess_level '2'
 

decollector/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=decollector
-PKG_VERSION:=4.2.1.1.2
+PKG_VERSION:=4.2.1.1.5
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=caa2c1dc89c5f75455a0346f44ae80097b8e2e29
+PKG_SOURCE_VERSION:=b34c94d516ee18e33fc910b8a656649541b7e8e8
 PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/decollector.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip

hostmngr/files/etc/hostmngr/input.json

@@ -2,7 +2,8 @@
 	"daemon": {
 		"input": {
 			"type": "DotSo",
-			"name": "/etc/hostmngr/libhostmngr.so"
+			"name": "/etc/hostmngr/libhostmngr.so",
+			"plugin_dir": "/etc/hostmngr/plugins/"
 		},
 		"output": {
 			"type": "UBUS",

map-agent/Config.in

@@ -55,5 +55,8 @@ config AGENT_OPER_CHANNEL_CHANGE_RELAY_MCAST
 config AGENT_USE_LIBDPP
 	bool "Depend on libdpp for DPP EasyConnect"
 
+config DYNBHD_DYNAMICALLY_PERSIST_CONTROLLER
+	bool "Let dynbhd through AP-Autoconfiguration Search and DHCP Discovery determine the controller or agent role"
+
 endmenu
 endif

map-agent/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-agent
-PKG_VERSION:=4.5.0.20
+PKG_VERSION:=4.5.0.23
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=b378b720a514a0df8ccfac62f4415f75376ee1e3
+PKG_SOURCE_VERSION:=eb1138dfc1a87193a03c8e71590e4be0a466dfad
 PKG_MAINTAINER:=Jakob Olsson <jakob.olsson@iopsys.eu>
 
 PKG_LICENSE:=BSD-3-Clause
@@ -105,6 +105,10 @@ ifeq ($(CONFIG_AGENT_OPER_CHANNEL_CHANGE_RELAY_MCAST),y)
 TARGET_CFLAGS += -DOPER_CHAN_CHANGE_RELAY_MCAST
 endif
 
+ifeq ($(CONFIG_DYNBHD_DYNAMICALLY_PERSIST_CONTROLLER),y)
+TARGET_CFLAGS += -DPERSIST_CONTROLLER
+endif
+
 MAKE_PATH:=src
 
 define Package/map-agent/install

map-agent/files/lib/multiap/map_genconfig

@@ -188,12 +188,12 @@ map_genconf () {
 			uci -q set mapagent.@controller_select[0].local=1
 		fi
 		uci -q commit mapagent
-	fi
 
-	if [ "$multiap_mode" == "agent" -o "$multiap_mode" == "none" ]; then
-		uci set mapcontroller.controller.enabled="0"
-	else
-		uci set mapcontroller.controller.enabled="1"
+		if [ "$multiap_mode" == "agent" -o "$multiap_mode" == "none" ]; then
+			uci set mapcontroller.controller.enabled="0"
+		else
+			uci set mapcontroller.controller.enabled="1"
+		fi
+		uci -q commit mapcontroller
 	fi
-	uci -q commit mapcontroller
 }

map-controller/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-controller
-PKG_VERSION:=4.5.0.6
+PKG_VERSION:=4.5.0.8
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=ab1665212b0f7264b75fb89f3074737c03af24e8
+PKG_SOURCE_VERSION:=c719a86bb2485b8de79a639cc42a8f1d6303253c
 PKG_MAINTAINER:=Jakob Olsson <jakob.olsson@iopsys.eu>
 
 LOCAL_DEV=0

mcastmngr/files/linux/lib/mcast/linux.sh

@@ -262,10 +262,6 @@ config_mcproxy_instance() {
 		downstreams=$igmp_p_down_interfaces
 		mcast_mode=$igmp_p_mode
 
-		# mcproxy reserves two multicast subscriptions for igmp router service groups
-		local mg=$(cat /proc/sys/net/ipv4/igmp_max_memberships)
-		mg=$((mg+2))
-		echo $mg > /proc/sys/net/ipv4/igmp_max_memberships
 	elif [ "$protocol" == "mld" ]; then
 		case "$version" in
 			[1-2])

obuspa/Makefile

@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=obuspa
-PKG_VERSION:=7.0.5.6.3
+PKG_VERSION:=7.0.5.6.6
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
@@ -104,7 +104,6 @@ define Package/obuspa/install
 	$(INSTALL_DATA) ./files/etc/config/obuspa $(1)/etc/config/
 	$(INSTALL_DATA) ./files/etc/obuspa/roles.json $(1)/etc/obuspa/roles.json
 	$(INSTALL_DATA) ./files/etc/obuspa/dmcaching_exclude.json $(1)/etc/obuspa/dmcaching_exclude.json
-	$(INSTALL_BIN) ./files/etc/uci-defaults/00-obuspa-extender-mode $(1)/etc/uci-defaults/
 	$(INSTALL_BIN) ./files/etc/uci-defaults/01-fix-upgrade-uci $(1)/etc/uci-defaults/
 	$(INSTALL_BIN) ./files/etc/uci-defaults/02-obuspa-dhcp-option $(1)/etc/uci-defaults/
 	$(INSTALL_BIN) ./files/etc/udhcpc.user.d/udhcpc_obuspa_opt125.user $(1)/etc/udhcpc.user.d/udhcpc_obuspa_opt125.user

obuspa/files/etc/config/obuspa

@@ -6,8 +6,9 @@ config obuspa 'global'
 	option prototrace '0'
 	option db_file '/etc/obuspa/usp.db'
 	option role_file '/etc/obuspa/roles.json'
-	option dm_caching_exclude '/etc/obuspa/dmcaching_exclude.json'
+	#option dm_caching_exclude '/etc/obuspa/dmcaching_exclude.json'
 	#option trust_cert '/etc/ssl/cert.pem'
 	#option client_cert '/etc/obuspa/client.pem'
 	#option log_dest '/tmp/obuspa.log'
+	option max_cache_time  '120'
 

obuspa/files/etc/uci-defaults/00-obuspa-extender-mode

@@ -1,13 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-config_load obuspa
-config_get interface global interface ""
-
-if command -v fw_printenv; then
-	mode="$(fw_printenv -n netmode)"
-	if [ "${mode}" == "extender" -a -z "$interface" ] ; then
-		uci_set obuspa global interface "lan"
-	fi
-fi

obuspa/files/etc/udhcpc.user.d/udhcpc_obuspa_opt125.user

@@ -8,6 +8,11 @@ RETRY_MIN_INTERVAL="5"
 RETRY_INTERVAL_MUL="2000"
 ENDPOINT_ID=""
 
+log()
+{
+	echo "$*"|logger -t obuspa.dhcp -p debug
+}
+
 get_oui_from_db() {
 	db -q get device.deviceinfo.ManufacturerOUI
 }
@@ -124,15 +129,15 @@ get_vivsoi() {
 	done
 }
 
-get_netmode()
+get_access_role()
 {
-	local mode
+	local mode lan_proto
 
-	if command -v fw_printenv; then
-		mode="$(fw_printenv -n netmode)"
-	fi
+	lan_proto="$(uci -q get network.lan.proto)"
 
-	if [ "$mode" != "extender" ]; then
+	if [ "${lan_proto}" == "dhcp" ]; then
+		mode="extender"
+	else
 		mode="full_access"
 	fi
 
@@ -141,13 +146,25 @@ get_netmode()
 
 config_load obuspa
 config_get_bool enable_obuspa global enabled 1
-config_get wan_intf global interface "wan"
+config_get wan_intf global interface
 config_get_bool dhcp_discovery global dhcp_discovery 1
 
 if [ "$enable_obuspa" = "0" ] || [ "$dhcp_discovery" = "0" ]; then
 	return 0
 fi
 
+if [ -z "${wan_intf}" ]; then
+	role="$(get_access_role)"
+
+	if [ "${role}" = "extender" ]; then
+		wan_intf="lan"
+		uci -q set obuspa.global.interface="lan"
+		uci commit obuspa
+	else
+		wan_intf="wan"
+	fi
+fi
+
 if [ "${wan_intf}" == "${INTERFACE}" ]; then
 	if [ -n "$opt125" ]; then
 		len=$(printf "$opt125"|wc -c)
@@ -226,7 +243,7 @@ if [ "${wan_intf}" == "${INTERFACE}" ]; then
 			fi
 		fi
 
-		uci -q set obuspa.dhcpcontroller.assigned_role_name="$(get_netmode)"
+		uci -q set obuspa.dhcpcontroller.assigned_role_name="$(get_access_role)"
 		uci -q set obuspa.dhcpcontroller.Enable='1'
 		uci_change=1
 	fi
@@ -309,6 +326,7 @@ if [ "${wan_intf}" == "${INTERFACE}" ]; then
 	fi
 
 	if [ ${uci_change} -eq 1 ]; then
+		log "# Reloading obuspa as dhcp config changed"
 		ubus call uci commit '{"config":"obuspa"}'
 	fi
 fi