hostapd: fix MAC overlap with MBSSID enabled

Reverse byte order in non-OUI part of MAC address to prevent overlap
when MBSSID is enabled. Swaps bytes 3 and 5 and masks lower nibble
of byte 5 before applying index XOR.

Signed-off-by: John Crispin <john@phrozen.org>

feeds/ipq807x_v5.4/ath11k-wifi/Makefile

@@ -47,6 +47,7 @@ ALLWIFIBOARDS:= \
 	indio-um-310ax-v1 \
 	indio-um-510axp-v1 \
 	indio-um-510axm-v1 \
+	indio-um-325ax-v2 \
 	muxi-ap3220l \
 	plasmacloud-pax1800 \
 	wallys-dr5018 \
@@ -441,6 +442,7 @@ $(eval $(call generate-ath11k-wifi-package,liteon-wpx8324,Liteon WPX8324))
 $(eval $(call generate-ath11k-wifi-package,indio-um-310ax-v1,Indio UM-310AX V1))
 $(eval $(call generate-ath11k-wifi-package,indio-um-510axp-v1,Indio UM-510AXP V1))
 $(eval $(call generate-ath11k-wifi-package,indio-um-510axm-v1,Indio UM-510AXM V1))
+$(eval $(call generate-ath11k-wifi-package,indio-um-325ax-v2,Indio UM-325AX V2))
 $(eval $(call generate-ath11k-wifi-package,sonicfi-rap630c-311g,Sonicfi RAP630C 311G))
 $(eval $(call generate-ath11k-wifi-package,sonicfi-rap630w-311g,Sonicfi RAP630W 311G))
 $(eval $(call generate-ath11k-wifi-package,sonicfi-rap630w-312g,Sonicfi RAP630W 312G))

feeds/ipq807x_v5.4/ipq50xx/base-files/etc/board.d/01_leds

@@ -16,6 +16,12 @@ edgecore,eap104)
 	ucidef_set_led_netdev "wan" "wan" "yellow:uplink" "eth0"
         ucidef_set_led_default "power" "POWER" "green:power" "on"
 	;;
+indio,um-325ax-v2)
+	ucidef_set_led_wlan "wlan2g" "WLAN2G" "green:wifi2" "phy0tpt"
+	ucidef_set_led_wlan "wlan5g" "WLAN5G" "green:wifi5" "phy1tpt"
+	ucidef_set_led_netdev "wan" "wan" "yellow:uplink" "eth0"
+        ucidef_set_led_default "power" "POWER" "green:power" "on"
+	;;
 cig,wf186h|\
 cig,wf186w)
         ucidef_set_led_default "power" "POWER" "green:status" "on"

feeds/ipq807x_v5.4/ipq50xx/base-files/etc/board.d/02_network

@@ -48,6 +48,12 @@ qcom_setup_interfaces()
 		ucidef_add_switch "switch1" \
 			"6u@eth1" "1:lan" "2:lan" "3:lan" "4:lan"
 		;;
+	indio,um-325ax-v2)
+		ucidef_set_interface_wan "eth1"
+		ucidef_set_interface_lan "eth0"
+		ucidef_add_switch "switch1" \
+			"6@eth1" "1:lan" "2:lan" "3:lan" "4:lan"
+		;;
 	emplus,wap385c|\
 	hfcl,ion4x_w|\
 	hfcl,ion4xi_w)

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

@@ -142,6 +142,7 @@ ath11k/IPQ5018/hw1.0/caldata.bin)
 	emplus,wap385c|\
 	hfcl,ion4x_w|\
 	hfcl,ion4xi_w|\
+	indio,um-325ax-v2|\
 	optimcloud,d60|\
 	optimcloud,d60-5g|\
 	optimcloud,d50|\
@@ -183,6 +184,7 @@ ath11k/qcn6122/hw1.0/caldata_1.bin)
 	;;
 ath11k/qcn6122/hw1.0/caldata_2.bin)
 	case "$board" in
+	indio,um-325ax-v2|\
 	wallys,dr5018|\
 	edgecore,eap104|\
 	edgecore,oap101-6e|\
@@ -234,6 +236,7 @@ ath11k-macs)
 	edgecore,oap101|\
 	edgecore,oap101-6e|\
 	edgecore,oap101e-6e|\
+	indio,um-325ax-v2|\
 	optimcloud,d60|\
 	optimcloud,d60-5g|\
 	optimcloud,d50|\

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

@@ -81,6 +81,7 @@ platform_check_image() {
 	wallys,dr5018|\
 	hfcl,ion4x_w|\
 	hfcl,ion4xi_w|\
+	indio,um-325ax-v2|\
 	optimcloud,d60|\
 	optimcloud,d60-5g|\
 	optimcloud,d50|\
@@ -107,6 +108,7 @@ platform_do_upgrade() {
 
 	board=$(board_name)
 	case $board in
+	indio,um-325ax-v2|\
 	edgecore,oap101|\
 	edgecore,oap101-6e|\
 	edgecore,oap101e|\

feeds/ipq807x_v5.4/ipq50xx/files/arch/arm64/boot/dts/qcom/qcom-ipq5018-indio-um-325ax-v2.dts

@@ -0,0 +1,941 @@
+/dts-v1/;
+/* Copyright (c) 2018-2020, The Linux Foundation. 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.
+ */
+
+#include "ipq5018.dtsi"
+#include <dt-bindings/input/input.h>
+
+/ {
+	#address-cells = <0x2>;
+	#size-cells = <0x2>;
+	model = "Indio UM-325AX V2";
+	compatible = "indio,um-325ax-v2", "qcom,ipq5018-mp03.5-c1", "qcom,ipq5018";
+	interrupt-parent = <&intc>;
+
+	aliases {
+		sdhc1 = &sdhc_1; /* SDC1 eMMC slot */
+		serial0 = &blsp1_uart1;
+		serial1 = &blsp1_uart2;
+		ethernet0 = "/soc/dp1";
+		ethernet1 = "/soc/dp2";
+                //led-failsafe = &led_red;
+                //led-running = &led_green;
+                //led-upgrade = &led_green;
+                //led-gateway = &led_blue;
+                //led-factory = &led_blue;
+	};
+
+	chosen {
+		bootargs = "console=ttyMSM0,115200,n8 rw init=/init";
+	#ifdef __IPQ_MEM_PROFILE_256_MB__
+		bootargs-append = " swiotlb=1";
+	#else
+		bootargs-append = " swiotlb=1 coherent_pool=2M";
+	#endif
+		stdout-path = "serial0";
+	};
+
+	reserved-memory {
+	#ifdef __IPQ_MEM_PROFILE_256_MB__
+	/*                   256 MB Profile
+	 * +==========+==============+=========================+
+	 * |          |              |                         |
+	 * |  Region  | Start Offset |          Size           |
+	 * |          |              |                         |
+	 * +----------+--------------+-------------------------+
+	 * |    NSS   |  0x40000000  |           8MB           |
+	 * +----------+--------------+-------------------------+
+	 * |   Linux  |  0x40800000  | Depends on total memory |
+	 * +----------+--------------+-------------------------+
+	 * |   uboot  |  0x4A600000  |           4MB           |
+	 * +----------+--------------+-------------------------+
+	 * |    SBL   |  0x4AA00000  |           1MB           |
+	 * +----------+--------------+-------------------------+
+	 * |   smem   |  0x4AB00000  |           1MB           |
+	 * +----------+--------------+-------------------------+
+	 * |    TZ    |  0x4AC00000  |           4MB           |
+	 * +----------+--------------+-------------------------+
+	 * |    Q6    |              |                         |
+	 * |   code/  |  0x4B000000  |          20MB           |
+	 * |   data   |              |                         |
+	 * +----------+--------------+-------------------------+
+	 * |  IPQ5018 |              |                         |
+	 * |   data   |  0x4C400000  |          13MB           |
+	 * +----------+--------------+-------------------------+
+	 * |  IPQ5018 |              |                         |
+	 * |  M3 Dump |  0x4D100000  |           1MB           |
+	 * +----------+--------------+-------------------------+
+	 * |  IPQ5018 |              |                         |
+	 * |   QDSS   |  0x4D200000  |           1MB           |
+	 * +----------+--------------+-------------------------+
+	 * | QCN6122_1|              |                         |
+	 * |   data   |  0x4D300000  |          15MB           |
+	 * +----------+--------------+-------------------------+
+	 * | QCN6122_1|              |                         |
+	 * |  M3 Dump |  0x4E200000  |           1MB           |
+	 * +----------+--------------+-------------------------+
+	 * | QCN6122_1|              |                         |
+	 * |   QDSS   |  0x4E300000  |           1MB           |
+	 * +----------+--------------+-------------------------+
+	 * | QCN6122_2|              |                         |
+	 * |   data   |  0x4E400000  |          15MB           |
+	 * +----------+--------------+-------------------------+
+	 * | QCN6122_2|              |                         |
+	 * |  M3 Dump |  0x4F300000  |           1MB           |
+	 * +----------+--------------+-------------------------+
+	 * | QCN6122_2|              |                         |
+	 * |   QDSS   |  0x4F400000  |           1MB           |
+	 * +----------+--------------+-------------------------+
+	 * |                                                   |
+	 * |            Rest of the memory for Linux           |
+	 * |                                                   |
+	 * +===================================================+
+	 */
+		q6_mem_regions: q6_mem_regions@4B000000 {
+			no-map;
+			reg = <0x0 0x4B000000 0x0 0x4500000>;
+		};
+
+		q6_code_data: q6_code_data@4B000000 {
+			no-map;
+			reg = <0x0 0x4B000000 0x0 0x1400000>;
+		};
+
+		q6_ipq5018_data: q6_ipq5018_data@4C400000 {
+			no-map;
+			reg = <0x0 0x4C400000 0x0 0xD00000>;
+		};
+
+		m3_dump: m3_dump@4D100000 {
+			no-map;
+			reg = <0x0 0x4D100000 0x0 0x100000>;
+		};
+
+		q6_etr_region: q6_etr_dump@4D200000 {
+			no-map;
+			reg = <0x0 0x4D200000 0x0 0x100000>;
+		};
+
+		q6_qcn6122_data1: q6_qcn6122_data1@4D300000 {
+			no-map;
+			reg = <0x0 0x4D300000 0x0 0xF00000>;
+		};
+
+		m3_dump_qcn6122_1: m3_dump_qcn6122_1@4E200000 {
+			no-map;
+			reg = <0x0 0x4E200000 0x0 0x100000>;
+		};
+
+		q6_qcn6122_etr_1: q6_qcn6122_etr_1@4E300000 {
+			no-map;
+			reg = <0x0 0x4E300000 0x0 0x100000>;
+		};
+
+		q6_qcn6122_data2: q6_qcn6122_data2@4E400000 {
+			no-map;
+			reg = <0x0 0x4E400000 0x0 0xF00000>;
+		};
+
+		m3_dump_qcn6122_2: m3_dump_qcn6122_2@4F300000 {
+			no-map;
+			reg = <0x0 0x4F300000 0x0 0x100000>;
+		};
+
+		q6_qcn6122_etr_2: q6_qcn6122_etr_2@4F400000 {
+			no-map;
+			reg = <0x0 0x4F400000 0x0 0x100000>;
+		};
+		
+	#else
+	/*                 512MB/1GB Profiles
+	 * +==========+==============+=========================+
+	 * |          |              |                         |
+	 * |  Region  | Start Offset |          Size           |
+	 * |          |              |                         |
+	 * +----------+--------------+-------------------------+
+	 * |    NSS   |  0x40000000  |          16MB           |
+	 * +----------+--------------+-------------------------+
+	 * |   Linux  |  0x41000000  | Depends on total memory |
+	 * +----------+--------------+-------------------------+
+	 * |   uboot  |  0x4A600000  |           4MB           |
+	 * +----------+--------------+-------------------------+
+	 * |    SBL   |  0x4AA00000  |           1MB           |
+	 * +----------+--------------+-------------------------+
+	 * |   smem   |  0x4AB00000  |           1MB           |
+	 * +----------+--------------+-------------------------+
+	 * |    TZ    |  0x4AC00000  |           4MB           |
+	 * +----------+--------------+-------------------------+
+	 * |    Q6    |              |                         |
+	 * |   code/  |  0x4B000000  |          20MB           |
+	 * |   data   |              |                         |
+	 * +----------+--------------+-------------------------+
+	 * |  IPQ5018 |              |                         |
+	 * |   data   |  0x4C400000  |          14MB           |
+	 * +----------+--------------+-------------------------+
+	 * |  IPQ5018 |              |                         |
+	 * |  M3 Dump |  0x4D200000  |           1MB           |
+	 * +----------+--------------+-------------------------+
+	 * |  IPQ5018 |              |                         |
+	 * |   QDSS   |  0x4D300000  |           1MB           |
+	 * +----------+--------------+-------------------------+
+	 * |  IPQ5018 |              |                         |
+	 * |  Caldb   |  0x4D400000  |           2MB           |
+	 * +----------+--------------+-------------------------+
+	 * | QCN6122_1|              |                         |
+	 * |   data   |  0x4D600000  |          16MB           |
+	 * +----------+--------------+-------------------------+
+	 * | QCN6122_1|              |                         |
+	 * |  M3 Dump |  0x4E600000  |           1MB           |
+	 * +----------+--------------+-------------------------+
+	 * | QCN6122_1|              |                         |
+	 * |   QDSS   |  0x4E700000  |           1MB           |
+	 * +----------+--------------+-------------------------+
+	 * | QCN6122_1|              |                         |
+	 * |  Caldb   |  0x4E800000  |           5MB           |
+	 * +----------+--------------+-------------------------+
+	 * | QCN6122_2|              |                         |
+	 * |   data   |  0x4ED00000  |          16MB           |
+	 * +----------+--------------+-------------------------+
+	 * | QCN6122_2|              |                         |
+	 * |  M3 Dump |  0x4FD00000  |           1MB           |
+	 * +----------+--------------+-------------------------+
+	 * | QCN6122_2|              |                         |
+	 * |   QDSS   |  0x4FE00000  |           1MB           |
+	 * +----------+--------------+-------------------------+
+	 * | QCN6122_2|              |                         |
+	 * |  Caldb   |  0x4FF00000  |           5MB           |
+	 * +----------+--------------+-------------------------+
+	 * |                                                   |
+	 * |            Rest of the memory for Linux           |
+	 * |                                                   |
+	 * +===================================================+
+	 */
+		q6_mem_regions: q6_mem_regions@4B000000 {
+			no-map;
+			reg = <0x0 0x4B000000 0x0 0x5400000>;
+		};
+
+		q6_code_data: q6_code_data@4B000000 {
+			no-map;
+			reg = <0x0 0x4B000000 0x0 01400000>;
+		};
+
+		q6_ipq5018_data: q6_ipq5018_data@4C400000 {
+			no-map;
+			reg = <0x0 0x4C400000 0x0 0xE00000>;
+		};
+
+		m3_dump: m3_dump@4D200000 {
+			no-map;
+			reg = <0x0 0x4D200000 0x0 0x100000>;
+		};
+
+		q6_etr_region: q6_etr_dump@4D300000 {
+			no-map;
+			reg = <0x0 0x4D300000 0x0 0x100000>;
+		};
+
+		q6_caldb_region: q6_caldb_region@4D400000 {
+			no-map;
+			reg = <0x0 0x4D400000 0x0 0x200000>;
+		};
+
+		q6_qcn6122_data1: q6_qcn6122_data1@4D600000 {
+			no-map;
+			reg = <0x0 0x4D600000 0x0 0x1000000>;
+		};
+
+		m3_dump_qcn6122_1: m3_dump_qcn6122_1@4E600000 {
+			no-map;
+			reg = <0x0 0x4E600000 0x0 0x100000>;
+		};
+
+		q6_qcn6122_etr_1: q6_qcn6122_etr_1@4E700000 {
+			no-map;
+			reg = <0x0 0x4E700000 0x0 0x100000>;
+		};
+
+		q6_qcn6122_caldb_1: q6_qcn6122_caldb_1@4E800000 {
+			no-map;
+			reg = <0x0 0x4E800000 0x0 0x500000>;
+		};
+
+		q6_qcn6122_data2: q6_qcn6122_data2@4E900000 {
+			no-map;
+			reg = <0x0 0x4ED00000 0x0 0x1000000>;
+		};
+
+		m3_dump_qcn6122_2: m3_dump_qcn6122_2@4FD00000 {
+			no-map;
+			reg = <0x0 0x4FD00000 0x0 0x100000>;
+		};
+
+		q6_qcn6122_etr_2: q6_qcn6122_etr_2@4FE00000 {
+			no-map;
+			reg = <0x0 0x4FE00000 0x0 0x100000>;
+		};
+
+		q6_qcn6122_caldb_2: q6_qcn6122_caldb_2@4FF00000 {
+			no-map;
+			reg = <0x0 0x4FF00000 0x0 0x500000>;
+		};
+
+	#endif
+	};
+
+	soc {
+		gpio-watchdog {
+			compatible = "linux,wdt-gpio";
+			gpios = <&tlmm 27 GPIO_ACTIVE_LOW>;
+			hw_algo = "toggle";
+			hw_margin_ms = <5000>;
+			always-running;
+		};
+
+		serial@78af000 {
+			status = "ok";
+		};
+
+		blsp1_uart2: serial@78b0000 {
+			pinctrl-0 = <&blsp1_uart_pins>;
+			pinctrl-names = "default";
+		};
+
+		qpic_bam: dma@7984000{
+			status = "ok";
+		};
+
+		nand: qpic-nand@79b0000 {
+			pinctrl-0 = <&qspi_nand_pins>;
+			pinctrl-names = "default";
+			status = "ok";
+		};
+
+		spi_0: spi@78b5000 { /* BLSP1 QUP0 */
+			pinctrl-0 = <&blsp0_spi_pins>;
+			pinctrl-names = "default";
+			cs-select = <0>;
+			status = "ok";
+
+			m25p80@0 {
+				#address-cells = <1>;
+				#size-cells = <1>;
+				reg = <0>;
+				compatible = "n25q128a11";
+				linux,modalias = "m25p80", "n25q128a11";
+				spi-max-frequency = <50000000>;
+				use-default-sizes;
+			};
+		};
+
+		mdio0: mdio@88000 {
+			status = "ok";
+
+			ethernet-phy@0 {
+				reg = <7>;
+			};
+		};
+
+		mdio1: mdio@90000 {
+			status = "ok";
+			pinctrl-0 = <&mdio1_pins>;
+			pinctrl-names = "default";
+			phy-reset-gpio = <&tlmm 39 0>;
+
+			ethernet-phy@0 {
+				reg = <28>;
+			};
+		};
+
+		ess-instance {
+			num_devices = <0x1>;
+			ess-switch@0x39c00000 {
+				switch_mac_mode = <0xf>; /* mac mode for uniphy instance*/
+				cmnblk_clk = "internal_96MHz"; /* cmnblk clk*/
+				qcom,port_phyinfo {
+					port@0 {
+						port_id = <1>;
+						phy_address = <7>;
+						mdiobus = <&mdio0>;
+					};
+					port@1 {
+						port_id = <2>;
+						phy_address = <0x1c>;
+						mdiobus = <&mdio1>;
+						port_mac_sel = "QGMAC_PORT";
+					};
+				};
+				led_source@0 {
+					source = <0>;
+					mode = "normal";
+					speed = "all";
+					blink_en = "enable";
+					active = "high";
+				};
+			};
+				ess-switch1@1 {
+				compatible = "qcom,ess-switch-qca83xx";
+				device_id = <1>;
+				switch_access_mode = "mdio";
+				mdio-bus = <&mdio1>;
+				reset_gpio = <0x28>;
+				switch_cpu_bmp = <0x40>;  /* cpu port bitmap */
+				switch_lan_bmp = <0x1e>; /* lan port bitmap */
+				switch_wan_bmp = <0x0>;  /* wan port bitmap */
+				qca,ar8327-initvals = <
+						0x00004 0x7600000   /* PAD0_MODE */
+						0x00008 0x1000000   /* PAD5_MODE */
+						0x0000c 0x80        /* PAD6_MODE */
+						0x00010 0x2613a0    /* PORT6 FORCE MODE*/
+						0x000e4 0xaa545     /* MAC_POWER_SEL */
+						0x000e0 0xc74164de  /* SGMII_CTRL */
+						0x0007c 0x4e        /* PORT0_STATUS */
+						0x00094 0x4e        /* PORT6_STATUS */
+				>;
+				qcom,port_phyinfo {
+					port@0 {
+						port_id = <1>;
+						phy_address = <28>;
+					};
+				};
+			};
+		};
+
+		dp1 {
+			device_type = "network";
+			compatible = "qcom,nss-dp";
+			clocks = <&gcc GCC_SNOC_GMAC0_AXI_CLK>;
+			clock-names = "nss-snoc-gmac-axi-clk";
+			qcom,id = <1>;
+			reg = <0x39C00000 0x10000>;
+			interrupts = <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>;
+			qcom,mactype = <2>;
+			qcom,link-poll = <1>;
+			qcom,phy-mdio-addr = <7>;
+			mdio-bus = <&mdio0>;
+			local-mac-address = [000000000000];
+			phy-mode = "sgmii";
+		};
+
+		dp2 {
+			device_type = "network";
+			compatible = "qcom,nss-dp";
+			clocks = <&gcc GCC_SNOC_GMAC1_AXI_CLK>;
+			clock-names = "nss-snoc-gmac-axi-clk";
+			qcom,id = <2>;
+			reg = <0x39D00000 0x10000>;
+			interrupts = <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>;
+			qcom,mactype = <2>;
+			qcom,link-poll = <1>;
+			qcom,phy-mdio-addr = <28>;
+			mdio-bus = <&mdio1>;
+			local-mac-address = [000000000000];
+			phy-mode = "sgmii";
+		};
+
+		qcom,test@0 {
+			status = "ok";
+		};
+
+		nss-macsec1 {
+			compatible = "qcom,nss-macsec";
+			phy_addr = <0x1c>;
+			mdiobus = <&mdio1>;
+		};
+
+		lpass: lpass@0xA000000{
+			status = "disabled";
+		};
+
+		pcm: pcm@0xA3C0000{
+			pinctrl-0 = <&audio_pins>;
+			pinctrl-names = "default";
+			status = "disabled";
+		};
+
+		pcm_lb: pcm_lb@0 {
+			status = "disabled";
+		};
+	};
+
+	thermal-zones {
+		status = "ok";
+	};
+
+};
+
+&tlmm {
+	pinctrl-0 = <&blsp0_uart_pins &phy_led_pins>;
+	pinctrl-names = "default";
+
+	blsp0_uart_pins: uart_pins {
+		blsp0_uart_rx_tx {
+			pins = "gpio20", "gpio21";
+			function = "blsp0_uart0";
+			bias-disable;
+		};
+	};
+
+	blsp1_uart_pins: blsp1_uart_pins {
+		blsp1_uart_rx_tx {
+			pins = "gpio22", "gpio24", "gpio23", "gpio25";
+			function = "blsp1_uart2";
+			bias-disable;
+		};
+	};
+
+	blsp0_spi_pins: blsp0_spi_pins {
+		mux {
+			pins = "gpio10", "gpio11", "gpio12", "gpio13";
+			function = "blsp0_spi";
+			drive-strength = <2>;
+			bias-disable;
+		};
+	};
+
+	qspi_nand_pins: qspi_nand_pins {
+		qspi_clock {
+			pins = "gpio9";
+			function = "qspi_clk";
+			drive-strength = <8>;
+			bias-disable;
+		};
+		qspi_cs {
+			pins = "gpio8";
+			function = "qspi_cs";
+			drive-strength = <8>;
+			bias-disable;
+		};
+		qspi_data_0 {
+			pins = "gpio7";
+			function = "qspi0";
+			drive-strength = <8>;
+			bias-disable;
+		};
+		qspi_data_1 {
+			pins = "gpio6";
+			function = "qspi1";
+			drive-strength = <8>;
+			bias-disable;
+		};
+		qspi_data_2 {
+			pins = "gpio5";
+			function = "qspi2";
+			drive-strength = <8>;
+			bias-disable;
+		};
+		qspi_data_3 {
+			pins = "gpio4";
+			function = "qspi3";
+			drive-strength = <8>;
+			bias-disable;
+		};
+	};
+
+	mdio1_pins: mdio_pinmux {
+		mux_0 {
+			pins = "gpio36";
+			function = "mdc";
+			drive-strength = <8>;
+			bias-pull-up;
+		};
+
+		mux_1 {
+			pins = "gpio37";
+			function = "mdio";
+			drive-strength = <8>;
+			bias-pull-up;
+		};
+	};
+
+	phy_led_pins: phy_led_pins {
+		gephy_led_pin {
+			pins = "gpio46";
+			function = "led0";
+			drive-strength = <8>;
+			bias-pull-down;
+		};
+	};
+
+	i2c_pins: i2c_pins {
+		i2c_scl {
+			pins = "gpio25";
+			function = "blsp2_i2c1";
+			drive-strength = <8>;
+			bias-disable;
+		};
+
+		i2c_sda {
+			pins = "gpio26";
+			function = "blsp2_i2c1";
+			drive-strength = <8>;
+			bias-disable;
+		};
+	};
+
+	button_pins: button_pins {
+		reset_button {
+			pins = "gpio38";
+			function = "gpio";
+			drive-strength = <8>;
+			bias-pull-up;
+		};
+	};
+audio_pins: audio_pinmux {
+};
+        leds_pins: leds_pins {
+                led_5g {
+                        pins = "gpio34";
+                        function = "gpio";
+                        drive-strength = <8>;
+                        bias-pull-down;
+                };
+                led_2g {
+                        pins = "gpio33";
+                        function = "gpio";
+                        drive-strength = <8>;
+                        bias-pull-down;
+                };
+                led_sys {
+                        pins = "gpio26";
+                        function = "gpio";
+                        drive-strength = <8>;
+                        bias-pull-down;
+                };
+		led_onekey {
+                        pins = "gpio28";
+                        function = "gpio";
+                        drive-strength = <8>;
+                        bias-pull-down;
+                };
+        };
+};
+
+&soc {
+	gpio_keys {
+		compatible = "gpio-keys";
+		pinctrl-0 = <&button_pins>;
+		pinctrl-names = "default";
+
+		button@1 {
+			label = "reset";
+			linux,code = <KEY_RESTART>;
+			gpios = <&tlmm 38 GPIO_ACTIVE_LOW>;
+			linux,input-type = <1>;
+			debounce-interval = <60>;
+		};
+	};
+
+        leds {
+                compatible = "gpio-leds";
+                pinctrl-0 = <&leds_pins>;
+                pinctrl-names = "default";
+
+                led_blue: led@34 {
+                        label = "led_5g";
+                        gpios = <&tlmm 34 GPIO_ACTIVE_LOW>;
+                        linux,default-trigger = "led_5g";
+                        default-state = "off";
+                };
+                led_green: led@33 {
+                        label = "led_2g";
+                        gpios = <&tlmm 33 GPIO_ACTIVE_LOW>;
+                        linux,default-trigger = "led_2g";
+                        default-state = "off";
+                };
+                led_red: led@26 {
+                        label = "led_sys";
+                        gpios = <&tlmm 26 GPIO_ACTIVE_LOW>;
+                        linux,default-trigger = "led_sys";
+                        default-state = "off";
+                };
+		led@28 {
+                        label = "led_onekey";
+                        gpios = <&tlmm 28 GPIO_ACTIVE_LOW>;
+                        linux,default-trigger = "led_onekey";
+                        default-state = "off";
+                };
+        };
+};
+
+&q6v5_wcss {
+	compatible = "qcom,ipq5018-q6-mpd";
+	#address-cells = <1>;
+	#size-cells = <1>;
+	ranges;
+	firmware = "IPQ5018/q6_fw.mdt";
+	reg = <0x0cd00000 0x4040>,
+		<0x1938000 0x8>,
+		<0x193d204 0x4>;
+	reg-names = "qdsp6",
+			"tcsr-msip",
+			"tcsr-q6";
+	resets = <&gcc GCC_WCSSAON_RESET>,
+			<&gcc GCC_WCSS_Q6_BCR>;
+
+	reset-names = "wcss_aon_reset",
+			"wcss_q6_reset";
+
+	clocks = <&gcc GCC_Q6_AXIS_CLK>,
+		<&gcc GCC_WCSS_ECAHB_CLK>,
+		<&gcc GCC_Q6_AXIM_CLK>,
+		<&gcc GCC_Q6_AXIM2_CLK>,
+		<&gcc GCC_Q6_AHB_CLK>,
+		<&gcc GCC_Q6_AHB_S_CLK>,
+		<&gcc GCC_WCSS_AXI_S_CLK>;
+	clock-names = "gcc_q6_axis_clk",
+		"gcc_wcss_ecahb_clk",
+		"gcc_q6_axim_clk",
+		"gcc_q6_axim2_clk",
+		"gcc_q6_ahb_clk",
+		"gcc_q6_ahb_s_clk",
+		"gcc_wcss_axi_s_clk";
+
+	#ifdef __IPQ_MEM_PROFILE_256_MB__
+		memory-region = <&q6_mem_regions>, <&q6_etr_region>;
+	#else
+		memory-region = <&q6_mem_regions>, <&q6_etr_region>,
+				<&q6_caldb_region>;
+	#endif
+
+	qcom,rproc = <&q6v5_wcss>;
+	qcom,bootargs_smem = <507>;
+	boot-args = <0x1 0x4 0x3 0x0F 0x0 0x0>,
+			<0x2 0x4 0x2 0x12 0x0 0x0>;
+	status = "ok";
+	q6_wcss_pd1: remoteproc_pd1@4ab000 {
+		compatible = "qcom,ipq5018-wcss-ahb-mpd";
+		reg = <0x4ab000 0x20>;
+		reg-names = "rmb";
+		firmware = "IPQ5018/q6_fw.mdt";
+		m3_firmware = "IPQ5018/m3_fw.mdt";
+		interrupts-extended = <&wcss_smp2p_in 8 0>,
+					<&wcss_smp2p_in 9 0>,
+					<&wcss_smp2p_in 12 0>,
+					<&wcss_smp2p_in 11 0>;
+		interrupt-names = "fatal",
+					"ready",
+					"spawn-ack",
+					"stop-ack";
+
+		resets = <&gcc GCC_WCSSAON_RESET>,
+				<&gcc GCC_WCSS_BCR>,
+				<&gcc GCC_CE_BCR>;
+		reset-names = "wcss_aon_reset",
+				"wcss_reset",
+				"ce_reset";
+
+		clocks = <&gcc GCC_WCSS_AHB_S_CLK>,
+				<&gcc GCC_WCSS_ACMT_CLK>,
+				<&gcc GCC_WCSS_AXI_M_CLK>;
+		clock-names = "gcc_wcss_ahb_s_clk",
+					"gcc_wcss_acmt_clk",
+					"gcc_wcss_axi_m_clk";
+
+		qcom,halt-regs = <&tcsr_q6_block 0xa000 0xd000 0x0>;
+
+		qcom,smem-states = <&wcss_smp2p_out 8>,
+					<&wcss_smp2p_out 9>,
+					<&wcss_smp2p_out 10>;
+		qcom,smem-state-names = "shutdown",
+					"stop",
+					"spawn";
+	#ifdef __IPQ_MEM_PROFILE_256_MB__
+		memory-region = <&q6_ipq5018_data>, <&m3_dump>,
+				<&q6_etr_region>;
+	#else
+		memory-region = <&q6_ipq5018_data>, <&m3_dump>,
+				<&q6_etr_region>, <&q6_caldb_region>;
+	#endif
+
+	};
+
+	q6_wcss_pd2: remoteproc_pd2 {
+		compatible = "qcom,ipq5018-wcss-pcie-mpd";
+		firmware = "IPQ5018/q6_fw.mdt";
+		m3_firmware = "qcn6122/m3_fw.mdt";
+		interrupts-extended = <&wcss_smp2p_in 16 0>,
+					<&wcss_smp2p_in 17 0>,
+					<&wcss_smp2p_in 20 0>,
+					<&wcss_smp2p_in 19 0>;
+		interrupt-names = "fatal",
+					"ready",
+					"spawn-ack",
+					"stop-ack";
+
+		qcom,smem-states = <&wcss_smp2p_out 16>,
+					<&wcss_smp2p_out 17>,
+					<&wcss_smp2p_out 18>;
+		qcom,smem-state-names = "shutdown",
+					"stop",
+					"spawn";
+	#ifdef __IPQ_MEM_PROFILE_256_MB__
+		memory-region = <&q6_qcn6122_data1>, <&m3_dump_qcn6122_1>,
+				<&q6_qcn6122_etr_1>;
+	#else
+		memory-region = <&q6_qcn6122_data1>, <&m3_dump_qcn6122_1>,
+				<&q6_qcn6122_etr_1>, <&q6_qcn6122_caldb_1>;
+	#endif
+
+	};
+
+	q6_wcss_pd3: remoteproc_pd3 {
+		compatible = "qcom,ipq5018-wcss-pcie-mpd";
+		firmware = "IPQ5018/q6_fw.mdt";
+		interrupts-extended = <&wcss_smp2p_in 24 0>,
+					<&wcss_smp2p_in 25 0>,
+					<&wcss_smp2p_in 28 0>,
+					<&wcss_smp2p_in 27 0>;
+		interrupt-names = "fatal",
+					"ready",
+					"spawn-ack",
+					"stop-ack";
+
+		qcom,smem-states = <&wcss_smp2p_out 24>,
+					<&wcss_smp2p_out 25>,
+					<&wcss_smp2p_out 26>;
+		qcom,smem-state-names = "shutdown",
+					"stop",
+					"spawn";
+	#ifdef	__IPQ_MEM_PROFILE_256_MB__
+		memory-region = <&q6_qcn6122_data2>, <&m3_dump_qcn6122_2>,
+				<&q6_qcn6122_etr_2>;
+	#else
+		memory-region = <&q6_qcn6122_data2>, <&m3_dump_qcn6122_2>,
+				<&q6_qcn6122_etr_2>, <&q6_qcn6122_caldb_2>;
+	#endif
+	};
+};
+
+&i2c_0 {
+	pinctrl-0 = <&i2c_pins>;
+	pinctrl-names = "default";
+	status = "disabled";
+};
+
+&wifi0 {
+	/* IPQ5018 */
+	qcom,multipd_arch;
+	qcom,rproc = <&q6_wcss_pd1>;
+	qcom,userpd-subsys-name = "q6v5_wcss_userpd1";
+#ifdef __IPQ_MEM_PROFILE_256_MB__
+	qcom,tgt-mem-mode = <2>;
+#else
+	qcom,tgt-mem-mode = <1>;
+#endif
+	qcom,board_id = <0x24>;
+#ifdef __CNSS2__
+	qcom,bdf-addr = <0x4C400000 0x4C400000 0x4C400000 0x0 0x0>;
+	qcom,caldb-addr = <0x4D400000 0x4D400000 0 0 0>;
+	qcom,caldb-size = <0x200000>;
+	mem-region = <&q6_ipq5018_data>;
+#else
+	memory-region = <&q6_ipq5018_data>;
+#endif
+	status = "ok";
+};
+
+&wifi1 {
+	/* QCN6122 5G */
+	qcom,multipd_arch;
+	qcom,userpd-subsys-name = "q6v5_wcss_userpd2";
+	qcom,rproc = <&q6_wcss_pd2>;
+#ifdef __IPQ_MEM_PROFILE_256_MB__
+	qcom,tgt-mem-mode = <2>;
+#else
+	qcom,tgt-mem-mode = <1>;
+#endif
+	qcom,board_id = <0x50>;
+#ifdef __CNSS2__
+	qcom,bdf-addr = <0x4D600000 0x4D600000 0x4D300000 0x0 0x0>;
+	qcom,caldb-addr = <0x4E800000 0x4E800000 0 0 0>;
+	qcom,caldb-size = <0x500000>;
+	mem-region = <&q6_qcn6122_data1>;
+#else
+	memory-region = <&q6_qcn6122_data1>;
+#endif
+	status = "disabled";
+};
+
+&wifi2 {
+	/* QCN6122 6G */
+	qcom,multipd_arch;
+	qcom,userpd-subsys-name = "q6v5_wcss_userpd3";
+	qcom,rproc = <&q6_wcss_pd3>;
+#ifdef __IPQ_MEM_PROFILE_256_MB__
+	qcom,tgt-mem-mode = <2>;
+#else
+	qcom,tgt-mem-mode = <1>;
+#endif
+	qcom,board_id = <0xb0>;
+#ifdef __CNSS2__
+	qcom,bdf-addr = <0x4ED00000 0x4ED00000 0x4E400000 0x0 0x0>;
+	qcom,caldb-addr = <0x4FF00000 0x4FF00000 0 0 0>;
+	qcom,caldb-size = <0x500000>;
+	mem-region = <&q6_qcn6122_data2>;
+#else
+	memory-region = <&q6_qcn6122_data2>;
+#endif
+	status = "ok";
+};
+
+
+&usb3 {
+	status = "ok";
+	device-power-gpio = <&tlmm 24 1>;
+};
+
+&dwc_0 {
+	/delete-property/ #phy-cells;
+	/delete-property/ phys;
+	/delete-property/ phy-names;
+};
+&hs_m31phy_0 {
+	status = "ok";
+};
+
+&eud {
+	status = "ok";
+};
+
+&pcie_x1 {
+	#status = "disabled";
+	#perst-gpio = <&tlmm 18 1>;
+	perst-gpio = <&tlmm 18 GPIO_ACTIVE_LOW>;
+};
+
+&pcie_x2 {
+	#status = "disabled";
+	#perst-gpio = <&tlmm 15 1>;
+	perst-gpio = <&tlmm 15 GPIO_ACTIVE_LOW>;
+};
+
+&pcie_x1_rp {
+        status = "disabled";
+
+	mhi_0: qcom,mhi@0 {
+		reg = <0 0 0 0 0 >;
+	};
+};
+
+&pcie_x2_rp {
+        status = "disabled";
+
+	mhi_1: qcom,mhi@1 {
+		reg = <0 0 0 0 0 >;
+
+	};
+};
+

feeds/ipq807x_v5.4/ipq50xx/files/arch/arm64/boot/dts/qcom/qcom-ipq5018-rap630c-311g.dts

@@ -151,6 +151,14 @@
 			no-map;
 			reg = <0x0 0x4F000000 0x0 0x100000>;
 		};
+
+		ramoops: ramoops@4f100000 {
+			compatible = "ramoops";
+			reg = <0x0 0x4f100000 0x0 0x80000>;
+			record-size = <0x20000>;
+			console-size = <0x20000>;
+			pmsg-size = <0x20000>;
+		};
 	#else
 	/*                 512MB/1GB Profiles
 	 * +==========+==============+=========================+
@@ -285,6 +293,13 @@
 			reg = <0x0 0x4F800000 0x0 0x500000>;
 		};
 
+		ramoops: ramoops@4fd00000 {
+			compatible = "ramoops";
+			reg = <0x0 0x4fd00000 0x0 0x80000>;
+			record-size = <0x20000>;
+			console-size = <0x20000>;
+			pmsg-size = <0x20000>;
+		};
 	#endif
 	};
 

feeds/ipq807x_v5.4/ipq50xx/files/arch/arm64/boot/dts/qcom/qcom-ipq5018-rap630w-311g.dts

@@ -151,6 +151,14 @@
 			no-map;
 			reg = <0x0 0x4F000000 0x0 0x100000>;
 		};
+
+		ramoops: ramoops@4f100000 {
+			compatible = "ramoops";
+			reg = <0x0 0x4f100000 0x0 0x80000>;
+			record-size = <0x20000>;
+			console-size = <0x20000>;
+			pmsg-size = <0x20000>;
+		};
 	#else
 	/*                 512MB/1GB Profiles
 	 * +==========+==============+=========================+
@@ -285,6 +293,13 @@
 			reg = <0x0 0x4F800000 0x0 0x500000>;
 		};
 
+		ramoops: ramoops@4fd00000 {
+			compatible = "ramoops";
+			reg = <0x0 0x4fd00000 0x0 0x80000>;
+			record-size = <0x20000>;
+			console-size = <0x20000>;
+			pmsg-size = <0x20000>;
+		};
 	#endif
 	};
 

feeds/ipq807x_v5.4/ipq50xx/files/arch/arm64/boot/dts/qcom/qcom-ipq5018-rap630w-312g.dts

@@ -154,6 +154,14 @@
 			no-map;
 			reg = <0x0 0x4F000000 0x0 0x100000>;
 		};
+
+		ramoops: ramoops@4f100000 {
+			compatible = "ramoops";
+			reg = <0x0 0x4f100000 0x0 0x80000>;
+			record-size = <0x20000>;
+			console-size = <0x20000>;
+			pmsg-size = <0x20000>;
+		};
 	#else
 	/*		 512MB/1GB Profiles
 	 * +==========+==============+=========================+
@@ -288,6 +296,13 @@
 			reg = <0x0 0x4F800000 0x0 0x500000>;
 		};
 
+		ramoops: ramoops@4fd00000 {
+			compatible = "ramoops";
+			reg = <0x0 0x4fd00000 0x0 0x80000>;
+			record-size = <0x20000>;
+			console-size = <0x20000>;
+			pmsg-size = <0x20000>;
+		};
 	#endif
 	};
 

feeds/ipq807x_v5.4/ipq50xx/image/ipq50xx.mk

@@ -93,6 +93,15 @@ define Device/edgecore_eap104
 endef
 TARGET_DEVICES += edgecore_eap104
 
+define Device/indio_um-325ax-v2
+  DEVICE_TITLE := Indio UM-325ax-V2
+  DEVICE_DTS := qcom-ipq5018-indio-um-325ax-v2
+  SUPPORTED_DEVICES := indio,um-325ax-v2
+  DEVICE_PACKAGES := ath11k-wifi-indio-um-325ax-v2 ath11k-firmware-ipq50xx-spruce ath11k-firmware-qcn6122
+  DEVICE_DTS_CONFIG := config@mp03.5-c1
+endef
+TARGET_DEVICES += indio_um-325ax-v2
+
 define Device/udaya_a6_id2
   DEVICE_TITLE := Udaya A6 - ID2
   DEVICE_DTS := qcom-ipq5018-udaya-a6-id2

feeds/qca-wifi-7/cig-platform-pkg/cig-wifi-mode-sw/Makefile

@@ -24,7 +24,9 @@ endef
 
 define KernelPackage/cig-wifi-mode-sw/install
 	$(INSTALL_DIR) $(1)/usr/sbin/
+	$(INSTALL_DIR) $(1)/etc/init.d/
 	$(INSTALL_BIN) ./files/cig_wifi_mode_sw $(1)/usr/sbin/cig_wms
+	$(INSTALL_BIN) ./files/cig_wifi_mode_boot $(1)/etc/init.d/cig_wmb
 endef
 
 $(eval $(call KernelPackage,cig-wifi-mode-sw))

feeds/qca-wifi-7/cig-platform-pkg/cig-wifi-mode-sw/files/cig_wifi_mode_boot

@@ -0,0 +1,13 @@
+#!/bin/sh /etc/rc.common
+
+START=60
+
+boot(){
+	local bands=$(cat /proc/rf_switch)
+
+	if [ "x$bands" = "x3" ]; then
+		echo "AFC is not ready, switch to 2-band mode" >/dev/console
+		echo 2 > /proc/rf_switch
+		firstboot -y -r
+	fi
+}

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

@@ -259,8 +259,13 @@ const phy_proto = {
 			addr[0] ^= idx << 2;
 			break;
 		case "b5":
-			if (mbssid)
+			if (mbssid) {
+				let b5 = addr[5];
+				addr[5] = addr[3];
+				addr[3] = b5;
+				addr[5] &= ~0xf;
 				addr[0] |= 2;
+			}
 			addr[5] ^= idx;
 			break;
 		default:

feeds/ucentral/ucentral-tools/Makefile

@@ -18,7 +18,7 @@ endef
 
 define Package/ucentral-tools/install
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/{dhcpdiscover,dnsprobe,radiusprobe,ip-collide} $(1)/usr/sbin/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/{dhcpdiscover,dnsprobe,radiusprobe} $(1)/usr/sbin/
 	$(CP) ./files/* $(1)
 endef
 

feeds/ucentral/ucentral-tools/src/.clang-format

@@ -0,0 +1,60 @@
+---
+# clang-format configuration for ucentral-tools
+BasedOnStyle: LLVM
+
+# Indentation
+IndentWidth: 8
+TabWidth: 8
+UseTab: ForIndentation
+IndentCaseLabels: true
+IndentPPDirectives: BeforeHash
+
+# Line length
+ColumnLimit: 100
+
+# Braces
+BreakBeforeBraces: Linux
+Cpp11BracedListStyle: false
+
+# Spacing
+SpaceAfterCStyleCast: true
+SpaceBeforeParens: ControlStatements
+SpaceInEmptyParentheses: false
+SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+
+# Alignment
+AlignConsecutiveAssignments: false
+AlignConsecutiveDeclarations: false
+AlignOperands: true
+AlignTrailingComments: true
+
+# Breaking
+AllowShortBlocksOnASingleLine: false
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: None
+AllowShortIfStatementsOnASingleLine: false
+AllowShortLoopsOnASingleLine: false
+BreakBeforeBinaryOperators: None
+BreakBeforeTernaryOperators: true
+BreakStringLiterals: true
+
+# Pointers and references
+PointerAlignment: Right
+DerivePointerAlignment: false
+
+# Comments
+ReflowComments: true
+
+# Sorting
+SortIncludes: true
+IncludeBlocks: Preserve
+
+# Function calls
+BinPackArguments: true
+BinPackParameters: true
+
+# Other
+KeepEmptyLinesAtTheStartOfBlocks: false
+MaxEmptyLinesToKeep: 2

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

@@ -1,36 +1,108 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 3.10)
 
-PROJECT(openwifi-tools C)
-INCLUDE(GNUInstallDirs)
-ADD_DEFINITIONS(-Os -ggdb -Wall -Werror --std=gnu99 -Wmissing-declarations)
+project(openwifi-tools C)
+include(GNUInstallDirs)
 
-SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "")
+# Set C standard
+set(CMAKE_C_STANDARD 99)
+set(CMAKE_C_STANDARD_REQUIRED ON)
 
-ADD_EXECUTABLE(firstcontact firstcontact.c)
-TARGET_LINK_LIBRARIES(firstcontact curl crypto ssl ubox)
-INSTALL(TARGETS firstcontact
-	RUNTIME DESTINATION ${CMAKE_INSTALL_SBINDIR}
+# Comprehensive warning flags (cross-compilation friendly)
+set(WARNING_FLAGS
+    -Wall
+    -Wextra
+    -Werror
+    -Wformat=2
+    -Wformat-security
+    -Wnull-dereference
+    -Warray-bounds=2
+    -Wimplicit-fallthrough=3
+    -Wshift-overflow=2
+    -Wcast-qual
+    -Wstringop-overflow=4
+    -Wlogical-op
+    -Wduplicated-cond
+    -Wduplicated-branches
+    -Wformat-overflow=2
+    -Wformat-truncation=2
+    -Wmissing-declarations
+    -Wredundant-decls
+    -Wshadow
+    -Wstrict-overflow=4
+    -Wundef
+    -Wstrict-prototypes
+    -Wswitch-default
+    -Wbad-function-cast
+    -Wwrite-strings
+    -Wjump-misses-init
+    -Wold-style-definition
+    -Wmissing-prototypes
 )
 
-ADD_EXECUTABLE(dhcpdiscover dhcpdiscover.c)
-INSTALL(TARGETS dhcpdiscover
-	RUNTIME DESTINATION ${CMAKE_INSTALL_SBINDIR}
+# Security hardening flags (cross-compilation friendly)
+set(SECURITY_FLAGS
+    -fstack-protector-strong
 )
 
-ADD_EXECUTABLE(dnsprobe dnsprobe.c)
-TARGET_LINK_LIBRARIES(dnsprobe ubox resolv)
-INSTALL(TARGETS dnsprobe
-	RUNTIME DESTINATION ${CMAKE_INSTALL_SBINDIR}
+# Linker security flags (cross-compilation friendly)
+set(SECURITY_LINKER_FLAGS
+    -Wl,-z,relro
+    -Wl,-z,now
 )
 
-ADD_EXECUTABLE(radiusprobe radiusprobe.c)
-TARGET_LINK_LIBRARIES(radiusprobe radcli)
-INSTALL(TARGETS radiusprobe
-	RUNTIME DESTINATION ${CMAKE_INSTALL_SBINDIR}
+# Debug flags
+set(DEBUG_FLAGS
+    -g3
+    -ggdb
+    -fno-omit-frame-pointer
+    -fno-optimize-sibling-calls
 )
 
-ADD_EXECUTABLE(ip-collide ip-collide.c)
-TARGET_LINK_LIBRARIES(ip-collide ubox)
-INSTALL(TARGETS ip-collide
-	RUNTIME DESTINATION ${CMAKE_INSTALL_SBINDIR}
+# Release optimization flags
+set(RELEASE_FLAGS
+    -O2
+    -flto
+    -ffunction-sections
+    -fdata-sections
 )
+
+set(RELEASE_LINKER_FLAGS
+    -Wl,--gc-sections
+    -flto
+)
+
+# Apply flags based on build type
+if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+    add_compile_options(${WARNING_FLAGS} ${SECURITY_FLAGS} ${DEBUG_FLAGS})
+    add_link_options(${SECURITY_LINKER_FLAGS})
+else()
+    add_compile_options(${WARNING_FLAGS} ${SECURITY_FLAGS} ${RELEASE_FLAGS})
+    add_link_options(${SECURITY_LINKER_FLAGS} ${RELEASE_LINKER_FLAGS})
+endif()
+
+set(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "")
+
+# Define all targets
+set(TARGETS firstcontact dhcpdiscover dnsprobe radiusprobe)
+
+# firstcontact executable
+add_executable(firstcontact firstcontact.c)
+target_link_libraries(firstcontact PRIVATE curl crypto ssl ubox)
+
+# dhcpdiscover executable  
+add_executable(dhcpdiscover dhcpdiscover.c)
+
+# dnsprobe executable
+add_executable(dnsprobe dnsprobe.c)
+target_link_libraries(dnsprobe PRIVATE ubox resolv)
+
+# radiusprobe executable
+add_executable(radiusprobe radiusprobe.c)
+target_link_libraries(radiusprobe PRIVATE radcli)
+
+# Install all targets
+install(TARGETS ${TARGETS}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_SBINDIR}
+    COMPONENT Runtime
+)
+

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

@@ -16,54 +16,54 @@
  * 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.
+// 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))
+// applet:IF_NSLOOKUP_OPENWRT(APPLET(nslookup, BB_DIR_USR_BIN, BB_SUID_DROP))
 
-//kbuild:lib-$(CONFIG_NSLOOKUP_OPENWRT) += nslookup_lede.o
+// 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"
+// 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 <errno.h>
 #include <net/if.h>
 #include <netdb.h>
+#include <poll.h>
+#include <resolv.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/socket.h>
+#include <time.h>
+#include <unistd.h>
 
 #include <libubox/ulog.h>
 
-#define ENABLE_FEATURE_IPV6	1
+#define ENABLE_FEATURE_IPV6 1
 
 typedef struct len_and_sockaddr {
 	socklen_t len;
@@ -91,171 +91,169 @@ struct query {
 	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 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)
+static int parse_reply(const unsigned char *msg, size_t len)
 {
 	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));
+		// 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));
+			// 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;
+		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;
+			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_ns:
+				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("%s\tnameserver = %s\n", ns_rr_name(rr), dname);
+				break;
 
-		case ns_t_cname:
-			if (!format)
-				format = "%s\tcanonical name = %s\n";
-			/* fall through */
+			case ns_t_cname:
+				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("%s\tcanonical name = %s\n", ns_rr_name(rr), dname);
+				break;
 
-		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_ptr:
+				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("%s\tname = %s\n", 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_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_txt:
+				if (rdlen < 1) {
+					// fprintf(stderr, "TXT record too short\n");
+					return -1;
+				}
+				n = *((const 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;
-			}
+			case ns_t_soa:
+				if (rdlen < 20) {
+					// fprintf(stderr, "SOA record too short\n");
+					return -1;
+				}
 
-			printf("%s\n", ns_rr_name(rr));
+				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));
+				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;
-			}
+				if (n < 0) {
+					// fprintf(stderr, "Unable to uncompress domain: %s\n",
+					// strerror(errno));
+					return -1;
+				}
 
-			printf("\torigin = %s\n", dname);
-			cp += n;
+				printf("\torigin = %s\n", dname);
+				cp += n;
 
-			n = ns_name_uncompress(ns_msg_base(handle), ns_msg_end(handle),
-			                       cp, dname, sizeof(dname));
+				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;
-			}
+				if (n < 0) {
+					// fprintf(stderr, "Unable to uncompress domain: %s\n",
+					// strerror(errno));
+					return -1;
+				}
 
-			printf("\tmail addr = %s\n", dname);
-			cp += n;
+				printf("\tmail addr = %s\n", dname);
+				cp += n;
 
-			printf("\tserial = %lu\n", ns_get32(cp));
-			cp += 4;
+				printf("\tserial = %lu\n", ns_get32(cp));
+				cp += 4;
 
-			printf("\trefresh = %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("\tretry = %lu\n", ns_get32(cp));
+				cp += 4;
 
-			printf("\texpire = %lu\n", ns_get32(cp));
-			cp += 4;
+				printf("\texpire = %lu\n", ns_get32(cp));
+				cp += 4;
 
-			printf("\tminimum = %lu\n", ns_get32(cp));
-			break;
+				printf("\tminimum = %lu\n", ns_get32(cp));
+				break;
 
-		default:
-			break;
+			default:
+				break;
 		}
 	}
 
@@ -326,7 +324,7 @@ static unsigned long mtime(void)
 {
 	struct timespec ts;
 	clock_gettime(CLOCK_REALTIME, &ts);
-	return (unsigned long)ts.tv_sec * 1000 + ts.tv_nsec / 1000000;
+	return (unsigned long) ts.tv_sec * 1000 + ts.tv_nsec / 1000000;
 }
 
 #if ENABLE_FEATURE_IPV6
@@ -335,11 +333,9 @@ 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 + 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);
+	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;
@@ -356,8 +352,10 @@ static void to_v4_mapped(len_and_sockaddr *a)
 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 = { };
+	unsigned long timeout = default_timeout * 1000;
+	unsigned long retry_interval;
+	int servfail_retry = 0;
+	len_and_sockaddr from = {};
 #if ENABLE_FEATURE_IPV6
 	int one = 1;
 #endif
@@ -381,12 +379,12 @@ static int send_queries(struct ns *ns, int n_ns, struct query *queries, int n_qu
 #endif
 
 	/* Get local address and open/bind a socket */
-	fd = socket(from.u.sa.sa_family, SOCK_DGRAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0);
+	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);
+		fd = socket(AF_INET, SOCK_DGRAM | SOCK_CLOEXEC | SOCK_NONBLOCK, 0);
 		from.u.sa.sa_family = AF_INET;
 	}
 #endif
@@ -432,13 +430,13 @@ static int send_queries(struct ns *ns, int n_ns, struct query *queries, int n_qu
 		}
 
 		/* Wait for a response, or until time to retry */
-		if (poll(&pfd, 1, t1+retry_interval-t2) <= 0)
+		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);
+			recvlen =
+			    recvfrom(fd, queries[next_query].reply,
+			             sizeof(queries[next_query].reply), 0, &from.u.sa, &from.len);
 
 			/* read error */
 			if (recvlen < 0)
@@ -474,20 +472,21 @@ static int send_queries(struct ns *ns, int n_ns, struct query *queries, int n_qu
 			 * retry immediately on server failure, and ignore
 			 * all other codes such as refusal. */
 			switch (queries[qn].rcode) {
-			case 0:
-			case 3:
-				break;
+				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 */
+				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;
+				default:
+					continue;
 			}
 
 			/* Store answer */
@@ -502,8 +501,7 @@ static int send_queries(struct ns *ns, int n_ns, struct query *queries, int n_qu
 
 					next_query++;
 				}
-			}
-			else {
+			} else {
 				memcpy(queries[qn].reply, queries[next_query].reply, recvlen);
 			}
 
@@ -518,12 +516,10 @@ static int send_queries(struct ns *ns, int n_ns, struct query *queries, int n_qu
 static struct ns *add_ns(struct ns **ns, int *n_ns, const char *addr)
 {
 	char portstr[sizeof("65535")], *p;
-	len_and_sockaddr a = { };
+	len_and_sockaddr a = {};
 	struct ns *tmp;
-	struct addrinfo *ai, *aip, hints = {
-		.ai_flags = AI_NUMERICSERV,
-		.ai_socktype = SOCK_DGRAM
-	};
+	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
@@ -531,7 +527,7 @@ static struct ns *add_ns(struct ns **ns, int *n_ns, const char *addr)
 
 		p = strchr(addr, '#');
 		snprintf(portstr, sizeof(portstr), "%hu",
-		         (unsigned short)(p ? strtoul(p, NULL, 10) : default_port));
+		         (unsigned short) (p ? strtoul(p, NULL, 10) : default_port));
 
 		if (!getaddrinfo(addr, portstr, &hints, &ai)) {
 			for (aip = ai; aip; aip = aip->ai_next) {
@@ -539,7 +535,7 @@ static struct ns *add_ns(struct ns **ns, int *n_ns, const char *addr)
 				    aip->ai_addr->sa_family != AF_INET6)
 					continue;
 
-#if ! ENABLE_FEATURE_IPV6
+#if !ENABLE_FEATURE_IPV6
 				if (aip->ai_addr->sa_family != AF_INET)
 					continue;
 #endif
@@ -584,8 +580,7 @@ static struct ns *add_ns(struct ns **ns, int *n_ns, const char *addr)
 	return &(*ns)[(*n_ns)++];
 }
 
-static struct query *add_query(struct query **queries, int *n_queries,
-                               int type, const char *dname)
+static struct query *add_query(struct query **queries, int *n_queries, int type, const char *dname)
 {
 	struct query *tmp;
 	ssize_t qlen;
@@ -597,8 +592,8 @@ static struct query *add_query(struct query **queries, int *n_queries,
 
 	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));
+	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;
@@ -615,8 +610,8 @@ int main(int argc, char **argv)
 	int n_ns = 0, n_queries = 0;
 	int c = 0;
 
-	char *url = "telecominfraproject.com";
-	char *server = "127.0.0.1";
+	const char *url = "telecominfraproject.com";
+	const char *server = "127.0.0.1";
 	int v6 = 0;
 
 	while (1) {
@@ -626,29 +621,28 @@ int main(int argc, char **argv)
 			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;
+			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" : "");
+	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);
@@ -663,13 +657,12 @@ int main(int argc, char **argv)
 	}
 
 	if (queries[0].rcode != 0) {
-		printf("** server can't find %s: %s\n", queries[0].name,
-		rcodes[queries[0].rcode]);
+		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);
+		c = parse_reply(queries[0].reply, queries[0].rlen);
 	}
 
 	if (c == 0)

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

@@ -1,15 +1,15 @@
 #define _GNU_SOURCE
-#include <stdio.h>
 #include <getopt.h>
+#include <stdio.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_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";
+static const char *file_dbg = "/tmp/firstcontact.hdr";
 
 int main(int argc, char **argv)
 {
@@ -27,26 +27,26 @@ int main(int argc, char **argv)
 			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;
+			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;
 		}
 	}
 
@@ -72,7 +72,8 @@ int main(int argc, char **argv)
 		return -1;
 	}
 
-	if (asprintf(&url, "https://clientauth.demo.one.digicert.com/iot/api/v2/device/%s", devid) < 0) {
+	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;
 	}

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,10 +1,11 @@
+#include <radcli/radcli.h>
 #include <stdio.h>
 #include <string.h>
-#include <radcli/radcli.h>
 
-int
-main(int argc, char **argv)
+int main(int argc, char **argv)
 {
+	(void) argc;
+	(void) argv;
 	int result;
 	char username[128];
 	char passwd[AUTH_PASS_LEN + 1];

patches/0100-sonicfi_rap63xc-211g-enable-pstore.patch

@@ -0,0 +1,38 @@
+From adbd8be88f9c5af3f79dc106bc0f2ace5eb50768 Mon Sep 17 00:00:00 2001
+From: jackcybertan <jack.tsai@cybertan.com.tw>
+Date: Thu, 21 Aug 2025 15:22:51 +0800
+Subject: [PATCH] sonicfi_rap63xc-211g: enable pstore
+
+Signed-off-by: jackcybertan <jack.tsai@cybertan.com.tw>
+---
+ .../ramips/dts/mt7621_sonicfi_rap63xc-211g.dts     | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+diff --git a/target/linux/ramips/dts/mt7621_sonicfi_rap63xc-211g.dts b/target/linux/ramips/dts/mt7621_sonicfi_rap63xc-211g.dts
+index b64ca5708b..d076d682c9 100755
+--- a/target/linux/ramips/dts/mt7621_sonicfi_rap63xc-211g.dts
++++ b/target/linux/ramips/dts/mt7621_sonicfi_rap63xc-211g.dts
+@@ -79,6 +79,20 @@
+ 			linux,code = <KEY_RESTART>;
+ 		};
+ 	};
++
++	reserved-memory {
++		#address-cells = <1>;
++		#size-cells = <1>;
++		ranges;
++
++		ramoops: ramoops@ff80000 {
++			 compatible = "ramoops";
++			 reg = <0x0ff80000 0x80000>;
++			 record-size = <0x20000>;
++			 console-size = <0x20000>;
++			 pmsg-size = <0x20000>;
++		 };
++	};
+ };
+ 
+ &spi0 {
+-- 
+2.34.1
+

profiles/indio_um-325ax-v2.yml

@@ -0,0 +1,19 @@
+---
+profile: indio_um-325ax-v2
+target: ipq50xx
+subtarget: generic
+description: Build image for the Indio um-325ax-v2
+image: bin/targets/ipq50xx/generic/openwrt-ipq50xx-indio_um-325ax-v2-squashfs-sysupgrade.tar
+feeds:
+  - name: ipq807x
+    path: ../../feeds/ipq807x_v5.4
+include:
+  - ucentral-ap
+packages:
+  - ipq50xx
+diffconfig: |
+  CONFIG_KERNEL_IPQ_MEM_PROFILE=512
+  CONFIG_BUSYBOX_CUSTOM=y
+  CONFIG_BUSYBOX_CONFIG_STTY=y
+  
+