Add more configs to cover all datamdoel and fix some memory leaks

dmentry.c

@@ -16,10 +16,12 @@
 #include "dmdynamicjson.h"
 #include "dmdynamiclibrary.h"
 #include "dmdynamicvendor.h"
+#include "dmdynamicmem.h"
 #include "device.h"
 #include "dmbbfcommon.h"
 
 LIST_HEAD(head_package_change);
+LIST_HEAD(main_memhead);
 
 static char json_hash[64] = {0};
 static char library_hash[64] = {0};
@@ -447,4 +449,5 @@ void free_dynamic_arrays(void)
 	free_vendor_dynamic_arrays(tEntry181Obj);
 #endif
 	free_dm_browse_node_dynamic_object_tree(&node, root);
+	dm_dynamic_cleanmem(&main_memhead);
 }

dmentry.h

@@ -18,7 +18,7 @@
 #include <libbbf_api/dmcommon.h>
 
 extern struct list_head head_package_change;
-
+extern struct list_head main_memhead;
 enum ctx_init_enum {
 	CTX_INIT_ALL,
 	CTX_INIT_SUB

dmtree/tr104/common.c

@@ -8,6 +8,8 @@
  *	Author: Yalu Zhang, yalu.zhang@iopsys.eu
  */
 
+#include "dmdynamicmem.h"
+#include "dmentry.h"
 #include "common.h"
 
 char *RFPowerControl[] = {"Normal", "Reduced"};
@@ -24,7 +26,7 @@ LIST_HEAD(call_log_list);
 static int call_log_list_size = 0;
 int call_log_count = 0;
 
-int init_supported_codecs()
+int init_supported_codecs(void)
 {
 	json_object *res = NULL;
 
@@ -111,7 +113,7 @@ static void convert_src_dst(char *src_or_dst, size_t buf_size)
 #define CALL_LOG_FILE_OLD "/var/log/asterisk/cdr-csv/Master_old.csv"
 #define SEPARATOR "\",\""
 #define SEPARATOR_SIZE strlen(SEPARATOR)
-int init_call_log()
+int init_call_log(void)
 {
 #define CHECK_RESULT(cond) if (!(cond)) { \
 		BBF_DEBUG("Invalid cdr [%s]\ncalling_number = [%s], called_number = [%s], " \
@@ -536,8 +538,7 @@ int init_call_log()
 					pos = &entry->list;
 				}
 			} else {
-				// NOTE: dmmalloc() caused uspd crash when reusing the existing list entries!!!
-				entry = malloc(sizeof(struct call_log_entry));
+				entry = dm_dynamic_malloc(&main_memhead, sizeof(struct call_log_entry));
 				if (!entry)
 					return -1;
 

dmtree/tr104/common.h

@@ -76,7 +76,7 @@ extern char *DTMFMethod[];
 extern char *JitterBufferType[];
 extern char *KeyingMethods[];
 
-int init_supported_codecs();
-int init_call_log();
+int init_supported_codecs(void);
+int init_call_log(void);
 const char *get_codec_uci_name(const char *codec);
 const char *get_codec_name(const char *codec_profile);

dmtree/tr104/servicesvoiceservice.c

@@ -70,9 +70,8 @@ static int browseServicesVoiceServiceCallLogInst(struct dmctx *dmctx, DMNODE *pa
 		return 0;
 
 	list_for_each_entry(entry, &call_log_list, list) {
-		i++;
 
-		inst = handle_instance_without_section(dmctx, parent_node, i);
+		inst = handle_instance_without_section(dmctx, parent_node, ++i);
 
 		if (DM_LINK_INST_OBJ(dmctx, parent_node, entry, inst) == DM_STOP)
 			break;

dmtree/tr181/gre.c

@@ -43,14 +43,15 @@ static struct uci_section *has_tunnel_interface_route(char *interface)
 
 static int browseGRETunnelInterfaceInst(struct dmctx *dmctx, DMNODE *parent_node, void *prev_data, char *prev_instance)
 {
-	char *inst = NULL, *device = NULL;
+	char *inst = NULL, device[128] = {0};
 	struct dmmap_dup *p = NULL, *dm = (struct dmmap_dup *)prev_data;
 	struct uci_section *s = NULL;
 	LIST_HEAD(dup_list);
 
-	dmasprintf(&device, "@%s", section_name(dm->config_section));
+	snprintf(device, sizeof(device), "@%s", section_name(dm->config_section));
 	synchronize_specific_config_sections_with_dmmap_eq("network", "interface", "dmmap_network", "device", device, &dup_list);
 	list_for_each_entry(p, &dup_list, list) {
+
 		if ((s = has_tunnel_interface_route(section_name(p->config_section))) == NULL)
 			continue;
 

dmtree/tr181/security.c

@@ -317,10 +317,12 @@ static int get_SecurityCertificate_SerialNumber(char *refparam, struct dmctx *ct
 
 static int get_SecurityCertificate_Issuer(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
 {
-	*value = "";
 #ifdef LOPENSSL
-	struct certificate_profile *cert_profile = (struct certificate_profile*)data;
-	*value = X509_NAME_oneline(X509_get_issuer_name(cert_profile->openssl_cert), NULL, 0);
+	struct certificate_profile *cert_profile = (struct certificate_profile *)data;
+	char buf[256] = {0};
+
+	X509_NAME_oneline(X509_get_issuer_name(cert_profile->openssl_cert), buf, sizeof(buf));
+	*value = dmstrdup(buf);
 	if (*value[0] == '/')
 		(*value)++;
 	*value = replace_char(*value, '/', ' ');
@@ -374,10 +376,12 @@ static int get_SecurityCertificate_NotAfter(char *refparam, struct dmctx *ctx, v
 
 static int get_SecurityCertificate_Subject(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
 {
-	*value = "";
 #ifdef LOPENSSL
-	struct certificate_profile *cert_profile = (struct certificate_profile*)data;
-	*value = X509_NAME_oneline(X509_get_subject_name(cert_profile->openssl_cert), NULL, 0);
+	struct certificate_profile *cert_profile = (struct certificate_profile *)data;
+	char buf[256] = {0};
+
+	X509_NAME_oneline(X509_get_subject_name(cert_profile->openssl_cert), buf, sizeof(buf));
+	*value = dmstrdup(buf);
 	if (*value[0] == '/')
 		(*value)++;
 	*value = replace_char(*value, '/', ' ');

gitlab-ci/functional-test.sh

@@ -4,9 +4,6 @@ echo "Functional Tests"
 pwd
 source ./gitlab-ci/shared.sh
 
-# link '/bin/sh' to bash instead of dash
-ln -sf bash /bin/sh
-
 # compile and install libbbf
 install_libbbf
 

gitlab-ci/memory-test.sh

@@ -9,6 +9,8 @@ date +%s > timestamp.log
 install_libbbf
 
 install_libbbf_test
+install_libbulkdata
+#install_libperiodicstats
 
 supervisorctl status all
 supervisorctl update

gitlab-ci/setup.sh

@@ -4,6 +4,9 @@ echo "preparation script"
 
 pwd
 
+# link '/bin/sh' to bash instead of dash
+ln -sf bash /bin/sh
+
 cp -r ./test/files/etc/* /etc/
 cp -r ./test/files/usr/* /usr/
 cp -r ./test/files/var/* /var/

gitlab-ci/shared.sh

@@ -75,3 +75,29 @@ function install_libbbf_test()
 	echo "installing libbbf_test"
 	cp -f test/bbf_test/libbbf_test.so /usr/lib/bbfdm
 }
+
+function install_libbulkdata()
+{
+	# clone and compile libbulkdata
+	rm -rf /opt/dev/bulkdata
+	exec_cmd git clone -b devel https://dev.iopsys.eu/iopsys/bulkdata.git /opt/dev/bulkdata
+	echo "Compiling libbulkdata"
+	make clean -C /opt/dev/bulkdata/
+	make CFLAGS="-D_GNU_SOURCE" -C /opt/dev/bulkdata/
+
+	echo "installing libbulkdata"
+	cp -f /opt/dev/bulkdata/libbulkdata.so /usr/lib/bbfdm
+}
+
+function install_libperiodicstats()
+{
+	# clone and compile libperiodicstats
+	rm -rf /opt/dev/periodicstats
+	exec_cmd git clone -b devel https://dev.iopsys.eu/iopsys/periodicstats.git /opt/dev/periodicstats
+	echo "Compiling libperiodicstats"
+	make clean -C /opt/dev/periodicstats/
+	make -C /opt/dev/periodicstats/
+
+	echo "installing libperiodicstats"
+	cp -f /opt/dev/periodicstats/libperiodicstats.so /usr/lib/bbfdm
+}

gitlab-ci/unit-test.sh

@@ -4,9 +4,6 @@ echo "Unit Tests"
 pwd
 source ./gitlab-ci/shared.sh
 
-# link '/bin/sh' to bash instead of dash
-ln -sf bash /bin/sh
-
 # compile and install libbbf
 install_libbbf
 

libbbf_api/dmbbf.h

@@ -223,16 +223,16 @@ typedef struct dm_map_vendor_exclude {
 } DM_MAP_VENDOR_EXCLUDE;
 
 enum operate_ret_status {
-	CMD_INVALID_ARGUMENTS,
 	CMD_SUCCESS,
+	CMD_INVALID_ARGUMENTS,
 	CMD_FAIL,
 	CMD_NOT_FOUND,
 	__STATUS_MAX,
 };
 
 enum deprecated_operate_ret_status {
-	UBUS_INVALID_ARGUMENTS,
 	SUCCESS,
+	UBUS_INVALID_ARGUMENTS,
 	FAIL,
 };
 

test/bbf_test/Makefile

@@ -3,7 +3,7 @@ BIN = bbf_dm
 
 BIN_OBJ = bbf_dm.o
 LIB_OBJS = libbbf_test.o
-LIB_CFLAGS = $(CFLAGS) -fPIC -I /usr/local/include/
+LIB_CFLAGS = $(CFLAGS) -Wall -Werror -fPIC -I /usr/local/include/
 LIB_LDFLAGS = $(LDFLAGS) -lbbf_api
 BIN_LDFLAGS = $(LDFLAGS) -lbbfdm
 

test/bbf_test/bbf_dm.c

@@ -92,7 +92,7 @@ int main(int argc, char *argv[])
 	if (argc > 4 && strlen(argv[4]))
 		value = argv[3];
 
-	usp_dm_exec(cmd, param, NULL, NULL);
+	usp_dm_exec(cmd, param, value, NULL);
 
 	free_dynamic_arrays();
 }

test/cmocka/functional_api_test_bbfd.c

@@ -490,7 +490,7 @@ static void test_bbf_api_json(void **state)
 
 	// dmjson_get_value: test correct option
 	json_value = dmjson_get_value(wifi_status, 1, "ssid");
-	assert_string_equal(json_value, "iopsysWrt-002207AB9F80");
+	assert_string_equal(json_value, "iopsysWrt-44D43771B810");
 
 	// dmjson_get_value: test correct option under object
 	json_value = dmjson_get_value(wifi_status, 2, "capabilities", "dot11h");

test/cmocka/unit_test_bbfd.c

@@ -718,6 +718,7 @@ static void test_api_bbfdm_library_delete_object(void **state)
 int main(void)
 {
 	const struct CMUnitTest tests[] = {
+
 		// Get Value method test cases
 		cmocka_unit_test_setup_teardown(test_api_bbfdm_get_value_object, setup, teardown_commit),
 		cmocka_unit_test_setup_teardown(test_api_bbfdm_get_value_parameter, setup, teardown_commit),

test/files/etc/config/dhcp

@@ -40,6 +40,9 @@ config dhcp 'lan'
 	option ra_slaac '1'
 	list ra_flags 'managed-config'
 	list ra_flags 'other-config'
+	list dhcp_option '26,1470'
+	list dhcp_option '3,192.168.1.254'
+	list dhcp_option '6,iopsys.eu'
 
 config dhcp 'wan'
 	option interface 'wan'
@@ -51,3 +54,26 @@ config odhcpd 'odhcpd'
 	option leasetrigger '/usr/sbin/odhcpd-update'
 	option loglevel '4'
 
+config host 'host_1'
+	option dhcp 'lan'
+	option ip '192.168.1.55'
+	option mac '00:14:22:01:23:45'
+	option name 'host_1'
+
+config host 'host_2'
+	option dhcp 'lan'
+	option ip '192.168.1.56'
+	option mac '00:15:22:18:33:45'
+	option name 'host_2'
+
+config userclass 'userclass_1'
+	option userclass 'uc1'
+	option networkid 'wan'
+
+config vendorclass 'vendorclass_1'
+	option vendorclass 'vc1'
+	option networkid 'wan'
+
+config mac 'mac_1'
+	option mac '00:FF:12:34:56:78'
+	option networkid 'wan'

test/files/etc/config/firewall

@@ -171,3 +171,15 @@ config include 'dmzhost'
 	option path '/etc/firewall.dmz'
 	option reload '1'
 
+config redirect 'port_mapping_1'
+	option enabled '1'
+	option src 'wan'
+	option dest 'lan'
+	option target 'DNAT'
+	option reflection '1'
+	option name 'test'
+	option proto 'tcp'
+	option dest_ip 'wan'
+	option src_dport '192.168.3.45'
+	option src_dport '50:60'
+	option dest_port '44'

test/files/etc/config/network

@@ -84,8 +84,40 @@ config device 'eth4_100'
     option vid '100'
 
 config interface 'ppp_wan'
+	option type 'anywan'
 	option proto 'pppoe'
-	option username 'iopsys'
+	option username 'iopsyshome@iopsys.eu'
 	option password 'iopsys'
 	option device 'eth0.1'
+	option ipv6 '1'
 	option macaddr '44:D4:37:71:B8:14'
+
+config route 'route4'
+    option interface 'wan'
+    option target '0.0.0.0/0'
+    option gateway '10.72.197.110'
+
+config route6 'route6'
+	option interface 'wan6'
+	option target '::/0'
+
+config interface 'stabridge'
+	option proto 'relay'
+	option network 'lan wan'
+
+config interface 'mygre'
+	option ipaddr '10.1.1.1'
+	option peeraddr '10.2.2.1'
+	option proto 'gre'
+
+config interface 'mygre_static'
+	option proto 'static'
+	option device '@mygre'
+	option ipaddr '172.16.12.1'
+	option netmask '255.255.255.252'
+
+config route 'tunnel'
+	option interface 'mygre_static'
+	option target '172.16.2.0'
+	option netmask '255.255.255.0'
+	option gateway '172.16.12.2'	

test/files/etc/config/owsd

@@ -20,6 +20,7 @@ config owsd-listen 'lan'
 	option ipv6only 'off'
 	option whitelist_interface_as_origin '1'
 	option whitelist_dhcp_domains '1'
+	option cert '/etc/ssl/certs/ca-certificates.crt'
 
 config owsd-listen 'wan'
 	option port '80'

test/files/etc/config/wireless

@@ -1,27 +1,50 @@
 config wifi-device 'test1'
-    option channel 'auto'
-    option hwmode 'auto'
-    option country 'DE'
-    option band 'a'
-    option bandwidth '80'
+	option type 'mac80211'
+	option channel '36'
+	option hwmode '11a'
+	option country 'DE'
+	option htmode 'HE80'
+	option apsta '0'
+	option phy 'phy0'
 
-config wifi-iface 'test1_1'
-    option device 'test1'
-    option ifname 'test1'
-    option network 'lan'
-    option mode 'ap'
-    option encryption 'psk2'
+config wifi-iface 'default_test1'
+	option device 'test1'
+	option network 'lan'
+	option mode 'ap'
+	option ifname 'test1'
+	option ssid 'iopsysWrt-44D43771B810'
+	option uuid 'd0e411a7-57d2-4998-82ea-44D43771B810'
+	option encryption 'psk2'
+	option key 'MPUEO3L7WHJ45P'
+	option wps '1'
+	option wps_pushbutton '1'
+	option ieee80211k '1'
+	option ieee80211v '1'
+	option bss_transition '1'
+	option multi_ap '3'
 
 config wifi-device 'test2'
-    option channel 'auto'
-    option hwmode 'auto'
-    option country 'DE'
-    option band 'a'
-    option bandwidth '80'
+	option type 'mac80211'
+	option channel '11'
+	option hwmode '11g'
+	option country 'DE'
+	option htmode 'HE20'
+	option apsta '0'
+	option phy 'phy1'
 
-config wifi-iface 'test2_1'
-    option device 'test2'
-    option ifname 'test2'
-    option network 'lan'
-    option mode 'ap'
-    option encryption 'psk2'
+config wifi-iface 'default_test2'
+	option device 'test2'
+	option network 'lan'
+	option mode 'ap'
+	option ifname 'test2'
+	option ssid 'iopsysWrt-44D43771B810'
+	option uuid '3077d261-e293-461e-8a59-44D43771B810'
+	option encryption 'psk2'
+	option key 'MPUEO3L7WHJ45P'
+	option wps '1'
+	option wps_pushbutton '1'
+	option ieee80211k '1'
+	option ieee80211v '1'
+	option bss_transition '1'
+	option multi_ap '3'
+    

test/files/tmp/dhcp.ipv6leases.data

@@ -0,0 +1,44 @@
+{
+	"device": {
+		"br-lan": {
+			"leases": [
+				{
+					"duid": "0004c7e7a6156c6255081be203f6ecdf2703",
+					"iaid": 1995102333,
+					"hostname": "",
+					"accept-reconf": false,
+					"assigned": 2161,
+					"flags": [
+						"bound"
+					],
+					"ipv6-addr": [
+						{
+							"address": "fd69:6d12:c33d::871",
+							"preferred-lifetime": -1,
+							"valid-lifetime": -1
+						}
+					],
+					"valid": 1284
+				},
+			{
+					"duid": "0004bc823a7bb321a63f328ef37740021102",
+					"iaid": 1420466609,
+					"hostname": "",
+					"accept-reconf": false,
+					"assigned": 3059,
+					"flags": [
+						"bound"
+					],
+					"ipv6-addr": [
+						{
+							"2001:1ba8:1458:ce00::bf3",
+							"preferred-lifetime": 17099,
+							"valid-lifetime": 27899
+						}
+					],
+					"valid": 2775
+				}
+			]
+		}
+	}
+}

test/files/tmp/dhcp.leases

@@ -0,0 +1 @@
+1632358669 24:18:1d:e2:f7:dd 192.168.1.187 Galaxy-S8 01:24:18:1d:e2:f7:dd

test/files/tmp/ieee1905.info.data

@@ -0,0 +1,101 @@
+{
+	"version": "1905.1a",
+	"ieee1905id": "46:d4:37:71:b8:10",
+	"status": "enabled",
+	"registrar": true,
+	"registrar_band": [
+		"5GHz",
+		"2.4GHz"
+	],
+	"num_interfaces": 4,
+	"interface": [
+		{
+			"ifname": "eth1",
+			"macaddress": "44:d4:37:71:b8:10",
+			"status": "up",
+			"media": "IEEE 802_3AB_GIGABIT_ETHERNET",
+			"genphy_oui": "000000",
+			"genphy_variant": "",
+			"genphy_url": "",
+			"power": "on",
+			"num_vendor_properties": 0,
+			"properties": [
+				
+			],
+			"num_links": 0,
+			"links": [
+				
+			]
+		},
+		{
+			"ifname": "eth3",
+			"macaddress": "44:d4:37:71:b8:10",
+			"status": "up",
+			"media": "IEEE 802_3AB_GIGABIT_ETHERNET",
+			"genphy_oui": "000000",
+			"genphy_variant": "",
+			"genphy_url": "",
+			"power": "on",
+			"num_vendor_properties": 0,
+			"properties": [
+				
+			],
+			"num_links": 0,
+			"links": [
+				
+			]
+		},
+		{
+			"ifname": "wl0",
+			"macaddress": "44:d4:37:71:b8:1f",
+			"status": "up",
+			"media": "IEEE 802_11AX_5_GHZ",
+			"genphy_oui": "000000",
+			"genphy_variant": "",
+			"genphy_url": "",
+			"power": "on",
+			"num_vendor_properties": 0,
+			"properties": [
+				
+			],
+			"num_links": 0,
+			"links": [
+				
+			]
+		},
+		{
+			"ifname": "wl1",
+			"macaddress": "44:d4:37:71:b8:1e",
+			"status": "up",
+			"media": "IEEE 802_11AX_2_4_GHZ",
+			"genphy_oui": "000000",
+			"genphy_variant": "",
+			"genphy_url": "",
+			"power": "on",
+			"num_vendor_properties": 0,
+			"properties": [
+				
+			],
+			"num_links": 0,
+			"links": [
+				
+			]
+		}
+	],
+	"topology": {
+		"enabled": false,
+		"status": "available",
+		"max_changelog": 100,
+		"num_changelog": 0,
+		"last_change": "",
+		"num_device": 0,
+		"device": [
+			
+		]
+	},
+	"network_registrars": {
+		"registrar_2": "00:00:00:00:00:00",
+		"registrar_5": "00:00:00:00:00:00",
+		"registrar_60": "00:00:00:00:00:00"
+	}
+}

test/files/tmp/interface_lan.data

@@ -0,0 +1,75 @@
+{
+	"up": true,
+	"pending": false,
+	"available": true,
+	"autostart": true,
+	"dynamic": false,
+	"uptime": 5859,
+	"l3_device": "br-lan",
+	"proto": "static",
+	"device": "br-lan",
+	"updated": [
+		"addresses"
+	],
+	"metric": 0,
+	"dns_metric": 0,
+	"delegation": true,
+	"ipv4-address": [
+		{
+			"address": "192.168.1.1",
+			"mask": 24
+		}
+	],
+	"ipv6-address": [
+		
+	],
+	"ipv6-prefix": [
+		
+	],
+	"ipv6-prefix-assignment": [
+		{
+			"address": "fd28:eac7:478::",
+			"mask": 60,
+			"local-address": {
+				"address": "fd28:eac7:478::1",
+				"mask": 60
+			}
+		}
+	],
+	"route": [
+		
+	],
+	"dns-server": [
+		
+	],
+	"dns-search": [
+		
+	],
+	"neighbors": [
+		
+	],
+	"inactive": {
+		"ipv4-address": [
+			
+		],
+		"ipv6-address": [
+			
+		],
+		"route": [
+			
+		],
+		"dns-server": [
+			
+		],
+		"dns-search": [
+			
+		],
+		"neighbors": [
+			
+		]
+	},
+	"data": {
+		
+	}
+}
+

test/files/tmp/interface_wan.data

@@ -0,0 +1,77 @@
+{
+	"up": true,
+	"pending": false,
+	"available": true,
+	"autostart": true,
+	"dynamic": false,
+	"uptime": 92,
+	"l3_device": "eth0.1",
+	"proto": "dhcp",
+	"device": "eth0.1",
+	"updated": [
+		"addresses",
+		"routes",
+		"data"
+	],
+	"metric": 0,
+	"dns_metric": 0,
+	"delegation": true,
+	"ipv4-address": [
+		{
+			"address": "192.168.117.3",
+			"mask": 24
+		}
+	],
+	"ipv6-address": [
+		
+	],
+	"ipv6-prefix": [
+		
+	],
+	"ipv6-prefix-assignment": [
+		
+	],
+	"route": [
+		{
+			"target": "0.0.0.0",
+			"mask": 0,
+			"nexthop": "192.168.117.1",
+			"source": "192.168.117.3/32"
+		}
+	],
+	"dns-server": [
+		"192.168.117.1",
+		"8.8.4.4"
+	],
+	"dns-search": [
+		"bwrouter"
+	],
+	"neighbors": [
+		
+	],
+	"inactive": {
+		"ipv4-address": [
+			
+		],
+		"ipv6-address": [
+			
+		],
+		"route": [
+			
+		],
+		"dns-server": [
+			
+		],
+		"dns-search": [
+			
+		],
+		"neighbors": [
+			
+		]
+	},
+	"data": {
+		"hostname": "iopsysWrt-44D43771AFF0",
+		"leasetime": 86400,
+		"ntpserver": "200.23.51.102"
+	}
+}

test/files/tmp/interface_wan6.data

@@ -0,0 +1,112 @@
+{
+	"up": true,
+	"pending": false,
+	"available": true,
+	"autostart": true,
+	"dynamic": false,
+	"uptime": 138,
+	"l3_device": "eth0.1",
+	"proto": "dhcpv6",
+	"device": "eth0.1",
+	"updated": [
+		"data"
+	],
+	"metric": 0,
+	"dns_metric": 0,
+	"delegation": true,
+	"ipv4-address": [
+		
+	],
+	"ipv6-address": [
+		{
+			"address": "fd55:e399:a826:0:221f:31ff:feab:9f81",
+			"mask": 64
+		},
+		{
+			"address": "fd55:e399:a826:4:221f:31ff:feab:9f81",
+			"mask": 64
+		},
+		{
+			"address": "fdcc:a223:89db:d400:221f:31ff:feab:9f81",
+			"mask": 64,
+			"preferred": 3576,
+			"valid": 7176
+		},
+		{
+			"address": "fd55:e399:a826::cd7",
+			"mask": 128
+		}		
+	],
+	"ipv6-prefix": [
+		{
+			"address": "fd55:e399:a826:4::",
+			"mask": 62,
+			"class": "wan6",
+			"assigned": {
+				"lan": {
+					"address": "fd55:e399:a826:4::",
+					"mask": 62
+				}
+			}
+		}		
+	],
+	"ipv6-prefix-assignment": [
+		
+	],
+	"route": [
+		{
+			"target": "fd55:e399:a826::",
+			"mask": 64,
+			"nexthop": "::",
+			"metric": 256,
+			"source": "::/0"
+		},
+		{
+			"target": "fd55:e399:a826:4::",
+			"mask": 64,
+			"nexthop": "::",
+			"metric": 256,
+			"source": "::/0"
+		},
+		{
+			"target": "fdcc:a223:89db:d400::",
+			"mask": 64,
+			"nexthop": "::",
+			"metric": 256,
+			"valid": 7176,
+			"source": "::/0"
+		}		
+	],
+	"dns-server": [
+		"fe80::222:7ff:fe2c:5397"
+	],
+	"dns-search": [
+		
+	],
+	"neighbors": [
+		
+	],
+	"inactive": {
+		"ipv4-address": [
+			
+		],
+		"ipv6-address": [
+			
+		],
+		"route": [
+			
+		],
+		"dns-server": [
+			
+		],
+		"dns-search": [
+			
+		],
+		"neighbors": [
+			
+		]
+	},
+	"data": {
+		"passthru": "00170010fe80000000000000022207fffe2c5397"
+	}
+}

test/files/tmp/topology_hosts.data

@@ -31,7 +31,7 @@
 			"ipaddr": "192.168.1.187",
 			"address_source": "DHCP",
 			"lease_time_remaining": 3599,
-			"device": "wl0",
+			"device": "test2",
 			"network": "lan",
 			"interface_type": "Wi-Fi",
 			"hostname": "Galaxy-S8",

test/files/tmp/wifi.ap.test1.stations.data

@@ -0,0 +1,101 @@
+{
+	"stations": [
+		{
+			"macaddr": "24:18:1d:e2:f7:dd",
+			"wdev": "test1",
+			"channel": 36,
+			"frequency": 5180,
+			"rssi": -24,
+			"noise": -88,
+			"snr": 61,
+			"idle": 3,
+			"in_network": 50,
+			"tx_airtime": 0,
+			"rx_airtime": 0,
+			"airtime": 0,
+			"maxrate": 866,
+			"nss": 2,
+			"bandwidth": 80,
+			"status": {
+				"wmm": true,
+				"ps": true
+			},
+			"capabilities": {
+				"wmm": true,
+				"apsd": false,
+				"shortslot": false,
+				"dot11h": true,
+				"dot11n": {
+					"dot11n_ldpc": true,
+					"dot11n_40": true,
+					"dot11n_ps": true,
+					"dot11n_sgi20": true,
+					"dot11n_sgi40": true,
+					"dot11n_tx_stbc": true,
+					"dot11n_rx_stbc": true,
+					"dot11n_supp_max_mcs": -1
+				},
+				"dot11ac": {
+					"dot11ac_160": false,
+					"dot11ac_8080": false,
+					"dot11ac_sgi80": true,
+					"dot11ac_sgi160": false,
+					"dot11ac_rx_ldpc": true,
+					"dot11ac_tx_stbc": true,
+					"dot11ac_rx_stbc_1ss": false,
+					"dot11ac_rx_stbc_2ss": false,
+					"dot11ac_rx_stbc_3ss": false,
+					"dot11ac_rx_stbc_4ss": false,
+					"dot11ac_su_beamformer": true,
+					"dot11ac_su_beamformee": true,
+					"dot11ac_mu_beamformer": false,
+					"dot11ac_mu_beamformee": true,
+					"dot11ac_supp_max_rx_mcs": 7,
+					"dot11ac_supp_max_rx_nss": 8,
+					"dot11ac_supp_max_tx_mcs": 7,
+					"dot11ac_supp_max_tx_nss": 8
+				},
+				"dot11k": {
+					"dot11k_link_meas": true,
+					"dot11k_nbr_report": false,
+					"dot11k_bcn_passive": true,
+					"dot11k_bcn_active": true,
+					"dot11k_bcn_table": true,
+					"dot11k_rcpi": false,
+					"dot11k_rsni": false
+				}
+			},
+			"stats": {
+				"tx_total_pkts": 1072,
+				"tx_total_bytes": 123075,
+				"tx_failures": 0,
+				"tx_pkts_retries": 3,
+				"rx_data_pkts": 219,
+				"rx_data_bytes": 24676,
+				"rx_failures": 0,
+				"tx_rate_latest": {
+					"rate": 877,
+					"mcs": 10,
+					"bandwidth": 80,
+					"sgi": 1,
+					"nss": 2,
+					"phy": 9
+				},
+				"rx_rate_latest": {
+					"rate": 1083,
+					"mcs": 11,
+					"bandwidth": 80,
+					"sgi": 0,
+					"nss": 2,
+					"phy": 9
+				}
+			},
+			"rssi_per_antenna": [
+				-24,
+				-31,
+				-24,
+				-31
+			]
+		}
+	]
+}

test/files/tmp/wifi.ap.test1.stats.data

@@ -0,0 +1,65 @@
+{
+	"tx_bytes": 141537,
+	"tx_packets": 1222,
+	"tx_unicast_packets": 0,
+	"tx_multicast_packets": 1066,
+	"tx_broadcast_packets": 0,
+	"tx_error_packets": 0,
+	"tx_retrans_packets": 0,
+	"tx_retrans_fail_packets": 0,
+	"tx_retry_packets": 4,
+	"tx_multi_retry_packets": 4,
+	"tx_dropped_packets": 0,
+	"ack_fail_packets": 0,
+	"aggregate_packets": 0,
+	"rx_bytes": 25523,
+	"rx_packets": 185,
+	"rx_unicast_packets": 0,
+	"rx_multicast_packets": 32,
+	"rx_broadcast_packets": 0,
+	"rx_error_packets": 0,
+	"rx_dropped_packets": 0,
+	"rx_unknown_packets": 0,
+	"wmm_stats": [
+		{
+			"ac": "BE",
+			"tx_bytes": 0,
+			"tx_packets": 0,
+			"tx_error_packets": 0,
+			"tx_retrans_packets": 0,
+			"rx_bytes": 0,
+			"rx_packets": 0,
+			"rx_error_packets": 0
+		},
+		{
+			"ac": "BK",
+			"tx_bytes": 0,
+			"tx_packets": 0,
+			"tx_error_packets": 0,
+			"tx_retrans_packets": 0,
+			"rx_bytes": 0,
+			"rx_packets": 0,
+			"rx_error_packets": 0
+		},
+		{
+			"ac": "VI",
+			"tx_bytes": 0,
+			"tx_packets": 0,
+			"tx_error_packets": 0,
+			"tx_retrans_packets": 0,
+			"rx_bytes": 0,
+			"rx_packets": 0,
+			"rx_error_packets": 0
+		},
+		{
+			"ac": "VO",
+			"tx_bytes": 0,
+			"tx_packets": 0,
+			"tx_error_packets": 0,
+			"tx_retrans_packets": 0,
+			"rx_bytes": 0,
+			"rx_packets": 0,
+			"rx_error_packets": 0
+		}
+	]
+}

test/files/tmp/wifi.ap.test1.status.data

@@ -0,0 +1,151 @@
+{
+	"ifname": "test1",
+	"enabled": true,
+	"status": "running",
+	"ssid": "iopsysWrt-44D43771B810",
+	"bssid": "44:d4:37:71:b8:1f",
+	"security": "WPA2PSK",
+	"encryption": "CCMP",
+	"channel": 36,
+	"bandwidth": 80,
+	"standard": "802.11a/n/ac/ax",
+	"num_stations": 1,
+	"max_stations": 64,
+	"utilization": 6,
+	"adm_capacity": 0,
+	"hidden": false,
+	"supp_security": [
+		"NONE",
+		"WEP64",
+		"WEP128",
+		"WPAPSK",
+		"WPA2PSK",
+		"WPA3PSK",
+		"WPAPSK+WPA2PSK",
+		"WPA2PSK+WPA3PSK",
+		"WPA",
+		"WPA2",
+		"WPA3",
+		"WPA+WPA2",
+		"WPA2+WPA3",
+		"WPA3PSK+FT",
+		"WPA2PSK+FT"
+	],
+	"capabilities": {
+		"wmm": true,
+		"apsd": true,
+		"shortslot": false,
+		"dot11h": true,
+		"2040coex": false,
+		"psmp": false,
+		"proxy_arp": false,
+		"dot11v_btm": true,
+		"dot11n": {
+			"dot11n_ldpc": true,
+			"dot11n_40": true,
+			"dot11n_ps": true,
+			"dot11n_sgi20": true,
+			"dot11n_sgi40": true,
+			"dot11n_tx_stbc": false,
+			"dot11n_rx_stbc": false,
+			"dot11n_supp_max_mcs": 31
+		},
+		"dot11ac": {
+			"dot11ac_160": false,
+			"dot11ac_8080": false,
+			"dot11ac_mpdu_max": 7991,
+			"dot11ac_sgi80": true,
+			"dot11ac_sgi160": false,
+			"dot11ac_rx_ldpc": true,
+			"dot11ac_tx_stbc": false,
+			"dot11ac_rx_stbc_1ss": false,
+			"dot11ac_rx_stbc_2ss": false,
+			"dot11ac_rx_stbc_3ss": false,
+			"dot11ac_rx_stbc_4ss": false,
+			"dot11ac_su_beamformer": true,
+			"dot11ac_su_beamformee": false,
+			"dot11ac_mu_beamformer": true,
+			"dot11ac_mu_beamformee": false,
+			"dot11ac_supp_max_rx_mcs": 9,
+			"dot11ac_supp_max_rx_nss": 4,
+			"dot11ac_supp_max_tx_mcs": 9,
+			"dot11ac_supp_max_tx_nss": 4
+		},
+		"dot11ax": {
+			"dot11ax_twt_requester": false,
+			"dot11ax_twt_responder": true,
+			"dot11ax_all_ack": false,
+			"dot11ax_trs": false,
+			"dot11ax_bsr": true,
+			"dot11ax_twt_bcast": false,
+			"dot11ax_ba_32bit": false,
+			"dot11ax_om_control": true,
+			"dot11ax_ofdma_ra": false,
+			"dot11ax_amsdu_frag": true,
+			"dot11ax_twt_flexible": false,
+			"dot11ax_qtp": false,
+			"dot11ax_bqr": false,
+			"dot11ax_srp_responder": false,
+			"dot11ax_ops": false,
+			"dot11ax_amsdu_in_ampdu": false,
+			"dot11ax_dynamic_smps": false,
+			"dot11ax_2g_40": false,
+			"dot11ax_5g_4080": true,
+			"dot11ax_5g_160": false,
+			"dot11ax_5g_160_and_8080": false,
+			"dot11ax_2g_242ru": false,
+			"dot11ax_5g_242ru": false,
+			"dot11ax_ldpc_payload": true,
+			"dot11ax_tx_stbc_80": false,
+			"dot11ax_rx_stbc_80": false,
+			"dot11ax_ul_mumimo_full": false,
+			"dot11ax_ul_mumimo_partial": false,
+			"dot11ax_su_beamformer": true,
+			"dot11ax_su_beamformee": true,
+			"dot11ax_mu_beamformer": true,
+			"dot11ax_supp_max_rx_mcs_80": 11,
+			"dot11ax_supp_max_rx_nss_80": 4,
+			"dot11ax_supp_max_tx_mcs_80": 11,
+			"dot11ax_supp_max_tx_nss_80": 4
+		},
+		"dot11k": {
+			"dot11k_link_meas": true,
+			"dot11k_nbr_report": true,
+			"dot11k_bcn_passive": true,
+			"dot11k_bcn_active": true,
+			"dot11k_bcn_table": true,
+			"dot11k_rcpi": false,
+			"dot11k_rsni": false
+		}
+	},
+	"wmm_params": [
+		{
+			"ac": "BE",
+			"aifsn": 3,
+			"cwmin": 4,
+			"cwmax": 10,
+			"txop": 0
+		},
+		{
+			"ac": "BK",
+			"aifsn": 7,
+			"cwmin": 4,
+			"cwmax": 10,
+			"txop": 0
+		},
+		{
+			"ac": "VI",
+			"aifsn": 2,
+			"cwmin": 3,
+			"cwmax": 4,
+			"txop": 94
+		},
+		{
+			"ac": "VO",
+			"aifsn": 2,
+			"cwmin": 2,
+			"cwmax": 3,
+			"txop": 47
+		}
+	]
+}

test/files/tmp/wifi.ap.test2.stations.data

@@ -0,0 +1,101 @@
+{
+	"stations": [
+		{
+			"macaddr": "25:19:1e:e2:f9:dd",
+			"wdev": "test2",
+			"channel": 36,
+			"frequency": 5180,
+			"rssi": -24,
+			"noise": -88,
+			"snr": 61,
+			"idle": 3,
+			"in_network": 50,
+			"tx_airtime": 0,
+			"rx_airtime": 0,
+			"airtime": 0,
+			"maxrate": 866,
+			"nss": 2,
+			"bandwidth": 40,
+			"status": {
+				"wmm": true,
+				"ps": true
+			},
+			"capabilities": {
+				"wmm": true,
+				"apsd": false,
+				"shortslot": false,
+				"dot11h": true,
+				"dot11n": {
+					"dot11n_ldpc": true,
+					"dot11n_40": true,
+					"dot11n_ps": true,
+					"dot11n_sgi20": true,
+					"dot11n_sgi40": true,
+					"dot11n_tx_stbc": true,
+					"dot11n_rx_stbc": true,
+					"dot11n_supp_max_mcs": -1
+				},
+				"dot11ac": {
+					"dot11ac_160": false,
+					"dot11ac_8080": false,
+					"dot11ac_sgi80": true,
+					"dot11ac_sgi160": false,
+					"dot11ac_rx_ldpc": true,
+					"dot11ac_tx_stbc": true,
+					"dot11ac_rx_stbc_1ss": false,
+					"dot11ac_rx_stbc_2ss": false,
+					"dot11ac_rx_stbc_3ss": false,
+					"dot11ac_rx_stbc_4ss": false,
+					"dot11ac_su_beamformer": true,
+					"dot11ac_su_beamformee": true,
+					"dot11ac_mu_beamformer": false,
+					"dot11ac_mu_beamformee": true,
+					"dot11ac_supp_max_rx_mcs": 7,
+					"dot11ac_supp_max_rx_nss": 8,
+					"dot11ac_supp_max_tx_mcs": 7,
+					"dot11ac_supp_max_tx_nss": 8
+				},
+				"dot11k": {
+					"dot11k_link_meas": true,
+					"dot11k_nbr_report": false,
+					"dot11k_bcn_passive": true,
+					"dot11k_bcn_active": true,
+					"dot11k_bcn_table": true,
+					"dot11k_rcpi": false,
+					"dot11k_rsni": false
+				}
+			},
+			"stats": {
+				"tx_total_pkts": 1072,
+				"tx_total_bytes": 123075,
+				"tx_failures": 0,
+				"tx_pkts_retries": 3,
+				"rx_data_pkts": 219,
+				"rx_data_bytes": 24676,
+				"rx_failures": 0,
+				"tx_rate_latest": {
+					"rate": 877,
+					"mcs": 10,
+					"bandwidth": 80,
+					"sgi": 1,
+					"nss": 2,
+					"phy": 9
+				},
+				"rx_rate_latest": {
+					"rate": 1083,
+					"mcs": 11,
+					"bandwidth": 80,
+					"sgi": 0,
+					"nss": 2,
+					"phy": 9
+				}
+			},
+			"rssi_per_antenna": [
+				-24,
+				-31,
+				-24,
+				-31
+			]
+		}
+	]
+}

test/files/tmp/wifi.ap.test2.stats.data

@@ -0,0 +1,65 @@
+{
+	"tx_bytes": 114331,
+	"tx_packets": 1069,
+	"tx_unicast_packets": 0,
+	"tx_multicast_packets": 1095,
+	"tx_broadcast_packets": 0,
+	"tx_error_packets": 1,
+	"tx_retrans_packets": 0,
+	"tx_retrans_fail_packets": 0,
+	"tx_retry_packets": 0,
+	"tx_multi_retry_packets": 0,
+	"tx_dropped_packets": 0,
+	"ack_fail_packets": 0,
+	"aggregate_packets": 0,
+	"rx_bytes": 0,
+	"rx_packets": 0,
+	"rx_unicast_packets": 0,
+	"rx_multicast_packets": 0,
+	"rx_broadcast_packets": 0,
+	"rx_error_packets": 0,
+	"rx_dropped_packets": 0,
+	"rx_unknown_packets": 0,
+	"wmm_stats": [
+		{
+			"ac": "BE",
+			"tx_bytes": 0,
+			"tx_packets": 0,
+			"tx_error_packets": 0,
+			"tx_retrans_packets": 0,
+			"rx_bytes": 0,
+			"rx_packets": 0,
+			"rx_error_packets": 0
+		},
+		{
+			"ac": "BK",
+			"tx_bytes": 0,
+			"tx_packets": 0,
+			"tx_error_packets": 0,
+			"tx_retrans_packets": 0,
+			"rx_bytes": 0,
+			"rx_packets": 0,
+			"rx_error_packets": 0
+		},
+		{
+			"ac": "VI",
+			"tx_bytes": 0,
+			"tx_packets": 0,
+			"tx_error_packets": 0,
+			"tx_retrans_packets": 0,
+			"rx_bytes": 0,
+			"rx_packets": 0,
+			"rx_error_packets": 0
+		},
+		{
+			"ac": "VO",
+			"tx_bytes": 0,
+			"tx_packets": 0,
+			"tx_error_packets": 0,
+			"tx_retrans_packets": 0,
+			"rx_bytes": 0,
+			"rx_packets": 0,
+			"rx_error_packets": 0
+		}
+	]
+}

test/files/tmp/wifi.ap.test2.status.data

@@ -1,18 +1,19 @@
 {
 	"ifname": "test2",
+	"enabled": true,
 	"status": "running",
-	"ssid": "iopsysWrt-002207AB9F80",
-	"bssid": "00:22:07:aa:91:88",
+	"ssid": "iopsysWrt-44D43771B810",
+	"bssid": "44:d4:37:71:b8:1e",
 	"security": "WPA2PSK",
 	"encryption": "CCMP",
-	"channel": 36,
-	"bandwidth": 80,
-	"standard": "802.11",
+	"channel": 11,
+	"bandwidth": 20,
+	"standard": "802.11g/n/ax",
 	"num_stations": 0,
-	"max_stations": 0,
-	"utilization": 0,
+	"max_stations": 128,
+	"utilization": 1,
 	"adm_capacity": 0,
-	"hidden": true,
+	"hidden": false,
 	"supp_security": [
 		"NONE",
 		"WPA3PSK",

test/files/tmp/wifi.dataelements.collector.event.data

@@ -0,0 +1,46 @@
+{
+	"notification": [
+		{
+			"eventTime": "2020-10-24T01:09:34+01:00",
+			"wfa-dataelements:AssociationEvent": {
+				"AssocData": {
+					"BSSID": "00:22:07:6b:17:52",
+					"MACAddress": "54:b8:02:80:25:e8",
+					"StatusCode": 0,
+					"HTCapabilities": "AA==\n",
+					"VHTCapabilities": "AAAAAAAA\n"
+				}
+			}
+		},
+		{
+			"eventTime": "2020-10-24T01:10:03+01:00",
+			"wfa-dataelements:AssociationEvent": {
+				"AssocData": {
+					"BSSID": "00:22:07:6b:17:51",
+					"MACAddress": "d2:a2:d1:17:27:f7",
+					"StatusCode": 0,
+					"HTCapabilities": "AA==\n",
+					"VHTCapabilities": "AAAAAAAA\n"
+				}
+			}
+		},
+		{
+			"eventTime": "2020-10-24T01:10:20+01:00",
+			"wfa-dataelements:DisassociationEvent": {
+				"DisassocData": {
+					"BSSID": "00:22:07:6b:17:51",
+					"MACAddress": "d2:a2:d1:17:27:f7",
+					"ReasonCode": 0,
+					"BytesSent": 181625,
+					"BytesReceived": 11497,
+					"PacketsSent": 1951,
+					"PacketsReceived": 105,
+					"ErrorsSent": 0,
+					"ErrorsReceived": 0,
+					"RetransCount": 0
+				}
+			}
+		}
+	]
+}
+

test/files/tmp/wifi.radio.test1.scanresults.data

@@ -0,0 +1,60 @@
+{
+	"accesspoints": [
+		{
+			"ssid": "iopsysWrt-0022076D53B6",
+			"bssid": "00:22:07:6d:53:bd",
+			"channel": 36,
+			"bandwidth": 80,
+			"encryption": "WPA2PSK",
+			"ciphers": "CCMP",
+			"band": "5GHz",
+			"rssi": -21,
+			"standard": "802.11n/ac",
+			"load_stas": 0,
+			"load_utilization": 5,
+			"load_available": 0
+		},
+		{
+			"ssid": "piva-amin",
+			"bssid": "e8:2c:6d:a5:17:9a",
+			"channel": 36,
+			"bandwidth": 80,
+			"encryption": "WPA2PSK+FT",
+			"ciphers": "CCMP",
+			"band": "5GHz",
+			"rssi": -84,
+			"standard": "802.11n/ac",
+			"load_stas": 0,
+			"load_utilization": 3,
+			"load_available": 0
+		},
+		{
+			"ssid": "iopsysWrt-002207AB9F80",
+			"bssid": "00:22:07:aa:91:88",
+			"channel": 36,
+			"bandwidth": 80,
+			"encryption": "WPA2PSK",
+			"ciphers": "CCMP",
+			"band": "5GHz",
+			"rssi": -77,
+			"standard": "802.11n/ac",
+			"load_stas": 0,
+			"load_utilization": 3,
+			"load_available": 0
+		},
+		{
+			"ssid": "IOPSYS_WLAN_5",
+			"bssid": "50:4e:dc:4a:c7:50",
+			"channel": 52,
+			"bandwidth": 80,
+			"encryption": "WPAPSK/WPA2PSK",
+			"ciphers": "TKIP/CCMP",
+			"band": "5GHz",
+			"rssi": -71,
+			"standard": "802.11n/ac",
+			"load_stas": 0,
+			"load_utilization": 0,
+			"load_available": 0
+		}
+	]
+}

test/files/tmp/wifi.radio.test1.stats.data

@@ -0,0 +1,14 @@
+{
+	"tx_bytes": 150960,
+	"tx_packets": 1301,
+	"tx_error_packets": 0,
+	"tx_dropped_packets": 0,
+	"rx_bytes": 30172,
+	"rx_packets": 218,
+	"rx_error_packets": 8,
+	"rx_dropped_packets": 8,
+	"rx_plcp_error_packets": 0,
+	"rx_fcs_error_packets": 682379,
+	"rx_mac_error_packets": 0,
+	"rx_unknown_packets": 0
+}

test/files/tmp/wifi.radio.test1.status.data

@@ -0,0 +1,204 @@
+{
+	"radio": "test1",
+	"macaddr": "44:d4:37:71:b8:1f",
+	"firmware": "test1: Sep 28 2021 19:55:07 version 17.10.157.2805 (r796514 WLTEST) FWID 01-0",
+	"vendor_id": "0x14e4",
+	"device_id": "0xaaa4",
+	"isup": true,
+	"band": "5GHz",
+	"standard": "802.11a/n/ac/ax",
+	"num_iface": 1,
+	"iface": [
+		{
+			"name": "test1",
+			"mode": "ap"
+		}
+	],
+	"opclass": 128,
+	"channel": 36,
+	"bandwidth": 80,
+	"channel_ext": "above",
+	"tx_streams": 4,
+	"rx_streams": 4,
+	"noise": -85,
+	"guard_int": "Auto",
+	"maxrate": 2401,
+	"supp_bands": [
+		"5GHz"
+	],
+	"supp_std": [
+		"11a",
+		"11n",
+		"11ac",
+		"11ax"
+	],
+	"supp_bw": [
+		"20MHz",
+		"40MHz",
+		"80MHz",
+		"160MHz"
+	],
+	"supp_rates": [
+		
+	],
+	"basic_rates": [
+		
+	],
+	"supp_channels": [
+		{
+			"opclass": 115,
+			"bandwidth": 20,
+			"txpower": 23,
+			"channels": [
+				36,
+				40,
+				44,
+				48
+			]
+		},
+		{
+			"opclass": 118,
+			"bandwidth": 20,
+			"txpower": 23,
+			"channels": [
+				52,
+				56,
+				60,
+				64
+			]
+		},
+		{
+			"opclass": 121,
+			"bandwidth": 20,
+			"txpower": 30,
+			"channels": [
+				100,
+				104,
+				108,
+				112,
+				116,
+				120,
+				124,
+				128,
+				132,
+				136,
+				140
+			]
+		},
+		{
+			"opclass": 116,
+			"bandwidth": 40,
+			"txpower": 23,
+			"channels": [
+				36,
+				44
+			]
+		},
+		{
+			"opclass": 119,
+			"bandwidth": 40,
+			"txpower": 23,
+			"channels": [
+				52,
+				60
+			]
+		},
+		{
+			"opclass": 122,
+			"bandwidth": 40,
+			"txpower": 30,
+			"channels": [
+				100,
+				108,
+				116,
+				124,
+				132
+			]
+		},
+		{
+			"opclass": 117,
+			"bandwidth": 40,
+			"txpower": 23,
+			"channels": [
+				40,
+				48
+			]
+		},
+		{
+			"opclass": 120,
+			"bandwidth": 40,
+			"txpower": 23,
+			"channels": [
+				56,
+				64
+			]
+		},
+		{
+			"opclass": 123,
+			"bandwidth": 40,
+			"txpower": 30,
+			"channels": [
+				104,
+				112,
+				120,
+				128,
+				136
+			]
+		},
+		{
+			"opclass": 128,
+			"bandwidth": 80,
+			"txpower": 30,
+			"channels": [
+				36,
+				52,
+				100,
+				116
+			]
+		},
+		{
+			"opclass": 129,
+			"bandwidth": 160,
+			"txpower": 23,
+			"channels": [
+				36,
+				100
+			]
+		}
+	],
+	"txpower_dbm": 31,
+	"txpower": 100,
+	"dot11h_capable": false,
+	"dot11h_enabled": false,
+	"regdomain": "DE",
+	"beacon_int": 100,
+	"dtim_period": 2,
+	"preamble": "short",
+	"short_retry_limit": 7,
+	"long_retry_limit": 4,
+	"frag_threshold": -1,
+	"rts_threshold": -1,
+	"aggr_enabled": false,
+	"stats": {
+		"tx_bytes": 147885,
+		"tx_packets": 1275,
+		"tx_error_packets": 0,
+		"tx_dropped_packets": 0,
+		"rx_bytes": 27799,
+		"rx_packets": 201,
+		"rx_error_packets": 8,
+		"rx_dropped_packets": 8,
+		"rx_plcp_error_packets": 0,
+		"rx_fcs_error_packets": 682377,
+		"rx_mac_error_packets": 0,
+		"rx_unknown_packets": 0
+	},
+	"diagnostics": {
+		"channel_busy": 0,
+		"tx_airtime": 10000,
+		"rx_airtime": 0,
+		"obss_airtime": 0,
+		"cca_time": 1000000,
+		"false_cca_count": 220
+	}
+}

test/files/tmp/wifi.radio.test2.scanresults.data

@@ -0,0 +1,102 @@
+{
+	"accesspoints": [
+		{
+			"ssid": "ooredoo_5CAE00",
+			"bssid": "86:aa:9c:5c:ae:00",
+			"channel": 1,
+			"bandwidth": 20,
+			"encryption": "WPAPSK/WPA2PSK",
+			"ciphers": "TKIP/CCMP",
+			"band": "2.4GHz",
+			"rssi": -70,
+			"standard": "802.11b/g/n",
+			"load_stas": 0,
+			"load_utilization": 8,
+			"load_available": 31250
+		},
+		{
+			"ssid": "IOPSYS_WLAN",
+			"bssid": "74:da:da:7a:29:59",
+			"channel": 6,
+			"bandwidth": 20,
+			"encryption": "WPA2PSK",
+			"ciphers": "CCMP",
+			"band": "2.4GHz",
+			"rssi": -54,
+			"standard": "802.11b/g/n",
+			"load_stas": 0,
+			"load_utilization": 0,
+			"load_available": 0
+		},
+		{
+			"ssid": "amin_piva",
+			"bssid": "e8:2c:6d:00:02:d4",
+			"channel": 6,
+			"bandwidth": 20,
+			"encryption": "WPA2PSK",
+			"ciphers": "CCMP",
+			"band": "2.4GHz",
+			"rssi": -50,
+			"standard": "802.11b/g/n",
+			"load_stas": 0,
+			"load_utilization": 12,
+			"load_available": 0
+		},
+		{
+			"ssid": "piva-amin",
+			"bssid": "e8:2c:6d:a5:17:94",
+			"channel": 6,
+			"bandwidth": 20,
+			"encryption": "WPA2PSK+FT",
+			"ciphers": "CCMP",
+			"band": "2.4GHz",
+			"rssi": -73,
+			"standard": "802.11b/g",
+			"load_stas": 0,
+			"load_utilization": 20,
+			"load_available": 0
+		},
+		{
+			"ssid": "IOPSYS_WLAN_2.4",
+			"bssid": "50:4e:dc:4a:c7:54",
+			"channel": 11,
+			"bandwidth": 20,
+			"encryption": "WPAPSK/WPA2PSK",
+			"ciphers": "TKIP/CCMP",
+			"band": "2.4GHz",
+			"rssi": -68,
+			"standard": "802.11b/g/n",
+			"load_stas": 0,
+			"load_utilization": 0,
+			"load_available": 0
+		},
+		{
+			"ssid": "iopsysWrt-0022076D53B6",
+			"bssid": "00:22:07:6d:53:bc",
+			"channel": 11,
+			"bandwidth": 20,
+			"encryption": "WPA2PSK",
+			"ciphers": "CCMP",
+			"band": "2.4GHz",
+			"rssi": -15,
+			"standard": "802.11b/g/n",
+			"load_stas": 0,
+			"load_utilization": 13,
+			"load_available": 0
+		},
+		{
+			"ssid": "iopsys-5399",
+			"bssid": "00:22:07:2c:53:98",
+			"channel": 11,
+			"bandwidth": 20,
+			"encryption": "WPA2PSK",
+			"ciphers": "CCMP",
+			"band": "2.4GHz",
+			"rssi": -24,
+			"standard": "802.11b/g/n",
+			"load_stas": 0,
+			"load_utilization": 22,
+			"load_available": 0
+		}
+	]
+}

test/files/tmp/wifi.radio.test2.stats.data

@@ -0,0 +1,14 @@
+{
+	"tx_bytes": 118352,
+	"tx_packets": 1111,
+	"tx_error_packets": 5,
+	"tx_dropped_packets": 0,
+	"rx_bytes": 0,
+	"rx_packets": 0,
+	"rx_error_packets": 0,
+	"rx_dropped_packets": 0,
+	"rx_plcp_error_packets": 0,
+	"rx_fcs_error_packets": 75050,
+	"rx_mac_error_packets": 0,
+	"rx_unknown_packets": 0
+}

test/files/tmp/wifi.radio.test2.status.data

@@ -0,0 +1,135 @@
+{
+	"radio": "test2",
+	"macaddr": "44:d4:37:71:b8:1e",
+	"firmware": "test2: Aug 31 2021 22:20:08 version 17.10.157.2805 (r796514 WLTEST)",
+	"vendor_id": "0x14e4",
+	"device_id": "0xf6ca",
+	"isup": true,
+	"band": "2.4GHz",
+	"standard": "802.11g/n/ax",
+	"num_iface": 1,
+	"iface": [
+		{
+			"name": "test2",
+			"mode": "ap"
+		}
+	],
+	"opclass": 81,
+	"channel": 11,
+	"bandwidth": 20,
+	"channel_ext": "none",
+	"tx_streams": 2,
+	"rx_streams": 2,
+	"noise": -83,
+	"guard_int": "Auto",
+	"maxrate": 286,
+	"supp_bands": [
+		"2.4GHz"
+	],
+	"supp_std": [
+		"11b",
+		"11g",
+		"11n",
+		"11ac",
+		"11ax"
+	],
+	"supp_bw": [
+		"20MHz",
+		"40MHz"
+	],
+	"supp_rates": [
+		
+	],
+	"basic_rates": [
+		
+	],
+	"supp_channels": [
+		{
+			"opclass": 81,
+			"bandwidth": 20,
+			"txpower": 20,
+			"channels": [
+				1,
+				2,
+				3,
+				4,
+				5,
+				6,
+				7,
+				8,
+				9,
+				10,
+				11,
+				12,
+				13
+			]
+		},
+		{
+			"opclass": 83,
+			"bandwidth": 40,
+			"txpower": 20,
+			"channels": [
+				1,
+				2,
+				3,
+				4,
+				5,
+				6,
+				7,
+				8,
+				9
+			]
+		},
+		{
+			"opclass": 84,
+			"bandwidth": 40,
+			"txpower": 20,
+			"channels": [
+				5,
+				6,
+				7,
+				8,
+				9,
+				10,
+				11,
+				12,
+				13
+			]
+		}
+	],
+	"txpower_dbm": 31,
+	"txpower": 100,
+	"dot11h_capable": false,
+	"dot11h_enabled": false,
+	"regdomain": "DE",
+	"beacon_int": 100,
+	"dtim_period": 2,
+	"preamble": "short",
+	"short_retry_limit": 7,
+	"long_retry_limit": 4,
+	"frag_threshold": -1,
+	"rts_threshold": -1,
+	"aggr_enabled": false,
+	"stats": {
+		"tx_bytes": 117108,
+		"tx_packets": 1100,
+		"tx_error_packets": 5,
+		"tx_dropped_packets": 0,
+		"rx_bytes": 0,
+		"rx_packets": 0,
+		"rx_error_packets": 0,
+		"rx_dropped_packets": 0,
+		"rx_plcp_error_packets": 0,
+		"rx_fcs_error_packets": 75038,
+		"rx_mac_error_packets": 0,
+		"rx_unknown_packets": 0
+	},
+	"diagnostics": {
+		"channel_busy": 0,
+		"tx_airtime": 10000,
+		"rx_airtime": 0,
+		"obss_airtime": 0,
+		"cca_time": 1000000,
+		"false_cca_count": 16
+	}
+}

test/files/tmp/wifi.status.data

@@ -45,7 +45,7 @@
 				{
 					"ifname": "test1",
 					"status": "running",
-					"ssid": "iopsysWrt-44D43771AD50",
+					"ssid": "iopsysWrt-44D43771B810",
 					"bssid": "44:d4:37:71:ad:5f"
 				}
 			],
@@ -99,7 +99,7 @@
 				{
 					"ifname": "test2",
 					"status": "running",
-					"ssid": "iopsysWrt-44D43771AD50",
+					"ssid": "iopsysWrt-44D43771B810",
 					"bssid": "44:d4:37:71:ad:5e"
 				}
 			],

test/files/usr/libexec/rpcd/dhcp

@@ -0,0 +1,17 @@
+#!/bin/sh
+
+. /usr/share/libubox/jshn.sh
+
+case "$1" in
+        list)
+                echo '{ "ipv6leases" : {} }'
+        ;;
+        call)
+                case "$2" in
+                        ipv6leases)
+                                cat /tmp/dhcp.ipv6leases.data 2>/dev/null
+                        ;;
+                esac
+        ;;
+esac
+

test/files/usr/libexec/rpcd/ethernet

@@ -4,7 +4,7 @@
 
 case "$1" in
         list)
-                echo '{ "rmonstats" : {"ifname":"String"} }'
+                echo '{ "rmonstats" : {"ifname":"str"} }'
         ;;
         call)
                 case "$2" in

test/files/usr/libexec/rpcd/ieee1905

@@ -0,0 +1,17 @@
+#!/bin/sh
+
+. /usr/share/libubox/jshn.sh
+
+case "$1" in
+        list)
+                echo '{ "info" : {} }'
+        ;;
+        call)
+                case "$2" in
+                        info)
+                                cat /tmp/ieee1905.info.data 2>/dev/null
+                        ;;
+                esac
+        ;;
+esac
+

test/files/usr/libexec/rpcd/network.interface

@@ -0,0 +1,28 @@
+#!/bin/sh
+
+. /usr/share/libubox/jshn.sh
+
+case "$1" in
+        list)
+                echo '{ "status" : {"interface":"str"} }'
+        ;;
+        call)
+                case "$2" in
+                	status)
+						read input;
+						json_load "$input"
+						json_get_var interface interface
+						if [ "$interface" == "lan" ]; then
+							cat /tmp/interface_lan.data 2>/dev/null
+						elif [ "$interface" == "wan" ]; then
+							cat /tmp/interface_wan.data 2>/dev/null
+						elif [ "$interface" == "wan6" ]; then
+							cat /tmp/interface_wan6.data 2>/dev/null
+						else
+							cat /tmp/interface_lan.data 2>/dev/null
+						fi
+					;;
+                esac
+        ;;
+esac
+

test/files/usr/libexec/rpcd/wifi.ap.test1

@@ -0,0 +1,22 @@
+#!/bin/sh
+
+. /usr/share/libubox/jshn.sh
+
+case "$1" in
+        list)
+                echo '{ "status" : {}, "stats": {}, "stations": {} }'
+        ;;
+        call)
+                case "$2" in
+                        status)
+                                cat /tmp/wifi.ap.test1.status.data 2>/dev/null
+                        ;;
+                        stats)
+                                cat /tmp/wifi.ap.test1.stats.data 2>/dev/null
+                        ;;
+                        stations)
+                                cat /tmp/wifi.ap.test1.stations.data 2>/dev/null
+                        ;;
+                esac
+        ;;
+esac

test/files/usr/libexec/rpcd/wifi.ap.test2

@@ -4,14 +4,19 @@
 
 case "$1" in
         list)
-                echo '{ "status" : {} }'
+                echo '{ "status" : {}, "stats": {}, "stations": {} }'
         ;;
         call)
                 case "$2" in
                         status)
-                                cat /tmp/wifi.ap.status.data 2>/dev/null
+                                cat /tmp/wifi.ap.test2.status.data 2>/dev/null
+                        ;;
+                        stats)
+                                cat /tmp/wifi.ap.test2.stats.data 2>/dev/null
+                        ;;
+                        stations)
+                                cat /tmp/wifi.ap.test2.stations.data 2>/dev/null
                         ;;
                 esac
         ;;
 esac
-

test/files/usr/libexec/rpcd/wifi.dataelements.collector

@@ -0,0 +1,20 @@
+#!/bin/sh
+
+. /usr/share/libubox/jshn.sh
+
+case "$1" in
+        list)
+                echo '{ "dump" : {}, "event": {} }'
+        ;;
+        call)
+                case "$2" in
+                        dump)
+                                cat /tmp/wifi.dataelements.collector.dump.data 2>/dev/null
+                        ;;
+                        event)
+                                cat /tmp/wifi.dataelements.collector.event.data 2>/dev/null
+                        ;;
+                esac
+        ;;
+esac
+

test/files/usr/libexec/rpcd/wifi.radio.test1

@@ -0,0 +1,22 @@
+#!/bin/sh
+
+. /usr/share/libubox/jshn.sh
+
+case "$1" in
+        list)
+                echo '{ "status" : {}, "stats": {}, "scanresults": {} }'
+        ;;
+        call)
+                case "$2" in
+                        status)
+                                cat /tmp/wifi.radio.test1.status.data 2>/dev/null
+                        ;;
+                        stats)
+                                cat /tmp/wifi.radio.test1.stats.data 2>/dev/null
+                        ;;
+                        scanresults)
+                                cat /tmp/wifi.radio.test1.scanresults.data 2>/dev/null
+                        ;;
+                esac
+        ;;
+esac

test/files/usr/libexec/rpcd/wifi.radio.test2

@@ -0,0 +1,22 @@
+#!/bin/sh
+
+. /usr/share/libubox/jshn.sh
+
+case "$1" in
+        list)
+                echo '{ "status" : {}, "stats": {}, "scanresults": {} }'
+        ;;
+        call)
+                case "$2" in
+                        status)
+                                cat /tmp/wifi.radio.test2.status.data 2>/dev/null
+                        ;;
+                        stats)
+                                cat /tmp/wifi.radio.test2.stats.data 2>/dev/null
+                        ;;
+                        scanresults)
+                                cat /tmp/wifi.radio.test2.scanresults.data 2>/dev/null
+                        ;;
+                esac
+        ;;
+esac

test/files/var/dhcp.client.options

@@ -0,0 +1 @@
+24:18:1d:e2:f7:dd vcid=android-dhcp-9 clid=01:24:18:1d:e2:f7:dd ucid=-

test/files/var/log/asterisk/cdr-csv/Master.csv

@@ -0,0 +1,5 @@
+"","+441473708680","1451141411444441414441","sip0","""+441473708680"" <+441473708680>","TELCHAN/4/5","PJSIP/sip0-00000005","Dial","PJSIP/1451141411444441414441@sip0,,gT","2021-09-07 13:12:41","2021-09-07 13:12:41","2021-09-07 13:12:48",6,6,"ANSWERED",1269954892,"192.168.10.251","185.93.169.16",200,"alaw",0,0,0,0,0,0,0,0,0,0,0,0,0,0,200,0,0,0,0,0,322,331,0,0,"DOCUMENTATION","1631016761.15",""
+"","+441473708680","1471","sip0","""+441473708680"" <+441473708680>","TELCHAN/4/6","PJSIP/sip0-00000006","Dial","PJSIP/1471@sip0,,gT","2021-09-07 13:13:06",,"2021-09-07 13:13:14",7,0,"NO ANSWER",1201729234,"192.168.10.251","185.93.169.16",200,"alaw","DOCUMENTATION","1631016786.18",""
+"","+441473708680","123","sip0","""+441473708680"" <+441473708680>","TELCHAN/4/7","PJSIP/sip0-00000007","Dial","PJSIP/123@sip0,,gT","2021-09-07 13:13:42","2021-09-07 13:13:43","2021-09-07 13:13:49",7,6,"ANSWERED",1213132331,"192.168.10.251","185.93.169.16",200,"alaw",0,0,0,0,0,0,0,0,0,0,0,0,0,0,200,0,0,0,0,0,725,753,0,0,"DOCUMENTATION","1631016822.21",""
+"","102","100","call_line","""102"" <102>","PJSIP/sip0-00000000","TELCHAN/4/0","Dial","TELCHAN\/4,,tF(hangup,h,2)","2021-07-15 10:40:15","2021-07-15 10:40:17","2021-07-15 10:40:21",5,3,"ANSWERED",694574275,"192.168.8.124","192.168.8.121",200,"alaw",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,5,0,0,0,383,1913,1,5,"DOCUMENTATION","1626338415.0",""
+"","102","100","call_line","""102"" <102>","PJSIP/sip0-00000001","TELCHAN/4/1","Dial","TELCHAN\/4,,tF(hangup,h,2)","2021-07-15 10:40:32",,"2021-07-15 10:40:36",3,0,"NO ANSWER",463655327,"192.168.8.124","",487,"","DOCUMENTATION","1626338432.3",""