ratelimit: fix rate limiting on WiFi-7 devices

Rate limiting was not applied on WiFi-7 devices because their
hostapd interface names use the phy* prefix instead of wlan*.
This patch extends the match pattern to include both wlan* and phy*.

Fixes: WIFI-14884

Signed-off-by: Marek Kwaczynski <marek@shasta.cloud>

feeds/ipq807x_v5.4/ath11k-wifi/Makefile

@@ -24,6 +24,8 @@ endef
 #
 
 ALLWIFIBOARDS:= \
+	cig-wf186w \
+	cig-wf186h \
 	cig-wf660a \
 	cig-wf194c \
 	cig-wf194c4 \
@@ -106,16 +108,6 @@ $(call Package/ath11k-wifi-default)
     TITLE:=cig-wf196 bdf
 endef
 
-define Package/ath11k-wifi-cig-wf186w
-$(call Package/ath11k-wifi-default)
-    TITLE:=cig-wf186w bdf
-endef
-
-define Package/ath11k-wifi-cig-wf186h
-$(call Package/ath11k-wifi-default)
-    TITLE:=cig-wf186h bdf
-endef
-
 define Package/ath11k-wifi-gl-ax1800
 $(call Package/ath11k-wifi-default)
     TITLE:=gl-ax1800 bdf
@@ -292,24 +284,6 @@ define Package/ath11k-wifi-cig-wf196/install
 	$(INSTALL_DATA) ./board-cig-wf196-us.bin.IPQ8074 $(1)/lib/firmware/ath11k/IPQ8074/hw2.0/board.bin.US
 endef
 
-define Package/ath11k-wifi-cig-wf186w/install
-	$(INSTALL_DIR) $(1)/lib/firmware/ath11k/IPQ5018/hw1.0/
-	$(INSTALL_DIR) $(1)/lib/firmware/ath11k/qcn6122/hw1.0/
-	$(INSTALL_DATA) ./board-cig-wf186w-us.bin.IPQ5018 $(1)/lib/firmware/ath11k/IPQ5018/hw1.0/board.bin.US
-	$(INSTALL_DATA) ./board-cig-wf186w-ca.bin.IPQ5018 $(1)/lib/firmware/ath11k/IPQ5018/hw1.0/board.bin.CA
-	$(INSTALL_DATA) ./board-cig-wf186w-us.bin.QCN6122 $(1)/lib/firmware/ath11k/qcn6122/hw1.0/board.bin.US
-	$(INSTALL_DATA) ./board-cig-wf186w-ca.bin.QCN6122 $(1)/lib/firmware/ath11k/qcn6122/hw1.0/board.bin.CA
-endef
-
-define Package/ath11k-wifi-cig-wf186h/install
-	$(INSTALL_DIR) $(1)/lib/firmware/ath11k/IPQ5018/hw1.0/
-	$(INSTALL_DIR) $(1)/lib/firmware/ath11k/qcn6122/hw1.0/
-	$(INSTALL_DATA) ./board-cig-wf186h-us.bin.IPQ5018 $(1)/lib/firmware/ath11k/IPQ5018/hw1.0/board.bin.US
-	$(INSTALL_DATA) ./board-cig-wf186h-ca.bin.IPQ5018 $(1)/lib/firmware/ath11k/IPQ5018/hw1.0/board.bin.CA
-	$(INSTALL_DATA) ./board-cig-wf186h-us.bin.QCN6122 $(1)/lib/firmware/ath11k/qcn6122/hw1.0/board.bin.US
-	$(INSTALL_DATA) ./board-cig-wf186h-ca.bin.QCN6122 $(1)/lib/firmware/ath11k/qcn6122/hw1.0/board.bin.CA
-endef
-
 define Package/ath11k-wifi-optimcloud-d50/install
 	$(INSTALL_DIR) $(1)/lib/firmware/ath11k/IPQ5018/hw1.0/
 	$(INSTALL_DIR) $(1)/lib/firmware/ath11k/QCN9074/hw1.0/
@@ -419,6 +393,8 @@ define Package/ath11k-wifi-cig-wf188n/install
 	$(INSTALL_DATA) ./board-cig-wf188n-us.bin.IPQ6018 $(1)/lib/firmware/ath11k/IPQ6018/hw1.0/board.bin.US
 endef
 
+$(eval $(call generate-ath11k-wifi-package,cig-wf186w,Cigtech WF186w))
+$(eval $(call generate-ath11k-wifi-package,cig-wf186h,Cigtech WF186h))
 $(eval $(call generate-ath11k-wifi-package,cig-wf660a,Cigtech WF660a))
 $(eval $(call generate-ath11k-wifi-package,cig-wf194c,Cigtech WF194c))
 $(eval $(call generate-ath11k-wifi-package,cig-wf194c4,Cigtech WF194c4))
@@ -464,8 +440,6 @@ $(eval $(call BuildPackage,ath11k-wifi-qcom-ipq8074))
 $(eval $(call BuildPackage,ath11k-wifi-qcom-ipq6018))
 $(eval $(call BuildPackage,ath11k-wifi-qcom-qcn9000))
 $(eval $(call BuildPackage,ath11k-wifi-cig-wf196))
-$(eval $(call BuildPackage,ath11k-wifi-cig-wf186w))
-$(eval $(call BuildPackage,ath11k-wifi-cig-wf186h))
 $(eval $(call BuildPackage,ath11k-wifi-motorola-q14))
 $(eval $(call BuildPackage,ath11k-wifi-optimcloud-d50))
 $(eval $(call BuildPackage,ath11k-wifi-optimcloud-d60))

feeds/ipq807x_v5.4/hostapd/files/afc_location.uc

@@ -4,19 +4,19 @@ let fs = require("fs");
 let ubus = require('ubus').connect();
 
 let gps_info = ubus.call('gps', 'info');
-let latitude = gps_info.latitude || 0;
-let longitude = gps_info.longitude || 0;
+let latitude = gps_info.latitude ?? 0;
+let longitude = gps_info.longitude ?? 0;
 
 // afc-location.json file content
 let afc_location = {};
 afc_location.location_type = "ellipse";
 afc_location.location = longitude + ":" + latitude ;
-afc_location.height = gps_info.elevation || 0;
+afc_location.height = gps_info.elevation ?? 0;
 afc_location.height_type = "AMSL";
-afc_location.major_axis = int(gps_info.major_axis) || 1;
-afc_location.minor_axis = int(gps_info.minor_axis) || 1;
-afc_location.orientation = gps_info.major_orientation || 0;
-afc_location.vertical_tolerance = int(gps_info.vdop) || 1;
+afc_location.major_axis = gps_info.major_axis ?? 0;
+afc_location.minor_axis = gps_info.minor_axis ?? 0;
+afc_location.orientation = gps_info.major_orientation ?? 0;
+afc_location.vertical_tolerance = gps_info.vdop ?? 0;
 
 let afc_location_json = fs.open("/etc/ucentral/afc-location.json", "w");
 afc_location_json.write(afc_location);

feeds/ipq807x_v5.4/hostapd/files/hostapd.uc

@@ -1,8 +1,7 @@
 let libubus = require("ubus");
-import { open, readfile, writefile } from "fs";
+import { open, readfile } from "fs";
 import { wdev_create, wdev_remove, is_equal, vlist_new, phy_is_fullmac, phy_open } from "common";
 
-let uci = require('uci').cursor();
 let ubus = libubus.connect(null, 60);
 
 hostapd.data.config = {};
@@ -894,24 +893,10 @@ return {
 		hostapd.ubus.disconnect();
 	},
 	afc_request: function(iface, data) {
-		let wireless_config = uci.get_all('wireless');
-		for (let l, afc_server in wireless_config) {
-			if (afc_server['.type'] == 'afc-server' && afc_server.url && data) {
-				hostapd.printf(`Sending AFC request: ${data}`);
-				writefile("/tmp/afc-request.json", data);
-
-				if (afc_server.access_token)
-					system(`curl -s -X POST ${afc_server.url} -H \'accept: \*\/\*\' -H \'Authorization: Bearer ${afc_server.access_token}\' -H \'Content-Type: application/json\' -d \'${data}\' --output /tmp/afc-response.json`);
-				else if (afc_server.cert)
-					system(`curl -s -X POST ${afc_server.url} -H \'accept: \*\/\*\' --cert \'${afc_server.cert}\' -H \'Content-Type: application/json\' -d \'${data}\' --output /tmp/afc-response.json`);
-
-				let afc_response = (readfile("/tmp/afc-response.json"));
-				if (afc_response)
-					return afc_response;
-				else
-					return;
-			}
-		}
+		let ret = ubus.call("afc", "request", { data });
+		if (type(ret) != "object")
+			return;
+		return ret.data;
 	},
 	bss_add: function(name, obj) {
 		bss_event("add", name);

feeds/ipq807x_v5.4/ipq50xx/base-files/etc/hotplug.d/firmware/10-ath11k-caldata

@@ -251,32 +251,6 @@ ath11k-macs)
 		;;
 	esac
 	;;
-ath11k/IPQ5018/hw1.0/board.bin)
-	case "$board" in
-	cig,wf186w|\
-	cig,wf186h)
-                country=`cat /etc/ucentral/country`
-                if [ "$country" == "CA" ]; then
-                        ln -s /lib/firmware/ath11k/IPQ5018/hw1.0/board.bin.CA /lib/firmware/ath11k/IPQ5018/hw1.0/board.bin
-                else
-                        ln -s /lib/firmware/ath11k/IPQ5018/hw1.0/board.bin.US /lib/firmware/ath11k/IPQ5018/hw1.0/board.bin
-                fi
-                ;;
-	esac
-	;;
-ath11k/qcn6122/hw1.0/board.bin)
-	case "$board" in
-	cig,wf186w|\
-	cig,wf186h)
-                country=`cat /etc/ucentral/country`
-                if [ "$country" == "CA" ]; then
-                        ln -s /lib/firmware/ath11k/qcn6122/hw1.0/board.bin.CA /lib/firmware/ath11k/qcn6122/hw1.0/board.bin
-                else
-                        ln -s /lib/firmware/ath11k/qcn6122/hw1.0/board.bin.US /lib/firmware/ath11k/qcn6122/hw1.0/board.bin
-                fi
-                ;;
-	esac
-	;;
 *)
 	exit 1
 	;;

feeds/ipq807x_v5.4/ipq50xx/base-files/lib/upgrade/platform.sh

@@ -107,42 +107,29 @@ platform_do_upgrade() {
 
 	board=$(board_name)
 	case $board in
+	glinet,b3000|\
 	edgecore,oap101|\
 	edgecore,oap101-6e|\
 	edgecore,oap101e|\
 	edgecore,oap101e-6e|\
 	edgecore,eap104)
-		if [ "$(find_mtd_chardev rootfs)" ]; then
-			CI_UBIPART="rootfs"
-		else
-			if grep -q rootfs1 /proc/cmdline; then
-				CI_UBIPART="rootfs2"
-				CI_FWSETENV="active 2"
-			else
-				CI_UBIPART="rootfs1"
-				CI_FWSETENV="active 1"
-			fi
-		fi
-		nand_upgrade_tar "$1"
-		;;
-	glinet,b3000)
 		CI_UBIPART="rootfs1"
 		[ "$(find_mtd_chardev rootfs)" ] && CI_UBIPART="rootfs"
 		nand_upgrade_tar "$1"
 		;;
-	hfcl,ion4x_w|\
+        hfcl,ion4x_w|\
 	hfcl,ion4xi_w)
-		wp_part=$(fw_printenv primary | cut  -d = -f2)
-		echo "Current Primary is $wp_part"
-		if [[ $wp_part == 1 ]]; then
-				CI_UBIPART="rootfs"
-				CI_FWSETENV="primary 0"
-		else
-				CI_UBIPART="rootfs_1"
-				CI_FWSETENV="primary 1"
-		fi
-		nand_upgrade_tar "$1"
-		;;
+                wp_part=$(fw_printenv primary | cut  -d = -f2)
+                echo "Current Primary is $wp_part"
+                if [[ $wp_part == 1 ]]; then
+                        CI_UBIPART="rootfs"
+                        CI_FWSETENV="primary 0"
+                else
+                        CI_UBIPART="rootfs_1"
+                        CI_FWSETENV="primary 1"
+                fi
+                nand_upgrade_tar "$1"
+                ;;
 	cig,wf186w|\
 	cig,wf186h|\
 	emplus,wap385c|\

feeds/ipq807x_v5.4/qca-ssdk/patches/500-define-mib-loop-cnt-to-gobal.patch

@@ -1,61 +0,0 @@
---- a/include/init/ssdk_plat.h
-+++ b/include/init/ssdk_plat.h
-@@ -330,6 +330,7 @@ struct qca_phy_priv {
- 	struct mii_bus *miibus;
- /*qca808x_end*/
- 	u64 *mib_counters;
-+	a_uint32_t mib_loop_cnt;
- 	/* dump buf */
- 	a_uint8_t  buf[2048];
- 	a_uint32_t link_polling_required;
---- a/src/ref/ref_mib.c
-+++ b/src/ref/ref_mib.c
-@@ -479,39 +479,37 @@ qca_ar8327_sw_get_port_mib(struct switch
- #endif
-
- int
--_qca_ar8327_sw_capture_port_tx_counter(struct qca_phy_priv *priv, int port)
-+_qca_ar8327_sw_capture_port_tx_counter(a_uint32_t dev_id, int port)
- {
-     fal_mib_info_t  mib_Info;
-
-     memset(&mib_Info, 0, sizeof(fal_mib_info_t));
--    fal_get_tx_mib_info(priv->device_id, port, &mib_Info);
-+    fal_get_tx_mib_info(dev_id, port, &mib_Info);
-
-     return 0;
- }
-
- int
--_qca_ar8327_sw_capture_port_rx_counter(struct qca_phy_priv *priv, int port)
-+_qca_ar8327_sw_capture_port_rx_counter(a_uint32_t dev_id, int port)
- {
-     fal_mib_info_t  mib_Info;
-
-     memset(&mib_Info, 0, sizeof(fal_mib_info_t));
--    fal_get_rx_mib_info(priv->device_id, port, &mib_Info);
-+    fal_get_rx_mib_info(dev_id, port, &mib_Info);
-     return 0;
- }
-
- void
- qca_ar8327_sw_mib_task(struct qca_phy_priv *priv)
- {
--	static int loop = 0;
--
- 	mutex_lock(&priv->reg_mutex);
--	if ((loop % 2) == 0)
--		_qca_ar8327_sw_capture_port_rx_counter(priv, loop/2);
-+	if ((priv->mib_loop_cnt % 2) == 0)
-+		_qca_ar8327_sw_capture_port_rx_counter(priv->device_id, priv->mib_loop_cnt/2);
- 	else
--		_qca_ar8327_sw_capture_port_tx_counter(priv, loop/2);
-+		_qca_ar8327_sw_capture_port_tx_counter(priv->device_id, priv->mib_loop_cnt/2);
-
--	if(++loop == (2 * (priv->ports))) {
--		loop = 0;
-+	if(++priv->mib_loop_cnt == (2 * (priv->ports))) {
-+		priv->mib_loop_cnt = 0;
- 	}
-
- 	mutex_unlock(&priv->reg_mutex);

feeds/mediatek-sdk/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7981-edgecore-eap111.dts

@@ -200,7 +200,7 @@
 			phy-mode = "sgmii";
 			full-duplex;
 			pause;
-			airoha,surge = <0>;
+			airoha,surge = <1>;
 			airoha,polarity = <2>;
 		};
 

feeds/mediatek-sdk/mediatek/mt7981/base-files/etc/hotplug.d/iface/99-mtk-sr-scene-cond

@@ -34,11 +34,13 @@ case "$board" in
 
         if [ -f "$phy0_file" ]; then
             check_phy0=$(cat $phy0_file)
+            echo "check_phy0 = $check_phy0"
             [ "$check_phy0" == 0 ] && echo 1 > $phy0_file
         fi
 
         if [ -f "$phy1_file" ]; then
             check_phy1=$(cat $phy1_file)
+            echo "check_phy1 = $check_phy1"
             [ "$check_phy1" == 0 ] && echo 1 > $phy1_file
         fi
 

feeds/morse/utils/morse_mesh11sd/patches/002-remove-mesh-ifname-setting.patch

@@ -0,0 +1,107 @@
+# Description: The Mesh11sd daemon expects the mesh interface name to follow the format 'mesh<index>'. 
+# If it doesn't find this format, it attempts to set it in the UCI wireless configuration. 
+# However, when operating in other modes such as AP, STA, or Ad-Hoc, the script was patched to remove 
+# the mesh interface name from UCI. This process can lead to a race condition between the UI and Mesh11sd,
+# resulting in stale interface name values.
+# This patch resolves the issue by removing the setting of the interface name from the script, as it is 
+# now managed through the UI, ensuring consistency and eliminating the race condition.
+
+--- a/src/mesh11sd
++++ b/src/mesh11sd
+@@ -387,45 +387,45 @@ elif [ "$1" = "daemon" ]; then
+ 
+ 		if [ $mode -eq 5 ]; then
+ 			# startup=4, statusmode=0, enabled=1
++			syslogmessage="mesh11sd v$version has started: mesh management mode $mode"
+ 			startup=0
+ 			statusmode=0
+ 			mode=1
+-			syslogmessage="mesh11sd v$version has started: mesh management mode $mode"
+ 
+ 		elif [ $mode -eq 4 ]; then
+ 			# startup=4, statusmode=0, enabled=0
++			syslogmessage="mesh11sd v$version has started: mesh status mode $mode"
+ 			startup=0
+ 			statusmode=2
+ 			mode=0
+-			syslogmessage="mesh11sd v$version has started: mesh status mode $mode"
+ 
+ 		elif [ $mode -eq 3 ]; then
+ 			# startup=0, statusmode=2, enabled=1
++			syslogmessage="mesh11sd v$version has started: mesh management mode $mode"
+ 			startup=0
+ 			statusmode=0
+ 			mode=1
+-			syslogmessage="mesh11sd v$version has started: mesh management mode $mode"
+ 
+ 		elif [ $mode -eq 2 ]; then
+ 			# startup=0, statusmode=2, enabled=0
++			syslogmessage="mesh11sd v$version has started: mesh status mode $mode"
+ 			startup=0
+ 			statusmode=2
+ 			mode=0
+-			syslogmessage="mesh11sd v$version has started: mesh status mode $mode"
+ 
+ 		elif [ $mode -eq 1 ]; then
+ 			# startup=0, statusmode=0, enabled=1
++			syslogmessage="mesh11sd v$version has started, mesh management mode $mode"
+ 			startup=0
+ 			statusmode=0
+ 			mode=1
+-			syslogmessage="mesh11sd v$version has started, mesh management mode $mode"
+ 
+ 		elif [ $mode -eq 0 ]; then
+ 			# startup=0, statusmode=0, enabled=0
++			syslogmessage="mesh11sd v$version has started: mesh status mode $mode"
+ 			startup=0
+ 			statusmode=2
+ 			mode=0
+-			syslogmessage="mesh11sd v$version has started: mesh status mode $mode"
+ 		fi
+ 
+ 		if [ $mode -ne $lastmode ]; then
+@@ -441,26 +441,6 @@ elif [ "$1" = "daemon" ]; then
+ 			meshconfigs=$(uci show wireless 2> /dev/null | grep "mode='mesh'" | awk -F ".mode='mesh'" '{printf "%s " $1}')
+ 
+ 			if [ ! -z "$meshconfigs" ]; then
+-				for meshconfig in $meshconfigs; do
+-					ifname=$(uci get $meshconfig.ifname 2> /dev/null)
+-
+-					if [ -z "$ifname" ] || [ "$ifname" != "mesh$meshindex" ]; then
+-						# No interface name in config, so add one
+-						ucibatch="set $meshconfig.ifname='mesh$meshindex'"
+-						echo "$ucibatch" | uci batch
+-						changed=1
+-						syslogmessage="Setting mesh interface name to [ mesh$meshindex ]"
+-						write_to_syslog
+-					fi
+-					meshindex=$(($meshindex+1))
+-				done
+-
+-				if [ "$changed" -eq 1 ]; then
+-					changed=0
+-					restart_mesh
+-					continue
+-				fi
+-
+ 				# get a list of interfaces
+ 				get_mesh_iflist
+ 
+@@ -482,13 +462,13 @@ elif [ "$1" = "daemon" ]; then
+ 						# this is not a mesh interface
+ 						continue
+ 					else
+-						# Check if this interface has a uci ifname
+-						uciname=$(uci show wireless | grep "ifname='$iface'" | awk -F "." '{printf "wireless.%s" $2}')
++						# Check if this interface mode is 'mesh'
++						uciname=$(uci show wireless | grep "mode='mesh'" | awk -F "." '{printf "wireless.%s" $2}')
+ 
+ 						if [ -z "$uciname" ]; then
+-							# Error - No interface name in config, we should have added one
++							# Error - No interface with mode as mesh
+ 							debugtype="err"
+-							syslogmessage="Error getting mesh interface name"
++							syslogmessage="Error getting mesh interface section"
+ 							write_to_syslog
+ 							continue
+ 						fi

feeds/morse/utils/morse_mesh11sd/patches/002-remove-mesh-ifname-upon-disable.patch

@@ -1,63 +0,0 @@
-# Description: The Mesh11sd daemon sets the interface name 'mesh<index>' to the mesh interface.
-# However, even after disabling the mesh mode, this interface name persists, leading to confusion
-# when operating in other modes like AP/STA/Ad-Hoc, where the interface name continues to display as 'mesh<idx>'.
-# This patch addresses the issue by removing the 'mesh<idx>' interface name from the configuration when the device
-# is no longer in mesh mode. As this modification is not present in the upstream version, it is necessary to apply
-# this local patch to resolve the inconsistency
-
-diff --git a/src/mesh11sd b/src/mesh11sd
-index 85041d3..5f50e97 100755
---- a/src/mesh11sd
-+++ b/src/mesh11sd
-@@ -387,45 +387,45 @@ elif [ "$1" = "daemon" ]; then
- 
- 		if [ $mode -eq 5 ]; then
- 			# startup=4, statusmode=0, enabled=1
-+			syslogmessage="mesh11sd v$version has started: mesh management mode $mode"
- 			startup=0
- 			statusmode=0
- 			mode=1
--			syslogmessage="mesh11sd v$version has started: mesh management mode $mode"
- 
- 		elif [ $mode -eq 4 ]; then
- 			# startup=4, statusmode=0, enabled=0
-+			syslogmessage="mesh11sd v$version has started: mesh status mode $mode"
- 			startup=0
- 			statusmode=2
- 			mode=0
--			syslogmessage="mesh11sd v$version has started: mesh status mode $mode"
- 
- 		elif [ $mode -eq 3 ]; then
- 			# startup=0, statusmode=2, enabled=1
-+			syslogmessage="mesh11sd v$version has started: mesh management mode $mode"
- 			startup=0
- 			statusmode=0
- 			mode=1
--			syslogmessage="mesh11sd v$version has started: mesh management mode $mode"
- 
- 		elif [ $mode -eq 2 ]; then
- 			# startup=0, statusmode=2, enabled=0
-+			syslogmessage="mesh11sd v$version has started: mesh status mode $mode"
- 			startup=0
- 			statusmode=2
- 			mode=0
--			syslogmessage="mesh11sd v$version has started: mesh status mode $mode"
- 
- 		elif [ $mode -eq 1 ]; then
- 			# startup=0, statusmode=0, enabled=1
-+			syslogmessage="mesh11sd v$version has started, mesh management mode $mode"
- 			startup=0
- 			statusmode=0
- 			mode=1
--			syslogmessage="mesh11sd v$version has started, mesh management mode $mode"
- 
- 		elif [ $mode -eq 0 ]; then
- 			# startup=0, statusmode=0, enabled=0
-+			syslogmessage="mesh11sd v$version has started: mesh status mode $mode"
- 			startup=0
- 			statusmode=2
- 			mode=0
--			syslogmessage="mesh11sd v$version has started: mesh status mode $mode"
- 		fi
- 
- 		if [ $mode -ne $lastmode ]; then

feeds/morse/utils/morse_mesh11sd/patches/003-accton_fix_ifname_confliction.patch

@@ -1,39 +0,0 @@
---- a/src/mesh11sd	2024-09-06 17:13:52.075070001 +0800
-+++ b/src/mesh11sd	2024-09-06 17:47:36.326914438 +0800
-@@ -434,7 +434,6 @@
- 		fi
- 
- 		lastmode=$mode
--		meshindex=0
- 
- 		if [ "$enabled" = 1 ]; then
- 			#get list of mesh configs
-@@ -443,16 +442,19 @@
- 			if [ ! -z "$meshconfigs" ]; then
- 				for meshconfig in $meshconfigs; do
- 					ifname=$(uci get $meshconfig.ifname 2> /dev/null)
--
--					if [ -z "$ifname" ] || [ "$ifname" != "mesh$meshindex" ]; then
--						# No interface name in config, so add one
--						ucibatch="set $meshconfig.ifname='mesh$meshindex'"
--						echo "$ucibatch" | uci batch
--						changed=1
--						syslogmessage="Setting mesh interface name to [ mesh$meshindex ]"
--						write_to_syslog
-+					device=$(uci -q get $meshconfig.device)
-+					device_type=$(uci -q get wireless.$device.type)
-+					new_ifname="halow_mesh"
-+					if [ "$device_type" == "morse" ]; then
-+						if [ -z "$ifname" ] || [ "$ifname" != "$new_ifname" ]; then
-+							# No interface name in config, so add one
-+							ucibatch="set $meshconfig.ifname='$new_ifname'"
-+							echo "$ucibatch" | uci batch
-+							changed=1
-+							syslogmessage="Setting mesh interface name to [ $new_ifname ]"
-+							write_to_syslog
-+						fi
- 					fi
--					meshindex=$(($meshindex+1))
- 				done
- 
- 				if [ "$changed" -eq 1 ]; then

feeds/morse/utils/wpa_supplicant_s1g/Config.in

@@ -2,7 +2,7 @@ if PACKAGE_wpa_supplicant_s1g
 
 	config MORSE_WPA_SUPPLICANT_S1G_MESH_NETWORKING
 		bool
-		default y
+		default n
 		prompt "Enable mesh networking support"
 
 	config MORSE_WPA_SUPPLICANT_S1G_EAP

feeds/qca-wifi-7/ath12k-wifi/Makefile

@@ -43,11 +43,6 @@ $(call Package/ath12k-wifi-default)
     TITLE:=board-2.bin for EAP105
 endef
 
-define Package/ath12k-wifi-emplus-wap7635
-$(call Package/ath12k-wifi-default)
-    TITLE:=board-2.bin for WAP7635
-endef
-
 define Package/ath12k-wifi-sonicfi-rap7110c-341x
 $(call Package/ath12k-wifi-default)
     TITLE:=board-2.bin for RAP7710c_341x
@@ -101,8 +96,8 @@ endef
 define Package/ath12k-wifi-cig-wf189/install
 	$(INSTALL_DIR) $(1)/lib/firmware/ath12k/QCN92XX/hw1.0/
 	$(INSTALL_DIR) $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/
-	$(INSTALL_DATA) ./board-2.bin.wf189-us.QCN92XX $(1)/lib/firmware/ath12k/QCN92XX/hw1.0/board-2.bin.US
-	$(INSTALL_DATA) ./board-2.bin.wf189-us.IPQ5332 $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin.US
+	$(INSTALL_DATA) ./board-2.bin.wf189.QCN92XX $(1)/lib/firmware/ath12k/QCN92XX/hw1.0/board-2.bin
+	$(INSTALL_DATA) ./board-2.bin.wf189.IPQ5332 $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin
 endef
 
 define Package/ath12k-wifi-edgecore-eap105/install
@@ -112,13 +107,6 @@ define Package/ath12k-wifi-edgecore-eap105/install
 	$(INSTALL_DATA) ./board-2.bin.eap105.IPQ5332 $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin
 endef
 
-define Package/ath12k-wifi-emplus-wap7635/install
-	$(INSTALL_DIR) $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/
-	$(INSTALL_DIR) $(1)/lib/firmware/ath12k/QCN92XX/hw1.0/
-	$(INSTALL_DATA) ./board-2.bin.wap7635.IPQ5332 $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin
-	$(INSTALL_DATA) ./board-2.bin.wap7635.QCN6274 $(1)/lib/firmware/ath12k/QCN92XX/hw1.0/board-2.bin
-endef
-
 define Package/ath12k-wifi-sonicfi-rap7110c-341x/install
 	$(INSTALL_DIR) $(1)/lib/firmware/ath12k/QCN92XX/hw1.0/
 	$(INSTALL_DIR) $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/
@@ -156,8 +144,8 @@ endef
 define Package/ath12k-wifi-cig-wf189w/install
 	$(INSTALL_DIR) $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/
 	$(INSTALL_DIR) $(1)/lib/firmware/ath12k/QCN6432/hw1.0/
-	$(INSTALL_DATA) ./board-2.bin.189w-us.IPQ5332 $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin.US
-	$(INSTALL_DATA) ./board-2.bin.189w-us.QCN6432 $(1)/lib/firmware/ath12k/QCN6432/hw1.0/board-2.bin.US
+	$(INSTALL_DATA) ./board-2.bin.189w.IPQ5332 $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin
+	$(INSTALL_DATA) ./board-2.bin.189w.QCN6432 $(1)/lib/firmware/ath12k/QCN6432/hw1.0/board-2.bin
 	$(INSTALL_DATA) ./ipq5332_qcn6432.regdb $(1)/lib/firmware/ath12k/QCN6432/hw1.0/regdb.bin
 endef
 
@@ -165,8 +153,8 @@ endef
 define Package/ath12k-wifi-cig-wf189h/install
 	$(INSTALL_DIR) $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/
 	$(INSTALL_DIR) $(1)/lib/firmware/ath12k/QCN6432/hw1.0/
-	$(INSTALL_DATA) ./board-2.bin.189h-us.IPQ5332 $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin.US
-	$(INSTALL_DATA) ./board-2.bin.189h-us.QCN6432 $(1)/lib/firmware/ath12k/QCN6432/hw1.0/board-2.bin.US
+	$(INSTALL_DATA) ./board-2.bin.189h.IPQ5332 $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin
+	$(INSTALL_DATA) ./board-2.bin.189h.QCN6432 $(1)/lib/firmware/ath12k/QCN6432/hw1.0/board-2.bin
 	$(INSTALL_DATA) ./ipq5332_qcn6432.regdb $(1)/lib/firmware/ath12k/QCN6432/hw1.0/regdb.bin
 endef
 
@@ -194,13 +182,12 @@ endef
 define Package/ath12k-wifi-cig-wf672/install
 	$(INSTALL_DIR) $(1)/lib/firmware/ath12k/QCN92XX/hw1.0/
 	$(INSTALL_DIR) $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/
-	$(INSTALL_DATA) ./board-2.bin.wf672-us.QCN92XX $(1)/lib/firmware/ath12k/QCN92XX/hw1.0/board-2.bin.US
-	$(INSTALL_DATA) ./board-2.bin.wf672-us.IPQ5332 $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin.US
+	$(INSTALL_DATA) ./board-2.bin.wf672.QCN92XX $(1)/lib/firmware/ath12k/QCN92XX/hw1.0/board-2.bin
+	$(INSTALL_DATA) ./board-2.bin.wf672.IPQ5332 $(1)/lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin
 endef
 
 $(eval $(call BuildPackage,ath12k-wifi-cig-wf189))
 $(eval $(call BuildPackage,ath12k-wifi-edgecore-eap105))
-$(eval $(call BuildPackage,ath12k-wifi-emplus-wap7635))
 $(eval $(call BuildPackage,ath12k-wifi-sonicfi-rap7110c-341x))
 $(eval $(call BuildPackage,ath12k-wifi-sonicfi-rap750e-h))
 $(eval $(call BuildPackage,ath12k-wifi-sonicfi-rap750e-s))

feeds/qca-wifi-7/hostapd/files/afc_location.uc

@@ -4,19 +4,19 @@ let fs = require("fs");
 let ubus = require('ubus').connect();
 
 let gps_info = ubus.call('gps', 'info');
-let latitude = gps_info.latitude || 0;
-let longitude = gps_info.longitude || 0;
+let latitude = gps_info.latitude ?? 0;
+let longitude = gps_info.longitude ?? 0;
 
 // afc-location.json file content
 let afc_location = {};
 afc_location.location_type = "ellipse";
 afc_location.location = longitude + ":" + latitude ;
-afc_location.height = gps_info.elevation || 0;
+afc_location.height = gps_info.elevation ?? 0;
 afc_location.height_type = "AMSL";
-afc_location.major_axis = int(gps_info.major_axis) || 1;
-afc_location.minor_axis = int(gps_info.minor_axis) || 1;
-afc_location.orientation = gps_info.major_orientation || 0;
-afc_location.vertical_tolerance = int(gps_info.vdop) || 1;
+afc_location.major_axis = gps_info.major_axis ?? 0;
+afc_location.minor_axis = gps_info.minor_axis ?? 0;
+afc_location.orientation = gps_info.major_orientation ?? 0;
+afc_location.vertical_tolerance = gps_info.vdop ?? 0;
 
 let afc_location_json = fs.open("/etc/ucentral/afc-location.json", "w");
 afc_location_json.write(afc_location);

feeds/qca-wifi-7/hostapd/files/hostapd.uc

@@ -1,8 +1,7 @@
 let libubus = require("ubus");
-import { open, readfile, writefile } from "fs";
+import { open, readfile } from "fs";
 import { wdev_remove, is_equal, vlist_new, phy_is_fullmac, phy_open, wdev_set_radio_mask } from "common";
 
-let uci = require('uci').cursor();
 let ubus = libubus.connect(null, 60);
 
 hostapd.data.config = {};
@@ -1007,6 +1006,7 @@ let main_obj = {
 hostapd.data.ubus = ubus;
 hostapd.data.obj = ubus.publish("hostapd", main_obj);
 
+
 let auth_obj = {};
 hostapd.data.auth_obj = ubus.publish("hostapd-auth", auth_obj);
 
@@ -1026,24 +1026,10 @@ return {
 		hostapd.ubus.disconnect();
 	},
 	afc_request: function(iface, data) {
-		let wireless_config = uci.get_all('wireless');
-		for (let l, afc_server in wireless_config) {
-			if (afc_server['.type'] == 'afc-server' && afc_server.url && data) {
-				hostapd.printf(`Sending AFC request: ${data}`);
-				writefile("/tmp/afc-request.json", data);
-
-				if (afc_server.access_token)
-					system(`curl -s -X POST ${afc_server.url} -H \'accept: \*\/\*\' -H \'Authorization: Bearer ${afc_server.access_token}\' -H \'Content-Type: application/json\' -d \'${data}\' --output /tmp/afc-response.json`);
-				else if (afc_server.cert)
-					system(`curl -s -X POST ${afc_server.url} -H \'accept: \*\/\*\' --cert \'${afc_server.cert}\' -H \'Content-Type: application/json\' -d \'${data}\' --output /tmp/afc-response.json`);
-
-				let afc_response = (readfile("/tmp/afc-response.json"));
-				if (afc_response)
-					return afc_response;
-				else
-					return;
-			}
-		}
+		let ret = ubus.call("afc", "request", { data });
+		if (type(ret) != "object")
+			return;
+		return ret.data;
 	},
 	bss_create: function(phy, name, obj) {
 		phy = hostapd.data.config[phy];

feeds/qca-wifi-7/ipq53xx/base-files/etc/board.d/01_leds

@@ -7,11 +7,6 @@ board_config_update
 board=$(board_name)
 
 case "$board" in
-emplus,wap7635)
-	ucidef_set_led_default "ledb" "LEDB" "sys:blue" "on"
-	ucidef_set_led_default "ledg" "LEDG" "sys:green" "off"
-	ucidef_set_led_default "ledr" "LEDR" "sys:red" "off"
-	;;
 sercomm,ap72tip-v4|\
 sercomm,ap72tip)
 	ucidef_set_led_default "power" "POWER" "blue:status" "on"

feeds/qca-wifi-7/ipq53xx/base-files/etc/board.d/02_network

@@ -13,6 +13,7 @@ ipq53xx_setup_interfaces()
 		ucidef_set_interfaces_lan_wan "eth1 eth2 eth3 eth4 eth5" "eth0"
 		;;
 	cig,wf189|\
+	cig,wf672|\
 	edgecore,eap105|\
 	sercomm,ap72tip|\
 	sonicfi,rap750w-311a)
@@ -31,10 +32,6 @@ ipq53xx_setup_interfaces()
 		ucidef_set_interfaces_lan_wan "eth1" "eth0"
 		ucidef_add_switch "switch1" "0u@eth1" "3:lan" "2:lan"
 		;;
-	cig,wf672)
-		ucidef_set_interface_wan "eth0 eth1"
-		;;
-	emplus,wap7635|\
 	sercomm,ap72tip-v4)
 		ucidef_set_interface_wan "eth0"
 		;;	
@@ -107,7 +104,6 @@ qcom_setup_macs()
                 ucidef_set_wireless_macaddr_base 2g $(macaddr_add "$wan_mac" 2)
                 ucidef_set_wireless_macaddr_base 5g $(macaddr_add "$wan_mac" 3)
                 ;;
-        emplus,wap7635|\
         sercomm,ap72tip-v4)
                 wan_mac=$(cat /sys/class/net/eth0/address)
                 ucidef_set_wireless_macaddr_base 2g $(macaddr_add "$wan_mac" 1)

feeds/qca-wifi-7/ipq53xx/base-files/etc/hotplug.d/firmware/10-ath12k-caldata

@@ -64,7 +64,6 @@ ath12k/IPQ5332/hw1.0/caldata.bin)
 	cig,wf189h|\
 	cig,wf189|\
 	edgecore,eap105|\
-	emplus,wap7635|\
 	sercomm,ap72tip-v4|\
 	sercomm,ap72tip|\
 	zyxel,nwa130be)
@@ -87,7 +86,6 @@ ath12k/QCN92XX/hw1.0/cal-pci-0001:01:00.0.bin)
 	case "$board" in
 	cig,wf189|\
 	edgecore,eap105|\
-	emplus,wap7635|\
 	sercomm,ap72tip-v4|\
 	sercomm,ap72tip|\
 	zyxel,nwa130be)
@@ -126,47 +124,6 @@ ath12k/QCN6432/hw1.0/cal-ahb-soc@0:wifi2@c0000000.bin)
 		;;
 	esac
 	;;
-ath12k/IPQ5332/hw1.0/board-2.bin)
-	case "$board" in
-	cig,wf189|\
-	cig,wf189h|\
-	cig,wf189w|\
-	cig,wf672)
-                country=`cat /etc/ucentral/country`
-                if [ "$country" == "CA" ]; then
-                        ln -s /lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin.CA /lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin
-                else
-                        ln -s /lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin.US /lib/firmware/ath12k/IPQ5332/hw1.0/board-2.bin
-                fi
-                ;;
-	esac
-	;;
-ath12k/QCN6432/hw1.0/board-2.bin)
-	case "$board" in
-	cig,wf189h|\
-	cig,wf189w)
-                country=`cat /etc/ucentral/country`
-                if [ "$country" == "CA" ]; then
-                        ln -s /lib/firmware/ath12k/QCN6432/hw1.0/board-2.bin.CA /lib/firmware/ath12k/QCN6432/hw1.0/board-2.bin
-                else
-                        ln -s /lib/firmware/ath12k/QCN6432/hw1.0/board-2.bin.US /lib/firmware/ath12k/QCN6432/hw1.0/board-2.bin
-                fi
-                ;;
-	esac
-	;;
-ath12k/QCN92XX/hw1.0/board-2.bin)
-	case "$board" in
-	cig,wf189|\
-	cig,wf672)
-                country=`cat /etc/ucentral/country`
-                if [ "$country" == "CA" ]; then
-                        ln -s /lib/firmware/ath12k/QCN92XX/hw1.0/board-2.bin.CA /lib/firmware/ath12k/QCN92XX/hw1.0/board-2.bin
-                else
-                        ln -s /lib/firmware/ath12k/QCN92XX/hw1.0/board-2.bin.US /lib/firmware/ath12k/QCN92XX/hw1.0/board-2.bin
-                fi
-                ;;
-	esac
-	;;
 *)
 	exit 1
 	;;

feeds/qca-wifi-7/ipq53xx/base-files/lib/upgrade/platform.sh

@@ -136,8 +136,7 @@ platform_do_upgrade() {
 	sercomm,ap72tip|\
 	cig,wf189w|\
 	cig,wf189h|\
-	cig,wf189|\
-	emplus,wap7635)
+	cig,wf189)
 		if [ -f /proc/boot_info/bootconfig0/rootfs/upgradepartition ]; then
 			CI_UBIPART="$(cat /proc/boot_info/bootconfig0/rootfs/upgradepartition)"
 			CI_BOOTCFG=1

feeds/qca-wifi-7/ipq53xx/dts/ipq5332-emplus-wap7635.dts

@@ -1,413 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
-/*
- * IPQ5332 RDP468 board device tree source
- *
- * Copyright (c) 2020-2021 The Linux Foundation. All rights reserved.
- * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved.
- */
-
-/dts-v1/;
-
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/leds/common.h>
-#include "ipq5332.dtsi"
-#include "ipq5332-default-memory.dtsi"
-
-/ {
-	model = "Emplus WAP7635";
-	compatible = "emplus,wap7635", "qcom,ipq5332-ap-mi01.6", "qcom,ipq5332";
-
-	aliases {
-		serial0 = &blsp1_uart0; /*console*/
-		ethernet0 = "/soc/dp1";
-
-        led-boot = &led_power_green;
-        led-failsafe = &led_power_red;
-        led-running = &led_power_green;
-        led-upgrade = &led_power_green;
-	};
-
-	chosen {
-		stdout-path = "serial0";
-	};
-
-	soc@0 {
-		mdio:mdio@90000 {
-			pinctrl-0 = <&mdio1_pins>;
-			pinctrl-names = "default";
-			phy-reset-gpio = <&tlmm 51 GPIO_ACTIVE_LOW>;
-			phyaddr_fixup = <0xC90F018>;
-			uniphyaddr_fixup = <0xC90F014>;
-			mdio_clk_fixup; /* MDIO clock sequence fix up flag */
-			status = "okay";
-
-			phy0: ethernet-phy@0 {
-				reg = <24>;
-			};
-		};
-
-		ess-instance {
-			/*num_devices = <0x1>;*/
-			ess-switch@3a000000 {
-				switch_cpu_bmp = <0x1>;  /* cpu port bitmap */
-				switch_lan_bmp = <0x2>; /* lan port bitmap */
-				switch_wan_bmp = <0>; /* wan port bitmap */
-				switch_mac_mode = <0xf>; /* mac mode for uniphy instance0*/
-				switch_mac_mode1 = <0xd>; /* mac mode for uniphy instance1*/
-				switch_mac_mode2 = <0xff>; /* mac mode for uniphy instance2*/
-
-				qcom,port_phyinfo {
-					port@0 {
-						port_id = <1>;
-						phy_address = <24>;
-						mdiobus = <&mdio>;
-						ethernet-phy-ieee802.3-c45;
-					};
-				};
-			};
-		};
-
-		dp1 {
-			device_type = "network";
-			compatible = "qcom,nss-dp";
-			qcom,id = <1>;
-			reg = <0x3a500000 0x4000>;
-			qcom,mactype = <1>;
-			local-mac-address = [000000000000];
-			mdio-bus = <&mdio>;
-			qcom,phy-mdio-addr = <24>;
-			qcom,link-poll = <1>;
-			phy-mode = "sgmii";
-			/* phy-mode = "usxgmii"; */
-		};
-
-		/* EDMA host driver configuration for the board */
-		edma@3ab00000 {
-			qcom,txdesc-ring-start = <4>;		/* Tx desc ring start ID */
-			qcom,txdesc-rings = <12>;			/* Total number of Tx desc rings to be provisioned */
-			qcom,mht-txdesc-rings = <8>;		/* Extra Tx desc rings to be provisioned for MHT SW ports */
-			qcom,txcmpl-ring-start = <4>;		/* Tx complete ring start ID */
-			qcom,txcmpl-rings = <12>;			/* Total number of Tx complete rings to be provisioned */
-			qcom,mht-txcmpl-rings = <8>;		/* Extra Tx complete rings to be provisioned for mht sw ports. */
-			qcom,rxfill-ring-start = <4>;		/* Rx fill ring start ID */
-			qcom,rxfill-rings = <4>;			/* Total number of Rx fill rings to be provisioned */
-			qcom,rxdesc-ring-start = <12>;		/* Rx desc ring start ID */
-			qcom,rxdesc-rings = <4>;			/* Total number of Rx desc rings to be provisioned */
-			qcom,rx-page-mode = <0>;			/* Rx fill ring page mode */
-			qcom,tx-map-priority-level = <1>;	/* Tx priority level per port */
-			qcom,rx-map-priority-level = <1>;	/* Rx priority level per core */
-			qcom,ppeds-num = <2>;				/* Number of PPEDS nodes */
-
-			/* PPE-DS node format: <Rx-fill Tx-cmpl Rx Tx Queue-base Queue-count> */
-			qcom,ppeds-map = <1 1 1 1 32 8>,		/* PPEDS Node#0 ring and queue map */
-							 <2 2 2 2 40 8>;		/* PPEDS Node#1 ring and queue map */
-			qcom,txdesc-map = <8 9 10 11>,			/* Port0 per-core Tx ring map */
-							  <12 13 14 15>,		/* MHT-Port1 per-core Tx ring map */
-							  <4 5 6 7>,			/* MHT-Port2 per-core Tx ring map/packets from  vp*/
-							  <16 17 18 19>,		/* MHT-Port3 per-core Tx ring map */
-							  <20 21 22 23>;		/* MHT-Port4 per-core Tx ring map */
-			qcom,txdesc-fc-grp-map = <1 2 3 4 5>;	/* Per GMAC flow control group map */
-			qcom,rxfill-map = <4 5 6 7>;			/* Per-core Rx fill ring map */
-			qcom,rxdesc-map = <12 13 14 15>;		/* Per-core Rx desc ring map */
-			qcom,rx-queue-start = <0>;				/* Rx queue start */
-			qcom,rx-ring-queue-map = <0 8 16 24>,	/* Priority 0 queues per-core Rx ring map */
-									 <1 9 17 25>,	/* Priority 1 queues per-core Rx ring map */
-									 <2 10 18 26>,	/* Priority 2 queues per-core Rx ring map */
-									 <3 11 19 27>,	/* Priority 3 queues per-core Rx ring map */
-									 <4 12 20 28>,	/* Priority 4 queues per-core Rx ring map */
-									 <5 13 21 29>,	/* Priority 5 queues per-core Rx ring map */
-									 <6 14 22 30>,	/* Priority 6 queues per-core Rx ring map */
-									 <7 15 23 31>;	/* Priority 7 queues per-core Rx ring map */
-			interrupts = <0 163 4>,					/* Tx complete ring id #4 IRQ info */
-						 <0 164 4>,					/* Tx complete ring id #5 IRQ info */
-						 <0 165 4>,					/* Tx complete ring id #6 IRQ info */
-						 <0 166 4>,					/* Tx complete ring id #7 IRQ info */
-						 <0 167 4>,					/* Tx complete ring id #8 IRQ info */
-						 <0 168 4>,					/* Tx complete ring id #9 IRQ info */
-						 <0 169 4>,					/* Tx complete ring id #10 IRQ info */
-						 <0 170 4>,					/* Tx complete ring id #11 IRQ info */
-						 <0 171 4>,					/* Tx complete ring id #12 IRQ info */
-						 <0 172 4>,					/* Tx complete ring id #13 IRQ info */
-						 <0 173 4>,					/* Tx complete ring id #14 IRQ info */
-						 <0 174 4>,					/* Tx complete ring id #15 IRQ info */
-						 <0 139 4>,					/* Rx desc ring id #12 IRQ info */
-						 <0 140 4>,					/* Rx desc ring id #13 IRQ info */
-						 <0 141 4>,					/* Rx desc ring id #14 IRQ info */
-						 <0 142 4>,					/* Rx desc ring id #15 IRQ info */
-						 <0 191 4>,					/* Misc error IRQ info */
-						 <0 155 4>,					/* RxFill ring id #4 IRQ info */
-						 <0 156 4>,					/* RxFill ring id #5 IRQ info */
-						 <0 157 4>,					/* RxFill ring id #6 IRQ info */
-						 <0 158 4>,					/* RxFill ring id #7 IRQ info */
-						 <0 160 4>,					/* PPEDS Node #1(TxComp ring id #1) TxComplete IRQ info */
-						 <0 128 4>,					/* PPEDS Node #1(Rx Desc ring id #1) Rx Desc IRQ info */
-						 <0 152 4>,					/* PPEDS Node #1(RxFill Desc ring id #1) Rx Fill IRQ info */
-						 <0 161 4>,					/* PPEDS Node #2(TxComp ring id #2) TxComplete IRQ info */
-						 <0 129 4>,					/* PPEDS Node #2(Rx Desc ring id #2) Rx Desc IRQ info */
-						 <0 153 4>,					/* PPEDS Node #2(RxFill Desc ring id #2) Rx Fill IRQ info */
-						 <0 175 4>,					/* MHT port Tx complete ring id #16 IRQ info */
-						 <0 176 4>,					/* MHT port Tx complete ring id #17 IRQ info */
-						 <0 177 4>,					/* MHT port Tx complete ring id #18 IRQ info */
-						 <0 178 4>,					/* MHT port Tx complete ring id #19 IRQ info */
-						 <0 179 4>,					/* MHT port Tx complete ring id #20 IRQ info */
-						 <0 180 4>,					/* MHT port Tx complete ring id #21 IRQ info */
-						 <0 181 4>,					/* MHT port Tx complete ring id #22 IRQ info */
-						 <0 182 4>;					/* MHT port Tx complete ring id #23 IRQ info */
-		};
-
-		leds {
-			compatible = "gpio-leds";
-
-			led_power_blue: led@34 {
-				label = "sys:blue";
-				gpios = <&tlmm 34 GPIO_ACTIVE_HIGH>;
-				default-state = "off";
-			};
-			led_power_green: led@35 {
-				label = "sys:green";
-				gpios = <&tlmm 35 GPIO_ACTIVE_HIGH>;
-				default-state = "off";
-			};
-			led_power_red: led@37 {
-				label = "sys:red";
-				gpios = <&tlmm 37 GPIO_ACTIVE_HIGH>;
-				default-state = "off";
-			};
-		};
-
-		gpio_keys {
-			compatible = "gpio-keys";
-			pinctrl-0 = <&button_pins>;
-			pinctrl-names = "default";
-			button@1 {
-				label = "reset";
-				linux,code = <KEY_RESTART>;
-				gpios = <&tlmm 24 GPIO_ACTIVE_LOW>;
-				linux,input-type = <1>;
-				debounce-interval = <60>;
-			};
-		};
-
-		wsi: wsi {
-			id = <0>;
-			num_chip = <2>;
-			status = "okay";
-			chip_info = <0 1 1>,
-						<1 1 0>;
-		};
-	};
-};
-
-&wifi0 {
-	led-gpio = <&tlmm 36 GPIO_ACTIVE_HIGH>;
-	qcom,rproc = <&q6_wcss_pd1>;
-	qcom,rproc_rpd = <&q6v5_wcss>;
-	qcom,multipd_arch;
-	qcom,userpd-subsys-name = "q6v5_wcss_userpd1";
-	memory-region = <&q6_region>;
-	qcom,wsi = <&wsi>;
-	qcom,wsi_index = <0>;
-	qcom,board_id = <0x16>;
-	status = "okay";
-};
-
-&mhi_region1 {
-	status = "okay";
-};
-
-&qcn9224_pcie1 {
-	status = "okay";
-};
-
-/* QCN9224 5G+6G */
-&wifi4 {
-	hremote_node = <&qcn9224_pcie1>;
-	board_id = <0x1019>;
-	node_id = <0x1>;
-	status = "okay";
-};
-
-&blsp1_uart0 {
-	pinctrl-0 = <&serial_0_pins>;
-	pinctrl-names = "default";
-	status = "okay";
-};
-
-&blsp1_uart1 {
-	pinctrl-0 = <&serial_1_pins>;
-	pinctrl-names = "default";
-	status = "disabled";
-};
-
-&sdhc {
-	bus-width = <4>;
-	max-frequency = <192000000>;
-	mmc-ddr-1_8v;
-	mmc-hs200-1_8v;
-	non-removable;
-	pinctrl-0 = <&sdc_default_state>;
-	pinctrl-names = "default";
-	status = "disabled";
-};
-
-&sleep_clk {
-	clock-frequency = <32000>;
-};
-
-&xo {
-	clock-frequency = <24000000>;
-};
-
-&qpic_bam {
-	status = "okay";
-};
-
-&qpic_nand {
-	pinctrl-0 = <&qspi_default_state>;
-	pinctrl-names = "default";
-	status = "okay";
-
-	nandcs@0 {
-		reg = <0>;
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		nand-ecc-strength = <8>;
-		nand-ecc-step-size = <512>;
-		nand-bus-width = <8>;
-	};
-};
-
-&pcie1_phy_x2 {
-	status = "okay";
-};
-
-&pcie1 {
-	pinctrl-0 = <&pcie1_default_state>;
-	pinctrl-names = "default";
-	perst-gpios = <&tlmm 45 GPIO_ACTIVE_LOW>;
-	status = "okay";
-
-	pcie1_rp {
-		reg = <0 0 0 0 0>;
-
-		qcom,mhi@1 {
-			reg = <0 0 0 0 0>;
-			boot-args = <0x2 0x4 0x34 0x3 0x0 0x0     /* MX Rail, GPIO52, Drive strength 0x3 */
-						 0x4 0x4 0x18 0x3 0x0 0x0     /* RFA1p2 Rail, GPIO24, Drive strength 0x3 */
-						 0x0 0x4 0x0 0x0 0x0 0x0>;    /* End of arguments */
-			memory-region = <&qcn9224_pcie1>;
-			qcom,wsi = <&wsi>;
-			qcom,wsi_index = <1>;
-			qcom,board_id = <0x1019>;
-		};
-	};
-};
-
-/* PINCTRL */
-
-&tlmm {
-	sdc_default_state: sdc-default-state {
-		clk-pins {
-			pins = "gpio13";
-			function = "sdc_clk";
-			drive-strength = <8>;
-			bias-disable;
-		};
-
-		cmd-pins {
-			pins = "gpio12";
-			function = "sdc_cmd";
-			drive-strength = <8>;
-			bias-pull-up;
-		};
-
-		data-pins {
-			pins = "gpio8", "gpio9", "gpio10", "gpio11";
-			function = "sdc_data";
-			drive-strength = <8>;
-			bias-pull-up;
-		};
-	};
-
-	spi_0_data_clk_pins: spi-0-data-clk-state {
-		pins = "gpio14", "gpio15", "gpio16";
-		function = "blsp0_spi";
-		drive-strength = <2>;
-		bias-pull-down;
-	};
-
-	spi_0_cs_pins: spi-0-cs-state {
-		pins = "gpio17";
-		function = "blsp0_spi";
-		drive-strength = <2>;
-		bias-pull-up;
-	};
-
-	qspi_default_state: qspi-default-state {
-		qspi_clock {
-			pins = "gpio13";
-			function = "qspi_clk";
-			drive-strength = <8>;
-			bias-pull-down;
-		};
-
-		qspi_cs {
-			pins = "gpio12";
-			function = "qspi_cs";
-			drive-strength = <8>;
-			bias-pull-up;
-		};
-
-		qspi_data {
-			pins = "gpio8", "gpio9", "gpio10", "gpio11";
-			function = "qspi_data";
-			drive-strength = <8>;
-			bias-pull-down;
-		};
-	};
-
-	serial_1_pins: serial1-pinmux { /*ble*/
-		pins = "gpio33", "gpio35";
-		function = "blsp1_uart2";
-		drive-strength = <8>;
-		bias-pull-up;
-	};
-
-	button_pins: button-state {
-		pins = "gpio24";
-		function = "gpio";
-		drive-strength = <8>;
-		bias-pull-up;
-	};
-
-	pcie1_default_state: pcie1-default-state {
-		pins = "gpio45";
-		function = "gpio";
-		drive-strength = <8>;
-		bias-pull-up;
-		output-low;
-	};
-};
-
-&license_manager {
-	status = "okay";
-};
-
-&usb3 {
-	qcom,multiplexed-phy;
-	status = "disabled";
-};
-
-&hs_m31phy_0 {
-	status = "okay";
-};
-
-&hs_m31phy_0 {
-	status = "okay";
-};
-
-&ssuniphy_0 {
-	status = "okay";
-};

feeds/qca-wifi-7/ipq53xx/dts/ipq5332-sonicfi-rap7110c-341x.dts

@@ -31,20 +31,6 @@
 		stdout-path = "serial0";
 	};
 
-	reserved-memory {
-		#address-cells = <2>;
-		#size-cells = <2>;
-		ranges;
-
-		ramoops@49c00000 {
-			compatible = "ramoops";
-			reg = <0x0 0x49c00000 0x0 0x100000>;
-			record-size = <0x20000>;
-			console-size = <0x20000>;
-			pmsg-size = <0x20000>;
-		};
-	};
-
 	soc@0 {
 		mdio:mdio@90000 {
 			pinctrl-0 = <&mdio1_pins>;

feeds/qca-wifi-7/ipq53xx/dts/ipq5332-sonicfi-rap750e-h.dts

@@ -190,14 +190,6 @@
 		/delete-node/ wcnss@4a900000;
 		/delete-node/ q6_caldb_region@4ce00000;
 
-		ramoops@49c00000 {
-			compatible = "ramoops";
-			reg = <0x0 0x49c00000 0x0 0x100000>;
-			record-size = <0x20000>;
-			console-size = <0x20000>;
-			pmsg-size = <0x20000>;
-		};
-
 		q6_mem_regions: q6_mem_regions@4A900000  {
 		        no-map;
 		        reg = <0x0 0x4A900000 0x0 0x5100000>;

feeds/qca-wifi-7/ipq53xx/dts/ipq5332-sonicfi-rap750e-s.dts

@@ -190,14 +190,6 @@
 		/delete-node/ wcnss@4a900000;
 		/delete-node/ q6_caldb_region@4ce00000;
 
-		ramoops@49c00000 {
-			compatible = "ramoops";
-			reg = <0x0 0x49c00000 0x0 0x100000>;
-			record-size = <0x20000>;
-			console-size = <0x20000>;
-			pmsg-size = <0x20000>;
-		};
-
 		q6_mem_regions: q6_mem_regions@4A900000  {
 		        no-map;
 		        reg = <0x0 0x4A900000 0x0 0x5100000>;

feeds/qca-wifi-7/ipq53xx/dts/ipq5332-sonicfi-rap750w-311a.dts

@@ -190,14 +190,6 @@
 		/delete-node/ wcnss@4a900000;
 		/delete-node/ q6_caldb_region@4ce00000;
 
-		ramoops@49c00000 {
-			compatible = "ramoops";
-			reg = <0x0 0x49c00000 0x0 0x100000>;
-			record-size = <0x20000>;
-			console-size = <0x20000>;
-			pmsg-size = <0x20000>;
-		};
-
 		q6_mem_regions: q6_mem_regions@4A900000  {
 		        no-map;
 		        reg = <0x0 0x4A900000 0x0 0x5100000>;

feeds/qca-wifi-7/ipq53xx/image/ipq53xx.mk

@@ -52,19 +52,6 @@ define Device/edgecore_eap105
 endef
 TARGET_DEVICES += edgecore_eap105
 
-define Device/emplus_wap7635
-  DEVICE_TITLE := EMPLUS WAP7635
-  DEVICE_DTS := ipq5332-emplus-wap7635
-  DEVICE_DTS_DIR := ../dts
-  DEVICE_DTS_CONFIG := config@mi01.6
-  IMAGES := sysupgrade.tar nand-factory.bin nand-factory.ubi
-  IMAGE/sysupgrade.tar := sysupgrade-tar | append-metadata
-  IMAGE/nand-factory.bin := append-ubi | qsdk-ipq-factory-nand
-  IMAGE/nand-factory.ubi := append-ubi
-  DEVICE_PACKAGES := ath12k-wifi-emplus-wap7635 ath12k-firmware-qcn92xx ath12k-firmware-ipq5332
-endef
-TARGET_DEVICES += emplus_wap7635
-
 define Device/sonicfi_rap7110c_341x
   DEVICE_TITLE := SONICFI RAP7110C-341X
   DEVICE_DTS := ipq5332-sonicfi-rap7110c-341x

feeds/qca-wifi-7/qca-ssdk-qca/Makefile

@@ -100,7 +100,6 @@ endif
 ifdef CONFIG_TARGET_PROFILE
 TARGET_PROFILE=$(subst ",,$(CONFIG_TARGET_PROFILE))
 PATCH_PROFILE_NAME=patches-$(subst DEVICE_,,$(TARGET_PROFILE))
-FILES_PROFILE_NAME=files-$(subst DEVICE_,,$(TARGET_PROFILE))
 endif
 
 QCASSDK_CONFIG_OPTS+= TOOL_PATH=$(TOOLCHAIN_BIN_PATH) \
@@ -203,15 +202,6 @@ define patch_profile
 	$(call PatchDir/Default,$(PKG_BUILD_DIR),./$(PATCH_PROFILE_NAME))
 endef
 
-define files_profile
-
-	if [ -d "./$(FILES_PROFILE_NAME)" ]; then \
-		$(CP) ./$(FILES_PROFILE_NAME)/* ./files/ ; \
-	fi
-endef
-
 Hooks/Prepare/Post += patch_profile
-Hooks/Prepare/Post += files_profile
-
 $(eval $(call KernelPackage,qca-ssdk-qca-nohnat))
 $(eval $(call KernelPackage,qca-ssdk-qca-hnat))

feeds/qca-wifi-7/qca-ssdk-qca/files-zyxel_nwa130be/qca-ssdk

@@ -1,317 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (c) 2018, 2021, The Linux Foundation. All rights reserved.
-# Copyright (c) 2022-2024, Qualcomm Innovation Center, Inc. All rights reserved.
-#
-# Permission to use, copy, modify, and/or distribute this software for any
-# purpose with or without fee is hereby granted, provided that the above
-# copyright notice and this permission notice appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-
-START=16
-
-#!/bin/sh
-ruletype="ip4 ip6"
-side="wan lan"
-qwan="1 3 2 0 5 7 6 4"
-qlan="0 1 2 3 4 5 6 7"
-
-function create_war_acl_rules(){
-	for lw in $side
-	do
-		#echo $lw
-		if [ "$lw" == "wan" ];then
-			listid=254
-			queue=$qwan
-			portmap=0x20
-		else
-			listid=255
-			queue=$qlan
-			portmap=0x1e
-		fi
-		#echo $queue
-		#echo "creating list $listid"
-		ssdk_sh acl list create $listid 255
-		ruleid=0
-		for rt in $ruletype
-		do
-			for qid in $queue
-			do
-				cmd="ssdk_sh acl rule add $listid $ruleid  1 n 0 0"
-				#echo $cmd
-				if [ "$rt" == "ip4" ];then
-					cmd="$cmd ip4 n n n n n n n n n n n n n n n n n n n n n n n n n n n n n"
-					#echo $cmd
-				else
-					cmd="$cmd ip6 n n n n n n n n n n n n n n n n n n n n n n n n n n n n n n n"
-					#echo $cmd
-				fi
-				if [ $ruleid -le 3 ];then
-					#non-zero dscp
-					cmd="$cmd y 0x0 0xff"
-				elif [ $ruleid -le 7 ];then
-					#zero dscp
-					cmd="$cmd n"
-				elif [ $ruleid -le 11 ];then
-					#non-zero dscp
-					cmd="$cmd y 0x0 0xff"
-				else
-					#zero dscp
-					cmd="$cmd n"
-				fi
-				p=$((ruleid/2))
-				cmd="$cmd y mask $((ruleid%2)) 0x1 y mask $((p%2)) 0x1 n n n n n n n n n n n n n n n y n n n n n n n y $qid n n 0 0 n n n n n n n n n n n n n n n n n n n n 0"
-				#echo $cmd
-				$cmd
-				ruleid=`expr $ruleid + 1`
-			done
-		done
-		ssdk_sh acl list bind $listid 0 1 $portmap
-	done
-}
-
-function create_war_cosmap(){
-	ssdk_sh cosmap pri2q set 0 0
-	ssdk_sh cosmap pri2q set 1 0
-	ssdk_sh cosmap pri2q set 2 0
-	ssdk_sh cosmap pri2q set 3 0
-	ssdk_sh cosmap pri2q set 4 1
-	ssdk_sh cosmap pri2q set 5 1
-	ssdk_sh cosmap pri2q set 6 1
-	ssdk_sh cosmap pri2q set 7 1
-	ssdk_sh cosmap pri2ehq set 0 0
-	ssdk_sh cosmap pri2ehq set 1 0
-	ssdk_sh cosmap pri2ehq set 2 0
-	ssdk_sh cosmap pri2ehq set 3 0
-	ssdk_sh cosmap pri2ehq set 4 1
-	ssdk_sh cosmap pri2ehq set 5 1
-	ssdk_sh cosmap pri2ehq set 6 1
-	ssdk_sh cosmap pri2ehq set 7 1
-}
-
-function create_acl_byp_egstp_rules(){
-	chip_ver=$1
-	cmd="ssdk_sh servcode config set 1 n 0 0xfffefc7f 0xffbdff 0 0 0 0 0 0"
-	if [ "$chip_ver" == "0x2000" ] || [ "$chip_ver" = "0x2001" ] || [ "$chip_ver" = "0x2100" ]; then
-		cmd="$cmd 0"
-	fi
-	#echo $cmd
-	$cmd
-
-	ssdk_sh acl list create 56 48
-	#action bypass eg stp check
-	action="y n n n n n n n n n n 0 0 n n n n n n n n n n n n n y n n n n n n n n n n n n y n n n n n n n n n n n n n n n n n n"
-	if [ "$chip_ver" == "0x2000" ]; then
-		action="$action n n 0"
-	elif [ "$chip_ver" = "0x2001" ] || [ "$chip_ver" = "0x2100" ]; then
-		action="$action n n n 0"
-	else
-		action="$action 0"
-	fi
-
-	for ruleid in $( seq 0 2 )
-	do
-		if [ "$ruleid" == "0" ];then
-			cmd="ssdk_sh acl rule add 56 0 1 n 0 0 mac n n n n n y 01-80-c2-00-00-00 ff-ff-ff-ff-ff-ff n n n n n n n n n n n n n n n n n n n n n n n"
-		elif [ "$ruleid" == "1" ];then
-			cmd="ssdk_sh acl rule add 56 1 1 n 0 0 mac n n n n n n n yes 0x8809 0xffff n n n n n n n n n n n n n n n n n n n n n"
-		else
-			cmd="ssdk_sh acl rule add 56 2 1 n 0 0 mac n n n n n n n yes 0x888e 0xffff n n n n n n n n n n n n n n n n n n n n n"
-		fi
-		if [ "$chip_ver" == "0x2000" ] || [ "$chip_ver" = "0x2001" ] || [ "$chip_ver" = "0x2100" ]; then
-			cmd="$cmd n $action"
-		else
-			cmd="$cmd $action"
-		fi
-		#echo $cmd
-		$cmd
-	done
-	ssdk_sh acl list bind 56 0 2 1
-}
-
-function delete_war_acl_rules(){
-	for lw in $side
-	do
-		#echo $lw
-		if [ "$lw" == "wan" ];then
-			listid=254
-			queue=$qwan
-			portmap=0x20
-		else
-			listid=255
-			queue=$qlan
-			portmap=0x1e
-		fi
-		ssdk_sh acl list unbind $listid 0 1 $portmap
-		for rt in $ruletype
-		do
-			for qid in $queue
-			do
-				cmd="ssdk_sh acl rule del $listid 0 1"
-				echo $cmd
-				$cmd
-			done
-		done
-		#echo "deleting list $listid"
-		ssdk_sh acl list destroy $listid
-	done
-}
-
-function delete_war_cosmap(){
-	ssdk_sh cosmap pri2q set 0 0
-	ssdk_sh cosmap pri2q set 1 0
-	ssdk_sh cosmap pri2q set 2 1
-	ssdk_sh cosmap pri2q set 3 1
-	ssdk_sh cosmap pri2q set 4 2
-	ssdk_sh cosmap pri2q set 5 2
-	ssdk_sh cosmap pri2q set 6 3
-	ssdk_sh cosmap pri2q set 7 3
-	ssdk_sh cosmap pri2ehq set 0 1
-	ssdk_sh cosmap pri2ehq set 1 0
-	ssdk_sh cosmap pri2ehq set 2 2
-	ssdk_sh cosmap pri2ehq set 3 2
-	ssdk_sh cosmap pri2ehq set 4 3
-	ssdk_sh cosmap pri2ehq set 5 3
-	ssdk_sh cosmap pri2ehq set 6 4
-	ssdk_sh cosmap pri2ehq set 7 5
-}
-
-function delete_acl_byp_egstp_rules(){
-	chip_ver=$1
-	cmd="ssdk_sh servcode config set 1 n 0 0xfffefcff 0xffbfff 0 0 0 0 0 0"
-	if [ "$chip_ver" == "0x2000" ] || [ "$chip_ver" = "0x2001" ] || [ "$chip_ver" = "0x2100" ]; then
-		cmd="$cmd 0"
-	fi
-	#echo $cmd
-	$cmd
-	ssdk_sh acl list unbind 56 0 2 1
-	ssdk_sh acl rule del 56 0 1
-	ssdk_sh acl rule del 56 1 1
-	ssdk_sh acl rule del 56 2 1
-	ssdk_sh acl list destroy 56
-}
-
-function edma_war_config_add(){
-	create_war_cosmap
-	ssdk_sh acl status set enable
-	create_war_acl_rules
-}
-
-function edma_war_config_del(){
-	delete_war_acl_rules
-	delete_war_cosmap
-}
-
-function ipq50xx_serdes_monitor () {
-	#if qca808x phy exist, need to monitor the serdes to avoid the effect for WIFI
-	port_id=2
-	old_linkstatus="DISABLE"
-	phy_id_info=`ssdk_sh port phyid get $port_id | grep Org | awk -F '!' '{print $2}'`
-	if [ "$phy_id_info" = "[Org ID]:0x004d[Rev ID]:0xd101" ]; then
-		ssdk_sh debug phy set 29 0xb 0x300d
-		ssdk_sh debug uniphy set 0 0x7ac 0x300d 4
-
-		while true
-		do
-			cur_linkstatus=`ssdk_sh port linkstatus get $port_id | grep Status | awk -F ':' '{print $2}'`
-			#when qca808x phy link status is from down to up, serdes tx would be enabled
-			if [ "$cur_linkstatus" = "ENABLE" ] && [ "$old_linkstatus" = "DISABLE" ]; then
-				ssdk_sh debug phy set 29 0xb 0xb00d
-				ssdk_sh debug uniphy set 0 0x7ac 0xb00d 4
-			fi
-			#when qca808x phy link status is from up to down, serdes tx would be disabled
-			if [ "$cur_linkstatus" = "DISABLE" ] && [ "$old_linkstatus" = "ENABLE" ]; then
-				ssdk_sh debug phy set 29 0xb 0x300d
-				ssdk_sh debug uniphy set 0 0x7ac 0x300d 4
-			fi
-			old_linkstatus=$cur_linkstatus
-		done
-	fi
-}
-
-function ipq53xx_phy_amplitude_set () {
-	#for qca808x phy sgmii, set half amplitude with src_half_swing register
-	port_id=2
-	phy_id_info=`ssdk_sh port phyid get $port_id | grep Org | awk -F '!' '{print $2}'`
-	if [ "$phy_id_info" = "[Org ID]:0x004d[Rev ID]:0xd180" ]; then
-		ssdk_sh debug phy set 5 0x40010087 0x208a
-		ssdk_sh debug phy set 6 0x40010087 0x208a
-		#Set the Reg0x67 bits[7:5]=3’b000 and bit4=1’b1
-		ampl_val=$(eval "ssdk_sh debug phy get 5 0x40010067 | grep SSDK | grep -oE '0x[0-9a-fA-F]+' | sed 's/\(0x..\)./\11/'")
-		ssdk_sh debug phy set 5 0x40010067 $ampl_val
-		ampl_val=$(eval "ssdk_sh debug phy get 6 0x40010067 | grep SSDK | grep -oE '0x[0-9a-fA-F]+' | sed 's/\(0x..\)./\11/'")
-		ssdk_sh debug phy set 6 0x40010067 $ampl_val
-	fi
-}
-
-function ipq53xx_uniphy_amplitude_set () {
-	#for ipq50xx sgmii, set half amplitude with tx_emp_lvl/margin_index and tx_margin
-	ssdk_sh debug uniphy set 0 0x7ac 0xb10d 4
-	ssdk_sh debug uniphy set 0 0x24 0 4
-	ssdk_sh debug uniphy set 1 0x7ac 0xb10d 4
-	ssdk_sh debug uniphy set 1 0x24 0 4
-}
-
-ssdk_dependency() {
-	counter=0
-	[ -e /lib/modules/$(uname -r)/qca-ssdk.ko ] && [ ! -d /sys/module/qca_ssdk ] && {
-		insmod qca-ssdk.ko
-	}
-	while [ ! -d /sys/ssdk ] && [ "$counter" -le 5 ]
-	do
-		sleep 1
-		counter=$((counter+1))
-	done
-}
-
-start() {
-	ssdk_dependency
-	chip_ver=`ssdk_sh debug reg get 0 4 | grep Data | tr -d 'SSDK Init OK![Data]:'`
-	#The following commands should be uncommented to enable EDMA WAR
-	if [ "$chip_ver" = "0x1401" ]; then
-		#edma_war_config_add
-		echo ''
-	fi
-	#The following commands should be uncommented to add acl egress stp bypass rules
-	if [ "$chip_ver" = "0x1500" ] || [ "$chip_ver" = "0x1501" ] || [ "$chip_ver" = "0x2000" ] || [ "$chip_ver" = "0x2001" ] || [ "$chip_ver" = "0x2100" ]; then
-		#create_acl_byp_egstp_rules $chip_ver
-		echo ''
-	fi
-	#The following commands should be uncommented to enable WAR for ipq50xx
-	chip_type_info=`cat tmp/sysinfo/model`
-	result=$(echo $chip_type_info | grep "IPQ5018")
-	if [ "$result" != "" ]; then
-		#ipq50xx_serdes_monitor &
-		#ipq50xx_uniphy_amplitude_set
-		#ipq50xx_phy_amplitude_set
-		echo ''
-	fi
-	if [ "$chip_ver" = "0x2001" ]; then
-		ipq53xx_uniphy_amplitude_set
-		ipq53xx_phy_amplitude_set
-		echo ''
-	fi
-	echo starting
-}
-
-stop() {
-	chip_ver=`ssdk_sh debug reg get 0 4 | grep Data | tr -d 'SSDK Init OK![Data]:'`
-	#The following commands should be uncommented to disable EDMA WAR
-	if [ "$chip_ver" = "0x1401" ]; then
-		#edma_war_config_del
-		echo ''
-	fi
-	#The following commands should be uncommented to delete acl egress stp bypass rules
-	if [ "$chip_ver" = "0x1500" ] || [ "$chip_ver" = "0x1501" ] || [ "$chip_ver" = "0x2000" ] || [ "$chip_ver" = "0x2001" ] || [ "$chip_ver" = "0x2100" ]; then
-		#delete_acl_byp_egstp_rules $chip_ver
-		echo ''
-	fi
-	echo stoping
-}

feeds/tip/certificates/files/etc/init.d/early_boot

@@ -20,7 +20,6 @@ copy_certificates() {
 	[ -z "$country" ] && country=US
 	echo "options cfg80211 ieee80211_regdom="$country > /etc/modules.conf 
 	echo -n $country > /etc/ucentral/country
-	sync
 	exit 0
 }
 

feeds/tip/certificates/files/usr/bin/mount_certs

@@ -6,16 +6,13 @@ check_certificates() {
 
 check_certificates
 
-tar_part_lookup() {
-	part="$(fw_printenv -n cert_part)"
-	if [ "$part" -eq 0 ]; then
-		echo "$2"
-		part=1
-	else
-		echo "$1"
-		part=0
-	fi
-	fw_setenv cert_part $part
+bootconfig_lookup() {
+	case "$(fw_printenv -n cert_part)" in
+	0)	echo "0:BOOTCONFIG"
+		;;
+	1)	echo "0:BOOTCONFIG1"
+		;;
+	esac
 }
 
 . /lib/functions.sh
@@ -38,40 +35,13 @@ sonicfi,rap7*)
 		[ -n "$mtd" ] && mount -t ext4 /dev/mtdblock$mtd /certificates
 	fi
 	if [ ! -f /certificates/cert.pem ] || [ ! -f /certificates/key.pem ]; then
-		part=$(tar_part_lookup "0:BOOTCONFIG" "0:BOOTCONFIG1")
-		if [ -n "part" ]; then
-			mmc_dev=$(echo $(find_mmc_part "$part") | sed 's/^.\{5\}//')
+		bootconfig=$(bootconfig_lookup)
+		if [ -n "$bootconfig" ]; then
+			mmc_dev=$(echo $(find_mmc_part "$bootconfig") | sed 's/^.\{5\}//')
 			[ -n "$mmc_dev" ] && tar xf /dev/$mmc_dev -C /certificates
 		fi
 	fi
 	;;
-udaya,a5-id2|\
-yuncore,ax820)
-	mtd=$(find_mtd_index certificates)
-	if [ "$(head -c 4 /dev/mtd$mtd)" == "hsqs" ]; then
-		mount -t squashfs /dev/mtdblock$mtd /mnt
-		cp /mnt/* /certificates
-		umount /mnt
-	fi
-	part=$(tar_part_lookup "insta1" "insta2")
-	if [ -n "insta" ]; then
-		mtd=$(find_mtd_index $part)
-		[ -n "$mtd" ] && tar xf /dev/mtdblock$mtd -C /certificates
-	fi
-	;;
-sonicfi,rap6*)
-	mtd=$(find_mtd_index certificates)
-	if [ "$(head -c 4 /dev/mtd$mtd)" == "hsqs" ]; then
-		mount -t squashfs /dev/mtdblock$mtd /mnt
-		cp /mnt/* /certificates
-		umount /mnt
-	fi
-	part=$(tar_part_lookup "devinfo" "certificates")
-	if [ -n "$part" ]; then
-		mtd=$(find_mtd_index $part)
-		[ -n "$mtd" ] && tar xf /dev/mtdblock$mtd -C /certificates
-	fi
-	;;
 *)
 	mtd=$(find_mtd_index certificates)
 

feeds/tip/certificates/files/usr/bin/store_certs

@@ -1,44 +1,25 @@
 #!/bin/sh
 
-tar_part_lookup() {
-	part="$(fw_printenv -n cert_part)"
-	if [ "$part" -eq 0 ]; then
-		echo "$2"
-		part=1
-	else
-		echo "$1"
-		part=0
-	fi
-	fw_setenv cert_part $part
+bootconfig_lookup() {
+	bootconfig="$(fw_printenv -n cert_part)"
+	case "$(fw_printenv -n cert_part)" in
+	0)	echo "0:BOOTCONFIG1"
+		bootconfig=1
+		;;
+	*)	echo "0:BOOTCONFIG"
+		bootconfig=0
+		;;
+	esac
+	fw_setenv cert_part $bootconfig
 }
 
 . /lib/functions.sh
 case "$(board_name)" in
 sonicfi,rap7110c-341x)
 	cd /certificates
-	tar cf /tmp/certs.tar .
-	part=$(tar_part_lookup "0:BOOTCONFIG" "0:BOOTCONFIG1")
-	mmc_dev=$(echo $(find_mmc_part $part) | sed 's/^.\{5\}//')
-	dd if=/tmp/certs.tar of=/dev/$mmc_dev
-	;;
-udaya,a5-id2|\
-yuncore,ax820)
-	cd /certificates
-	tar cf /tmp/certs.tar .
-	part=$(tar_part_lookup "insta1" "insta2")
-	mtd=$(find_mtd_index $part)
-	dd if=/tmp/certs.tar of=/dev/mtdblock$mtd
-	;;
-sonicfi,rap6*)
-	if [ "$(fw_printenv -n store_certs_disabled)" != "1" ]; then
-		cd /certificates
-		tar cf /tmp/certs.tar .
-		part=$(tar_part_lookup "devinfo" "certificates")
-		mtd=$(find_mtd_index $part)
-		block_size=$(cat /sys/class/mtd/mtd$mtd/size)
-		dd if=/tmp/certs.tar of=/tmp/certs_pad.tar bs=$block_size conv=sync
-		mtd write /tmp/certs_pad.tar /dev/mtd$mtd
-		rm -f /tmp/certs.tar /tmp/certs_pad.tar
-	fi
+	tar cf /tmp/certs.tar
+	bootconfig=$(bootconfig_lookup)
+	mmc_dev=$(echo $(find_mmc_part $bootconfig) | sed 's/^.\{5\}//')
+	dd if=/tmp/certs.tar of=/dev/$bootconfig
 	;;
 esac

feeds/tip/cloud_discovery/files/etc/init.d/cloud_discover

@@ -22,19 +22,6 @@ start_service() {
 	[ "$valid" == "true" ] || 
 		/usr/share/ucentral/ucentral.uc /etc/ucentral/ucentral.cfg.0000000001 > /dev/null
 
-	est_client check
-	[ $? -eq 1 ] && {
-		logger ERROR
-		logger ERROR
-		logger ERROR
-		logger The certificate used has a CN that does not match the serial of the device
-		echo The certificate used has a CN that does not match the serial of the device
-		logger ERROR
-		logger ERROR
-		logger ERROR
-		return
-	}
-
 	procd_open_instance
 	procd_set_param command "$PROG"
 	procd_set_param respawn

feeds/tip/cloud_discovery/files/usr/bin/cloud_discovery

@@ -15,14 +15,9 @@ const ONLINE = 2;
 const OFFLINE = 3;
 const ORPHAN = 4;
 
-const DISCOVER_DHCP = "DHCP";
-const DISCOVER_FLASH = "FLASH";
-const DISCOVER_LOOKUP = "OpenLAN";
-
 let ubus = libubus.connect();
 let uci = libuci.cursor();
 let state = DISCOVER;
-let discovery_method = "";
 let validate_time;
 let offline_time;
 let orphan_time;
@@ -32,8 +27,6 @@ let timeouts = {
 	'validate': 120,
 	'orphan': 2 * 60 * 60,
 	interval: 10000,
-	expiry_interval: 60 * 60 * 1000,
-	expiry_threshold: 1 * 365 * 24 * 60 * 60,
 };
 
 ulog_open(ULOG_SYSLOG | ULOG_STDIO, LOG_DAEMON, "cloud_discover");
@@ -42,24 +35,6 @@ ulog(LOG_INFO, 'Start\n');
 
 uloop.init();
 
-let cds_server = 'discovery.open-lan.org';
-
-function detect_certificate_type() {
-	let pipe = fs.popen(`openssl x509 -in /etc/ucentral/cert.pem -noout -issuer`);
-	let issuer = pipe.read("all");
-	pipe.close();
-
-	if (match(issuer, /OpenLAN Demo Birth CA/)) {
-		ulog(LOG_INFO, 'Certificate type is "Demo" \n');
-		cds_server = 'discovery-qa.open-lan.org';
-		timeouts.expiry_threshold = 3 * 24 * 60 * 60;
-	} else if (match(issuer, /OpenLAN Birth Issuing CA/)) {
-		ulog(LOG_INFO, 'Certificate type is "Production"\n');
-	} else {
-		ulog(LOG_INFO, 'Certificate type is "TIP"\n');
-	}
-}
-
 function readjsonfile(path) {
 	let file = fs.readfile(path);
 	if (file)
@@ -101,14 +76,6 @@ function gateway_load() {
 	return readjsonfile('/etc/ucentral/gateway.json');
 }
 
-function discovery_state_write() {
-	let discovery_state = {
-		"type": discovery_method,
-		"updated": time()
-	};
-	fs.writefile('/etc/ucentral/discovery.state.json', discovery_state);
-}
-
 function gateway_write(data) {
 	let gateway = gateway_load();
 	gateway ??= {};
@@ -122,10 +89,8 @@ function gateway_write(data) {
 		if (new[key] != gateway[key])
 			changed = true;
 	}
-	if (changed) {
+	if (changed)
 		fs.writefile('/etc/ucentral/gateway.json', new);
-		system('sync');
-	}
 	return changed;
 }
 
@@ -162,7 +127,6 @@ function set_state(set) {
 		if (prev == VALIDATING) {
 			ulog(LOG_INFO, 'Setting cloud controller to validated\n');
 			gateway_write({ valid: true });
-			discovery_state_write();
 		}
 		break;
 
@@ -197,7 +161,7 @@ function redirector_lookup() {
 	let serial = uci.get('system', '@system[-1]', 'mac');
 
 	fs.unlink(path);
-	system(`curl -k --cert /etc/ucentral/operational.pem --key /etc/ucentral/key.pem --cacert /etc/ucentral/operational.ca https://${cds_server}/v1/devices/${serial} --output /tmp/ucentral.redirector`);
+	system(`curl -k --cert /etc/ucentral/operational.pem --key /etc/ucentral/key.pem --cacert /etc/ucentral/operational.ca https://openlan.keys.tip.build/v1/devices/${serial} --output /tmp/ucentral.redirector`);
 	if (!fs.stat(path))
 		return;
 	let redir = readjsonfile(path);
@@ -260,18 +224,15 @@ function interval_handler() {
 		if (!time_is_valid())
 			return;
 
-		discovery_method = DISCOVER_DHCP;
 		if (discover_dhcp())
 			return;
 
 		if (system('/usr/bin/est_client enroll'))
 			return;
 
-		discovery_method = DISCOVER_FLASH;
 		if (!discover_flash())
 			return;
 
-		discovery_method = DISCOVER_LOOKUP;
 		redirector_lookup();
 		break;
 
@@ -291,36 +252,6 @@ function interval_handler() {
 	}
 }
 
-function trigger_reenroll() {
-	ulog(LOG_INFO, 'triggering reenroll\n');
-
-	if (system('/usr/bin/est_client reenroll')) {
-		ulog(LOG_INFO, 'reenroll failed\n');
-		return;
-	}
-	
-	ulog(LOG_INFO, 'reenroll succeeded\n');
-	ulog(LOG_INFO, 'stopping client\n');
-	
-	system('/etc/init.d/ucentral stop');
-	set_state(DISCOVER);
-}
-
-function expiry_handler() {
-	let stat = fs.stat('/etc/ucentral/operational.ca');
-	if (!stat)
-		return;
-
-	let ret = system(`openssl x509 -checkend ${timeouts.expiry_threshold} -noout -in /certificates/operational.pem`);
-	if (!ret) {
-		ulog(LOG_INFO, 'checked certificate expiry - all ok\n');
-		return;
-	}
-
-	ulog(LOG_INFO, 'certificate will expire soon\n');
-	trigger_reenroll();
-}
-
 let ubus_methods = {
 	discover: {
 		call: function(req) {
@@ -395,17 +326,8 @@ let ubus_methods = {
 		},
 		args: {},
 	},
-	reenroll: {
-		call: function(req) {
-			trigger_reenroll();
-			return 0;
-		},
-		args: {},
-	},
 };
 
-detect_certificate_type();
-
 if (gateway_available()) {
 	let status = ubus.call('ucentral', 'status');
 	ulog(LOG_INFO, 'cloud is known\n');
@@ -422,7 +344,6 @@ if (gateway_available()) {
 timeouts_load();
 
 interval = uloop.interval(timeouts.interval, interval_handler);
-uloop.interval(timeouts.expiry_interval, expiry_handler);
 
 ubus.publish('cloud', ubus_methods);
 

feeds/tip/cloud_discovery/files/usr/bin/est_client

@@ -4,28 +4,12 @@
 
 import { ulog_open, ulog, ULOG_SYSLOG, ULOG_STDIO, LOG_DAEMON, LOG_INFO } from 'log';
 import * as fs from 'fs';
-import * as libuci from 'uci';
 
 let store_operational_pem = false;
 let store_operational_ca = false;
-let est_server = 'est.certificates.open-lan.org';
+let est_server = 'qaest.certificates.open-lan.org:8001';
 let cert_prefix = 'operational';
 
-function set_est_server() {
-	let pipe = fs.popen(`openssl x509 -in /etc/ucentral/cert.pem -noout -issuer`);
-	let issuer = pipe.read("all");
-	pipe.close();
-
-	if (match(issuer, /OpenLAN Demo Birth CA/)) {
-		ulog(LOG_INFO, 'Certificate type is "Demo" \n');
-		est_server = 'qaest.certificates.open-lan.org:8001';
-	} else if (match(issuer, /OpenLAN Birth Issuing CA/)) {
-		ulog(LOG_INFO, 'Certificate type is "Production"\n');
-	} else {
-		ulog(LOG_INFO, 'Certificate type is "TIP"\n');
-	}
-}
-
 if (getenv('EST_SERVER'))
 	est_server = getenv('EST_SERVER');
 
@@ -94,8 +78,6 @@ function call_est_server(path, cert, target) {
 	if (generate_csr(cert))
 		return 1;
 
-	set_est_server();	
-
 	let ret = system('curl -m 10 -X POST https://' + est_server + '/.well-known/est/' + path + ' -d @/tmp/csr.nohdr.p10 -H "Content-Type: application/pkcs10" --cert ' + cert + ' --key /etc/ucentral/key.pem --cacert /etc/ucentral/insta.pem -o /tmp/operational.nohdr.p7');
 	if (ret) {
 		ulog(LOG_INFO, 'Failed to request operational certificate\n');
@@ -143,9 +125,6 @@ function load_operational_ca() {
 		ulog(LOG_INFO, 'Operational CA is present\n');
 		return 0;
 	}
-
-	set_est_server();	
-
 	let ret = system('curl -m 10 -X GET https://' + est_server + '/.well-known/est/cacerts --cert /etc/ucentral/' + cert_prefix + '.pem --key /etc/ucentral/key.pem --cacert /etc/ucentral/insta.pem -o /tmp/' + cert_prefix + '.ca.nohdr.p7');
 	if (!ret)
 		ret = p7_too_pem('/tmp/' + cert_prefix + '.ca.nohdr.p7', '/etc/ucentral/' + cert_prefix + '.ca');
@@ -160,14 +139,11 @@ function load_operational_ca() {
 }
 
 function fwtool() {
-	if (!fs.stat('/etc/ucentral/cert.pem'))
-		return 0;
-
 	let pipe = fs.popen(`openssl x509 -in /etc/ucentral/cert.pem -noout -issuer`);
 	let issuer = pipe.read("all");
 	pipe.close();
 
-	if (!(match(issuer, /OpenLAN/) && match(issuer, /Birth/)))
+	if (!(match(issuer, /OpenLAN/) && match(issuer, /Birth CA/)))
 		return 0;
 
 	ulog(LOG_INFO, 'The issuer is insta\n');
@@ -187,20 +163,6 @@ function fwtool() {
 	return 0;
 }
 
-function check_cert() {
-	if (!fs.stat('/etc/ucentral/cert.pem'))
-		return 0;
-	let pipe = fs.popen("openssl x509 -in /etc/ucentral/cert.pem  -noout -subject -nameopt multiline | grep commonName | awk '{ print $3 }'");
-	let cn = pipe.read("all");
-	pipe.close();
-	if (!cn)
-		return 0;
-	cn = lc(trim(cn));
-	let uci = libuci.cursor();
-	let serial = uci.get('ucentral', 'config', 'serial');
-	return cn != serial;
-}
-
 switch(ARGV[0]) {
 case 'enroll':
 	let ret = simpleenroll();
@@ -222,7 +184,4 @@ case 'reenroll':
 
 case 'fwtool':
 	exit(fwtool());
-
-case 'check':
-	exit(check_cert());
 }

feeds/tip/cloud_discovery/files/usr/share/ucentral/cloud_discovery.uc

@@ -5,7 +5,7 @@ import * as fs from 'fs';
 
 let cmd = ARGV[0];
 let ifname = getenv("interface");
-let opt138 = getenv("opt138");
+let opt224 = getenv("opt138");
 let opt224 = getenv("opt224");
 
 if (cmd != 'bound' && cmd != 'renew')

feeds/tip/tip-defaults/files/etc/ucentral/insta.pem

@@ -4,6 +4,3 @@ MIIFajCCA1KgAwIBAgICDnowDQYJKoZIhvcNAQELBQAwHzEdMBsGA1UEAwwUT3BlbkxBTiBEZW1vIFJv
 -----BEGIN CERTIFICATE-----
 MIIFIDCCAwigAwIBAgICDnkwDQYJKoZIhvcNAQELBQAwHzEdMBsGA1UEAwwUT3BlbkxBTiBEZW1vIFJvb3QgQ0EwHhcNMjUwMjIxMTUwMDAwWhcNMjYwMjIxMTUwMDAwWjAfMR0wGwYDVQQDDBRPcGVuTEFOIERlbW8gUm9vdCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMjExylKdJWoJu9mOHPJ6yZFXKe1lE467G65acpS2FKIWnPVFjNCmATMpkMOIFzEFwyFdbQjzOidtiL+73zlE52lOJpXCfOcxDFqDYDJJ8//J1/gQWsBaKpSvgLiHU/0awkQg+yJYZpj8YZa4NkFe+zTjQScSfOsqPPb3rZ7DOQ2BKAhjVShKmVbtNil0iO0zm8vE8DNkktTNMREp2pzb8MbCAgfOkwlrby6T+rV3TvmjThGdFUb5lWDFxWtlF8W0SUII9qj7p5TdGpryeLsO0nZTBtS4HxZNdvmKOHfgcRHmSZIJigB2NzKLNrXF9JBW0WnUSwZJZAG2C1RTx6lADILPueuusyfR/hZ3koKi4PHnSiTwQghzia9K9QjNHq5z9R9ZoCnhBg1VyU4LKmp862L0sIp2vgnOYunEIi9aCYBaDwo+0FuVjZuXyDIatwVuA7TN5IWPHA6XLdOt1mmkeYy1Ldr4XHjdondhtOyeei1UFXmyyLm2+kmRYfTm91TqYmNzRgbRV2NHO50AmsnBknX4Rv3gishGe0+dV5yFcUwZud0z2rSCkuoai5tKrPT+6Y6NqkT9u9HFifIBXnLwEzVUqHRtW6SuWj2DClVQIXIUZtFnhY4GuTuf6DlzgnXO58oDVCZmCW4ULIpbqGeRsvBHR8Sw5JXP/1+TMUYhE8TAgMBAAGjZjBkMB8GA1UdIwQYMBaAFDzIg8eyTI3xc4A2R60f8HanhBZDMB0GA1UdDgQWBBQ8yIPHskyN8XOANketH/B2p4QWQzAOBgNVHQ8BAf8EBAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBATANBgkqhkiG9w0BAQsFAAOCAgEAkHZ5KR8IOrdfMFy+iOvauvZxfQ84LL6TpB2FQKDjneJUdd7c29UJJFNW/0mp4Gc6jKZab6J8Dx/pNnbH0RqFjGjeRGtJ4Sk0G7gf9zw1S7qut5WJDcisM9l/wXC+zy/KSKKPQmbt0grWOtU7+NNPh1YU76hIrInq/u2sVZyKH8SXQ957fbJk6BX6JTKyNEn05AB6rNSrbOWo8sy2MlcJ7bBsrWYI1t6GcWFh4b36bLu7/dKJWpyFNXXIkKJsgMEDpEQae56+fSSDo0KRNtYB82fNZDIQlGK81rGJWNzAahM+3GD1tgk/3ZVugfaJhcBpoHHKNOGqZAvtirLAIDocno7AzqoeIz974Rh2Olsl2/arApYPyyfi8PMYuFe/d4h+Wie8n+jh5n48lZ2Ve4PK+j+QHD6tTZS4f0bGnPL1puMxzQloltuQWgLDeVfEgrc3snLvjOg8aDzWm/es85lP8XcyW54U4t3JmrNUC2C7v+Uafx7cL7eDeunhs+BRhtGV+IUmjub2IrpqZp3zZqn+LVRdYJIy/qHhjS5+ImckXkFojOmeWhfmEmYSuNP8Oa6cGuXp829qnbxLh9Qzi3TfXV883KLse4kL5Zl7gBA/4hz2hVMyGJ8fY+VvzbaTuOXyvKJ+rGZCTcRSeotBLnIevVMiL7SqOEwN0j4Mfbznfq8=
 -----END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIIFFTCCAv2gAwIBAgICAxIwDQYJKoZIhvcNAQELBQAwGjEYMBYGA1UEAwwPT3BlbkxBTiBSb290IENBMCAXDTI1MDUxNDA4NDcxMFoYDzIwNTUwNTE0MDg0NzEwWjAaMRgwFgYDVQQDDA9PcGVuTEFOIFJvb3QgQ0EwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDGibJ04A55kSURTBSKgcBmLnND2I5wws1taKqqU9aaRhB7NtvMHwh2voH9b1brUiulZaZwTN/9kzd4AnXeKQ+0u5tV7Ofk0fzF2MK47n17TS30Yenqc4NuQEKdpKK/pM3VvOEppR/bqtgyLtDmbDnmFOx+zTj/+smTgouwA+Iier0P4s5OohYxn/bjOqwQbHbU79VpGBIWv6/kt55AhH7zvsqqKHkrzTxnsRBv3SBIufrjJr9PIhZBLDrqr56P6KgAi0eoutNt2ToiJbE0WfjU7GI1RSiSN5bGj1zXhjNVzQWs1H9QzRf3c9pl3+haHQZ7FZ1UqiTRewmbNrQ6I9k81au3SttUlb87MyAuDSzatkiq7CjQ8VE1J6te6ZBt2zWpUhHsR/Lg7g3eOw5dL4oZJdK5GgGu/MUajLUXifIqM13Mvg0VTzDhN69VLXLSL0gPcicsQCwJuAza1IC/VqmBGx19fAkyJhOurCXWOgisi0g1+xzPKRphUNwMPUf8vBVOM/Vc6xDIvwVGE3+eWXyhixneFlSpAI03nWWjpwWXihTBoxbfRXO3Y/ilJqrgFN+U4PJcCPA+Wo7ThH0mgX6bOTPcgXMUzT3v3FF6Bx5/PNV3kYrw2yLzribUiS6AGvVGnW4hX2Z6OQvA/aHME8KF+6y6m4pC7FkUjVaRlzWu/wIDAQABo2MwYTAfBgNVHSMEGDAWgBSUaFuoOPk4QLByZP47kj4p1IbCJjAdBgNVHQ4EFgQUlGhbqDj5OECwcmT+O5I+KdSGwiYwDgYDVR0PAQH/BAQDAgGGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIBAB+/RUC2X6eVoPsFNMkaXO5Iib/ub0JoWhODQm8j2Mr5dpGXESSpXjfDcqDOLuJbWWoflXBLdr8BsVCBqOA9YgCX0H8Br7dUWmCScixxLW0he592/424EvdwifxcKHZLjv9CKV5Txhqnm2djc5RY/nTH5MYVrIh/If2TNO5ydDP6+vgy9GQ4en04VK7rz+PW17O8l7k9/lOmYptZmHgSDAPj/cT3PlG+McqaI5rMSHeEHlzH+PvgWjtSeEhF4FwFBXroDl4/yb4l2JB8bqAZ3vsOXSkigFcZh5MXPe+zuSSW+G8iLr4xoi0CFsP2DaHEyxgqP4B1FtE9nFPo6cvWbwqTVT7QSzqfH+jPJuQvpFXeRF5UFegNZTFT5/uFFPamihakFslEYxeJey1y+OJdLcP6ef87ruSt8amsq56OAETYpnW4JFowlEh0C+QwLGHGGY6WrOgHY/90hJmPgXBdBVg/IoOhzbvk5A+LqZDvxV2/rLNfClw8Kr3g5e8obcB6dWgMCy2z+us0H79ucnmhzQKsjpxM9T1ncHovAQfiD3jVqfHULY53avh0wIAjosoTGbe8dyx80quHe+16qWan7C9idXeAYYJXbZt5hs6hLw4I8M1LsjTg6vwsqiaHZpsmDyyQLdFjNJldG7aosfS9F+BIpuwijF+1dashL0CPsbIJ
------END CERTIFICATE-----

feeds/ucentral/rrmd/files/etc/init.d/rrmd

@@ -6,8 +6,6 @@ STOP=01
 USE_PROCD=1
 
 start_service() {
-	[ -e "/tmp/rrm_timestamp" ] && rm -rf /tmp/rrm_timestamp
-	[ -e "/tmp/rrm_chan_switch" ] && rm -rf /tmp/rrm_chan_switch
 	rm -rf /tmp/threshold_breach_count*
 	rm -rf /tmp/fixed_channel*
 	rm -rf /tmp/chanutil_phy*

feeds/ucentral/rrmd/files/usr/share/rrmd/policy_chanutil.uc

@@ -24,10 +24,6 @@ function stats_info_write(path, value) {
 	file.close();
 }
 
-function record_rrm_timestamp() {
-    stats_info_write("/tmp/rrm_timestamp", time());
-}
-
 // total number of radios: default=2
 let num_radios = 2;
 let phy_count;
@@ -140,122 +136,20 @@ function channel_to_freq(band, channel) {
     return freq;
 }
 
-// using mapping to get correct center channel, especially for 6G radio
-function get_center_channel(channel, band, bw) {
-    let center_channel = channel;
-    let center_channel_map = {};
+function center_freq_calc(band, freq, bandwidth) {
+    if (bandwidth == 40)
+        return +freq + 10;
+    if (bandwidth == 80)
+        return +freq + 30;
+    if (bandwidth == 160)
+        return +freq + 70;
+    if (bandwidth == 320)
+        if (freq == 6115)
+            return +freq - 10;
+        else
+            return +freq + 150;
 
-    switch (band) {
-    case '5g':
-        if (bw == 40) {
-            center_channel_map = {
-                "36": 38, "40": 38,
-                "44": 46, "48": 46,
-                "52": 54, "56": 54,
-                "60": 62, "64": 62,
-                "100": 102, "104": 102,
-                "108": 110, "112": 110,
-                "116": 118, "120": 118,
-                "124": 126, "128": 126,
-                "132": 134, "136": 134,
-                "140": 142, "144": 142,
-                "149": 151, "153": 151,
-                "157": 159, "161": 159,
-                "165": 167
-            };
-        } else if (bw == 80) {
-            center_channel_map = {
-                "36": 42, "40": 42, "44": 42, "48": 42,
-                "52": 58, "56": 58, "60": 58, "64": 58,
-                "100": 106, "104": 106, "108": 106, "112": 106,
-                "116": 122, "120": 122, "124": 122, "128": 122,
-                "132": 138, "136": 138, "140": 138, "144": 138,
-                "149": 155, "153": 155, "157": 155, "161": 155,
-                "165": 171
-            };
-        } else if (bw == 160) {
-            center_channel_map = {
-                "36": 50, "40": 50, "44": 50, "48": 50,
-                "52": 50, "56": 50, "60": 50, "64": 50,
-                "100": 114, "104": 114, "108": 114, "112": 114,
-                "116": 114, "120": 114, "124": 114, "128": 114
-            };
-        }
-        break;
-    case '6g':
-        if (bw == 40) {
-            center_channel_map = {
-                "1": 3, "5": 3, "9": 11, "13": 11,
-                "17": 19, "21": 19, "25": 27, "29": 27,
-                "33": 35, "37": 35, "41": 43, "45": 43,
-                "49": 51, "53": 51, "57": 59, "61": 59,
-                "65": 67, "69": 67, "73": 75, "77": 75,
-                "81": 83, "85": 83, "89": 91, "93": 91,
-                "97": 99, "101": 99, "105": 107, "109": 107,
-                "113": 115, "117": 115, "121": 123, "125": 123,
-                "129": 131, "133": 131, "137": 139, "141": 139,
-                "145": 147, "149": 147, "153": 155, "157": 155,
-                "161": 163, "165": 163, "169": 171, "173": 171,
-                "177": 179, "181": 179, "185": 187, "189": 187,
-                "193": 195, "197": 195, "201": 203, "205": 203,
-                "209": 211, "213": 211, "217": 219, "221": 219,
-                "225": 227
-            };
-        } else if (bw == 80) {
-            center_channel_map = {
-                "1": 7, "5": 7, "9": 7, "13": 7,
-                "17": 23, "21": 23, "25": 23, "29": 23,
-                "33": 39, "37": 39, "41": 39, "45": 39,
-                "49": 55, "53": 55, "57": 55, "61": 55,
-                "65": 71, "69": 71, "73": 71, "77": 71,
-                "81": 87, "85": 87, "89": 87, "93": 87,
-                "97": 103, "101": 103, "105": 103, "109": 103,
-                "113": 119, "117": 119, "121": 119, "125": 119,
-                "129": 135, "133": 135, "137": 135, "141": 135,
-                "145": 151, "149": 151, "153": 151, "157": 151,
-                "161": 167, "165": 167, "169": 167, "173": 167,
-                "177": 183, "181": 183, "185": 183, "189": 183,
-                "193": 199, "197": 199, "201": 199, "205": 199,
-                "209": 215
-            };
-        } else if (bw == 160) {
-            center_channel_map = {
-                "1": 15, "5": 15, "9": 15, "13": 15,
-                "17": 15, "21": 15, "25": 15, "29": 15,
-                "33": 47, "37": 47, "41": 47, "45": 47,
-                "49": 47, "53": 47, "57": 47, "61": 47,
-                "65": 79, "69": 79, "73": 79, "77": 79,
-                "81": 79, "85": 79, "89": 79, "93": 79,
-                "97": 111, "101": 111, "105": 111, "109": 111,
-                "113": 111, "117": 111, "121": 111, "125": 111,
-                "129": 143, "133": 143, "137": 143, "141": 143,
-                "145": 143, "149": 143, "153": 143, "157": 143,
-                "161": 175, "165": 175, "169": 175, "173": 175,
-                "177": 175, "181": 175, "185": 175, "189": 175,
-                "193": 207
-            };
-        } else if (bw == 320) {
-            center_channel_map = {
-                "1": 31, "5": 31, "9": 31, "13": 31,
-                "17": 31, "21": 31, "25": 31, "29": 31,
-                "33": 63, "37": 63, "41": 63, "45": 63,
-                "49": 63, "53": 63, "57": 63, "61": 63,
-                "65": 63, "69": 63, "73": 63, "77": 63,
-                "81": 63, "85": 63, "89": 63, "93": 63,
-                "97": 127, "101": 127, "105": 127, "109": 127,
-                "113": 127, "117": 127, "121": 127, "125": 127,
-                "129": 127, "133": 127, "137": 127, "141": 127,
-                "145": 127, "149": 127, "153": 127, "157": 127,
-                "161": 191
-            };
-        }
-        break;
-    }
-
-    if (center_channel_map[channel])
-        center_channel = center_channel_map[channel];
-
-    return center_channel;
+    return +freq;
 }
 
 function interface_status_check(iface) {
@@ -307,9 +201,6 @@ function check_current_channel(iface) {
 function hostapd_switch_channel(msg) {
     ulog_info(`[%s] Start switch channel to %d \n`, msg.iface, msg.channel);
 
-    // Channel switch in progress, set flag = 1
-    stats_info_write("/tmp/rrm_chan_switch", 1);
-
     let chan_switch_status = 0;
     let sec_channel_offset = null;
 
@@ -317,8 +208,7 @@ function hostapd_switch_channel(msg) {
     let bandwidth = replace(msg.htmode, /[^0-9]/g, '');
 
     let target_freq = channel_to_freq(msg.band, msg.channel);
-    let center_channel = get_center_channel(msg.channel, msg.band, bandwidth);
-    let center_freq = channel_to_freq(msg.band, center_channel);
+    let center_freq = center_freq_calc(msg.band, target_freq, bandwidth);
     if (bandwidth > 20)
         sec_channel_offset = 1;
 
@@ -355,20 +245,9 @@ function switch_status_check(iface, dfs_enabled_5g_flag) {
         ulog_info(`[%s] 5G radio might need some time to be UP (DFS enabled) \n`, iface);
 
         let p = 0;
-        // Default max 70 seconds wait for the DFS enabled interface to be UP
+        // Max 65 seconds wait for the DFS enabled interface to be UP
         let timer = 70;
 
-        // get real timer from hostapd_cli command
-        let check_cac_time = sprintf('hostapd_cli -i %s status | grep \"cac_time_left_seconds\" | awk -F "=" \'{print $2}\'', iface);
-        let _cac_time = fs.popen(check_cac_time);
-        let cac_time = trim(_cac_time.read('all'));
-        _cac_time.close();
-
-        // if cac_time is a valid number, set timer to cac_time + 5 seconds
-        if (cac_time > 0 && match(cac_time, /^[0-9]+$/)) {
-            timer = int(cac_time) + 5;
-        }
-
         while (p < timer) {
             ulog_info(`[%s] Check#%d \n `, iface, p);
 
@@ -388,9 +267,6 @@ function switch_status_check(iface, dfs_enabled_5g_flag) {
         }
     }
 
-    // Channel switch done, set flag = 0
-    stats_info_write("/tmp/rrm_chan_switch", 0);
-
     let current_chan = check_current_channel(iface);
     return current_chan;
 }
@@ -560,7 +436,7 @@ function random_channel_selection(iface, band, htmode, chan_list_valid) {
     ulog_info(`[%s] Selected channel list from config (default channel list shall be used in case channels haven't been selected) = %s \n`, iface, (chan_list_valid || '[]'));
 
     if (band == '2g' && bw >= 40) {
-        ulog_info(`[%s] It is highly recommended to NOT use %dMHz bandwidth for 2.4G radio (RRM will not work properly) \n`, iface, bw);
+        ulog_info(`[%s] It is highly recommended to NOT use %dMHz bandwidth for 2.4G radio \n`, iface, bw);
     } else if (band == '5g' && bw > 160) {
         ulog_info(`[%s] %dMHz bandwidth not supported for 5G radio. Please use a bandwidth of 160MHz or lower\n`, iface, bw);
     }
@@ -692,28 +568,9 @@ function random_channel_selection(iface, band, htmode, chan_list_valid) {
     return random_channel;
 }
 
-function check_center_channel(chosen_random_channel, current_channel, band, htmode) {
-    let ret = false;
-    let bw = replace(htmode, /[^0-9]/g, '');
-
-    if (band != '2g' || bw != 20) {
-        // for 2G band or 20MHz bandwidth, center channel is the same as the channel
-        let chosen_random_channel_center = get_center_channel(chosen_random_channel, band, bw);
-        let current_channel_center = get_center_channel(current_channel, band, bw);
-
-        ulog_info(`Center channel of the chosen random channel (%d) = %d; Center channel of the current channel (%d) = %d \n`, chosen_random_channel, chosen_random_channel_center, current_channel, current_channel_center);
-
-        if (chosen_random_channel_center == current_channel_center)
-            ret = true;
-    }
-
-    return ret;
-}
-
 function algo_rcs(iface, current_channel, band, htmode, selected_channels) {
     let chosen_random_channel = 0;
     let res = 0;
-    let same_center_channel = false;
 
     // random_channel_selection script will help to select random channel
     chosen_random_channel = random_channel_selection(iface, band, htmode, selected_channels);
@@ -723,15 +580,8 @@ function algo_rcs(iface, current_channel, band, htmode, selected_channels) {
         ulog_info(`[%s] RCS assigned the same channel = %d; Skip channel switch \n`, iface, chosen_random_channel);
         res = 0;
     } else if (chosen_random_channel > 0) {
-        // check if the random channel has the same center channel as the current channel
-        same_center_channel = check_center_channel(chosen_random_channel, current_channel, band, htmode);
-        if (same_center_channel) {
-            ulog_info(`[%s] RCS found channel %d with the same center channel as current channel %d; Skip channel switch \n`, iface, chosen_random_channel, current_channel);
-            res = 0;
-        } else {
-            ulog_info(`[%s] RCS done ... random channel found = %d\n`, iface, chosen_random_channel);
-            res = 1;
-        }
+        ulog_info(`[%s] RCS done ... random channel found = %d\n`, iface, chosen_random_channel);
+        res = 1;
     } else {
         ulog_info(`[%s] RCS scan FAIL. Retry Channel optimization at next cycle \n`, iface);
         res = 0;
@@ -761,8 +611,6 @@ function channel_optimize() {
         return config.interval;
     }
 
-    record_rrm_timestamp();
-
     let current_rf_down = {};
 	let cool_down_f = {};
     let check_all_cool_down = 0;
@@ -1076,7 +924,7 @@ function channel_optimize() {
                             }
                         } else {
                             // revert back to the original channel
-                            ulog_info(`[%s] Channel %d may have a cac_time longer than 60 seconds, RRM failed for this interval (you might want to avoid selecting this channel) \n`, radio_iface[l], init_payload.channel);
+                            ulog_info(`[%s] Channel %d has a cac_time longer than 60 seconds, RRM failed for this interval (you might want to avoid selecting this channel) \n`, radio_iface[l], init_payload.channel);
                         }
                     } else if (selected_algo == "ACS") {
                         let random_wait_time = random_time_calc();
@@ -1092,9 +940,6 @@ function channel_optimize() {
                             check_all_threshold_breach >= 1: threshold breach count exceeded for one or more interfaces
                         */
 
-                        // Channel switch in progress, set flag = 1
-                        stats_info_write("/tmp/rrm_chan_switch", 1);
-
                         // flag to check if 5G radio was restarted
                         let radio_5g_restarted = 0;
 
@@ -1158,10 +1003,6 @@ function channel_optimize() {
                             sleep(30000);
                         }
                     }
-
-                    sleep(5000);
-                    // Channel switch done, set flag = 0
-                    stats_info_write("/tmp/rrm_chan_switch", 0);
                 } else {
                     if (threshold_breach_f[l] != 1) {
                         ulog_info(`[%s] Threshold breach count (=%d) < Allowed consecutive Channel Utilization threshold breach count (=%d), will be checked again in the next interval \n`, radio_iface[l], threshold_breach_count[l], config.consecutive_threshold_breach);
@@ -1175,7 +1016,6 @@ function channel_optimize() {
         }
     }
     ulog_info(`RRM with channel optimization finished; next RRM round starts in %d seconds \n`, config.interval/1000);
-    record_rrm_timestamp();
 
     return config.interval;
 }

feeds/ucentral/rtty/files/rtty.init

@@ -51,7 +51,7 @@ start_rtty() {
 	procd_set_param command $BIN -h $host -I "$id" -a
 	[ -n "$port" ] && procd_append_param command -p "$port"
 	[ -n "$description" ] && procd_append_param command -d "$description"
-	[ "$ssl" = "1" ] && procd_append_param command -s -c /etc/ucentral/operational.pem -k /etc/ucentral/key.pem
+	[ "$ssl" = "1" ] && procd_append_param command -s -c /etc/ucentral/cert.pem -k /etc/ucentral/key.pem
 	[ -n "$token" ] && procd_append_param command -t "$token"
 	[ "$verbose" = "1" ] && procd_append_param command -v
 	[ "$timeout" -eq "0" ] || procd_append_param command -e $timeout

feeds/ucentral/ucentral-client/Makefile

@@ -4,9 +4,10 @@ PKG_NAME:=ucentral-client
 PKG_RELEASE:=1
 
 PKG_SOURCE_URL=https://github.com/Telecominfraproject/wlan-ucentral-client.git
+PKG_MIRROR_HASH:=2e28e0aa61b74851c7daf3634ec34d303a603e881e6c5d1fd76c837dea527582
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_DATE:=2025-08-11
-PKG_SOURCE_VERSION:=549e84e5fea7230c5471d6a3dbddcc7d3152f665
+PKG_SOURCE_DATE:=2025-07-08
+PKG_SOURCE_VERSION:=69829f63ea172ce9bd19b7b02073746fe9cf6a52
 
 PKG_LICENSE:=BSD-3-Clause
 PKG_MAINTAINER:=John Crispin <john@phrozen.org>

feeds/ucentral/ucentral-client/files/etc/config/ucentral

@@ -6,9 +6,9 @@ config ucentral config
 	option reporting	10
 
 config timeouts timeouts
-	option offline		14400
+	option offline		120
 	option validate		120
-	option orphan		7200
+	option orphan		120
 
 #config event
 #	option type  dhcp

feeds/ucentral/ucentral-schema/Makefile

@@ -4,9 +4,10 @@ PKG_NAME:=ucentral-schema
 PKG_RELEASE:=1
 
 PKG_SOURCE_URL=https://github.com/Telecominfraproject/wlan-ucentral-schema.git
+PKG_MIRROR_HASH:=1ad9f7b5d5d1145e3aed14937eef60d6794d821e0244cc8fa824400d3da47f5a
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_DATE:=2025-08-04
-PKG_SOURCE_VERSION:=1c6b3095cb9e398fcbfcb2bf995365066eb76b21
+PKG_SOURCE_DATE:=2025-07-11
+PKG_SOURCE_VERSION:=5276d0b8b6e83ab57354b0bcbb820de83a91ab88
 PKG_MAINTAINER:=John Crispin <john@phrozen.org>
 PKG_LICENSE:=BSD-3-Clause
 

feeds/ucentral/ucentral-state/files/ucentral-state

@@ -20,68 +20,9 @@ let config;
 let offline_timer;
 let current_state;
 let online = false;
-let leds_off = false;
 
 function self_healing() {
-	let heal_wifi = false;
-	let health_stat = json(fs.readfile('/tmp/ucentral.health'));
-	let last_nw_restart_ts = int(fs.readfile('/tmp/ucentral.nw_restart_ts')) || 0;
-	let time_passed_since_nw_restart = time() - last_nw_restart_ts;
 
-	if (health_stat) {
-		if (health_stat.data.rrm_chanutil == false) {
-			// RRM with Channel utilization abnormal, restart rrmd
-			ulog(LOG_INFO, 'RRM with Channel utilization abnormal, restarting rrmd\n');
-			system('/etc/init.d/rrmd restart');
-		}
-
-		if (health_stat.sanity != 100) {
-			for (let iface in health_stat.data.interfaces) {
-				let iface_data = health_stat.data.interfaces[iface];
-				if (iface_data.ssids) {
-					// one of the VAPs have an issue: flag up!
-					heal_wifi = true;
-					ulog(LOG_INFO, 'Time passed since last network restart = %d seconds\n', time_passed_since_nw_restart);
-					break;
-				}
-			}
-		} else {
-			// all VAPs are healthy, no need to heal anything
-			return;
-		}
-	}
-
-	if (fs.stat('/tmp/rrm_timestamp')) {
-		let rrm_chan_switch_flag = int(fs.readfile('/tmp/rrm_chan_switch')) || 0;
-		let last_rrm_timestamp = int(fs.readfile('/tmp/rrm_timestamp'));
-		let time_passed_since_rrm = time() - last_rrm_timestamp;
-
-		if (rrm_chan_switch_flag == 1) {
-			// RRM chan switch in progress, do not restart network!
-			ulog(LOG_INFO, 'RRM channel switch in progress, cannot restart network \n');
-			heal_wifi = false;
-		}
-
-		if (time_passed_since_rrm < 180) {
-			// RRM in progress, do not restart network!
-			ulog(LOG_INFO, 'RRM with Channel utilization may still be in progress, cannot restart network \n');
-			heal_wifi = false;
-		}
-	}
-
-	// keep a gap of at least 5 minutes between network restarts
-	if (heal_wifi && time_passed_since_nw_restart > 300) {
-		ulog(LOG_INFO, 'Restarting network \n');
-		// update network restart timestamp
-		let f = fs.open("/tmp/ucentral.nw_restart_ts", "w");
-		if (f) {
-			f.write(time());
-			f.close();
-		}
-
-		// restart network
-		system('/etc/init.d/network restart');
-	}
 }
 
 let healthcheck;
@@ -101,7 +42,7 @@ healthcheck = {
 	},
 
 	spawn: function() {
-		ulog(LOG_INFO, 'healthcheck execute\n');
+		ulog(LOG_INFO, 'healtcheck execute\n');
 		healthcheck.pid = uloop.process('/usr/share/ucentral/health.uc', [], {}, healthcheck.complete);
 	},
 };
@@ -149,13 +90,6 @@ function online_handler() {
 
 function config_load() {
 	ulog(LOG_INFO, 'loading config\n');
-
-	uci.load('system');
-	let led_off_cfg = uci.get("system", "@system[0]", "leds_off");
-	if (led_off_cfg == 1) {
-		leds_off = true;
-	}
-
 	uci.load('state');
 	config = uci.get_all('state');
 
@@ -199,7 +133,7 @@ function led_find(alias) {
 function factory_reset_timeout() {
 	let led = led_find('led-running');
 	if (led)
-		led_write(led, 'trigger', leds-off ? 'none' : 'default-on');
+		led_write(led, 'trigger', 'default-on');
 }
 
 let blink_timer;
@@ -218,7 +152,7 @@ let state_handler = {
 	offline: function() {
 		online = false;
 		let led = led_find('led-running');
-		if (!leds_off && led)
+		if (led)
 			led_write(led, 'trigger', 'heartbeat');
 		if (config.ui.offline_trigger) {
 			if (offline_timer)
@@ -231,7 +165,7 @@ let state_handler = {
 	online: function() {
 		online = true;
 		let led = led_find('led-running');
-		if (!leds_off && led)
+		if (led)
 			led_write(led, 'trigger', 'default-on');
 		online_handler();
 		return 0;
@@ -273,7 +207,7 @@ let ubus_methods = {
 			current_state = req.args.state;
 			blink_timeout();
 			ulog(LOG_INFO, 'set state -> ' + req.args.state + '\n');
-
+			
 			return state_handler[req.args.state](req.args);
 		},
 		args: {

feeds/ucentral/ucentral-tools/Makefile

@@ -3,6 +3,12 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=ucentral-tools
 PKG_RELEASE:=1
 
+PKG_SOURCE_URL=https://github.com/blogic/ucentral-tools.git
+PKG_MIRROR_HASH:=9ae6a0cd431595871c233550427c4043c2ba7ddb3c5d87e46ab74a03b2b5a947
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_DATE:=2021-01-28
+PKG_SOURCE_VERSION:=b013fc636e48d407870a46aaa68a09ed74de8d6f
+
 PKG_MAINTAINER:=John Crispin <john@phrozen.org>
 PKG_LICENSE:=BSD-3-Clause
 

feeds/ucentral/ucentral-tools/src/CMakeLists.txt

@@ -1,36 +0,0 @@
-cmake_minimum_required(VERSION 2.6)
-
-PROJECT(openwifi-tools C)
-INCLUDE(GNUInstallDirs)
-ADD_DEFINITIONS(-Os -ggdb -Wall -Werror --std=gnu99 -Wmissing-declarations)
-
-SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "")
-
-ADD_EXECUTABLE(firstcontact firstcontact.c)
-TARGET_LINK_LIBRARIES(firstcontact curl crypto ssl ubox)
-INSTALL(TARGETS firstcontact
-	RUNTIME DESTINATION ${CMAKE_INSTALL_SBINDIR}
-)
-
-ADD_EXECUTABLE(dhcpdiscover dhcpdiscover.c)
-INSTALL(TARGETS dhcpdiscover
-	RUNTIME DESTINATION ${CMAKE_INSTALL_SBINDIR}
-)
-
-ADD_EXECUTABLE(dnsprobe dnsprobe.c)
-TARGET_LINK_LIBRARIES(dnsprobe ubox resolv)
-INSTALL(TARGETS dnsprobe
-	RUNTIME DESTINATION ${CMAKE_INSTALL_SBINDIR}
-)
-
-ADD_EXECUTABLE(radiusprobe radiusprobe.c)
-TARGET_LINK_LIBRARIES(radiusprobe radcli)
-INSTALL(TARGETS radiusprobe
-	RUNTIME DESTINATION ${CMAKE_INSTALL_SBINDIR}
-)
-
-ADD_EXECUTABLE(ip-collide ip-collide.c)
-TARGET_LINK_LIBRARIES(ip-collide ubox)
-INSTALL(TARGETS ip-collide
-	RUNTIME DESTINATION ${CMAKE_INSTALL_SBINDIR}
-)

feeds/ucentral/ucentral-tools/src/dnsprobe.c

@@ -1,690 +0,0 @@
-/*
- * nslookup_lede - musl compatible replacement for busybox nslookup
- *
- * Copyright (C) 2017 Jo-Philipp Wich <jo@mein.io>
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-//config:config NSLOOKUP_OPENWRT
-//config:	bool "nslookup_openwrt"
-//config:	depends on !NSLOOKUP
-//config:	default y
-//config:	help
-//config:	  nslookup is a tool to query Internet name servers (LEDE flavor).
-//config:
-//config:config FEATURE_NSLOOKUP_OPENWRT_LONG_OPTIONS
-//config:       bool "Enable long options"
-//config:       default y
-//config:       depends on NSLOOKUP_OPENWRT && LONG_OPTS
-//config:       help
-//config:         Support long options for the nslookup applet.
-
-//applet:IF_NSLOOKUP_OPENWRT(APPLET(nslookup, BB_DIR_USR_BIN, BB_SUID_DROP))
-
-//kbuild:lib-$(CONFIG_NSLOOKUP_OPENWRT) += nslookup_lede.o
-
-//usage:#define nslookup_lede_trivial_usage
-//usage:       "[HOST] [SERVER]"
-//usage:#define nslookup_lede_full_usage "\n\n"
-//usage:       "Query the nameserver for the IP address of the given HOST\n"
-//usage:       "optionally using a specified DNS server"
-//usage:
-//usage:#define nslookup_lede_example_usage
-//usage:       "$ nslookup localhost\n"
-//usage:       "Server:     default\n"
-//usage:       "Address:    default\n"
-//usage:       "\n"
-//usage:       "Name:       debian\n"
-//usage:       "Address:    127.0.0.1\n"
-
-#include <stdio.h>
-#include <resolv.h>
-#include <string.h>
-#include <errno.h>
-#include <time.h>
-#include <poll.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <sys/socket.h>
-#include <arpa/inet.h>
-#include <net/if.h>
-#include <netdb.h>
-
-#include <libubox/ulog.h>
-
-#define ENABLE_FEATURE_IPV6	1
-
-typedef struct len_and_sockaddr {
-	socklen_t len;
-	union {
-		struct sockaddr sa;
-		struct sockaddr_in sin;
-#if ENABLE_FEATURE_IPV6
-		struct sockaddr_in6 sin6;
-#endif
-	} u;
-} len_and_sockaddr;
-
-struct ns {
-	const char *name;
-	len_and_sockaddr addr;
-	int failures;
-	int replies;
-};
-
-struct query {
-	const char *name;
-	size_t qlen, rlen;
-	unsigned char query[512], reply[512];
-	unsigned long latency;
-	int rcode, n_ns;
-};
-
-static const char *rcodes[] = {
-	"NOERROR",
-	"FORMERR",
-	"SERVFAIL",
-	"NXDOMAIN",
-	"NOTIMP",
-	"REFUSED",
-	"YXDOMAIN",
-	"YXRRSET",
-	"NXRRSET",
-	"NOTAUTH",
-	"NOTZONE",
-	"RESERVED11",
-	"RESERVED12",
-	"RESERVED13",
-	"RESERVED14",
-	"RESERVED15",
-	"BADVERS"
-};
-
-static unsigned int default_port = 53;
-static unsigned int default_retry = 1;
-static unsigned int default_timeout = 2;
-
-
-static int parse_reply(const unsigned char *msg, size_t len, int *bb_style_counter)
-{
-	ns_msg handle;
-	ns_rr rr;
-	int i, n, rdlen;
-	const char *format = NULL;
-	char astr[INET6_ADDRSTRLEN], dname[MAXDNAME];
-	const unsigned char *cp;
-
-	if (ns_initparse(msg, len, &handle) != 0) {
-		//fprintf(stderr, "Unable to parse reply: %s\n", strerror(errno));
-		return -1;
-	}
-
-	for (i = 0; i < ns_msg_count(handle, ns_s_an); i++) {
-		if (ns_parserr(&handle, ns_s_an, i, &rr) != 0) {
-			//fprintf(stderr, "Unable to parse resource record: %s\n", strerror(errno));
-			return -1;
-		}
-
-		rdlen = ns_rr_rdlen(rr);
-
-		switch (ns_rr_type(rr))
-		{
-		case ns_t_a:
-			if (rdlen != 4) {
-				//fprintf(stderr, "Unexpected A record length\n");
-				return -1;
-			}
-			inet_ntop(AF_INET, ns_rr_rdata(rr), astr, sizeof(astr));
-			printf("Name:\t%s\nAddress: %s\n", ns_rr_name(rr), astr);
-			break;
-
-#if ENABLE_FEATURE_IPV6
-		case ns_t_aaaa:
-			if (rdlen != 16) {
-				//fprintf(stderr, "Unexpected AAAA record length\n");
-				return -1;
-			}
-			inet_ntop(AF_INET6, ns_rr_rdata(rr), astr, sizeof(astr));
-			printf("%s\thas AAAA address %s\n", ns_rr_name(rr), astr);
-			break;
-#endif
-
-		case ns_t_ns:
-			if (!format)
-				format = "%s\tnameserver = %s\n";
-			/* fall through */
-
-		case ns_t_cname:
-			if (!format)
-				format = "%s\tcanonical name = %s\n";
-			/* fall through */
-
-		case ns_t_ptr:
-			if (!format)
-				format = "%s\tname = %s\n";
-			if (ns_name_uncompress(ns_msg_base(handle), ns_msg_end(handle),
-				ns_rr_rdata(rr), dname, sizeof(dname)) < 0) {
-				//fprintf(stderr, "Unable to uncompress domain: %s\n", strerror(errno));
-				return -1;
-			}
-			printf(format, ns_rr_name(rr), dname);
-			break;
-
-		case ns_t_mx:
-			if (rdlen < 2) {
-				fprintf(stderr, "MX record too short\n");
-				return -1;
-			}
-			n = ns_get16(ns_rr_rdata(rr));
-			if (ns_name_uncompress(ns_msg_base(handle), ns_msg_end(handle),
-				ns_rr_rdata(rr) + 2, dname, sizeof(dname)) < 0) {
-				//fprintf(stderr, "Cannot uncompress MX domain: %s\n", strerror(errno));
-				return -1;
-			}
-			printf("%s\tmail exchanger = %d %s\n", ns_rr_name(rr), n, dname);
-			break;
-
-		case ns_t_txt:
-			if (rdlen < 1) {
-				//fprintf(stderr, "TXT record too short\n");
-				return -1;
-			}
-			n = *(unsigned char *)ns_rr_rdata(rr);
-			if (n > 0) {
-				memset(dname, 0, sizeof(dname));
-				memcpy(dname, ns_rr_rdata(rr) + 1, n);
-				printf("%s\ttext = \"%s\"\n", ns_rr_name(rr), dname);
-			}
-			break;
-
-		case ns_t_soa:
-			if (rdlen < 20) {
-				//fprintf(stderr, "SOA record too short\n");
-				return -1;
-			}
-
-			printf("%s\n", ns_rr_name(rr));
-
-			cp = ns_rr_rdata(rr);
-			n = ns_name_uncompress(ns_msg_base(handle), ns_msg_end(handle),
-			                       cp, dname, sizeof(dname));
-
-			if (n < 0) {
-				//fprintf(stderr, "Unable to uncompress domain: %s\n", strerror(errno));
-				return -1;
-			}
-
-			printf("\torigin = %s\n", dname);
-			cp += n;
-
-			n = ns_name_uncompress(ns_msg_base(handle), ns_msg_end(handle),
-			                       cp, dname, sizeof(dname));
-
-			if (n < 0) {
-				//fprintf(stderr, "Unable to uncompress domain: %s\n", strerror(errno));
-				return -1;
-			}
-
-			printf("\tmail addr = %s\n", dname);
-			cp += n;
-
-			printf("\tserial = %lu\n", ns_get32(cp));
-			cp += 4;
-
-			printf("\trefresh = %lu\n", ns_get32(cp));
-			cp += 4;
-
-			printf("\tretry = %lu\n", ns_get32(cp));
-			cp += 4;
-
-			printf("\texpire = %lu\n", ns_get32(cp));
-			cp += 4;
-
-			printf("\tminimum = %lu\n", ns_get32(cp));
-			break;
-
-		default:
-			break;
-		}
-	}
-
-	return i;
-}
-
-static int parse_nsaddr(const char *addrstr, len_and_sockaddr *lsa)
-{
-	char *eptr, *hash, ifname[IFNAMSIZ];
-	unsigned int port = default_port;
-	unsigned int scope = 0;
-
-	hash = strchr(addrstr, '#');
-
-	if (hash) {
-		*hash++ = '\0';
-		port = strtoul(hash, &eptr, 10);
-
-		if (eptr == hash || *eptr != '\0' || port > 65535) {
-			errno = EINVAL;
-			return -1;
-		}
-	}
-
-	hash = strchr(addrstr, '%');
-
-	if (hash) {
-		for (eptr = ++hash; *eptr != '\0' && *eptr != '#'; eptr++) {
-			if ((eptr - hash) >= IFNAMSIZ) {
-				errno = ENODEV;
-				return -1;
-			}
-
-			ifname[eptr - hash] = *eptr;
-		}
-
-		ifname[eptr - hash] = '\0';
-		scope = if_nametoindex(ifname);
-
-		if (scope == 0) {
-			errno = ENODEV;
-			return -1;
-		}
-	}
-
-#if ENABLE_FEATURE_IPV6
-	if (inet_pton(AF_INET6, addrstr, &lsa->u.sin6.sin6_addr)) {
-		lsa->u.sin6.sin6_family = AF_INET6;
-		lsa->u.sin6.sin6_port = htons(port);
-		lsa->u.sin6.sin6_scope_id = scope;
-		lsa->len = sizeof(lsa->u.sin6);
-		return 0;
-	}
-#endif
-
-	if (!scope && inet_pton(AF_INET, addrstr, &lsa->u.sin.sin_addr)) {
-		lsa->u.sin.sin_family = AF_INET;
-		lsa->u.sin.sin_port = htons(port);
-		lsa->len = sizeof(lsa->u.sin);
-		return 0;
-	}
-
-	errno = EINVAL;
-	return -1;
-}
-
-static unsigned long mtime(void)
-{
-	struct timespec ts;
-	clock_gettime(CLOCK_REALTIME, &ts);
-	return (unsigned long)ts.tv_sec * 1000 + ts.tv_nsec / 1000000;
-}
-
-#if ENABLE_FEATURE_IPV6
-static void to_v4_mapped(len_and_sockaddr *a)
-{
-	if (a->u.sa.sa_family != AF_INET)
-		return;
-
-	memcpy(a->u.sin6.sin6_addr.s6_addr + 12,
-	       &a->u.sin.sin_addr, 4);
-
-	memcpy(a->u.sin6.sin6_addr.s6_addr,
-	       "\0\0\0\0\0\0\0\0\0\0\xff\xff", 12);
-
-	a->u.sin6.sin6_family = AF_INET6;
-	a->u.sin6.sin6_flowinfo = 0;
-	a->u.sin6.sin6_scope_id = 0;
-	a->len = sizeof(a->u.sin6);
-}
-#endif
-
-
-/*
- * Function logic borrowed & modified from musl libc, res_msend.c
- */
-
-static int send_queries(struct ns *ns, int n_ns, struct query *queries, int n_queries)
-{
-	int fd;
-	int timeout = default_timeout * 1000, retry_interval, servfail_retry = 0;
-	len_and_sockaddr from = { };
-#if ENABLE_FEATURE_IPV6
-	int one = 1;
-#endif
-	int recvlen = 0;
-	int n_replies = 0;
-	struct pollfd pfd;
-	unsigned long t0, t1, t2;
-	int nn, qn, next_query = 0;
-
-	from.u.sa.sa_family = AF_INET;
-	from.len = sizeof(from.u.sin);
-
-#if ENABLE_FEATURE_IPV6
-	for (nn = 0; nn < n_ns; nn++) {
-		if (ns[nn].addr.u.sa.sa_family == AF_INET6) {
-			from.u.sa.sa_family = AF_INET6;
-			from.len = sizeof(from.u.sin6);
-			break;
-		}
-	}
-#endif
-
-	/* Get local address and open/bind a socket */
-	fd = socket(from.u.sa.sa_family, SOCK_DGRAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0);
-
-#if ENABLE_FEATURE_IPV6
-	/* Handle case where system lacks IPv6 support */
-	if (fd < 0 && from.u.sa.sa_family == AF_INET6 && errno == EAFNOSUPPORT) {
-		fd = socket(AF_INET, SOCK_DGRAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0);
-		from.u.sa.sa_family = AF_INET;
-	}
-#endif
-
-	if (fd < 0)
-		return -1;
-
-	if (bind(fd, &from.u.sa, from.len) < 0) {
-		close(fd);
-		return -1;
-	}
-
-#if ENABLE_FEATURE_IPV6
-	/* Convert any IPv4 addresses in a mixed environment to v4-mapped */
-	if (from.u.sa.sa_family == AF_INET6) {
-		setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &one, sizeof(one));
-
-		for (nn = 0; nn < n_ns; nn++)
-			to_v4_mapped(&ns[nn].addr);
-	}
-#endif
-
-	pfd.fd = fd;
-	pfd.events = POLLIN;
-	retry_interval = timeout / default_retry;
-	t0 = t2 = mtime();
-	t1 = t2 - retry_interval;
-
-	for (; t2 - t0 < timeout; t2 = mtime()) {
-		if (t2 - t1 >= retry_interval) {
-			for (qn = 0; qn < n_queries; qn++) {
-				if (queries[qn].rlen)
-					continue;
-
-				for (nn = 0; nn < n_ns; nn++) {
-					sendto(fd, queries[qn].query, queries[qn].qlen,
-					       MSG_NOSIGNAL, &ns[nn].addr.u.sa, ns[nn].addr.len);
-				}
-			}
-
-			t1 = t2;
-			servfail_retry = 2 * n_queries;
-		}
-
-		/* Wait for a response, or until time to retry */
-		if (poll(&pfd, 1, t1+retry_interval-t2) <= 0)
-			continue;
-
-		while (1) {
-			recvlen = recvfrom(fd, queries[next_query].reply,
-			                   sizeof(queries[next_query].reply), 0,
-			                   &from.u.sa, &from.len);
-
-			/* read error */
-			if (recvlen < 0)
-				break;
-
-			/* Ignore non-identifiable packets */
-			if (recvlen < 4)
-				continue;
-
-			/* Ignore replies from addresses we didn't send to */
-			for (nn = 0; nn < n_ns; nn++)
-				if (memcmp(&from.u.sa, &ns[nn].addr.u.sa, from.len) == 0)
-					break;
-
-			if (nn >= n_ns)
-				continue;
-
-			/* Find which query this answer goes with, if any */
-			for (qn = next_query; qn < n_queries; qn++)
-				if (!memcmp(queries[next_query].reply, queries[qn].query, 2))
-					break;
-
-			if (qn >= n_queries || queries[qn].rlen)
-				continue;
-
-			queries[qn].rcode = queries[next_query].reply[3] & 15;
-			queries[qn].latency = mtime() - t0;
-			queries[qn].n_ns = nn;
-
-			ns[nn].replies++;
-
-			/* Only accept positive or negative responses;
-			 * retry immediately on server failure, and ignore
-			 * all other codes such as refusal. */
-			switch (queries[qn].rcode) {
-			case 0:
-			case 3:
-				break;
-
-			case 2:
-				if (servfail_retry && servfail_retry--) {
-					ns[nn].failures++;
-					sendto(fd, queries[qn].query, queries[qn].qlen,
-					       MSG_NOSIGNAL, &ns[nn].addr.u.sa, ns[nn].addr.len);
-				}
-				/* fall through */
-
-			default:
-				continue;
-			}
-
-			/* Store answer */
-			n_replies++;
-
-			queries[qn].rlen = recvlen;
-
-			if (qn == next_query) {
-				while (next_query < n_queries) {
-					if (!queries[next_query].rlen)
-						break;
-
-					next_query++;
-				}
-			}
-			else {
-				memcpy(queries[qn].reply, queries[next_query].reply, recvlen);
-			}
-
-			if (next_query >= n_queries)
-				return n_replies;
-		}
-	}
-
-	return n_replies;
-}
-
-static struct ns *add_ns(struct ns **ns, int *n_ns, const char *addr)
-{
-	char portstr[sizeof("65535")], *p;
-	len_and_sockaddr a = { };
-	struct ns *tmp;
-	struct addrinfo *ai, *aip, hints = {
-		.ai_flags = AI_NUMERICSERV,
-		.ai_socktype = SOCK_DGRAM
-	};
-
-	if (parse_nsaddr(addr, &a)) {
-		/* Maybe we got a domain name, attempt to resolve it using the standard
-		 * resolver routines */
-
-		p = strchr(addr, '#');
-		snprintf(portstr, sizeof(portstr), "%hu",
-		         (unsigned short)(p ? strtoul(p, NULL, 10) : default_port));
-
-		if (!getaddrinfo(addr, portstr, &hints, &ai)) {
-			for (aip = ai; aip; aip = aip->ai_next) {
-				if (aip->ai_addr->sa_family != AF_INET &&
-				    aip->ai_addr->sa_family != AF_INET6)
-					continue;
-
-#if ! ENABLE_FEATURE_IPV6
-				if (aip->ai_addr->sa_family != AF_INET)
-					continue;
-#endif
-
-				tmp = realloc(*ns, sizeof(**ns) * (*n_ns + 1));
-
-				if (!tmp)
-					return NULL;
-
-				*ns = tmp;
-
-				(*ns)[*n_ns].name = addr;
-				(*ns)[*n_ns].replies = 0;
-				(*ns)[*n_ns].failures = 0;
-				(*ns)[*n_ns].addr.len = aip->ai_addrlen;
-
-				memcpy(&(*ns)[*n_ns].addr.u.sa, aip->ai_addr, aip->ai_addrlen);
-
-				(*n_ns)++;
-			}
-
-			freeaddrinfo(ai);
-
-			return &(*ns)[*n_ns];
-		}
-
-		return NULL;
-	}
-
-	tmp = realloc(*ns, sizeof(**ns) * (*n_ns + 1));
-
-	if (!tmp)
-		return NULL;
-
-	*ns = tmp;
-
-	(*ns)[*n_ns].addr = a;
-	(*ns)[*n_ns].name = addr;
-	(*ns)[*n_ns].replies = 0;
-	(*ns)[*n_ns].failures = 0;
-
-	return &(*ns)[(*n_ns)++];
-}
-
-static struct query *add_query(struct query **queries, int *n_queries,
-                               int type, const char *dname)
-{
-	struct query *tmp;
-	ssize_t qlen;
-
-	tmp = realloc(*queries, sizeof(**queries) * (*n_queries + 1));
-
-	if (!tmp)
-		return NULL;
-
-	memset(&tmp[*n_queries], 0, sizeof(*tmp));
-
-	qlen = res_mkquery(QUERY, dname, C_IN, type, NULL, 0, NULL,
-	                   tmp[*n_queries].query, sizeof(tmp[*n_queries].query));
-
-	tmp[*n_queries].qlen = qlen;
-	tmp[*n_queries].name = dname;
-	*queries = tmp;
-
-	return &tmp[(*n_queries)++];
-}
-
-int main(int argc, char **argv)
-{
-	int rc = 1;
-	struct ns *ns = NULL;
-	struct query *queries = NULL;
-	int n_ns = 0, n_queries = 0;
-	int c = 0;
-
-	char *url = "telecominfraproject.com";
-	char *server = "127.0.0.1";
-	int v6 = 0;
-
-	while (1) {
-		int option = getopt(argc, argv, "u:s:i:6");
-
-		if (option == -1)
-			break;
-
-		switch (option) {
-		case '6':
-			v6 = 1;
-			break;
-		case 'u':
-			url = optarg;
-			break;
-		case 's':
-			server = optarg;
-			break;
-		default:
-		case 'h':
-			printf("Usage: dnsprobe OPTIONS\n"
-			       "  -6 - use ipv6\n"
-			       "  -u <url>\n"
-			       "  -s <server>\n");
-			return -1;
-		}
-	}
-
-	ulog_open(ULOG_SYSLOG | ULOG_STDIO, LOG_DAEMON, "dnsprobe");
-
-	ULOG_INFO("attempting to probe dns - %s %s %s\n",
-		url, server, v6 ? "ipv6" : "");
-
-
-	add_query(&queries, &n_queries, v6 ? T_AAAA : T_A, url);
-
-	add_ns(&ns, &n_ns, server);
-
-	rc = send_queries(&ns[0], 1, queries, n_queries);
-	if (rc <= 0) {
-		fprintf(stderr, "Failed to send queries: %s\n", strerror(errno));
-		rc = -1;
-		goto out;
-	}
-
-	if (queries[0].rcode != 0) {
-		printf("** server can't find %s: %s\n", queries[0].name,
-		rcodes[queries[0].rcode]);
-		goto out;
-	}
-
-	if (queries[0].rlen) {
-		c = parse_reply(queries[0].reply, queries[0].rlen, NULL);
-	}
-
-	if (c == 0)
-		printf("*** Can't find %s: No answer\n", queries[0].name);
-	else if (c < 0)
-		printf("*** Can't find %s: Parse error\n", queries[0].name);
-	else
-		rc = 0;
-
-out:
-	if (n_ns)
-		free(ns);
-
-	if (n_queries)
-		free(queries);
-
-	return rc;
-}

feeds/ucentral/ucentral-tools/src/firstcontact.c

@@ -1,100 +0,0 @@
-#define _GNU_SOURCE
-#include <stdio.h>
-#include <getopt.h>
-
-#include <curl/curl.h>
-
-#include <libubox/ulog.h>
-
-static const char *file_cert = "/etc/open-wifi/client.pem";
-static const char *file_key  = "/etc/open-wifi/client_dec.key";
-static const char *file_json = "/etc/open-wifi/redirector.json";
-static const char *file_dbg  = "/tmp/firstcontact.hdr";
-
-int main(int argc, char **argv)
-{
-	FILE *fp_json;
-	FILE *fp_dbg;
-	CURLcode res;
-	CURL *curl;
-	char *devid = NULL;
-	char *url;
-
-	while (1) {
-		int option = getopt(argc, argv, "k:c:o:hi:");
-
-		if (option == -1)
-			break;
-
-		switch (option) {
-		case 'k':
-			file_key = optarg;
-			break;
-		case 'c':
-			file_cert = optarg;
-			break;
-		case 'o':
-			file_json = optarg;
-			break;
-		case 'i':
-			devid = optarg;
-			break;
-		default:
-		case 'h':
-			printf("Usage: firstcontact OPTIONS\n"
-			       "  -k <keyfile>\n"
-			       "  -c <certfile>\n"
-			       "  -o <outfile>\n"
-			       "  -i <devid>\n");
-			return -1;
-		}
-	}
-
-	if (!devid) {
-		fprintf(stderr, "missing devid\n");
-		return -1;
-	}
-
-	ulog_open(ULOG_SYSLOG | ULOG_STDIO, LOG_DAEMON, "firstcontact");
-	ULOG_INFO("attempting first contact\n");
-
-	fp_dbg = fopen(file_dbg, "wb");
-	fp_json = fopen(file_json, "wb");
-	if (!fp_json) {
-		ULOG_ERR("failed to create %s\n", file_json);
-		return -1;
-	}
-
-	curl_global_init(CURL_GLOBAL_DEFAULT);
-	curl = curl_easy_init();
-	if (!curl) {
-		ULOG_ERR("curl_easy_init failed\n");
-		return -1;
-	}
-
-	if (asprintf(&url, "https://clientauth.demo.one.digicert.com/iot/api/v2/device/%s", devid) < 0) {
-		ULOG_ERR("failed to assemble url\n");
-		return -1;
-	}
-
-	curl_easy_setopt(curl, CURLOPT_URL, url);
-	curl_easy_setopt(curl, CURLOPT_WRITEDATA, fp_json);
-	curl_easy_setopt(curl, CURLOPT_HEADERDATA, fp_dbg);
-	curl_easy_setopt(curl, CURLOPT_SSLCERTTYPE, "PEM");
-	curl_easy_setopt(curl, CURLOPT_SSLCERT, file_cert);
-	curl_easy_setopt(curl, CURLOPT_SSLKEYTYPE, "PEM");
-	curl_easy_setopt(curl, CURLOPT_SSLKEY, file_key);
-	curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 1L);
-
-	res = curl_easy_perform(curl);
-	if (res != CURLE_OK)
-		ULOG_ERR("curl_easy_perform() failed: %s\n", curl_easy_strerror(res));
-	else
-		ULOG_INFO("downloaded first contact data\n");
-	curl_easy_cleanup(curl);
-	curl_global_cleanup();
-
-	ulog_close();
-
-	return (res != CURLE_OK);
-}

feeds/ucentral/ucentral-tools/src/ip-collide.c

@@ -1,86 +0,0 @@
-#include <arpa/inet.h>
-#include <net/if.h>
-
-#include <libubox/list.h>
-#include <libubox/ulog.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-struct route {
-	struct list_head list;
-	char devname[64];
-	uint32_t domain;
-	uint32_t mask;
-};
-
-static struct list_head routes = LIST_HEAD_INIT(routes);
-
-static int parse_routes(void)
-{
-	FILE *fp = fopen("/proc/net/route", "r");
-	int flgs, ref, use, metric, mtu, win, ir;
-	struct route *route;
-	unsigned long g;
-	int r;
-
-	r = fscanf(fp, "%*[^\n]\n");
-	if (r < 0) {
-		fprintf(stderr, "failed to parse routes\n");
-		return -1;
-	}
-	while (1) {
-		route = malloc(sizeof(*route));
-		if (!route)
-			break;
-		memset(route, 0, sizeof(*route));
-		r = fscanf(fp, "%63s%x%lx%X%d%d%d%x%d%d%d\n",
-			route->devname, &route->domain, &g, &flgs, &ref, &use, &metric, &route->mask,
-			&mtu, &win, &ir);
-		if (r != 11 && (r < 0) && feof(fp))
-			break;
-		list_add(&route->list, &routes);
-		printf("1 %s %x %x\n", route->devname, ntohl(route->domain), ntohl(route->mask));
-	}
-
-	fclose(fp);
-
-	return 0;
-}
-
-static int find_collisions(void)
-{
-	struct route *route;
-
-	list_for_each_entry(route, &routes, list) {
-		struct route *compare;
-
-		if (!route->domain || !route->mask)
-			continue;
-		list_for_each_entry(compare, &routes, list) {
-			if (!compare->domain || !compare->mask)
-				continue;
-			if (compare == route)
-				continue;
-			if (((route->domain & route->mask) == (compare->domain & route->mask)) ||
-			    ((route->domain & compare->mask) == (compare->domain & compare->mask))) {
-				ULOG_ERR("collision detected\n");
-				return 1;
-			}
-		}
-	}
-	ULOG_INFO("no collision detected\n");
-	return 0;
-}
-
-int main(int argc, char **argv)
-{
-	ulog_open(ULOG_SYSLOG | ULOG_STDIO, LOG_DAEMON, "ip-collide");
-
-	parse_routes();
-	if (!list_empty(&routes))
-		return find_collisions();
-
-	return 0;
-}

feeds/ucentral/ucentral-tools/src/radiusprobe.c

@@ -1,47 +0,0 @@
-#include <stdio.h>
-#include <string.h>
-#include <radcli/radcli.h>
-
-int
-main(int argc, char **argv)
-{
-	int result;
-	char username[128];
-	char passwd[AUTH_PASS_LEN + 1];
-	VALUE_PAIR *send, *received;
-	uint32_t service;
-	rc_handle *rh;
-
-	/* Not needed if you already used openlog() */
-	rc_openlog("radiusprobe");
-
-	if ((rh = rc_read_config("/tmp/radius.conf")) == NULL)
-		return ERROR_RC;
-
-	strcpy(username, "healthcheck");
-	strcpy(passwd, "uCentral");
-
-	send = NULL;
-
-	if (rc_avpair_add(rh, &send, PW_USER_NAME, username, -1, 0) == NULL)
-		return ERROR_RC;
-
-	if (rc_avpair_add(rh, &send, PW_USER_PASSWORD, passwd, -1, 0) == NULL)
-		return ERROR_RC;
-
-	service = PW_AUTHENTICATE_ONLY;
-	if (rc_avpair_add(rh, &send, PW_SERVICE_TYPE, &service, -1, 0) == NULL)
-		return ERROR_RC;
-
-	result = rc_auth(rh, 0, send, &received, NULL);
-
-	if (result == OK_RC || result == REJECT_RC) {
-		fprintf(stderr, "RADIUS server OK\n");
-		result = 0;
-	} else {
-		fprintf(stderr, "RADIUS server failure\n");
-		result = -1;
-	}
-
-	return result;
-}

feeds/ucentral/udevmand/Makefile

@@ -2,9 +2,17 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=udevmand
 PKG_RELEASE:=1
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL=https://github.com/blogic/udevmand.git
+PKG_MIRROR_HASH:=6f6a5536656a64e1f38f03747ef06ab03b28ef797adc72a901eb7dbc6e45e496
+PKG_SOURCE_DATE:=20250704
+PKG_SOURCE_VERSION:=e56be31d7c341467cc26714dac5c6b450a612808
 CMAKE_INSTALL:=1
+
 PKG_LICENSE:=LGPL-2.1
 PKG_LICENSE_FILES:=
+
 PKG_MAINTAINER:=John Crispin <john@phrozen.org>
 
 include $(INCLUDE_DIR)/package.mk

feeds/ucentral/udevmand/src/CMakeLists.txt

@@ -1,15 +0,0 @@
-cmake_minimum_required(VERSION 2.6)
-
-include_directories(/usr/local/include/libnl-tiny)
-
-PROJECT(udevmand C)
-INCLUDE(GNUInstallDirs)
-ADD_DEFINITIONS(-Os -ggdb -Wall -Werror --std=gnu99 -Wmissing-declarations)
-
-SET(LIBS ubox ubus json-c blobmsg_json uci nl-tiny)
-
-ADD_EXECUTABLE(udevmand main.c mac.c neigh.c ubus.c blob.c netlink.c bridge.c dhcp.c netifd.c ethers.c netdev.c)
-TARGET_LINK_LIBRARIES(udevmand ${LIBS})
-INSTALL(TARGETS udevmand
-	RUNTIME DESTINATION ${CMAKE_INSTALL_SBINDIR}
-)

feeds/ucentral/udevmand/src/COPYING

@@ -1,502 +0,0 @@
-                  GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-                  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-                            NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!

feeds/ucentral/udevmand/src/blob.c

@@ -1,69 +0,0 @@
-/*
- * Copyright (C) 2017 John Crispin <john@phrozen.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 2.1
- * as published by the Free Software Foundation
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#include "udevmand.h"
-
-struct blob_buf b = { 0 };
-
-static char *iftype_string[NUM_NL80211_IFTYPES] = {
-	[NL80211_IFTYPE_STATION] = "station",
-	[NL80211_IFTYPE_AP] = "ap",
-	[NL80211_IFTYPE_MONITOR] = "monitor",
-	[NL80211_IFTYPE_ADHOC] = "adhoc",
-};
-
-void blobmsg_add_iface(struct blob_buf *bbuf, char *name, int index)
-{
-	static char _ifname[IF_NAMESIZE];
-	char *ifname = if_indextoname(index, _ifname);
-
-	if (!ifname)
-		return;
-	blobmsg_add_string(&b, name, ifname);
-}
-
-void blobmsg_add_iftype(struct blob_buf *bbuf, const char *name, const uint32_t iftype)
-{
-	if (iftype_string[iftype])
-		blobmsg_add_string(&b, name, iftype_string[iftype]);
-	else
-		blobmsg_add_u32(&b, name, iftype);
-}
-
-void blobmsg_add_ipv4(struct blob_buf *bbuf, const char *name, const uint8_t* addr)
-{
-	char ip[16];
-
-	snprintf(ip, sizeof(ip), "%d.%d.%d.%d", addr[0], addr[1], addr[2], addr[3]);
-	blobmsg_add_string(&b, name, ip);
-}
-
-void blobmsg_add_ipv6(struct blob_buf *bbuf, const char *name, const uint8_t* _addr)
-{
-	const uint16_t* addr = (const uint16_t*) _addr;
-	char ip[40];
-
-	snprintf(ip, sizeof(ip), "%x:%x:%x:%x:%x:%x:%x:%x",
-		ntohs(addr[0]), ntohs(addr[1]), ntohs(addr[2]), ntohs(addr[3]),
-		ntohs(addr[4]), ntohs(addr[5]), ntohs(addr[6]), ntohs(addr[7]));
-	blobmsg_add_string(&b, name, ip);
-}
-
-void blobmsg_add_mac(struct blob_buf *bbuf, const char *name, const uint8_t* addr)
-{
-	char mac[18];
-
-	snprintf(mac, sizeof(mac), "%02x:%02x:%02x:%02x:%02x:%02x",
-		addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]);
-	blobmsg_add_string(&b, name, mac);
-}

feeds/ucentral/udevmand/src/bridge.c

@@ -1,213 +0,0 @@
-/*
- * Copyright (C) 2020 John Crispin <john@phrozen.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 2.1
- * as published by the Free Software Foundation
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#include "udevmand.h"
-
-#include <linux/if_bridge.h>
-
-#define BR_MAX_ENTRY	2048
-
-static struct uloop_timeout bridge_timer;
-static struct vlist_tree bridge_mac;
-static LIST_HEAD(bridge_if);
-
-struct bridge_if {
-	struct list_head list;
-
-	char name[IF_NAMESIZE];
-	unsigned int port_no;
-};
-
-static void
-bridge_read_mac(const char *bridge)
-{
-	FILE *fd;
-	int i, cnt;
-	struct __fdb_entry fe[BR_MAX_ENTRY];
-	char path[PATH_MAX];
-
-	snprintf(path, PATH_MAX, "/sys/class/net/%s/brforward", bridge);
-	fd = fopen(path, "r");
-	if (!fd)
-		return;
-
-	cnt = fread(fe, sizeof(struct __fdb_entry), BR_MAX_ENTRY, fd);
-	fclose(fd);
-
-	for (i = 0; i < cnt; i++) {
-		struct bridge_mac *b = malloc(sizeof(*b));
-		struct bridge_if *brif;
-
-		if (!b)
-			continue;
-		strncpy(b->bridge, bridge, IF_NAMESIZE);
-		strncpy(b->ifname, bridge, IF_NAMESIZE);
-		list_for_each_entry(brif, &bridge_if, list)
-			if (fe[i].port_no == brif->port_no)
-				strncpy(b->ifname, brif->name, IF_NAMESIZE);
-		memcpy(b->addr, fe[i].mac_addr, ETH_ALEN);
-		b->port_no = fe[i].port_no;
-		vlist_add(&bridge_mac, &b->vlist, (void *) b);
-	}
-}
-
-void
-bridge_dump_if(const char *bridge)
-{
-	char path[PATH_MAX];
-	void *c = NULL;
-	glob_t gl;
-	int i;
-
-	snprintf(path, PATH_MAX, "/sys/class/net/%s/brif/*", bridge);
-	if (glob(path, GLOB_MARK | GLOB_ONLYDIR | GLOB_NOSORT, NULL, &gl))
-		return;
-
-	for (i = 0; i < gl.gl_pathc; i++) {
-		if (!c)
-			c = blobmsg_open_array(&b, "bridge");
-
-		blobmsg_add_string(&b, NULL, basename(gl.gl_pathv[i]));
-	}
-	if (c)
-		blobmsg_close_array(&b, c);
-
-	globfree(&gl);
-}
-
-static void
-bridge_read_if(const char *bridge)
-{
-	struct bridge_if *brif;
-	char path[PATH_MAX];
-	glob_t gl;
-	int i;
-
-	snprintf(path, PATH_MAX, "/sys/class/net/%s/brif/*", bridge);
-	if (glob(path, GLOB_MARK | GLOB_ONLYDIR | GLOB_NOSORT, NULL, &gl))
-		return;
-
-	for (i = 0; i < gl.gl_pathc; i++) {
-		unsigned int port_no;
-		FILE *fd;
-		int ret;
-
-		snprintf(path, PATH_MAX, "/sys/class/net/%s/brif/%s/port_no", bridge, basename(gl.gl_pathv[i]));
-		fd = fopen(path, "r");
-		if (!fd)
-			continue;
-		ret = fscanf(fd, "0x%x", &port_no);
-		fclose(fd);
-		if (ret != 1)
-			continue;
-		brif = malloc(sizeof(*brif));
-		if (!brif)
-			goto out;
-		strcpy(brif->name, basename(gl.gl_pathv[i]));
-		brif->port_no = port_no;
-		list_add(&brif->list, &bridge_if);
-
-	}
-out:
-	globfree(&gl);
-}
-
-static void bridge_tout(struct uloop_timeout *t)
-{
-	struct bridge_if *brif, *tmp;
-	glob_t gl;
-
-	int i;
-
-	if (glob("/sys/class/net/*", GLOB_MARK | GLOB_ONLYDIR | GLOB_NOSORT, NULL, &gl))
-		goto out;
-
-	list_for_each_entry_safe(brif, tmp, &bridge_if, list) {
-		list_del(&brif->list);
-		free(brif);
-	}
-
-	for (i = 0; i < gl.gl_pathc; i++)
-		bridge_read_if(basename(gl.gl_pathv[i]));
-	vlist_update(&bridge_mac);
-	for (i = 0; i < gl.gl_pathc; i++)
-		bridge_read_mac(basename(gl.gl_pathv[i]));
-	vlist_flush(&bridge_mac);
-	globfree(&gl);
-
-out:
-	uloop_timeout_set(&bridge_timer, 1000);
-}
-
-static int bridge_cmp(const void *k1, const void *k2, void *ptr)
-{
-	const struct bridge_mac *b1 = (const struct bridge_mac *)k1;
-	const struct bridge_mac *b2 = (const struct bridge_mac *)k2;
-
-	return memcmp(b1->addr, b2->addr, ETH_ALEN);
-}
-
-static void bridge_update(struct vlist_tree *tree, struct vlist_node *node_new, struct vlist_node *node_old)
-{
-	struct bridge_mac *b1, *b2;
-
-	b1 = container_of(node_old, struct bridge_mac, vlist);
-	b2 = container_of(node_new, struct bridge_mac, vlist);
-
-	if (!!b1 != !!b2) {
-		struct bridge_mac *_b = b1 ? b1 : b2;
-
-		ULOG_INFO("%s fdb %s:%d "MAC_FMT"\n", b1 ? "del" : "new", _b->ifname, _b->port_no, MAC_VAR(_b->addr));
-	}
-
-	if (b1) {
-		list_del(&b1->mac);
-		free(b1);
-	}
-
-	if (b2) {
-		struct mac *mac = NULL;
-
-		mac = mac_find(b2->addr);
-		mac_update(mac, b2->bridge);
-		list_add(&b2->mac, &mac->bridge_mac);
-	}
-}
-
-void bridge_init(void)
-{
-	bridge_timer.cb = bridge_tout;
-	uloop_timeout_set(&bridge_timer, 1000);
-	vlist_init(&bridge_mac, bridge_cmp, bridge_update);
-}
-
-void bridge_flush(void)
-{
-	struct bridge_if *brif, *tmp;
-
-	vlist_flush_all(&bridge_mac);
-	list_for_each_entry_safe(brif, tmp, &bridge_if, list) {
-		list_del(&brif->list);
-		free(brif);
-	}
-}
-
-void
-bridge_mac_del(struct bridge_mac *b)
-{
-	list_del(&b->mac);
-	vlist_delete(&bridge_mac, &b->vlist);
-	free(b);
-}
-
-

feeds/ucentral/udevmand/src/dhcp.c

@@ -1,161 +0,0 @@
-#include "udevmand.h"
-
-enum {
-	DHCP_MAC,
-	DHCP_IP,
-	DHCP_NAME,
-	DHCP_IFACE,
-	__DHCP_MAX
-};
-
-static const struct blobmsg_policy dhcp_policy[__DHCP_MAX] = {
-	[DHCP_MAC] = { .name = "mac", .type = BLOBMSG_TYPE_STRING },
-	[DHCP_IP] = { .name = "ip", .type = BLOBMSG_TYPE_STRING },
-	[DHCP_NAME] = { .name = "name", .type = BLOBMSG_TYPE_STRING },
-	[DHCP_IFACE] = { .name = "interface", .type = BLOBMSG_TYPE_STRING },
-};
-
-static struct avl_tree dhcpv4_tree = AVL_TREE_INIT(dhcpv4_tree, avl_mac_cmp, false, NULL);
-
-static void
-dhcpv4_add(uint8_t *addr, uint8_t *ip, char *name, char *iface)
-{
-	struct dhcpv4 *dhcpv4;
-	struct mac *mac;
-
-	mac = mac_find(addr);
-
-	dhcpv4 = avl_find_element(&dhcpv4_tree, addr, dhcpv4, avl);
-	if (dhcpv4) {
-		list_del(&dhcpv4->mac);
-		avl_delete(&dhcpv4_tree, &dhcpv4->avl);
-		free(dhcpv4);
-	}
-
-	dhcpv4 = malloc(sizeof(*dhcpv4) + (name ? strlen(name) + 1 : 1));
-        if (!dhcpv4)
-                return;
-	if (iface)
-		strncpy(dhcpv4->iface, iface, sizeof(dhcpv4->iface));
-	else
-		*dhcpv4->iface = '\0';
-	if (name)
-		strcpy(dhcpv4->name, name);
-	else
-		*dhcpv4->name = '\0';
-	memcpy(dhcpv4->ip, ip, 4);
-	memcpy(dhcpv4->addr, addr, ETH_ALEN);
-	dhcpv4->avl.key = dhcpv4->addr;
-
-	avl_insert(&dhcpv4_tree, &dhcpv4->avl);
-	list_add(&dhcpv4->mac, &mac->dhcpv4);
-	mac_update(mac, dhcpv4->iface);
-	ULOG_INFO("new dhcpv4 " MAC_FMT "/" IP_FMT " for %s\n",
-		  MAC_VAR(dhcpv4->addr), IP_VAR(ip),
-		  strlen(dhcpv4->name) ? dhcpv4->name : "<unknown>");
-}
-
-void
-dhcpv4_ack(struct blob_attr *msg)
-{
-	struct blob_attr *tb[__DHCP_MAX];
-	uint8_t addr[ETH_ALEN], ip[4];
-	char *name = NULL;
-	int ret;
-
-	blobmsg_parse(dhcp_policy, __DHCP_MAX, tb, blob_data(msg), blob_len(msg));
-
-	if (!tb[DHCP_MAC] || !tb[DHCP_IP] || !tb[DHCP_IFACE])
-		return;
-
-	ret = sscanf(blobmsg_get_string(tb[DHCP_MAC]), "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx",
-		     &addr[0], &addr[1], &addr[2], &addr[3], &addr[4], &addr[5]);
-	if (ret != 6)
-		return;
-
-	ret = sscanf(blobmsg_get_string(tb[DHCP_IP]), "%hhu.%hhu.%hhu.%hhu",
-		     &ip[0], &ip[1], &ip[2], &ip[3]);
-	if (ret != 4)
-		return;
-
-	if (tb[DHCP_NAME])
-		name = blobmsg_get_string(tb[DHCP_NAME]);
-
-	dhcpv4_add(addr, ip, name, blobmsg_get_string(tb[DHCP_IFACE]));
-}
-
-void
-dhcpv4_release(struct blob_attr *msg)
-{
-	struct blob_attr *tb[__DHCP_MAX];
-	struct dhcpv4 *dhcpv4;
-	uint8_t addr[ETH_ALEN];
-	int ret;
-
-	blobmsg_parse(dhcp_policy, __DHCP_MAX, tb, blob_data(msg), blob_len(msg));
-
-	if (!tb[DHCP_MAC])
-		return;
-
-	ret = sscanf(blobmsg_get_string(tb[DHCP_MAC]), "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx",
-		     &addr[0], &addr[1], &addr[2], &addr[3], &addr[4], &addr[5]);
-	if (ret != 6)
-		return;
-
-	dhcpv4 = avl_find_element(&dhcpv4_tree, addr, dhcpv4, avl);
-	if (!dhcpv4)
-		return;
-	ULOG_INFO("del dhcpv4 " MAC_FMT "\n", MAC_VAR(dhcpv4->addr));
-	list_del(&dhcpv4->mac);
-	avl_delete(&dhcpv4_tree, &dhcpv4->avl);
-	free(dhcpv4);
-}
-
-void
-dhcpv4_del(struct dhcpv4 *dhcpv4)
-{
-	list_del(&dhcpv4->mac);
-	avl_delete(&dhcpv4_tree, &dhcpv4->avl);
-	free(dhcpv4);
-}
-
-void
-dhcp_init(void)
-{
-	FILE *fp = fopen("/tmp/dhcp.leases", "r");
-	char line[1024];
-
-	if (!fp)
-		return;
-
-	while (fgets(line, sizeof(line), fp)) {
-		uint8_t addr[ETH_ALEN], ip[4];
-		char hostname[256 + 1];
-		long int timestamp;
-		int ret;
-
-		ret = sscanf(line, "%ld %02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx %hhu.%hhu.%hhu.%hhu %s",
-			     &timestamp,
-			     &addr[0], &addr[1], &addr[2], &addr[3], &addr[4], &addr[5],
-			     &ip[0], &ip[1], &ip[2], &ip[3],
-			     hostname);
-		if (ret != 12)
-			continue;
-
-		dhcpv4_add(addr, ip, hostname, NULL);
-	}
-
-	fclose(fp);
-}
-
-void
-dhcp_done(void)
-{
-	struct dhcpv4 *d, *t;
-
-	avl_for_each_element_safe(&dhcpv4_tree, d, avl, t) {
-		avl_delete(&dhcpv4_tree, &d->avl);
-		free(d);
-	}
-}
-

feeds/ucentral/udevmand/src/ethers.c

@@ -1,36 +0,0 @@
-#include "udevmand.h"
-
-void
-ethers_init(void)
-{
-	char buf[512], *p;
-	int ret;
-	FILE *f;
-
-	f = fopen("/etc/ethers", "r");
-
-	if (!f)
-		return;
-
-	while (fgets(buf, sizeof(buf), f)) {
-		uint8_t addr[ETH_ALEN];
-		struct mac *mac;
-
-		p = strtok(buf, " \t\n");
-		ret = sscanf(p, "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx",
-			     &addr[0], &addr[1], &addr[2], &addr[3], &addr[4], &addr[5]);
-		if (ret != 6)
-			continue;
-
-		p = strtok(NULL, " \t\n");
-
-		if (!p)
-			continue;
-		mac = mac_find(addr);
-		mac->ethers = strdup(p);
-		ULOG_INFO("new ethers " MAC_FMT" %s\n", MAC_VAR(addr), p);
-	}
-
-	fclose(f);
-}
-

feeds/ucentral/udevmand/src/mac.c

@@ -1,158 +0,0 @@
-#include "udevmand.h"
-
-int
-avl_mac_cmp(const void *k1, const void *k2, void *ptr)
-{
-	return memcmp(k1, k2, ETH_ALEN);
-}
-
-struct avl_tree mac_tree = AVL_TREE_INIT(mac_tree, avl_mac_cmp, false, NULL);
-
-struct mac*
-mac_find(uint8_t *addr)
-{
-	struct mac *mac;
-	uint8_t *addr_buf;
-
-	mac = avl_find_element(&mac_tree, addr, mac, avl);
-
-	if (mac)
-		return mac;
-
-	mac = calloc_a(sizeof(struct mac), &addr_buf, 6);
-	if (!mac)
-		return NULL;
-	mac->addr = memcpy(addr_buf, addr, ETH_ALEN);
-	mac->avl.key = mac->addr;
-	mac->ethers = NULL;
-	*mac->interface = '\0';
-	INIT_LIST_HEAD(&mac->neigh4);
-	INIT_LIST_HEAD(&mac->neigh6);
-	INIT_LIST_HEAD(&mac->dhcpv4);
-	INIT_LIST_HEAD(&mac->bridge_mac);
-
-	avl_insert(&mac_tree, &mac->avl);
-	ULOG_INFO("new mac "MAC_FMT"\n", MAC_VAR(mac->addr));
-
-	return mac;
-}
-
-void
-mac_update(struct mac *mac, char *iface)
-{
-	char *interface = interface_resolve(iface);
-
-	if (iface && *iface)
-		strncpy(mac->interface, interface, sizeof(mac->interface));
-
-	clock_gettime(CLOCK_MONOTONIC, &mac->ts);
-}
-
-void
-mac_dump(struct mac *mac, int interface)
-{
-	struct timespec ts;
-	time_t last_seen;
-	char buf[18];
-	void *c, *d;
-
-	neigh_enum();
-
-	clock_gettime(CLOCK_MONOTONIC, &ts);
-
-	last_seen = ts.tv_sec - mac->ts.tv_sec;
-	snprintf(buf, sizeof(buf), MAC_FMT, MAC_VAR(mac->addr));
-	c = blobmsg_open_table(&b, buf);
-	if (interface && *mac->interface)
-		blobmsg_add_string(&b, "interface", mac->interface);
-	if (mac->ethers)
-		blobmsg_add_string(&b, "ethers", mac->ethers);
-	if (last_seen < 5 * 60)
-		blobmsg_add_u32(&b, "last_seen", last_seen);
-	else
-		blobmsg_add_u8(&b, "offline", 1);
-	if (!list_empty(&mac->neigh4)) {
-		struct neigh *neigh;
-
-		d = blobmsg_open_array(&b, "ipv4");
-		list_for_each_entry(neigh, &mac->neigh4, list)
-			blobmsg_add_ipv4(&b, NULL, neigh->ip);
-		blobmsg_close_array(&b, d);
-	}
-
-	if (!list_empty(&mac->neigh6)) {
-		struct neigh *neigh;
-
-		d = blobmsg_open_array(&b, "ipv6");
-		list_for_each_entry(neigh, &mac->neigh6, list)
-			blobmsg_add_ipv6(&b, NULL, neigh->ip);
-		blobmsg_close_array(&b, d);
-	}
-
-	if (!list_empty(&mac->dhcpv4)) {
-		struct dhcpv4 *dhcpv4;
-
-		d = blobmsg_open_array(&b, "dhcpv4");
-		list_for_each_entry(dhcpv4, &mac->dhcpv4, mac) {
-			blobmsg_add_ipv4(&b, NULL, dhcpv4->ip);
-			if (strlen(dhcpv4->name) > 0)
-				blobmsg_add_string(&b, NULL, dhcpv4->name);
-			break;
-		}
-		blobmsg_close_array(&b, d);
-	}
-
-	if (!list_empty(&mac->bridge_mac)) {
-		struct bridge_mac *bridge_mac;
-
-		d = blobmsg_open_array(&b, "fdb");
-		list_for_each_entry(bridge_mac, &mac->bridge_mac, mac)
-			blobmsg_add_string(&b, NULL, bridge_mac->ifname);
-		blobmsg_close_array(&b, d);
-	}
-
-	blobmsg_close_array(&b, c);
-	neigh_flush();
-}
-
-static void
-mac_flush(struct mac *mac, struct timespec ts)
-{
-	time_t last_seen;
-
-	last_seen = ts.tv_sec - mac->ts.tv_sec;
-	if (last_seen <  60 * 60)
-		return;
-
-	if (!list_empty(&mac->dhcpv4)) {
-		struct dhcpv4 *dhcpv4, *t;
-
-		list_for_each_entry_safe(dhcpv4, t, &mac->dhcpv4, mac)
-			dhcpv4_del(dhcpv4);
-	}
-
-	if (!list_empty(&mac->bridge_mac)) {
-		struct bridge_mac *bridge_mac, *t;
-
-		list_for_each_entry_safe(bridge_mac, t, &mac->bridge_mac, mac)
-			bridge_mac_del(bridge_mac);
-	}
-}
-
-int
-mac_dump_all(void)
-{
-	struct mac *mac, *t;
-	struct timespec ts;
-
-	blob_buf_init(&b, 0);
-
-	avl_for_each_element(&mac_tree, mac, avl)
-		mac_dump(mac, 1);
-
-	clock_gettime(CLOCK_MONOTONIC, &ts);
-	avl_for_each_element_safe(&mac_tree, mac, avl, t)
-		mac_flush(mac, ts);
-
-	return 0;
-}

feeds/ucentral/udevmand/src/main.c

@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2020 John Crispin <john@phrozen.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 2.1
- * as published by the Free Software Foundation
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#include "udevmand.h"
-
-int main(int argc, char **argv)
-{
-	ulog_open(ULOG_STDIO, LOG_DAEMON, "udevmand");
-
-	uloop_init();
-	ubus_init();
-	ethers_init();
-	neigh_init();
-	bridge_init();
-	dhcp_init();
-	uloop_run();
-	uloop_done();
-	ubus_uninit();
-	bridge_flush();
-	blob_buf_free(&b);
-	neigh_done();
-	interface_done();
-	dhcp_done();
-	iface_done();
-
-	return 0;
-}

feeds/ucentral/udevmand/src/neigh.c

@@ -1,189 +0,0 @@
-/*
- * Copyright (C) 2020 John Crispin <john@phrozen.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 2.1
- * as published by the Free Software Foundation
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#include "udevmand.h"
-
-static struct nl_socket rtnl_sock;
-
-static int
-avl_ipv4_cmp(const void *k1, const void *k2, void *ptr)
-{
-	return memcmp(k1, k2, 4);
-}
-
-static int
-avl_ipv6_cmp(const void *k1, const void *k2, void *ptr)
-{
-	return memcmp(k1, k2, 16);
-}
-
-static struct avl_tree ip4_tree = AVL_TREE_INIT(ip4_tree, avl_ipv4_cmp, false, NULL);
-static struct avl_tree ip6_tree = AVL_TREE_INIT(ip6_tree, avl_ipv6_cmp, false, NULL);
-
-static void
-neigh_del(struct neigh *neigh)
-{
-	struct avl_tree *ip_tree = &ip4_tree;
-
-	if (neigh->ip_ver == 6)
-		ip_tree = &ip6_tree;
-
-	uloop_timeout_cancel(&neigh->ageing);
-	list_del(&neigh->list);
-	avl_delete(ip_tree, &neigh->avl);
-	free(neigh);
-}
-
-static void
-neigh_ageing_cb(struct uloop_timeout *t)
-{
-	struct neigh *neigh = container_of(t, struct neigh, ageing);
-
-	neigh_del(neigh);
-}
-
-static void
-neigh_handler(struct nlmsghdr *nh, int type)
-{
-	uint8_t *lladdr, *dummy[6] = { 0 };
-	uint8_t set[6] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
-	uint8_t clear[6] = { };
-	uint8_t mcast[2] = { 0x33, 0x33 };
-	struct ndmsg *ndm = nlmsg_data(nh);
-	struct nlattr *nda[__NDA_MAX];
-	uint8_t *mac_buf, *ip_buf;
-	struct avl_tree *ip_tree;
-	struct neigh *neigh;
-	struct mac *mac;
-	int ip_len, ip_ver, refresh = 0;
-	void *dst;
-
-	nlmsg_parse(nh, sizeof(struct ndmsg), nda, NDA_MAX, NULL);
-	if (!nda[NDA_DST])
-		return;
-
-	dst = nla_data(nda[NDA_DST]);
-	lladdr = nda[NDA_LLADDR] ? nla_data(nda[NDA_LLADDR]) : dummy;
-	if (!memcmp(lladdr, set, 6) || !memcmp(lladdr, clear, 6) || !memcmp(lladdr, mcast, 2) || *lladdr == 0x1)
-		return;
-
-	mac = mac_find(lladdr);
-
-	switch (ndm->ndm_family) {
-	case AF_INET:
-		ip_len = ip_ver = 4;
-		ip_tree = &ip4_tree;
-		break;
-
-	case AF_INET6:
-		ip_len = 16;
-		ip_ver = 6;
-		ip_tree = &ip6_tree;
-		break;
-
-	default:
-		return;
-	}
-
-	neigh = avl_find_element(ip_tree, dst, neigh, avl);
-
-	if (neigh) {
-		if (!type)
-			ULOG_INFO("del ipv%d for "MAC_FMT" on %s\n", neigh->ip_ver,  MAC_VAR(lladdr), neigh->ifname);
-		refresh = 1;
-		neigh_del(neigh);
-	}
-
-	if (!type)
-		return;
-
-	neigh = calloc_a(sizeof(struct neigh),
-		&ip_buf, ip_len, &mac_buf, 6);
-	if (!neigh)
-		return;
-	neigh->ip = memcpy(ip_buf, dst, ip_len);
-	neigh->iface = ndm->ndm_ifindex;
-	neigh->avl.key = neigh->ip;
-	neigh->ip_ver = ip_ver;
-	neigh->ageing.cb = neigh_ageing_cb;
-	uloop_timeout_set(&neigh->ageing, 24 * 60 * 60 * 1000);
-	if_indextoname(neigh->iface, neigh->ifname);
-	if (neigh->ip_ver == 4)
-		list_add(&neigh->list, &mac->neigh4);
-	else
-		list_add(&neigh->list, &mac->neigh6);
-	avl_insert(ip_tree, &neigh->avl);
-	mac_update(mac, neigh->ifname);
-	if (!refresh)
-		ULOG_INFO("new ipv%d for "MAC_FMT" on %s\n", neigh->ip_ver,  MAC_VAR(lladdr), neigh->ifname);
-}
-
-static int
-neigh_netlink_cb(struct nl_msg *msg, void *arg)
-{
-
-	struct nlmsghdr *nh = nlmsg_hdr(msg);
-
-
-	switch (nh->nlmsg_type) {
-	case RTM_NEWNEIGH:
-		neigh_handler(nh, 1);
-		break;
-
-	case RTM_DELNEIGH:
-		neigh_handler(nh, 0);
-		break;
-
-	default:
-		break;
-	}
-	return NL_OK;
-}
-
-void
-neigh_enum(void)
-{
-	struct rtgenmsg msg = { .rtgen_family = AF_UNSPEC };
-
-	nl_send_simple(rtnl_sock.sock, RTM_GETNEIGH, NLM_F_DUMP, &msg, sizeof(msg));
-	nl_wait_for_ack(rtnl_sock.sock);
-}
-
-void
-neigh_flush(void)
-{
-	struct neigh *neigh, *tmp;
-
-	avl_for_each_element_safe(&ip4_tree, neigh, avl, tmp)
-		neigh_del(neigh);
-	avl_for_each_element_safe(&ip6_tree, neigh, avl, tmp)
-		neigh_del(neigh);
-}
-
-int
-neigh_init(void)
-{
-	ULOG_INFO("open neigh netlink socket\n");
-	if (!nl_status_socket(&rtnl_sock, NETLINK_ROUTE, neigh_netlink_cb, NULL)) {
-		ULOG_ERR("failed to open rtnl socket\n");
-		return -1;
-	}
-
-	return 0;
-}
-
-void
-neigh_done(void)
-{
-	nl_socket_free(rtnl_sock.sock);
-}

feeds/ucentral/udevmand/src/netdev.c

@@ -1,235 +0,0 @@
-#include "udevmand.h"
-
-struct avl_tree iface_tree = AVL_TREE_INIT(iface_tree, avl_strcmp, false, NULL);
-
-struct iface_ip {
-	struct list_head list;
-	char ip[];
-};
-
-struct iface {
-	struct avl_node avl;
-	int alive;
-	char name[IF_NAMESIZE];
-	struct rtnl_link_stats stats;
-	struct rtnl_link_stats stats_old;
-	struct list_head ipv6, ipv4;
-	uint8_t addr[ETH_ALEN];
-};
-
-static struct iface*
-iface_find(char *name)
-{
-	struct iface *iface = avl_find_element(&iface_tree, name, iface, avl);
-
-	if (iface) {
-		iface->alive = 1;
-		return iface;
-	}
-	iface = malloc(sizeof(*iface));
-	if (!iface)
-		return NULL;
-	memset(iface, 0, sizeof(*iface));
-	iface->alive = 1;
-	iface->avl.key = strcpy(iface->name, name);
-	INIT_LIST_HEAD(&iface->ipv4);
-	INIT_LIST_HEAD(&iface->ipv6);
-	avl_insert(&iface_tree, &iface->avl);
-	return iface;
-}
-
-void
-iface_done(void)
-{
-	struct iface *i, *t;
-
-	avl_for_each_element_safe(&iface_tree, i, avl, t) {
-		avl_delete(&iface_tree, &i->avl);
-		free(i);
-	}
-}
-
-static void
-iface_get(void)
-{
-	int fd = socket(PF_INET, SOCK_DGRAM, IPPROTO_IP);
-	struct ifaddrs *ifaddr, *ifa;
-	int n;
-
-	if (getifaddrs(&ifaddr) == -1) {
-		ULOG_ERR("failed to getifaddrs\n");
-		return;
-	}
-
-	for (ifa = ifaddr, n = 0; ifa != NULL; ifa = ifa->ifa_next, n++) {
-		char host[NI_MAXHOST];
-		struct iface *iface;
-		int family, s;
-
-		if (ifa->ifa_addr == NULL)
-			continue;
-
-		if ((ifa->ifa_flags & IFF_UP) == 0)
-			continue;
-
-		if (ifa->ifa_flags & IFF_LOOPBACK)
-			continue;
-
-		family = ifa->ifa_addr->sa_family;
-
-		iface = iface_find(ifa->ifa_name);
-		if (!iface)
-			continue;
-
-		if (family == AF_INET || family == AF_INET6) {
-			struct iface_ip *ip;
-
-			s = getnameinfo(ifa->ifa_addr,
-					(family == AF_INET) ? sizeof(struct sockaddr_in) :
-					sizeof(struct sockaddr_in6),
-					host, NI_MAXHOST,
-					NULL, 0, NI_NUMERICHOST);
-			if (s)
-				continue;
-			ip = malloc(sizeof(*ip) + strlen(host) + 1);
-			if (!ip)
-				continue;
-			strcpy(ip->ip, host);
-			if (family == AF_INET)
-				list_add(&ip->list, &iface->ipv4);
-			else
-				list_add(&ip->list, &iface->ipv6);
-		} else if (family == AF_PACKET && ifa->ifa_data != NULL) {
-			struct rtnl_link_stats *stats = ifa->ifa_data;
-			struct ifreq s;
-
-			memcpy(&iface->stats, stats, sizeof(*stats));
-			memset(iface->addr, 0, ETH_ALEN);
-			if (fd) {
-				strcpy(s.ifr_name, ifa->ifa_name);
-				if (!ioctl(fd, SIOCGIFHWADDR, &s))
-					memcpy(iface->addr, s.ifr_addr.sa_data, ETH_ALEN);
-			}
-		}
-	}
-
-	freeifaddrs(ifaddr);
-	if (fd)
-		close(fd);
-}
-
-static void
-iface_flush(void)
-{
-	struct iface *iface, *tmp;
-
-	avl_for_each_element_safe(&iface_tree, iface, avl, tmp) {
-		struct iface_ip *ip, *tmp;
-
-		list_for_each_entry_safe(ip, tmp, &iface->ipv4, list) {
-			list_del(&ip->list);
-			free(ip);
-		}
-
-		list_for_each_entry_safe(ip, tmp, &iface->ipv6, list) {
-			list_del(&ip->list);
-			free(ip);
-		}
-		if (!iface->alive) {
-			avl_delete(&iface_tree, &iface->avl);
-			free(iface);
-		} else {
-			iface->alive = 0;
-		}
-	}
-}
-
-static int get_counter_delta(__u32 new, __u32 old)
-{
-	uint32_t delta;
-
-	if (new < old)
-		delta = UINT32_MAX - old + new;
-	else
-		delta = new - old;
-
-
-	return delta > 0 ? delta : 0;
-}
-
-void
-iface_dump(int delta)
-{
-	struct iface *iface;
-
-	iface_get();
-
-	blob_buf_init(&b, 0);
-	avl_for_each_element(&iface_tree, iface, avl) {
-		struct iface_ip *ip;
-		void *c, *d;
-
-		if (!iface->alive)
-			continue;
-
-		c = blobmsg_open_table(&b, interface_resolve(iface->name));
-		blobmsg_add_mac(&b, "hwaddr", iface->addr);
-		if (!list_empty(&iface->ipv4)) {
-			d = blobmsg_open_array(&b, "ipv4");
-			list_for_each_entry(ip, &iface->ipv4, list)
-				blobmsg_add_string(&b, NULL, ip->ip);
-			blobmsg_close_array(&b, d);
-		}
-
-		if (!list_empty(&iface->ipv4)) {
-			d = blobmsg_open_array(&b, "ipv6");
-			list_for_each_entry(ip, &iface->ipv6, list)
-				blobmsg_add_string(&b, NULL, ip->ip);
-			blobmsg_close_array(&b, d);
-		}
-
-		d = blobmsg_open_table(&b, "counters");
-		blobmsg_add_u64(&b, "rx_packets", iface->stats.rx_packets);
-		blobmsg_add_u64(&b, "tx_packets", iface->stats.tx_packets);
-	        blobmsg_add_u64(&b, "rx_bytes", iface->stats.rx_bytes);
-	        blobmsg_add_u64(&b, "tx_bytes", iface->stats.tx_bytes);
-	        blobmsg_add_u64(&b, "rx_errors", iface->stats.rx_errors);
-	        blobmsg_add_u64(&b, "tx_errors", iface->stats.tx_errors);
-	        blobmsg_add_u64(&b, "rx_dropped", iface->stats.rx_dropped);
-	        blobmsg_add_u64(&b, "tx_dropped", iface->stats.tx_dropped);
-	        blobmsg_add_u64(&b, "multicast", iface->stats.multicast);
-	        blobmsg_add_u64(&b, "collisions", iface->stats.collisions);
-		blobmsg_close_table(&b, d);
-
-		if (delta) {
-			d = blobmsg_open_table(&b, "deltas");
-			blobmsg_add_u32(&b, "rx_packets",
-				get_counter_delta(iface->stats.rx_packets, iface->stats_old.rx_packets));
-			blobmsg_add_u32(&b, "tx_packets",
-				get_counter_delta(iface->stats.tx_packets, iface->stats_old.tx_packets));
-		        blobmsg_add_u32(&b, "rx_bytes",
-				get_counter_delta(iface->stats.rx_bytes, iface->stats_old.rx_bytes));
-		        blobmsg_add_u32(&b, "tx_bytes",
-				get_counter_delta(iface->stats.tx_bytes, iface->stats_old.tx_bytes));
-		        blobmsg_add_u32(&b, "rx_errors",
-				get_counter_delta(iface->stats.rx_errors, iface->stats_old.rx_errors));
-		        blobmsg_add_u32(&b, "tx_errors",
-				get_counter_delta(iface->stats.tx_errors, iface->stats_old.tx_errors));
-		        blobmsg_add_u32(&b, "rx_dropped",
-				get_counter_delta(iface->stats.rx_dropped, iface->stats_old.rx_dropped));
-		        blobmsg_add_u32(&b, "tx_dropped",
-				get_counter_delta(iface->stats.tx_dropped, iface->stats_old.tx_dropped));
-		        blobmsg_add_u32(&b, "multicast",
-				get_counter_delta(iface->stats.multicast, iface->stats_old.multicast));
-		        blobmsg_add_u32(&b, "collisions",
-				get_counter_delta(iface->stats.collisions, iface->stats_old.collisions));
-			blobmsg_close_table(&b, d);
-		}
-		memcpy(&iface->stats_old, &iface->stats, sizeof(iface->stats));
-
-		bridge_dump_if(iface->name);
-		blobmsg_close_table(&b, c);
-	}
-
-	iface_flush();
-}

feeds/ucentral/udevmand/src/netifd.c

@@ -1,116 +0,0 @@
-#include "udevmand.h"
-
-enum {
-	INTERFACE_DEVICE,
-	INTERFACE_IFACE,
-	__INTERFACE_MAX
-};
-
-static const struct blobmsg_policy interface_policy[__INTERFACE_MAX] = {
-	[INTERFACE_DEVICE] = { .name = "device", .type = BLOBMSG_TYPE_STRING },
-	[INTERFACE_IFACE] = { .name = "interface", .type = BLOBMSG_TYPE_STRING },
-};
-
-static struct avl_tree interface_tree = AVL_TREE_INIT(interface_tree, avl_strcmp, false, NULL);
-
-void
-interface_update(struct blob_attr *msg, int raw)
-{
-	struct blob_attr *tb[__INTERFACE_MAX];
-	struct interface *interface;
-	char *device, *iface, *device_buf, *iface_buf;
-
-	if (raw)
-		blobmsg_parse(interface_policy, __INTERFACE_MAX, tb, blob_data(msg), blob_len(msg));
-	else
-		blobmsg_parse(interface_policy, __INTERFACE_MAX, tb, blobmsg_data(msg), blobmsg_data_len(msg));
-
-	if (!tb[INTERFACE_DEVICE] || !tb[INTERFACE_IFACE])
-		return;
-
-	iface = blobmsg_get_string(tb[INTERFACE_IFACE]);
-	device = blobmsg_get_string(tb[INTERFACE_DEVICE]);
-
-	interface = avl_find_element(&interface_tree, iface, interface, avl);
-	if (interface) {
-		avl_delete(&interface_tree, &interface->avl);
-		free(interface);
-	}
-
-	interface = calloc_a(sizeof(struct neigh),
-			     &iface_buf, strlen(iface) + 1,
-			     &device_buf, strlen(device) + 1);
-        if (!interface)
-                return;
-	interface->iface = strcpy(iface_buf, iface);
-	interface->device = strcpy(device_buf, device);
-	interface->avl.key = interface->iface;
-
-	avl_insert(&interface_tree, &interface->avl);
-
-	ULOG_INFO("new interface %s:%s\n", iface, device);
-}
-
-void
-interface_down(struct blob_attr *msg)
-{
-	struct blob_attr *tb[__INTERFACE_MAX];
-	struct interface *interface;
-	char *iface;
-
-	blobmsg_parse(interface_policy, __INTERFACE_MAX, tb, blob_data(msg), blob_len(msg));
-
-	if (!tb[INTERFACE_IFACE])
-		return;
-
-	iface = blobmsg_get_string(tb[INTERFACE_IFACE]);
-
-	interface = avl_find_element(&interface_tree, iface, interface, avl);
-	if (!interface)
-		return;
-
-	ULOG_INFO("del interface %s\n", interface->iface);
-	avl_delete(&interface_tree, &interface->avl);
-	free(interface);
-}
-
-char*
-interface_resolve(char *ifname)
-{
-	struct interface *interface;
-
-	avl_for_each_element(&interface_tree, interface, avl)
-		if (!strcmp(interface->device, ifname))
-			return interface->iface;
-	return ifname;
-}
-
-int
-interface_dump(void)
-{
-	struct interface *interface;
-	struct mac *mac;
-
-	blob_buf_init(&b, 0);
-
-	avl_for_each_element(&interface_tree, interface, avl) {
-		void *c;
-
-		c = blobmsg_open_table(&b, interface->iface);
-		avl_for_each_element(&mac_tree, mac, avl)
-			if (!strcmp(interface->iface, mac->interface))
-				mac_dump(mac, 0);
-		blobmsg_close_table(&b, c);
-	}
-	return 0;
-}
-
-void
-interface_done(void)
-{
-	struct interface *i, *t;
-
-	avl_for_each_element_safe(&interface_tree, i, avl, t)
-		free(i);
-}
-

feeds/ucentral/udevmand/src/netlink.c

@@ -1,113 +0,0 @@
-/*
- * Copyright (C) 2017 John Crispin <john@phrozen.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 2.1
- * as published by the Free Software Foundation
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#include "udevmand.h"
-
-static void
-nl_handler_nl_status(struct uloop_fd *u, unsigned int statuss)
-{
-	struct nl_socket *ev = container_of(u, struct nl_socket, uloop);
-	int err;
-	socklen_t errlen = sizeof(err);
-
-	if (!u->error) {
-		nl_recvmsgs_default(ev->sock);
-		return;
-	}
-
-	if (getsockopt(u->fd, SOL_SOCKET, SO_ERROR, (void *)&err, &errlen))
-		goto abort;
-
-	switch(err) {
-	case ENOBUFS:
-		ev->bufsize *= 2;
-		if (nl_socket_set_buffer_size(ev->sock, ev->bufsize, 0))
-			goto abort;
-		break;
-
-	default:
-		goto abort;
-	}
-	u->error = false;
-	return;
-
-abort:
-	uloop_fd_delete(&ev->uloop);
-	return;
-}
-
-static struct nl_sock *
-nl_create_socket(int protocol, int groups)
-{
-	struct nl_sock *sock;
-
-	sock = nl_socket_alloc();
-	if (!sock)
-		return NULL;
-
-	if (groups)
-		nl_join_groups(sock, groups);
-
-	if (nl_connect(sock, protocol))
-		return NULL;
-
-	return sock;
-}
-
-static bool
-nl_raw_status_socket(struct nl_socket *ev, int protocol, int groups,
-		    uloop_fd_handler cb, int flags)
-{
-	ev->sock = nl_create_socket(protocol, groups);
-	if (!ev->sock)
-		return false;
-
-	ev->uloop.fd = nl_socket_get_fd(ev->sock);
-	ev->uloop.cb = cb;
-	if (uloop_fd_add(&ev->uloop, ULOOP_READ|flags))
-		return false;
-
-	return true;
-}
-
-bool
-nl_status_socket(struct nl_socket *ev, int protocol,
-		int (*cb)(struct nl_msg *msg, void *arg), void *priv)
-{
-	if (!nl_raw_status_socket(ev, protocol, 0, nl_handler_nl_status, ULOOP_ERROR_CB))
-		return false;
-
-	nl_socket_modify_cb(ev->sock, NL_CB_VALID, NL_CB_CUSTOM, cb, priv);
-	nl_socket_disable_seq_check(ev->sock);
-	ev->bufsize = 65535;
-	if (nl_socket_set_buffer_size(ev->sock, ev->bufsize, 0))
-		return false;
-
-	return true;
-}
-
-int genl_send_and_recv(struct nl_socket *ev, struct nl_msg * msg)
-{
-	int ret = nl_send_auto_complete(ev->sock, msg);
-
-	nlmsg_free(msg);
-	if (ret < 0)
-		return ret;
-
-	nl_recvmsgs_default(ev->sock);
-	nl_wait_for_ack(ev->sock);
-
-	return 0;
-}
-
-

feeds/ucentral/udevmand/src/ubus.c

@@ -1,253 +0,0 @@
-/*
- * Copyright (C) 2020 John Crispin <john@phrozen.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 2.1
- * as published by the Free Software Foundation
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#include "udevmand.h"
-
-static struct ubus_auto_conn conn;
-static struct ubus_subscriber subscriber;
-
-enum {
-	EVENT_ID,
-	EVENT_PATH,
-	__EVENT_MAX
-};
-
-static const struct blobmsg_policy status_policy[__EVENT_MAX] = {
-	[EVENT_ID] = { .name = "id", .type = BLOBMSG_TYPE_INT32 },
-	[EVENT_PATH] = { .name = "path", .type = BLOBMSG_TYPE_STRING },
-};
-
-static const struct ubus_watch_list {
-	const char *path;
-	int wildcard;
-} ubus_watch_list[] = {
-	{
-		.path = "service",
-	}, {
-		.path = "dnsmasq",
-	}, {
-		.path = "network.interface",
-	}, {
-		.path = "network.status",
-	},
-};
-
-static int
-ubus_mac_cb(struct ubus_context *ctx, struct ubus_object *obj,
-	    struct ubus_request_data *req, const char *method,
-	    struct blob_attr *msg)
-{
-	if (!mac_dump_all())
-		ubus_send_reply(ctx, req, b.head);
-	return UBUS_STATUS_OK;
-}
-
-/*static int
-ubus_interface_cb(struct ubus_context *ctx, struct ubus_object *obj,
-		  struct ubus_request_data *req, const char *method,
-		  struct blob_attr *msg)
-{
-	if (!interface_dump())
-		ubus_send_reply(ctx, req, b.head);
-	return UBUS_STATUS_OK;
-}*/
-
-static int
-ubus_port_cb(struct ubus_context *ctx, struct ubus_object *obj,
-	     struct ubus_request_data *req, const char *method,
-	     struct blob_attr *msg)
-{
-	enum {
-		DUMP_DELTA,
-		__DUMP_MAX
-	};
-
-	static const struct blobmsg_policy dump_policy[__DUMP_MAX] = {
-		[DUMP_DELTA] = { .name = "delta", .type = BLOBMSG_TYPE_INT32 },
-	};
-
-	struct blob_attr *tb[__DUMP_MAX];
-	int delta = 0;
-
-	blobmsg_parse(dump_policy, __DUMP_MAX, tb, blob_data(msg), blob_len(msg));
-
-	if (tb[DUMP_DELTA])
-		delta = blobmsg_get_u32(tb[DUMP_DELTA]);
-
-	iface_dump(delta);
-	ubus_send_reply(ctx, req, b.head);
-
-	return UBUS_STATUS_OK;
-}
-
-static const struct ubus_method topology_methods[] = {
-	//UBUS_METHOD_NOARG("interface", ubus_interface_cb),
-        UBUS_METHOD_NOARG("mac", ubus_mac_cb),
-	UBUS_METHOD_NOARG("port", ubus_port_cb),
-};
-
-static struct ubus_object_type ubus_object_type =
-	UBUS_OBJECT_TYPE("topology", topology_methods);
-
-static struct ubus_object ubus_object = {
-	.name = "topology",
-	.type = &ubus_object_type,
-	.methods = topology_methods,
-	.n_methods = ARRAY_SIZE(topology_methods),
-};
-
-static int
-ubus_watch_match(const char *path)
-{
-	int i;
-
-	for (i = 0; i < ARRAY_SIZE(ubus_watch_list); i++) {
-		int len = strlen(ubus_watch_list[i].path);
-
-		if (ubus_watch_list[i].wildcard && strncmp(path, ubus_watch_list[i].path, len))
-			continue;
-		if (!ubus_watch_list[i].wildcard && strcmp(path, ubus_watch_list[i].path))
-			continue;
-		return 0;
-	}
-	return -1;
-}
-
-enum {
-	INTERFACE,
-	__INTERFACE_MAX,
-};
-
-static const struct blobmsg_policy interface_policy[__INTERFACE_MAX] = {
-	[INTERFACE] = { .name = "interface", .type = BLOBMSG_TYPE_ARRAY },
-};
-
-static void
-ubus_netifd_dump_cb(struct ubus_request *req,
-		    int type, struct blob_attr *msg)
-{
-	struct blob_attr *tb[__INTERFACE_MAX];
-	struct blob_attr *iter;
-	int rem;
-
-	blobmsg_parse(interface_policy, __INTERFACE_MAX, tb, blob_data(msg), blob_len(msg));
-	if (!tb[INTERFACE])
-		return;
-	blobmsg_for_each_attr(iter, tb[INTERFACE], rem)
-		interface_update(iter, 0);
-}
-
-static int
-ubus_notify_cb(struct ubus_context *ctx, struct ubus_object *obj,
-	       struct ubus_request_data *req, const char *method,
-	       struct blob_attr *msg)
-{
-	if (0) {
-		char *str;
-
-		str = blobmsg_format_json(msg, true);
-		ULOG_INFO("Received ubus notify '%s': %s\n", method, str);
-		free(str);
-	}
-
-	if (!strcmp(method, "dhcp.ack"))
-		dhcpv4_ack(msg);
-
-	else if (!strcmp(method, "dhcp.release"))
-		dhcpv4_release(msg);
-
-	else if (!strcmp(method, "interface.update"))
-		interface_update(msg, 1);
-
-	else if (!strcmp(method, "interface.down"))
-		interface_down(msg);
-
-	return 0;
-}
-
-static void
-ubus_event_handler_cb(struct ubus_context *ctx,  struct ubus_event_handler *ev,
-	      const char *type, struct blob_attr *msg)
-{
-	struct blob_attr *tb[__EVENT_MAX];
-	const char *path;
-	uint32_t id;
-
-	if (strcmp("ubus.object.add", type))
-		return;
-
-	if (0) {
-		char *str;
-
-		str = blobmsg_format_json(msg, true);
-		ULOG_INFO("Received ubus notify '%s': %s\n", type, str);
-		free(str);
-	}
-
-	blobmsg_parse(status_policy, __EVENT_MAX, tb, blob_data(msg), blob_len(msg));
-
-	if (!tb[EVENT_ID] || !tb[EVENT_PATH])
-		return;
-
-	path = blobmsg_get_string(tb[EVENT_PATH]);
-	id = blobmsg_get_u32(tb[EVENT_ID]);
-
-	if (!ubus_watch_match(path) && !ubus_subscribe(ctx, &subscriber, id))
-		ULOG_INFO("Subscribe to %s (%u)\n", path, id);
-}
-
-static struct ubus_event_handler ubus_event_handler = { .cb = ubus_event_handler_cb };
-
-static void
-receive_list_result(struct ubus_context *ctx, struct ubus_object_data *obj,
-		    void *priv)
-{
-	char *path = strdup(obj->path);
-
-	if (!ubus_watch_match(path) && !ubus_subscribe(ctx, &subscriber, obj->id))
-		ULOG_INFO("Subscribe to %s (%u)\n", path, obj->id);
-	free(path);
-}
-
-static void
-ubus_connect_handler(struct ubus_context *ctx)
-{
-	uint32_t netifd;
-
-	ubus_add_object(ctx, &ubus_object);
-
-	ubus_register_event_handler(ctx, &ubus_event_handler, "ubus.object.add");
-	ubus_register_event_handler(ctx, &ubus_event_handler, "ubus.object.remove");
-
-	subscriber.cb = ubus_notify_cb;
-	if (ubus_register_subscriber(ctx, &subscriber))
-		ULOG_ERR("failed to register ubus subscriber\n");
-
-	ubus_lookup(ctx, NULL, receive_list_result, NULL);
-
-	if (!ubus_lookup_id(ctx, "network.interface", &netifd))
-		ubus_invoke(ctx, netifd, "dump", NULL, ubus_netifd_dump_cb, NULL, 5000);
-}
-
-void
-ubus_init(void)
-{
-	conn.cb = ubus_connect_handler;
-	ubus_auto_connect(&conn);
-}
-
-void
-ubus_uninit(void)
-{
-	ubus_auto_shutdown(&conn);
-}

feeds/ucentral/udevmand/src/udevmand.h

@@ -1,150 +0,0 @@
-#define _GNU_SOURCE
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <glob.h>
-#include <time.h>
-#include <ifaddrs.h>
-
-#include <net/if.h>
-
-#include <sys/ioctl.h>
-#include <sys/types.h>
-
-#include <linux/if_ether.h>
-#include <linux/rtnetlink.h>
-#include <linux/nl80211.h>
-#include <linux/limits.h>
-#include <linux/sockios.h>
-#include <linux/ethtool.h>
-
-#include <netlink/msg.h>
-#include <netlink/attr.h>
-#include <netlink/socket.h>
-#include <netlink/genl/ctrl.h>
-#include <netlink/genl/genl.h>
-
-#include <libubox/avl.h>
-#include <libubox/avl-cmp.h>
-#include <libubox/uloop.h>
-#include <libubox/utils.h>
-#include <libubox/ulog.h>
-#include <libubox/blobmsg_json.h>
-#include <libubox/vlist.h>
-
-#include <libubus.h>
-
-#define MAC_FMT	"%02x:%02x:%02x:%02x:%02x:%02x"
-#define MAC_VAR(x) x[0], x[1], x[2], x[3], x[4], x[5]
-
-#define IP_FMT	"%d.%d.%d.%d"
-#define IP_VAR(x) x[0], x[1], x[2], x[3]
-
-struct nl_socket {
-	struct uloop_fd uloop;
-	struct nl_sock *sock;
-	int bufsize;
-};
-
-struct mac {
-	uint8_t *addr;
-	struct avl_node avl;
-	char interface[64];
-	char *ethers;
-
-	struct timespec ts;
-	struct list_head neigh4;
-	struct list_head neigh6;
-	struct list_head dhcpv4;
-	struct list_head bridge_mac;
-};
-
-struct neigh {
-	struct avl_node avl;
-	struct list_head list;
-
-	uint8_t *ip;
-	int ip_ver;
-	int iface;
-	char ifname[IF_NAMESIZE];
-
-	struct uloop_timeout ageing;
-};
-
-struct dhcpv4 {
-	struct avl_node avl;
-	struct list_head mac;
-
-	uint8_t addr[ETH_ALEN];
-	uint8_t ip[4];
-	char iface[IF_NAMESIZE];
-	char name[];
-};
-
-struct interface {
-	struct avl_node avl;
-
-	char *iface;
-	char *device;
-};
-
-struct bridge_mac {
-	struct vlist_node vlist;
-	struct list_head mac;
-
-	char bridge[IF_NAMESIZE];
-	char ifname[IF_NAMESIZE];
-	uint8_t addr[ETH_ALEN];
-	__u8 port_no;
-};
-
-int avl_mac_cmp(const void *k1, const void *k2, void *ptr);
-
-extern struct avl_tree mac_tree;
-int mac_dump_all(void);
-void mac_dump(struct mac *mac, int interface);
-struct mac* mac_find(uint8_t *addr);
-void mac_update(struct mac *mac, char *iface);
-
-int neigh_init(void);
-void neigh_enum(void);
-void neigh_flush(void);
-void neigh_done(void);
-
-bool nl_status_socket(struct nl_socket *ev, int protocol,
-		     int (*cb)(struct nl_msg *msg, void *arg), void *priv);
-int genl_send_and_recv(struct nl_socket *ev, struct nl_msg * msg);
-
-extern struct blob_buf b;
-void blobmsg_add_iface(struct blob_buf *bbuf, char *name, int index);
-void blobmsg_add_iftype(struct blob_buf *bbuf, const char *name, const uint32_t iftype);
-void blobmsg_add_ipv4(struct blob_buf *bbuf, const char *name, const uint8_t* addr);
-void blobmsg_add_ipv6(struct blob_buf *bbuf, const char *name, const uint8_t* addr);
-void blobmsg_add_mac(struct blob_buf *bbuf, const char *name, const uint8_t* addr);
-
-void ubus_init(void);
-void ubus_uninit(void);
-
-void bridge_init(void);
-void bridge_dump_if(const char *bridge);
-void bridge_flush(void);
-void bridge_mac_del(struct bridge_mac *b);
-
-void dhcpv4_ack(struct blob_attr *msg);
-void dhcpv4_release(struct blob_attr *msg);
-void dhcp_init(void);
-void dhcp_done(void);
-void dhcpv4_del(struct dhcpv4 *dhcpv4);
-
-int interface_dump(void);
-void interface_update(struct blob_attr *msg, int raw);
-void interface_down(struct blob_attr *msg);
-char *interface_resolve(char *device);
-void interface_done(void);
-
-void ethers_init(void);
-
-void iface_done(void);
-void iface_dump(int delta);

feeds/ucentral/udnssnoop/Makefile

@@ -6,6 +6,12 @@ PKG_RELEASE:=1
 PKG_LICENSE:=GPL-2.0
 PKG_MAINTAINER:=John Crispin <john@phrozen.org>
 
+PKG_SOURCE_URL=https://github.com/blogic/udnssnoop.git
+PKG_MIRROR_HASH:=afd17cc6aed4a151bc0f437b84491d751932a39f93f429418200e9e8be53dfad
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_DATE:=2021-04-12
+PKG_SOURCE_VERSION:=67e1e5f0bfc12222aa59c54e7066b1c00a680e56
+
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
 

feeds/ucentral/udnssnoop/src/.gitignore

@@ -1,4 +0,0 @@
-CMakeCache.txt
-CMakeFiles/
-cmake_install.cmake
-udnssnoop

feeds/ucentral/udnssnoop/src/CMakeLists.txt

@@ -1,16 +0,0 @@
-cmake_minimum_required(VERSION 2.6)
-
-PROJECT(udnssnoop C)
-INCLUDE(GNUInstallDirs)
-ADD_DEFINITIONS(-Os -ggdb -Wall -Werror --std=gnu99 -Wmissing-declarations)
-
-SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "")
-
-SET(SOURCES main.c dns.c)
-SET(LIBS ubox ubus resolv)
-
-ADD_EXECUTABLE(udnssnoop ${SOURCES})
-TARGET_LINK_LIBRARIES(udnssnoop ${LIBS})
-INSTALL(TARGETS udnssnoop
-	RUNTIME DESTINATION ${CMAKE_INSTALL_SBINDIR}
-)

feeds/ucentral/udnssnoop/src/dns.c

@@ -1,215 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause */
-
-#include "dns.h"
-
-static char name_buffer[MAX_NAME_LEN + 1];
-
-static int
-scan_name(const uint8_t *buffer, int len)
-{
-	int offset = 0;
-
-	while (len && (*buffer != '\0')) {
-		int l = *buffer;
-
-		if (IS_COMPRESSED(l))
-			return offset + 2;
-
-		if (l + 1 > len) return -1;
-		len -= l + 1;
-		offset += l + 1;
-		buffer += l + 1;
-	}
-
-	if (!len || !offset || (*buffer != '\0'))
-		return -1;
-
-	return offset + 1;
-}
-
-static struct dns_header*
-dns_consume_header(uint8_t **data, int *len)
-{
-	struct dns_header *h = (struct dns_header *) *data;
-
-	if (*len < sizeof(struct dns_header))
-		return NULL;
-
-	h->id = be16_to_cpu(h->id);
-	h->flags = be16_to_cpu(h->flags);
-	h->questions = be16_to_cpu(h->questions);
-	h->answers = be16_to_cpu(h->answers);
-	h->authority = be16_to_cpu(h->authority);
-	h->additional = be16_to_cpu(h->additional);
-
-	*len -= sizeof(struct dns_header);
-	*data += sizeof(struct dns_header);
-
-	return h;
-}
-
-static struct dns_question*
-dns_consume_question(uint8_t **data, int *len)
-{
-	struct dns_question *q = (struct dns_question *) *data;
-
-	if (*len < sizeof(struct dns_question))
-		return NULL;
-
-	q->type = be16_to_cpu(q->type);
-	q->class = be16_to_cpu(q->class);
-
-	*len -= sizeof(struct dns_question);
-	*data += sizeof(struct dns_question);
-
-	return q;
-}
-
-static struct dns_answer*
-dns_consume_answer(uint8_t **data, int *len)
-{
-	struct dns_answer *a = (struct dns_answer *) *data;
-
-	if (*len < sizeof(struct dns_answer))
-		return NULL;
-
-	a->type = be16_to_cpu(a->type);
-	a->class = be16_to_cpu(a->class);
-	a->ttl = be32_to_cpu(a->ttl);
-	a->rdlength = be16_to_cpu(a->rdlength);
-
-	*len -= sizeof(struct dns_answer);
-	*data += sizeof(struct dns_answer);
-
-	return a;
-}
-
-static char *
-dns_consume_name(const uint8_t *base, int blen, uint8_t **data, int *len)
-{
-	int nlen = scan_name(*data, *len);
-
-	if (nlen < 1)
-		return NULL;
-
-	if (dn_expand(base, base + blen, *data, name_buffer, MAX_NAME_LEN) < 0) {
-		perror("dns_consume_name/dn_expand");
-		return NULL;
-	}
-
-	*len -= nlen;
-	*data += nlen;
-
-	return name_buffer;
-}
-
-static int
-parse_answer(uint8_t *buffer, int len, uint8_t **b, int *rlen)
-{
-	char *name = dns_consume_name(buffer, len, b, rlen);
-	struct dns_answer *a;
-	uint8_t *rdata;
-	char ipbuf[33];
-
-	if (*rlen < 0) {
-		fprintf(stderr, "dropping: bad answer - bad length\n");
-		return -1;
-	}
-
-	a = dns_consume_answer(b, rlen);
-	if (!a) {
-		fprintf(stderr, "dropping: bad answer - bad buffer\n");
-		return -1;
-	}
-
-	if (!name) {
-		return 0;
-	}
-
-	if ((a->class & ~CLASS_FLUSH) != CLASS_IN) {
-		fprintf(stderr, "dropping: class\n");
-		return -1;
-	}
-
-	rdata = *b;
-	if (a->rdlength > *rlen) {
-		fprintf(stderr, "dropping: bad answer - bad rlen\n");
-		return -1;
-	}
-
-	*rlen -= a->rdlength;
-	*b += a->rdlength;
-
-	switch (a->type) {
-	case TYPE_A:
-		if (a->rdlength != 4)
-			return 0;
-
-		if (!inet_ntop(AF_INET, rdata, ipbuf, sizeof(ipbuf)))
-			return 0;
-		break;
-
-	case TYPE_AAAA:
-		if (a->rdlength != 16)
-			return 0;
-
-		if (!inet_ntop(AF_INET6, rdata, ipbuf, sizeof(ipbuf)))
-			return 0;
-		break;
-
-	default:
-		return 0;
-	}
-
-	ubus_notify_qosify(name, ipbuf, a->type, a->ttl);
-	printf("%s %s %" PRIu32 "\n", name, ipbuf, a->ttl);
-
-	return 0;
-}
-
-void
-dns_handle_packet(uint8_t *buffer, int len)
-{
-	struct dns_header *h;
-	uint8_t *b = buffer;
-	int rlen = len;
-
-	h = dns_consume_header(&b, &rlen);
-	if (!h) {
-		fprintf(stderr, "dropping: bad header\n");
-		return;
-	}
-
-	if (!(h->flags & FLAG_RESPONSE))
-		return;
-
-	if (!h->answers)
-		return;
-
-	while (h->questions-- > 0) {
-		char *name = dns_consume_name(buffer, len, &b, &rlen);
-		struct dns_question *q;
-
-		if (!name || rlen < 0)
-			return;
-
-		q = dns_consume_question(&b, &rlen);
-		if (!q) {
-			fprintf(stderr, "dropping: bad question\n");
-			return;
-		}
-	}
-
-	while (h->answers-- > 0)
-		if (parse_answer(buffer, len, &b, &rlen))
-			return;
-
-/*	while (h->authority-- > 0)
-		if (parse_answer(buffer, len, &b, &rlen))
-			return;
-
-	while (h->additional-- > 0)
-		if (parse_answer(buffer, len, &b, &rlen))
-			return;
-*/
-}

feeds/ucentral/udnssnoop/src/dns.h

@@ -1,86 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause */
-
-#ifndef _DNS_H__
-#define _DNS_H__
-
-#define _GNU_SOURCE
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <string.h>
-#include <inttypes.h>
-#include <netinet/ip.h>
-#include <netinet/in.h>
-#include <sys/socket.h>
-#include <arpa/inet.h>
-#include <linux/if_ether.h>
-#include <linux/filter.h>
-#include <linux/udp.h>
-#include <netinet/ip6.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-#include <resolv.h>
-
-#include <libubox/avl-cmp.h>
-#include <libubox/utils.h>
-#include <libubox/uloop.h>
-#include <libubox/ulog.h>
-#include <libubus.h>
-#include <uci.h>
-#include <uci_blob.h>
-
-#define FLAG_RESPONSE		0x8000
-#define FLAG_AUTHORATIVE	0x0400
-
-#define TYPE_A			0x0001
-#define TYPE_PTR		0x000C
-#define TYPE_TXT		0x0010
-#define TYPE_AAAA		0x001c
-#define TYPE_SRV		0x0021
-#define TYPE_ANY		0x00ff
-
-#define IS_COMPRESSED(x)	((x & 0xc0) == 0xc0)
-
-#define CLASS_FLUSH		0x8000
-#define CLASS_UNICAST		0x8000
-#define CLASS_IN		0x0001
-
-#define MAX_NAME_LEN            8096
-#define MAX_DATA_LEN            8096
-
-struct vlan_hdr {
-	uint16_t h_vlan_TCI;
-	uint16_t h_vlan_encapsulated_proto;
-};
-
-struct dns_header {
-	uint16_t id;
-	uint16_t flags;
-	uint16_t questions;
-	uint16_t answers;
-	uint16_t authority;
-	uint16_t additional;
-} __attribute__((packed));
-
-struct dns_srv_data {
-	uint16_t priority;
-	uint16_t weight;
-	uint16_t port;
-} __attribute__((packed));
-
-struct dns_answer {
-	uint16_t type;
-	uint16_t class;
-	uint32_t ttl;
-	uint16_t rdlength;
-} __attribute__((packed));
-
-struct dns_question {
-	uint16_t type;
-	uint16_t class;
-} __attribute__((packed));
-
-void dns_handle_packet(uint8_t *buffer, int len);
-void ubus_notify_qosify(char *name, char *address, int type, int ttl);
-
-#endif

feeds/ucentral/udnssnoop/src/main.c

@@ -1,282 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause */
-
-/* code is derived from hapd proxy_arp snooping */
-
-#include "dns.h"
-
- /* sudo tcpdump -s 3000 -dd greater 96 and '(ip or ip6)' and '(udp or tcp)' and '(port 53)' */
-static struct sock_filter dns_sock_filter_insns[] = {
-	{ 0x80, 0, 0, 0x00000000 },
-	{ 0x35, 0, 19, 0x00000060 },
-	{ 0x28, 0, 0, 0x0000000c },
-	{ 0x15, 0, 9, 0x00000800 },
-	{ 0x30, 0, 0, 0x00000017 },
-	{ 0x15, 0, 15, 0x00000011 },
-	{ 0x28, 0, 0, 0x00000014 },
-	{ 0x45, 13, 0, 0x00001fff },
-	{ 0xb1, 0, 0, 0x0000000e },
-	{ 0x48, 0, 0, 0x0000000e },
-	{ 0x15, 9, 0, 0x00000035 },
-	{ 0x48, 0, 0, 0x00000010 },
-	{ 0x15, 7, 8, 0x00000035 },
-	{ 0x15, 0, 7, 0x000086dd },
-	{ 0x30, 0, 0, 0x00000014 },
-	{ 0x15, 0, 5, 0x00000011 },
-	{ 0x28, 0, 0, 0x00000036 },
-	{ 0x15, 2, 0, 0x00000035 },
-	{ 0x28, 0, 0, 0x00000038 },
-	{ 0x15, 0, 1, 0x00000035 },
-	{ 0x6, 0, 0, 0x00000bb8 },
-	{ 0x6, 0, 0, 0x00000000 },
-};
-
-static const struct sock_fprog sock_filter = {
-	.len = ARRAY_SIZE(dns_sock_filter_insns),
-	.filter = dns_sock_filter_insns,
-};
-
-static struct ubus_auto_conn conn;
-static struct uloop_fd fd;
-static struct blob_buf b;
-static char *ifname;
-static int qosify;
-
-static struct ubus_object_type ubus_object_type = {
-	.name = "dnssnoop"
-};
-
-static void ubus_state_handler(struct ubus_context *ctx, struct ubus_object *obj)
-{
-}
-
-struct ubus_object ubus_object = {
-	.name = "dnssnoop",
-	.type = &ubus_object_type,
-	.subscribe_cb = ubus_state_handler,
-};
-
-
-static int
-proto_is_vlan(uint16_t h_proto)
-{
-	return !!(h_proto == ETH_P_8021Q ||
-		  h_proto == ETH_P_8021AD);
-}
-
-static int
-consume_buffer(uint8_t **buf, int *len, int size)
-{
-	if (size > *len)
-		return -1;
-
-	*buf += size;
-	*len -= size;
-
-	return 0;
-}
-
-static void
-packet_handle(uint8_t *buf, int len)
-{
-	struct ethhdr *eth = (struct ethhdr *)buf;
-	uint16_t h_proto;
-
-	if (consume_buffer(&buf, &len, sizeof(*eth)))
-		return;
-
-	h_proto = eth->h_proto;
-
-	if (proto_is_vlan(ntohs(h_proto))) {
-		struct vlan_hdr *vlanh = (struct vlan_hdr *)buf;
-
-		if (consume_buffer(&buf, &len, sizeof(struct vlan_hdr)))
-			return;
-
-		h_proto = vlanh->h_vlan_encapsulated_proto;
-	}
-
-	switch (ntohs(eth->h_proto)) {
-	case ETH_P_IP:
-		if (consume_buffer(&buf, &len, sizeof(struct ip)))
-			return;
-		break;
-	case ETH_P_IPV6:
-		if (consume_buffer(&buf, &len, sizeof(struct ip6_hdr)))
-			return;
-		break;
-	default:
-		return;
-	}
-
-	if (consume_buffer(&buf, &len, sizeof(struct udphdr)))
-		return;
-
-	dns_handle_packet(buf, len);
-}
-
-static void
-socket_fd_cb(struct uloop_fd *fd, unsigned int events)
-{
-	uint8_t buf[8192];
-
-	do {
-		int len = recvfrom(fd->fd, buf, sizeof(buf), MSG_DONTWAIT, NULL, NULL);
-
-		if (len <= 0) {
-			switch (errno) {
-			case EINTR:
-			case EAGAIN:
-				return;
-			default:
-				exit(1);
-			}
-			break;
-		}
-		packet_handle(buf, len);
-	} while (true);
-}
-
-static int
-socket_open(void)
-{
-	int sock;
-
-	sock = socket(PF_PACKET, SOCK_RAW, htons(ETH_P_ALL));
-	if (sock == -1) {
-		ULOG_ERR("failed to open socket on %s\n", ifname);
-		return -1;
-	}
-
-	if (setsockopt(sock, SOL_SOCKET, SO_BINDTODEVICE, ifname, strlen(ifname))) {
-		ULOG_ERR("failed to bind socket to %s\n", ifname);
-		close(sock);
-		return -1;
-	}
-
-	if (setsockopt(sock, SOL_SOCKET, SO_ATTACH_FILTER,
-		       &sock_filter, sizeof(struct sock_fprog))) {
-		ULOG_ERR("failed to attach filter to %s\n", ifname);
-		close(sock);
-		return -1;
-	}
-
-	return sock;
-}
-
-static void
-snoop_start(void)
-{
-	int sock = socket_open();
-	if (sock == -1) {
-		ULOG_ERR("failed to open socket on %s\n", ifname);
-		return;
-	}
-	fd.cb = socket_fd_cb;
-	fd.fd = sock;
-	uloop_fd_add(&fd, ULOOP_READ);
-}
-
-void
-ubus_notify_qosify(char *name, char *address, int type, int ttl)
-{
-	if (!qosify)
-		return;
-
-	blob_buf_init(&b, 0);
-	switch (type) {
-	case TYPE_AAAA:
-		blobmsg_add_string(&b, "type", "AAAA");
-		break;
-	case TYPE_A:
-		blobmsg_add_string(&b, "type", "A");
-		break;
-	default:
-		return;
-	}
-	blobmsg_add_string(&b, "name", name);
-	blobmsg_add_string(&b, "address", address);
-        blobmsg_add_u32(&b, "ttl", ttl);
-
-	ubus_invoke(&conn.ctx, qosify, "add_dns_host", b.head, NULL, NULL, 200);
-}
-
-static void
-ubus_handle_status(struct ubus_context *ctx,  struct ubus_event_handler *ev,
-	      const char *type, struct blob_attr *msg)
-{
-	enum {
-		EVENT_ID,
-		EVENT_PATH,
-		__EVENT_MAX
-	};
-
-	static const struct blobmsg_policy status_policy[__EVENT_MAX] = {
-		[EVENT_ID] = { .name = "id", .type = BLOBMSG_TYPE_INT32 },
-		[EVENT_PATH] = { .name = "path", .type = BLOBMSG_TYPE_STRING },
-	};
-
-	struct blob_attr *tb[__EVENT_MAX];
-	uint32_t id;
-	char *path;
-
-	blobmsg_parse(status_policy, __EVENT_MAX, tb, blob_data(msg), blob_len(msg));
-	if (!tb[EVENT_ID] || !tb[EVENT_PATH])
-		return;
-
-	path = blobmsg_get_string(tb[EVENT_PATH]);
-	id = blobmsg_get_u32(tb[EVENT_ID]);
-
-	if (strcmp(path, "qosify"))
-		return;
-
-	if (!strcmp("ubus.object.remove", type))
-		qosify = 0;
-
-	if (!strcmp("ubus.object.add", type))
-		qosify = id;
-}
-
-static void
-ubus_lookup_cb(struct ubus_context *ctx, struct ubus_object_data *obj,
-                    void *priv)
-{
-	if (strcmp(obj->path, "qosify"))
-		return;
-
-	qosify = obj->id;
-}
-
-static struct ubus_event_handler ubus_status_handler = { .cb = ubus_handle_status };
-
-static void
-ubus_connect_handler(struct ubus_context *ctx)
-{
-        ULOG_NOTE("connected to ubus\n");
-	ubus_add_object(ctx, &ubus_object);
-
-	ubus_register_event_handler(ctx, &ubus_status_handler, "ubus.object.add");
-	ubus_register_event_handler(ctx, &ubus_status_handler, "ubus.object.remove");
-
-	ubus_lookup(ctx, NULL, ubus_lookup_cb, NULL);
-}
-
-int
-main(int argc, char **argv)
-{
-	if (argc != 2)
-		return -1;
-
-	ifname = argv[1];
-
-	ulog_open(ULOG_STDIO | ULOG_SYSLOG, LOG_DAEMON, "udnssnoop");
-
-	uloop_init();
-
-	conn.cb = ubus_connect_handler;
-        ubus_auto_connect(&conn);
-	snoop_start();
-	uloop_run();
-	uloop_done();
-
-	return 0;
-}

patches/0090-netifd-add-gcmp-256-on-6GHz.patch

@@ -1,68 +0,0 @@
-From a2a7cdf9e292bac5b146738276a593d8e119fe8f Mon Sep 17 00:00:00 2001
-From: Marek Kwaczynski <marek@shasta.cloud>
-Date: Thu, 3 Jul 2025 15:55:43 +0000
-Subject: [PATCH] netifd: add gcmp-256 as a cipher suite when SAE is enabled on
- HE/EHT
-
-Enabling gcmp-256 only on 6GHz radio.
-
-Fixes: WIFI-14594
-
-Signed-off-by: Marek Kwaczynski <marek@shasta.cloud>
----
- .../config/netifd/patches/200-gcmp-256.patch  | 43 +++++++++++++++++++
- 1 file changed, 43 insertions(+)
- create mode 100644 package/network/config/netifd/patches/200-gcmp-256.patch
-
-diff --git a/package/network/config/netifd/patches/200-gcmp-256.patch b/package/network/config/netifd/patches/200-gcmp-256.patch
-new file mode 100644
-index 0000000000..7ac6262e7f
---- /dev/null
-+++ b/package/network/config/netifd/patches/200-gcmp-256.patch
-@@ -0,0 +1,43 @@
-+Index: netifd-2023-09-19-8587c074/scripts/netifd-wireless.sh
-+===================================================================
-+--- netifd-2023-09-19-8587c074.orig/scripts/netifd-wireless.sh
-++++ netifd-2023-09-19-8587c074/scripts/netifd-wireless.sh
-+@@ -39,11 +39,10 @@ prepare_key_wep() {
-+ }
-+ 
-+ _wdev_prepare_channel() {
-+-	json_get_vars channel band hwmode
-++	json_get_vars channel band hwmode htmode
-+ 
-+ 	auto_channel=0
-+ 	enable_ht=0
-+-	htmode=
-+ 	hwmode="${hwmode##11}"
-+ 
-+ 	case "$channel" in
-+@@ -70,7 +69,14 @@ _wdev_prepare_channel() {
-+ 
-+ 	case "$band" in
-+ 		2g) hwmode=g;;
-+-		5g|6g) hwmode=a;;
-++		5g) hwmode=a;;
-++		6g)
-++			hwmode=a;
-++			case "$htmode" in
-++				HE*|EHT*) wpa3_cipher="GCMP-256 ";;
-++				*) wpa3_cipher="";;
-++			esac
-++		;;
-+ 		60g) hwmode=ad;;
-+ 		*)
-+ 			case "$hwmode" in
-+@@ -216,6 +222,9 @@ wireless_vif_parse_encryption() {
-+ 		wpa_cipher="GCMP"
-+ 	else
-+ 		wpa_cipher="CCMP"
-++		case "$encryption" in
-++			sae*|wpa3*|psk3*|owe) wpa_cipher="${wpa3_cipher}$wpa_cipher";;
-++		esac
-+ 	fi
-+ 
-+ 	case "$encryption" in
--- 
-2.43.0
-

patches/0095-toolchain-use-older-gcc11-for-legacy-targets.patch

@@ -1,37 +0,0 @@
-From 0b83834085bf536183b0683f4f86800dbe1e2d39 Mon Sep 17 00:00:00 2001
-From: John Crispin <john@phrozen.org>
-Date: Mon, 28 Jul 2025 07:49:07 +0200
-Subject: [PATCH] toolchain: use older gcc11 for legacy targets
-
-Signed-off-by: John Crispin <john@phrozen.org>
----
- toolchain/binutils/Config.version | 1 +
- toolchain/gcc/Config.version      | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/toolchain/binutils/Config.version b/toolchain/binutils/Config.version
-index c9f8584480..5393d389a5 100644
---- a/toolchain/binutils/Config.version
-+++ b/toolchain/binutils/Config.version
-@@ -1,6 +1,7 @@
- 
- config BINUTILS_VERSION_2_37
- 	bool
-+	default y if TARGET_ipq40xx
- 
- config BINUTILS_VERSION_2_38
- 	bool
-diff --git a/toolchain/gcc/Config.version b/toolchain/gcc/Config.version
-index 7126a0c883..b7de3d00e3 100644
---- a/toolchain/gcc/Config.version
-+++ b/toolchain/gcc/Config.version
-@@ -1,5 +1,6 @@
- config GCC_VERSION_11
- 	default y if GCC_USE_VERSION_11
-+	default y if TARGET_ipq40xx
- 	bool
- 
- config GCC_VERSION_13
--- 
-2.34.1
-

patches/0096-base-files-boot-add-sync-after-uci-defaults.patch

@@ -1,33 +0,0 @@
-From 309a419087da906a2f3b0f39763f021e9729dd85 Mon Sep 17 00:00:00 2001
-From: Paul White <paul@shasta.cloud>
-Date: Mon, 4 Aug 2025 04:14:23 +0000
-Subject: [PATCH] base-files: boot: add sync after uci-defaults
-
-A scenario was seen where UCI config was not flushed to disk before
-an AP power-cycle after uci-defaults was completed.  Since these
-scripts are deleted after being ran once, there is no way to recover
-without a factory reset.
-
-Adding this sync operation proved to help avoid this situation from
-happening
-
-Signed-off-by: Paul White <paul@shasta.cloud>
----
- package/base-files/files/etc/init.d/boot | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/package/base-files/files/etc/init.d/boot b/package/base-files/files/etc/init.d/boot
-index 15756669a9..c8a803e32c 100755
---- a/package/base-files/files/etc/init.d/boot
-+++ b/package/base-files/files/etc/init.d/boot
-@@ -15,6 +15,7 @@ uci_apply_defaults() {
- 		( . "./$(basename $file)" ) && rm -f "$file"
- 	done
- 	uci commit
-+	sync
- }
- 
- boot() {
--- 
-2.43.0
-

patches/0096-uboot-envtools-add-udaya-id5.patch

@@ -1,25 +0,0 @@
-From d366477af72e725524b47f2fffe8a8c1d500060d Mon Sep 17 00:00:00 2001
-From: John Crispin <john@phrozen.org>
-Date: Thu, 31 Jul 2025 14:45:12 +0200
-Subject: [PATCH] uboot-envtools: add udaya-id5
-
-Signed-off-by: John Crispin <john@phrozen.org>
----
- package/boot/uboot-envtools/files/ipq40xx | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/package/boot/uboot-envtools/files/ipq40xx b/package/boot/uboot-envtools/files/ipq40xx
-index 8d993fae36..78299195bd 100644
---- a/package/boot/uboot-envtools/files/ipq40xx
-+++ b/package/boot/uboot-envtools/files/ipq40xx
-@@ -42,6 +42,7 @@ luma,wrtq-329acn|\
- netgear,wac510|\
- openmesh,a42|\
- openmesh,a62|\
-+udaya,a5-id2|\
- pakedge,wr-1|\
- plasmacloud,pa1200|\
- plasmacloud,pa2200)
--- 
-2.34.1
-

patches/0097-yuncore_ax820-add-insta1-2-partitions.patch

@@ -1,36 +0,0 @@
-From 3ceb72aaffa13375c049d161702e9d9f55da38c8 Mon Sep 17 00:00:00 2001
-From: John Crispin <john@phrozen.org>
-Date: Mon, 4 Aug 2025 08:34:50 +0200
-Subject: [PATCH] yuncore_ax820: add insta1/2 partitions
-
-Signed-off-by: John Crispin <john@phrozen.org>
----
- target/linux/ramips/dts/mt7621_yuncore_ax820.dts | 12 +++++++++++-
- 1 file changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/target/linux/ramips/dts/mt7621_yuncore_ax820.dts b/target/linux/ramips/dts/mt7621_yuncore_ax820.dts
-index b2f55b9be0..cc1b59340b 100644
---- a/target/linux/ramips/dts/mt7621_yuncore_ax820.dts
-+++ b/target/linux/ramips/dts/mt7621_yuncore_ax820.dts
-@@ -120,7 +120,17 @@
- 			partition@90000 {
- 				compatible = "denx,uimage";
- 				label = "firmware";
--				reg = <0x90000 0xf60000>;
-+				reg = <0x90000 0xf40000>;
-+			};
-+
-+			partition@fd0000 {
-+				label = "insta1";
-+				reg = <0xfd0000 0x10000>;
-+			};
-+
-+			partition@fe0000 {
-+				label = "insta2";
-+				reg = <0xfe0000 0x10000>;
- 			};
- 
- 			partition@ff0000 {
--- 
-2.34.1
-

patches/0099-elfutils-fix-build-with-GCC11.patch

@@ -1,26 +0,0 @@
-From b82a8514a3f52b91ec84f703ef92740dda19d5d9 Mon Sep 17 00:00:00 2001
-From: John Crispin <john@phrozen.org>
-Date: Thu, 14 Aug 2025 10:29:29 +0200
-Subject: [PATCH] elfutils: fix build with GCC11
-
-Signed-off-by: John Crispin <john@phrozen.org>
----
- package/libs/elfutils/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/package/libs/elfutils/Makefile b/package/libs/elfutils/Makefile
-index f7364c36be..76112c89ff 100644
---- a/package/libs/elfutils/Makefile
-+++ b/package/libs/elfutils/Makefile
-@@ -87,7 +87,7 @@ TARGET_CFLAGS += \
- 	-Wno-unused-result \
- 	-Wno-format-nonliteral
- 
--ifneq ($(CONFIG_GCC_USE_VERSION_11),y)
-+ifneq ($(CONFIG_GCC_VERSION_11),y)
- TARGET_CFLAGS += \
- 	-Wno-error=use-after-free
- endif
--- 
-2.34.1
-

patches/0099-wireless-regdb-fix-channel-14-in-JP.patch

@@ -1,39 +0,0 @@
-From d0a0f0304f292a40f2fcdd20b320089627b0f05f Mon Sep 17 00:00:00 2001
-From: John Crispin <john@phrozen.org>
-Date: Thu, 7 Aug 2025 14:50:51 +0200
-Subject: [PATCH] wireless-regdb: fix channel 14 in JP
-
-Signed-off-by: John Crispin <john@phrozen.org>
----
- .../patches/200-jp-no-channel-14.patch        | 19 +++++++++++++++++++
- 1 file changed, 19 insertions(+)
- create mode 100644 package/firmware/wireless-regdb/patches/200-jp-no-channel-14.patch
-
-diff --git a/package/firmware/wireless-regdb/patches/200-jp-no-channel-14.patch b/package/firmware/wireless-regdb/patches/200-jp-no-channel-14.patch
-new file mode 100644
-index 0000000000..ea1411cfdd
---- /dev/null
-+++ b/package/firmware/wireless-regdb/patches/200-jp-no-channel-14.patch
-@@ -0,0 +1,19 @@
-+--- a/db.txt
-++++ b/db.txt
-+@@ -16,8 +16,6 @@ country 00:
-+ 	(2402 - 2472 @ 40), (20)
-+ 	# Channel 12 - 13.
-+ 	(2457 - 2482 @ 20), (20), NO-IR, AUTO-BW
-+-	# Channel 14. Only JP enables this and for 802.11b only
-+-	(2474 - 2494 @ 20), (20), NO-IR, NO-OFDM
-+ 	# Channel 36 - 48
-+ 	(5170 - 5250 @ 80), (20), AUTO-BW
-+ 	# Channel 52 - 64
-+@@ -945,7 +943,6 @@ country JO: DFS-JP
-+ # https://www.soumu.go.jp/main_content/000833682.pdf
-+ country JP: DFS-JP
-+ 	(2402 - 2482 @ 40), (20)
-+-	(2474 - 2494 @ 20), (20), NO-OFDM
-+ 	(4910 - 4990 @ 40), (23)
-+ 	(5170 - 5250 @ 80), (20), AUTO-BW
-+ 	(5250 - 5330 @ 80), (20), DFS, AUTO-BW
--- 
-2.34.1
-

profiles/edgecore_spw2ac1200.yml

@@ -1,12 +0,0 @@
----
-profile: edgecore_spw2ac1200
-target: ipq40xx
-subtarget: generic
-description: Build image for the Edgecore spw2ac1200
-image: bin/targets/ipq40xx/generic/openwrt-ipq40xx-generic-edgecore_spw2ac1200-squashfs-nand-sysupgrade.bin
-packages:
-  - ipq40xx
-include:
-  - ucentral-ap
-  - hostapd
-  - target-ipq40xx

profiles/emplus_wap7635.yml

@@ -1,22 +0,0 @@
----
-profile: emplus_wap7635
-target: ipq53xx
-subtarget: generic
-description: Build image for the EMPLUS WAP7635
-image: bin/targets/ipq53xx/generic/openwrt-ipq53xx-emplus_wap7635-squashfs-sysupgrade.tar
-feeds:
-  - name: qca
-    path: ../../feeds/qca-wifi-7
-include:
-  - ucentral-ap
-packages:
-  - ipq53xx
-  - qca-ssdk-shell
-  - iperf3
-  - jq
-  - sysstat
-  - tree
-diffconfig: |
-  CONFIG_KERNEL_IPQ_MEM_PROFILE=0
-  CONFIG_BUSYBOX_CUSTOM=y
-  CONFIG_BUSYBOX_CONFIG_PSTREE=y

profiles/hfcl_ion4.yml

@@ -1,12 +0,0 @@
----
-profile: hfcl_ion4
-target: ipq40xx
-subtarget: generic
-description: Build image for the HFCL ION4
-image: bin/targets/ipq40xx/generic/openwrt-ipq40xx-generic-hfcl_ion4-squashfs-nand-sysupgrade.bin
-packages:
-  - ipq40xx
-include:
-  - ucentral-ap
-  - hostapd
-  - target-ipq40xx