mirror/bbfdm
1
0
Fork 0
mirror of https://dev.iopsys.eu/bbf/bbfdm.git synced 2025-12-10 07:44:39 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Simulate dump2 Multi-AP setup && Fix a crash

Browse source
This commit is contained in:
Amin Ben Ramdhane 2021-12-13 08:24:06 +00:00
parent 591d7ac3c5
commit 2486dffd24
7 changed files with 524 additions and 1083 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

@ -41,3 +41,6 @@ tools/__pycache__
*\.log *\.log
.libs .libs
m4/ m4/
bbf_ubus
memory-report.xml
*.la

22
dmtree/tr181/wifi.c
View file

@ -656,7 +656,7 @@ static json_object *dump2_find_device_object(const char *unique_key)
return NULL; return NULL;
} }
static json_object *find_radio_object(json_object *device_obj, const char *unique_key) static json_object *dump_find_radio_object(json_object *device_obj, const char *unique_key)
{ {
json_object *radio_arr = NULL; json_object *radio_arr = NULL;
json_object *radio_obj = NULL; json_object *radio_obj = NULL;
@ -675,6 +675,22 @@ static json_object *find_radio_object(json_object *device_obj, const char *uniqu
return NULL; return NULL;
} }
static json_object *dump2_find_radio_object(json_object *device_obj, const char *unique_key)
{
json_object *radio_arr = NULL;
json_object *radio_obj = NULL;
int i = 0;
dmjson_foreach_obj_in_array(device_obj, radio_arr, radio_obj, i, 1, "RadioList") {
char *mac = dmjson_get_value(radio_obj, 1, "macaddr");
if (strcmp(unique_key, mac) == 0)
return radio_obj;
}
return NULL;
}
static int browseWiFiDataElementsNetworkDeviceInst(struct dmctx *dmctx, DMNODE *parent_node, void *prev_data, char *prev_instance) static int browseWiFiDataElementsNetworkDeviceInst(struct dmctx *dmctx, DMNODE *parent_node, void *prev_data, char *prev_instance)
{ {
struct wifi_data_element_args wifi_da_device_args = {0}; struct wifi_data_element_args wifi_da_device_args = {0};
@ -734,8 +750,8 @@ static int browseWiFiDataElementsNetworkDeviceRadioInst(struct dmctx *dmctx, DMN
continue; continue;
wifi_da_radio_args.uci_s = p; wifi_da_radio_args.uci_s = p;
wifi_da_radio_args.dump_obj = find_radio_object(wifi_da_device->dump_obj, key); wifi_da_radio_args.dump_obj = dump_find_radio_object(wifi_da_device->dump_obj, key);
wifi_da_radio_args.dump2_obj = find_radio_object(wifi_da_device->dump2_obj, key); wifi_da_radio_args.dump2_obj = dump2_find_radio_object(wifi_da_device->dump2_obj, key);
inst = handle_instance(dmctx, parent_node, p->dmmap_section, "wifi_da_device_instance", "wifi_da_device_alias"); inst = handle_instance(dmctx, parent_node, p->dmmap_section, "wifi_da_device_instance", "wifi_da_device_alias");

2
libbbf_api/dmcommon.c
View file

@ -1567,7 +1567,7 @@ char *base64_decode(const char *src)
{ {
int i, j = 0; int i, j = 0;
if (!src) if (!src || *src == '\0')
return ""; return "";
size_t decsize = strlen(src)*6/8; size_t decsize = strlen(src)*6/8;

120
test/files/etc/config/mapcontroller
View file

@ -1,4 +1,3 @@
config controller 'controller' config controller 'controller'
option enabled '1' option enabled '1'
option registrar '5 2' option registrar '5 2'
@ -9,100 +8,55 @@ config controller 'controller'
option use_usta_metrics '0' option use_usta_metrics '0'
option primary_vid '1' option primary_vid '1'
option primary_pcp '0' option primary_pcp '0'
option backhaul_steer '0'
option beacon_metrics '0' config interface 'lan'
option usta_metrics '0'
option traffic_separation '0'
option coordinated_cac '0'
config ap config ap
option band '5' option band '5'
option ssid '5GHz-main' option ssid 'iopsysWrt-44D43771B410'
option encryption 'sae-mixed' option encryption 'sae-mixed'
option vid '100' option key 'PCTQ44TNVKK5NU'
option type 'fronthaul'
option network 'lan'
option key 'M7YrYVYh9ULtm3QG'
config ap
option band '5'
option ssid '5GHz-guest'
option encryption 'sae-mixed'
option vid '200'
option type 'fronthaul'
option network 'lan'
option key 'M7YrYVYh9ULtm3QG'
config ap
option band '2'
option ssid 'MAP-608D26C4983C-2.4GHz'
option encryption 'sae-mixed'
option vid '100'
option type 'fronthaul'
option network 'lan'
option key 'M7YrYVYh9ULtm3QG'
config ap
option band '5'
option ssid 'MAP-608D26C4983C-BH-5GHz'
option encryption 'sae'
option vid '1' option vid '1'
option type 'backhaul' option type 'fronthaul'
option network 'lan' option network 'lan'
option key 'c12bf5457bc6189133d2a803fb09bb5b49e35b0e05d9abe449a5f6025441cc4'
config ap config ap
option band '2' option band '2'
option ssid 'MAP-608D26C4983C-BH-2.4GHz' option ssid 'iopsysWrt-44D43771B410'
option encryption 'sae' option encryption 'sae-mixed'
option vid '10' option key 'PCTQ44TNVKK5NU'
option type 'backhaul' option vid '1'
option type 'fronthaul'
option network 'lan' option network 'lan'
option key 'c12bf5457bc6189133d2a803fb09bb5b49e35b0e05d9abe449a5f6025441cc4'
config node 'node_021111aabbcc' config ap
option agent_id '02:11:11:aa:bb:cc'
option backhaul_ul_macaddr '00:00:00:00:00:01'
option backhaul_dl_macaddr '06:10:20:30:40:50'
option backhaul_type 'none'
option primary_vid '1'
option primary_pcp '0'
option report_sta_assocfails '1'
option report_sta_assocfails_rate '2'
option report_metric_periodic '0'
option report_scan '0'
list steer_exclude '00:aa:bb:cc:dd:11'
list steer_exclude '00:aa:bb:cc:dd:22'
list steer_exclude '00:aa:bb:cc:dd:33'
list steer_exclude_btm '00:aa:bb:cc:dd:44'
list steer_exclude_btm '00:aa:bb:cc:dd:55'
option steer_disallow '0'
option coordinated_cac '1'
option traffic_separation '1'
option sta_steer '1'
config radio
option agent_id '02:11:11:aa:bb:cc'
option macaddr '02:12:12:bb:cc:dd'
option band '5' option band '5'
option steer_policy '0' option ssid 'MAP-44D43771B410-BH-5GHz'
option util_threshold '200' option encryption 'sae'
option rcpi_threshold '60' option type 'backhaul'
option report_rcpi_threshold '0' option vid '1'
option report_rcpi_hysteresis_margin '0' option network 'lan'
option report_util_threshold '0' option key '029be741b7ff7b4caf9b1b3c48c56030fed877c22f5031bc9cf0132d1672c2c'
option include_sta_stats '0'
option include_sta_metric '0' config ap
option band '2'
option ssid 'MAP-44D43771B410-BH-2.4GHz'
option encryption 'sae'
option type 'backhaul'
list disallow_bsta '0'
option vid '1'
option network 'lan'
option key '029be741b7ff7b4caf9b1b3c48c56030fed877c22f5031bc9cf0132d1672c2c'
config node
option agent_id '46:d4:37:71:b4:10'
config radio config radio
option agent_id '02:11:11:aa:bb:cc' option agent_id '46:d4:37:71:b4:10'
option macaddr '02:12:12:bb:cc:de' option macaddr '44:d4:37:71:b4:1f'
option band '5'
config radio
option agent_id '46:d4:37:71:b4:10'
option macaddr '44:d4:37:71:b4:1e'
option band '2' option band '2'
option steer_policy '0'
option util_threshold '200'
option rcpi_threshold '30'
option report_rcpi_threshold '0'
option report_rcpi_hysteresis_margin '0'
option report_util_threshold '0'
option include_sta_stats '0'
option include_sta_metric '0'

717
test/files/tmp/wifi.dataelements.collector.dump.data
View file

@ -1,302 +1,70 @@
{ {
"date": "Thu Dec 9 15:57:41 2021", "date": "Mon Dec 13 06:54:32 2021",
"version": "0.2", "version": "0.2",
"description": "WFA Data Elements", "description": "WFA Data Elements",
"TimeStamp": "2021-12-09T15:57:41+01:00", "TimeStamp": "2021-12-13T06:54:32+01:00",
"name": "wifi", "name": "wifi",
"data": [ "data": [
{ {
"wfa-dataelements:Network": { "wfa-dataelements:Network": {
"ID": "", "ID": "",
"NumberOfDevices": 1, "NumberOfDevices": 1,
"ControllerID": "02:11:11:aa:bb:cc", "ControllerID": "46:d4:37:71:b4:10",
"TimeStamp": "2021-12-09T14:46:53+01:00", "TimeStamp": "2021-12-13T06:06:35+01:00",
"DeviceList": [ "DeviceList": [
{ {
"ID": "02:11:11:aa:bb:cc", "ID": "46:d4:37:71:b4:10",
"NumberOfRadios": 2, "NumberOfRadios": 2,
"CollectionInterval": 1230, "CollectionInterval": 0,
"RadioList": [ "RadioList": [
{ {
"ID": "AhISu8zd", "ID": "RNQ3cbQf",
"Noise": 95, "Noise": 170,
"NumberOfBSS": 1, "NumberOfBSS": 2,
"Enabled": true, "Enabled": true,
"NumberOfCurrOpClass": 1, "NumberOfCurrOpClass": 1,
"NumberOfUnassocSta": 0, "NumberOfUnassocSta": 0,
"Utilization": 56, "Utilization": 0,
"Transmit": 0, "Transmit": 56,
"ReceiveSelf": 0, "ReceiveSelf": 56,
"RecieveOther": 0, "RecieveOther": 68,
"BSSList": [ "BSSList": [
{ {
"BSSID": "02:12:12:bb:cc:dd", "BSSID": "7e:d4:37:71:b4:18",
"SSID": "iopsysWrt-002207A2F052", "SSID": "MAP-44D43771B410-BH-5GHz",
"TimeStamp": "2021-12-09T14:46:53+01:00", "TimeStamp": "2021-12-13T06:06:35+01:00",
"Enabled": false, "Enabled": true,
"LastChange": 0, "LastChange": 0,
"NumberofSTA": 0, "NumberofSTA": 0,
"EstServiceParametersBE": "AAAA", "EstServiceParametersBE": "AAAA",
"EstServiceParametersBK": "AAAA", "EstServiceParametersBK": "AAAA",
"EstServiceParameterVO": "AAAA", "EstServiceParametersVO": "AAAA",
"EstServieParameterVI": "AAAA", "EstServiceParametersVI": "AAAA",
"UnicastBytesReceived": 0, "UnicastBytesReceived": 0,
"UnicastBytesSent": 0, "UnicastBytesSent": 0,
"MulticastBytesReceived": 0, "MulticastBytesReceived": 0,
"MulticastBytesSent": 0, "MulticastBytesSent": 30,
"BroadcastBytesReceived": 0, "BroadcastBytesReceived": 0,
"BroadcastBytesSent": 0, "BroadcastBytesSent": 0,
"STAList": [ "STAList": [
] ]
}
],
"Capabilites": {
"NumberOfOpClass": 3,
"OperatingClasses": [
{
"Class": 81,
"MaxTxPower": 20,
"NumberOfNonOperChan": 0,
"NonOperable": [
93
]
}, },
{ {
"Class": 83, "BSSID": "44:d4:37:71:b4:1f",
"MaxTxPower": 20, "SSID": "iopsysWrt-44D43771B410",
"NumberOfNonOperChan": 0, "TimeStamp": "2021-12-13T06:06:35+01:00",
"NonOperable": [
]
},
{
"Class": 84,
"MaxTxPower": 20,
"NumberOfNonOperChan": 0,
"NonOperable": [
]
}
],
"HTCapabilities": "Dg==",
"VHTCapabilities": "AA==",
"HECapabilities": "AAA="
},
"CurrentOperatingClasses": [
{
"TimeStamp": "2020-07-26T04:53:12+01:00",
"Channel": 11,
"Class": 4,
"TxPower": 30
}
],
"ScanResultList": [
{
"TimeStamp": "2020-07-26T04:53:12+01:00",
"NumberOfOpClassScans": 3,
"OpClassScanList": [
{
"OperatingClass": 81,
"NumberOfChannelScans": 13,
"ChannelScanList": [
{
"TimeStamp": "2020-07-26T04:53:12+01:00",
"Channel": 1,
"NumberofNeighbors": 1,
"Noise": 100,
"Utilization": 50,
"NeighborList": [
{
"StationCount": 1,
"ChannelUtilization": 14,
"BSSID": "02:12:12:bb:cc:de",
"SSID": "iopsysWrt-0022079FB7FC",
"SignalStrengh": -32,
"ChannelBandwidth": 0
}
]
},
{
"TimeStamp": "2020-07-26T04:53:12+01:00",
"Channel": 2,
"NumberofNeighbors": 0,
"Noise": 100,
"Utilization": 50,
"NeighborList": [
]
},
{
"TimeStamp": "2020-07-26T04:53:12+01:00",
"Channel": 3,
"NumberofNeighbors": 0,
"Noise": 100,
"Utilization": 50,
"NeighborList": [
]
},
{
"TimeStamp": "2020-07-26T04:53:12+01:00",
"Channel": 4,
"NumberofNeighbors": 0,
"Noise": 100,
"Utilization": 50,
"NeighborList": [
]
},
{
"TimeStamp": "2020-07-26T04:53:12+01:00",
"Channel": 5,
"NumberofNeighbors": 0,
"Noise": 100,
"Utilization": 50,
"NeighborList": [
]
},
{
"TimeStamp": "2020-07-26T04:53:12+01:00",
"Channel": 6,
"NumberofNeighbors": 1,
"Noise": 100,
"Utilization": 50,
"NeighborList": [
{
"StationCount": 0,
"ChannelUtilization": 0,
"BSSID": "50:0f:f5:89:20:41",
"SSID": "404 not found",
"SignalStrengh": -27,
"ChannelBandwidth": 1
}
]
},
{
"TimeStamp": "",
"Channel": 0,
"NumberofNeighbors": 0,
"Noise": 0,
"Utilization": 0,
"NeighborList": [
]
},
{
"TimeStamp": "",
"Channel": 0,
"NumberofNeighbors": 0,
"Noise": 0,
"Utilization": 0,
"NeighborList": [
]
},
{
"TimeStamp": "",
"Channel": 0,
"NumberofNeighbors": 0,
"Noise": 0,
"Utilization": 0,
"NeighborList": [
]
},
{
"TimeStamp": "",
"Channel": 0,
"NumberofNeighbors": 0,
"Noise": 0,
"Utilization": 0,
"NeighborList": [
]
},
{
"TimeStamp": "",
"Channel": 0,
"NumberofNeighbors": 0,
"Noise": 0,
"Utilization": 0,
"NeighborList": [
]
},
{
"TimeStamp": "",
"Channel": 0,
"NumberofNeighbors": 0,
"Noise": 0,
"Utilization": 0,
"NeighborList": [
]
},
{
"TimeStamp": "",
"Channel": 0,
"NumberofNeighbors": 0,
"Noise": 0,
"Utilization": 0,
"NeighborList": [
]
}
]
},
{
"OperatingClass": 83,
"NumberOfChannelScans": 0,
"ChannelScanList": [
]
},
{
"OperatingClass": 84,
"NumberOfChannelScans": 0,
"ChannelScanList": [
]
}
]
}
],
"UnassociatedStaList": [
],
"BackhaulSta": {
"MACAddress": "00:00:00:00:00:00"
}
},
{
"ID": "AhISu8ze",
"Noise": 90,
"NumberOfBSS": 1,
"Enabled": true, "Enabled": true,
"NumberOfCurrOpClass": 1,
"NumberOfUnassocSta": 0,
"Utilization": 0,
"Transmit": 156,
"ReceiveSelf": 0,
"RecieveOther": 121,
"BSSList": [
{
"BSSID": "02:12:12:bb:cc:de",
"SSID": "iopsysWrt-002207A2F052-new",
"TimeStamp": "2021-12-09T14:46:53+01:00",
"Enabled": false,
"LastChange": 0, "LastChange": 0,
"NumberofSTA": 0, "NumberofSTA": 0,
"EstServiceParametersBE": "AAAA", "EstServiceParametersBE": "AAAA",
"EstServiceParametersBK": "AAAA", "EstServiceParametersBK": "AAAA",
"EstServiceParameterVO": "AAAA", "EstServiceParametersVO": "AAAA",
"EstServieParameterVI": "AAAA", "EstServiceParametersVI": "AAAA",
"UnicastBytesReceived": 0, "UnicastBytesReceived": 0,
"UnicastBytesSent": 35, "UnicastBytesSent": 0,
"MulticastBytesReceived": 0, "MulticastBytesReceived": 0,
"MulticastBytesSent": 0, "MulticastBytesSent": 48,
"BroadcastBytesReceived": 0, "BroadcastBytesReceived": 0,
"BroadcastBytesSent": 0, "BroadcastBytesSent": 0,
"STAList": [ "STAList": [
@ -305,14 +73,14 @@
} }
], ],
"Capabilites": { "Capabilites": {
"NumberOfOpClass": 13, "NumberOfOpClass": 11,
"OperatingClasses": [ "OperatingClasses": [
{ {
"Class": 115, "Class": 115,
"MaxTxPower": 23, "MaxTxPower": 23,
"NumberOfNonOperChan": 0, "NumberOfNonOperChan": 0,
"NonOperable": [ "NonOperable": [
93
] ]
}, },
{ {
@ -379,14 +147,6 @@
] ]
}, },
{
"Class": 125,
"MaxTxPower": 30,
"NumberOfNonOperChan": 0,
"NonOperable": [
]
},
{ {
"Class": 128, "Class": 128,
"MaxTxPower": 30, "MaxTxPower": 30,
@ -401,380 +161,128 @@
"NumberOfNonOperChan": 0, "NumberOfNonOperChan": 0,
"NonOperable": [ "NonOperable": [
]
},
{
"Class": 130,
"MaxTxPower": 23,
"NumberOfNonOperChan": 0,
"NonOperable": [
] ]
} }
], ],
"HTCapabilities": "Dg==", "HTCapabilities": "Dg==",
"VHTCapabilities": "AA==", "VHTCapabilities": "AAAAAAIw",
"HECapabilities": "AAA=" "HECapabilities": "AAA="
}, },
"CurrentOperatingClasses": [ "CurrentOperatingClasses": [
{ {
"TimeStamp": "2020-07-26T04:53:12+01:00", "TimeStamp": "2021-12-13T06:06:36+01:00",
"Channel": 36, "Channel": 36,
"Class": 128, "Class": 128,
"TxPower": 30 "TxPower": 30
} }
], ],
"ScanResultList": [ "ScanResultList": [
],
"UnassociatedStaList": [
],
"BackhaulSta": {
"MACAddress": "00:00:00:00:00:00"
}
},
{ {
"TimeStamp": "2020-07-26T04:53:12+01:00", "ID": "RNQ3cbQe",
"NumberOfOpClassScans": 13, "Noise": 175,
"OpClassScanList": [ "NumberOfBSS": 2,
"Enabled": true,
"NumberOfCurrOpClass": 1,
"NumberOfUnassocSta": 0,
"Utilization": 0,
"Transmit": 56,
"ReceiveSelf": 0,
"RecieveOther": 128,
"BSSList": [
{ {
"OperatingClass": 115, "BSSID": "7a:d4:37:71:b4:1f",
"NumberOfChannelScans": 4, "SSID": "MAP-44D43771B410-BH-2.4GHz",
"ChannelScanList": [ "TimeStamp": "2021-12-13T06:06:35+01:00",
{ "Enabled": true,
"TimeStamp": "2020-07-26T04:53:12+01:00", "LastChange": 0,
"Channel": 36, "NumberofSTA": 0,
"NumberofNeighbors": 0, "EstServiceParametersBE": "AAAA",
"Noise": 100, "EstServiceParametersBK": "AAAA",
"Utilization": 50, "EstServiceParametersVO": "AAAA",
"NeighborList": [ "EstServiceParametersVI": "AAAA",
"UnicastBytesReceived": 0,
"UnicastBytesSent": 0,
"MulticastBytesReceived": 0,
"MulticastBytesSent": 30,
"BroadcastBytesReceived": 0,
"BroadcastBytesSent": 0,
"STAList": [
] ]
}, },
{ {
"TimeStamp": "2020-07-26T04:53:12+01:00", "BSSID": "44:d4:37:71:b4:1e",
"Channel": 40, "SSID": "iopsysWrt-44D43771B410",
"NumberofNeighbors": 0, "TimeStamp": "2021-12-13T06:06:35+01:00",
"Noise": 100, "Enabled": true,
"Utilization": 50, "LastChange": 0,
"NeighborList": [ "NumberofSTA": 0,
"EstServiceParametersBE": "AAAA",
] "EstServiceParametersBK": "AAAA",
}, "EstServiceParametersVO": "AAAA",
{ "EstServiceParametersVI": "AAAA",
"TimeStamp": "2020-07-26T04:53:12+01:00", "UnicastBytesReceived": 0,
"Channel": 44, "UnicastBytesSent": 0,
"NumberofNeighbors": 0, "MulticastBytesReceived": 0,
"Noise": 100, "MulticastBytesSent": 34,
"Utilization": 50, "BroadcastBytesReceived": 0,
"NeighborList": [ "BroadcastBytesSent": 0,
"STAList": [
]
},
{
"TimeStamp": "2020-07-26T04:53:12+01:00",
"Channel": 48,
"NumberofNeighbors": 0,
"Noise": 100,
"Utilization": 50,
"NeighborList": [
] ]
} }
] ],
}, "Capabilites": {
"NumberOfOpClass": 3,
"OperatingClasses": [
{ {
"OperatingClass": 118, "Class": 81,
"NumberOfChannelScans": 4, "MaxTxPower": 20,
"ChannelScanList": [ "NumberOfNonOperChan": 0,
{ "NonOperable": [
"TimeStamp": "2020-07-26T04:53:12+01:00",
"Channel": 52,
"NumberofNeighbors": 0,
"Noise": 100,
"Utilization": 50,
"NeighborList": [
] ]
}, },
{ {
"TimeStamp": "2020-07-26T04:53:12+01:00", "Class": 83,
"Channel": 56, "MaxTxPower": 20,
"NumberofNeighbors": 0, "NumberOfNonOperChan": 0,
"Noise": 100, "NonOperable": [
"Utilization": 50,
"NeighborList": [
] ]
}, },
{ {
"TimeStamp": "2020-07-26T04:53:12+01:00", "Class": 84,
"Channel": 60, "MaxTxPower": 20,
"NumberofNeighbors": 0, "NumberOfNonOperChan": 0,
"Noise": 100, "NonOperable": [
"Utilization": 50,
"NeighborList": [
]
},
{
"TimeStamp": "2020-07-26T04:53:12+01:00",
"Channel": 64,
"NumberofNeighbors": 0,
"Noise": 100,
"Utilization": 50,
"NeighborList": [
] ]
} }
] ],
"HTCapabilities": "CA==",
"VHTCapabilities": "AAAAAAAA",
"HECapabilities": "AAA="
}, },
"CurrentOperatingClasses": [
{ {
"OperatingClass": 121, "TimeStamp": "2021-12-13T06:06:36+01:00",
"NumberOfChannelScans": 11, "Channel": 6,
"ChannelScanList": [ "Class": 81,
{ "TxPower": 20
"TimeStamp": "2020-07-26T04:53:12+01:00",
"Channel": 100,
"NumberofNeighbors": 1,
"Noise": 100,
"Utilization": 50,
"NeighborList": [
{
"StationCount": 0,
"ChannelUtilization": 1,
"BSSID": "00:22:07:9f:b7:fd",
"SSID": "iopsysWrt-0022079FB7FC",
"SignalStrengh": -65,
"ChannelBandwidth": 2
} }
] ],
}, "ScanResultList": [
{
"TimeStamp": "",
"Channel": 0,
"NumberofNeighbors": 0,
"Noise": 0,
"Utilization": 0,
"NeighborList": [
]
},
{
"TimeStamp": "",
"Channel": 0,
"NumberofNeighbors": 0,
"Noise": 0,
"Utilization": 0,
"NeighborList": [
]
},
{
"TimeStamp": "",
"Channel": 0,
"NumberofNeighbors": 0,
"Noise": 0,
"Utilization": 0,
"NeighborList": [
]
},
{
"TimeStamp": "",
"Channel": 0,
"NumberofNeighbors": 0,
"Noise": 0,
"Utilization": 0,
"NeighborList": [
]
},
{
"TimeStamp": "",
"Channel": 0,
"NumberofNeighbors": 0,
"Noise": 0,
"Utilization": 0,
"NeighborList": [
]
},
{
"TimeStamp": "",
"Channel": 0,
"NumberofNeighbors": 0,
"Noise": 0,
"Utilization": 0,
"NeighborList": [
]
},
{
"TimeStamp": "",
"Channel": 0,
"NumberofNeighbors": 0,
"Noise": 0,
"Utilization": 0,
"NeighborList": [
]
},
{
"TimeStamp": "",
"Channel": 0,
"NumberofNeighbors": 0,
"Noise": 0,
"Utilization": 0,
"NeighborList": [
]
},
{
"TimeStamp": "",
"Channel": 0,
"NumberofNeighbors": 0,
"Noise": 0,
"Utilization": 0,
"NeighborList": [
]
},
{
"TimeStamp": "",
"Channel": 0,
"NumberofNeighbors": 0,
"Noise": 0,
"Utilization": 0,
"NeighborList": [
]
}
]
},
{
"OperatingClass": 116,
"NumberOfChannelScans": 0,
"ChannelScanList": [
]
},
{
"OperatingClass": 119,
"NumberOfChannelScans": 0,
"ChannelScanList": [
]
},
{
"OperatingClass": 122,
"NumberOfChannelScans": 0,
"ChannelScanList": [
]
},
{
"OperatingClass": 117,
"NumberOfChannelScans": 0,
"ChannelScanList": [
]
},
{
"OperatingClass": 120,
"NumberOfChannelScans": 0,
"ChannelScanList": [
]
},
{
"OperatingClass": 123,
"NumberOfChannelScans": 0,
"ChannelScanList": [
]
},
{
"OperatingClass": 125,
"NumberOfChannelScans": 6,
"ChannelScanList": [
{
"TimeStamp": "2020-07-26T04:53:12+01:00",
"Channel": 149,
"NumberofNeighbors": 0,
"Noise": 100,
"Utilization": 50,
"NeighborList": [
]
},
{
"TimeStamp": "2020-07-26T04:53:12+01:00",
"Channel": 153,
"NumberofNeighbors": 0,
"Noise": 100,
"Utilization": 50,
"NeighborList": [
]
},
{
"TimeStamp": "2020-07-26T04:53:12+01:00",
"Channel": 157,
"NumberofNeighbors": 0,
"Noise": 100,
"Utilization": 50,
"NeighborList": [
]
},
{
"TimeStamp": "2020-07-26T04:53:12+01:00",
"Channel": 161,
"NumberofNeighbors": 0,
"Noise": 100,
"Utilization": 50,
"NeighborList": [
]
},
{
"TimeStamp": "2020-07-26T04:53:12+01:00",
"Channel": 165,
"NumberofNeighbors": 0,
"Noise": 100,
"Utilization": 50,
"NeighborList": [
]
},
{
"TimeStamp": "2020-07-26T04:53:12+01:00",
"Channel": 169,
"NumberofNeighbors": 0,
"Noise": 100,
"Utilization": 50,
"NeighborList": [
]
}
]
},
{
"OperatingClass": 128,
"NumberOfChannelScans": 0,
"ChannelScanList": [
]
},
{
"OperatingClass": 129,
"NumberOfChannelScans": 0,
"ChannelScanList": [
]
},
{
"OperatingClass": 130,
"NumberOfChannelScans": 0,
"ChannelScanList": [
]
}
]
}
], ],
"UnassociatedStaList": [ "UnassociatedStaList": [
@ -790,4 +298,3 @@
} }
] ]
} }

238
test/files/tmp/wifi.dataelements.collector.dump2.data
View file

@ -1,41 +1,35 @@
{ {
"num_ssid": 1, "num_ssid": 4,
"ssidlist": [ "ssidlist": [
{ {
"ssid": "5GHz-main", "ssid": "iopsysWrt-44D43771B410",
"band": "5GHz", "band": "5GHz",
"vid": 100, "vid": 1,
"security": "WPA" "security": "WPA3PSK/WPA2PSK+WPA3PSK"
}, },
{ {
"ssid": "5GHz-guest", "ssid": "iopsysWrt-44D43771B410",
"band": "5GHz",
"vid": 200,
"security": "WPA"
},
{
"ssid": "MAP-608D26C4983C-2.4GHz",
"band": "2.4GHz", "band": "2.4GHz",
"vid": 100, "vid": 1,
"security": "WPA" "security": "WPA3PSK/WPA2PSK+WPA3PSK"
}, },
{ {
"ssid": "MAP-608D26C4983C-BH-5GHz", "ssid": "MAP-44D43771B410-BH-5GHz",
"band": "5GHz", "band": "5GHz",
"vid": 100, "vid": 1,
"security": "WPA" "security": "WPA3PSK"
}, },
{ {
"ssid": "MAP-608D26C4983C-BH-2.4GHz", "ssid": "MAP-44D43771B410-BH-2.4GHz",
"band": "2.4GHz", "band": "2.4GHz",
"vid": 100, "vid": 1,
"security": "WPA" "security": "WPA3PSK"
} }
], ],
"num_ap_devices":1, "num_ap_devices": 1,
"APDeviceList": [ "APDeviceList": [
{ {
"macaddr": "02:11:11:aa:bb:cc", "macaddr": "46:d4:37:71:b4:10",
"manufacturer": "IOPSYS", "manufacturer": "IOPSYS",
"oui": "00:22:07", "oui": "00:22:07",
"product_class": "AP", "product_class": "AP",
@ -49,152 +43,114 @@
"backhaul_utilization": 0, "backhaul_utilization": 0,
"backhaul_rcpi": 0, "backhaul_rcpi": 0,
"radar_detections": [ "radar_detections": [
], ],
"MaxReportingRate": 80,
"MultiAPProfile": "TODO",
"MaxVIDs": 4095,
"DFSEnable": true,
"EasyMeshControllerOperationMode": "TODO",
"EasyMeshAgentOperationMode": "TODO",
"Backhaul_BackhaulMACAddress": "TODO",
"Backhaul_BackhaulDeviceID": "TODO",
"Backhaul_CurrentOperatingClassProfileNumberOfEntries": 1,
"Backhaul_CurrentOperatingClassProfile": [
{
"Class": 10,
"Channel": 15,
"TxPower": -50,
"TimeStamp": "TODO"
}
],
"Backhaul_BytesSent": 1,
"Backhaul_BytesReceived": 2,
"Backhaul_PacketsSent": 3,
"Backhaul_PacketsReceived": 4,
"Backhaul_ErrorsSent": 5,
"Backhaul_ErrorsReceived": 6,
"Backhaul_LinkUtilization": 7,
"Backhaul_SignalStrength": 8,
"Backhaul_LastDataDownlinkRate": 9,
"Backhaul_LastDataUplinkRate": 10,
"Backhaul_TimeStamp": "TODO",
"num_radios": 2, "num_radios": 2,
"RadioList": [ "RadioList": [
{ {
"ID": "AhISu8zd", "macaddr": "44:d4:37:71:b4:1f",
"band": 2, "band": 5,
"standard": "ax", "standard": "ax",
"channel": 8, "channel": 36,
"bandwidth": 40, "bandwidth": 80,
"channel_ext": 1, "channel_ext": 0,
"mcs": 7, "mcs": 0,
"txpower": 23, "txpower": 23,
"channels": [ "channels": [
36,
40,
44,
48,
52,
56,
60,
64,
100,
104,
108,
112,
116,
120,
124,
128,
132,
136,
140,
144
], ],
"num_bss": 1, "num_bss": 2,
"APList": [ "APList": [
{ {
"bssid": "", "bssid": "7e:d4:37:71:b4:18",
"ssid": "", "ssid": "MAP-44D43771B410-BH-5GHz",
"num_steer_assoc_control": 12, "num_steer_assoc_control": 0,
"num_steer_btm": 5, "num_steer_btm": 0,
"num_steer_btm_query": 1, "num_steer_btm_query": 0,
"num_stations": 1, "num_stations": 0,
"StationList": [ "StationList": [
{
"macaddr": "",
"standard": "a",
"active": true,
"connect_time": 51,
"dl_rate": -52,
"ul_rate": -40,
"rcpi": 55,
"noise": -90,
"tx_bytes": 1,
"rx_bytes": 2,
"tx_packets": 3,
"rx_packets": 4,
"tx_error_packets": 5,
"rx_error_packets": 6,
"tx_retrans_packets": 7
}
] ]
} },
],
"scan_boot_only": true,
"scan_impact": 2,
"scan_interval": 50,
"scan_num_opclass": 1,
"OpClassChannels": [
{ {
"OpClass": 10, "bssid": "44:d4:37:71:b4:1f",
"ChannelList": "TODO" "ssid": "iopsysWrt-44D43771B410",
} "num_steer_assoc_control": 0,
], "num_steer_btm": 0,
"num_CACMethod": 1, "num_steer_btm_query": 0,
"CACMethod": [ "num_stations": 0,
{ "StationList": [
"Method": 12
]
} }
] ]
}, },
{ {
"ID": "AhISu8ze", "macaddr": "44:d4:37:71:b4:1e",
"band": 2, "band": 2,
"standard": "ax", "standard": "ax",
"channel": 8, "channel": 6,
"bandwidth": 40, "bandwidth": 20,
"channel_ext": 1, "channel_ext": 0,
"mcs": 7, "mcs": 0,
"txpower": 23, "txpower": 20,
"channels": [ "channels": [
1,
2,
3,
4,
5,
6,
7,
8,
9,
10,
11,
12,
13
], ],
"num_bss": 1, "num_bss": 2,
"APList": [ "APList": [
{ {
"bssid": "", "bssid": "7a:d4:37:71:b4:1f",
"ssid": "", "ssid": "MAP-44D43771B410-BH-2.4GHz",
"num_steer_assoc_control": 12, "num_steer_assoc_control": 0,
"num_steer_btm": 5, "num_steer_btm": 0,
"num_steer_btm_query": 1, "num_steer_btm_query": 0,
"num_stations": 1, "num_stations": 0,
"StationList": [ "StationList": [
{
"macaddr": "",
"standard": "a",
"active": true,
"connect_time": 51,
"dl_rate": -52,
"ul_rate": -40,
"rcpi": 55,
"noise": -90,
"tx_bytes": 1,
"rx_bytes": 2,
"tx_packets": 3,
"rx_packets": 4,
"tx_error_packets": 5,
"rx_error_packets": 6,
"tx_retrans_packets": 7
}
] ]
} },
],
"scan_boot_only": true,
"scan_impact": 2,
"scan_interval": 50,
"scan_num_opclass": 1,
"OpClassChannels": [
{ {
"OpClass": 10, "bssid": "44:d4:37:71:b4:1e",
"ChannelList": "TODO" "ssid": "iopsysWrt-44D43771B410",
} "num_steer_assoc_control": 0,
], "num_steer_btm": 0,
"num_CACMethod": 1, "num_steer_btm_query": 0,
"CACMethod": [ "num_stations": 0,
{ "StationList": [
"Method": 12
]
} }
] ]
} }

7
test/files/usr/libexec/rpcd/wifi.dataelements.collector
View file

@ -4,10 +4,15 @@
case "$1" in case "$1" in
list) list)
echo '{ "dump" : {}, "event": {}, "dump2": {} }' echo '{ "status": {}, "dump" : {}, "event": {}, "dump2": {} }'
;; ;;
call) call)
case "$2" in case "$2" in
status)
json_init
json_add_string status available
json_dump
;;
dump) dump)
cat /tmp/wifi.dataelements.collector.dump.data 2>/dev/null cat /tmp/wifi.dataelements.collector.dump.data 2>/dev/null
;; ;;