Merge branch 'feature/eval_station_count'

This commit is contained in:
PolynomialDivision 2017-12-17 22:38:04 +01:00
commit ec3996c883
3 changed files with 35 additions and 33 deletions

View file

@ -1,36 +1,37 @@
config settings network config settings network
option broadcast_ip '225.0.0.37' option broadcast_ip '225.0.0.37'
option broadcast_port '1025' option broadcast_port '1025'
option multicast '1' option multicast '1'
option shared_key 'Niiiiiiiiiiiiiik' option shared_key 'Niiiiiiiiiiiiiik'
option iv 'Niiiiiiiiiiiiiik' option iv 'Niiiiiiiiiiiiiik'
config settings ordering config settings ordering
option sort_order 'csfb' option sort_order 'csfb'
config settings hostapd config settings hostapd
option hostapd_dir '/var/run/hostapd' option hostapd_dir '/var/run/hostapd'
config settings times config settings times
option update_client '50' option update_client '10'
option remove_client '120' option remove_client '120'
option remove_probe '120' option remove_probe '120'
option remove_ap '460' option remove_ap '460'
option update_hostapd '10' option update_hostapd '10'
config settings metric config settings metric
option ht_support '10' option ht_support '10'
option vht_support '50' option vht_support '100'
option no_ht_support '0' option no_ht_support '0'
option no_vht_support '0' option no_vht_support '0'
option rssi '10' option rssi '10'
option low_rssi '-500' option low_rssi '-500'
option freq '100' option freq '100'
option chan_util '50' option chan_util '0'
option max_chan_util '-50' option max_chan_util '0'
option rssi_val '-60' option rssi_val '-60'
option low_rssi_val '-80' option low_rssi_val '-80'
option chan_util_val '140' option chan_util_val '140'
option max_chan_util_val '170' option max_chan_util_val '170'
option min_probe_count '2' option min_probe_count '4'
option bandwith_threshold '6' option bandwith_threshold '6'
option use_station_count '1'

View file

@ -508,11 +508,11 @@ ap insert_to_ap_array(ap entry) {
ap ap_array_get_ap(uint8_t bssid_addr[]) { ap ap_array_get_ap(uint8_t bssid_addr[]) {
ap ret; ap ret;
char bssid_mac_string[20]; //char bssid_mac_string[20];
sprintf(bssid_mac_string, MACSTR, MAC2STR(bssid_addr)); //sprintf(bssid_mac_string, MACSTR, MAC2STR(bssid_addr));
printf("Try to find: %s\n", bssid_mac_string); //printf("Try to find: %s\n", bssid_mac_string);
printf("in\n"); //printf("in\n");
print_ap_array(); //print_ap_array();
if (ap_entry_last == -1) { if (ap_entry_last == -1) {
return ret; return ret;

View file

@ -599,10 +599,11 @@ static void ubus_get_clients_cb(struct ubus_request *req, int type, struct blob_
if (!msg) if (!msg)
return; return;
parse_to_clients(msg, 1, req->peer);
char *str = blobmsg_format_json(msg, true); char *str = blobmsg_format_json(msg, true);
send_string_enc(str); send_string_enc(str);
parse_to_clients(msg, 1, req->peer);
print_client_array(); print_client_array();
print_ap_array(); print_ap_array();
} }