external/DAWN
1
0
Fork 0
mirror of https://github.com/berlin-open-wireless-lab/DAWN.git synced 2025-03-09 15:40:12 +00:00
Code Issues Releases Wiki Activity

reformat code

Browse source
This commit is contained in:
PolynomialDivision 2018-04-12 22:22:40 +02:00
parent f2348e0ae7
commit 40ba9d7f8d
8 changed files with 76 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/include/datastorage.h
View file

@ -131,6 +131,7 @@ typedef struct auth_entry_s assoc_entry;
#define DENY_REQ_ARRAY_LEN 100 #define DENY_REQ_ARRAY_LEN 100
struct auth_entry_s denied_req_array[DENY_REQ_ARRAY_LEN]; struct auth_entry_s denied_req_array[DENY_REQ_ARRAY_LEN];
pthread_mutex_t denied_array_mutex; pthread_mutex_t denied_array_mutex;
auth_entry insert_to_denied_req_array(auth_entry entry, int inc_counter); auth_entry insert_to_denied_req_array(auth_entry entry, int inc_counter);
// ---------------- Defines ---------------- // ---------------- Defines ----------------

6
src/include/ubus.h
View file

@ -127,7 +127,7 @@ void add_client_update_timer(time_t time);
* @param msg * @param msg
* @return * @return
*/ */
int handle_network_msg(char* msg); int handle_network_msg(char *msg);
/** /**
* Send message via network. * Send message via network.
@ -135,7 +135,7 @@ int handle_network_msg(char* msg);
* @param method * @param method
* @return * @return
*/ */
int send_blob_attr_via_network(struct blob_attr *msg, char* method); int send_blob_attr_via_network(struct blob_attr *msg, char *method);
/** /**
* Add mac to a list that contains addresses of clients that can not be controlled. * Add mac to a list that contains addresses of clients that can not be controlled.
@ -158,6 +158,6 @@ int send_set_probe(uint8_t client_addr[]);
* @param client_addr * @param client_addr
* @return * @return
*/ */
int send_add_mac(uint8_t* client_addr); int send_add_mac(uint8_t *client_addr);
#endif #endif

4
src/include/utils.h
View file

@ -37,7 +37,7 @@ int convert_mac(char *in, char *out);
* @param path * @param path
* @param addr * @param addr
*/ */
void write_mac_to_file(char* path, uint8_t addr[]); void write_mac_to_file(char *path, uint8_t addr[]);
/** /**
* Check if a string is greater than another one. * Check if a string is greater than another one.
@ -45,6 +45,6 @@ void write_mac_to_file(char* path, uint8_t addr[]);
* @param str_2 * @param str_2
* @return * @return
*/ */
int string_is_greater(uint8_t* str, uint8_t* str_2); int string_is_greater(uint8_t *str, uint8_t *str_2);
#endif #endif

10
src/main.c
View file

@ -53,17 +53,17 @@ void signal_handler(int sig) {
int init_mutex() { int init_mutex() {
if (pthread_mutex_init(&list_mutex, NULL) != 0) { if (pthread_mutex_init(&list_mutex, NULL) != 0) {
fprintf(stderr,"Mutex init failed!\n"); fprintf(stderr, "Mutex init failed!\n");
return 1; return 1;
} }
if (pthread_mutex_init(&probe_array_mutex, NULL) != 0) { if (pthread_mutex_init(&probe_array_mutex, NULL) != 0) {
fprintf(stderr,"Mutex init failed!\n"); fprintf(stderr, "Mutex init failed!\n");
return 1; return 1;
} }
if (pthread_mutex_init(&client_array_mutex, NULL) != 0) { if (pthread_mutex_init(&client_array_mutex, NULL) != 0) {
fprintf(stderr,"Mutex init failed!\n"); fprintf(stderr, "Mutex init failed!\n");
return 1; return 1;
} }
@ -73,12 +73,12 @@ int init_mutex() {
} }
if (pthread_mutex_init(&tcp_array_mutex, NULL) != 0) { if (pthread_mutex_init(&tcp_array_mutex, NULL) != 0) {
fprintf(stderr,"Mutex init failed!\n"); fprintf(stderr, "Mutex init failed!\n");
return 1; return 1;
} }
if (pthread_mutex_init(&denied_array_mutex, NULL) != 0) { if (pthread_mutex_init(&denied_array_mutex, NULL) != 0) {
fprintf(stderr,"Mutex init failed!\n"); fprintf(stderr, "Mutex init failed!\n");
return 1; return 1;
} }
return 0; return 0;

6
src/network/networksocket.c
View file

@ -42,14 +42,12 @@ int init_socket_runopts(const char *_ip, int _port, int _multicast_socket) {
} }
pthread_t sniffer_thread; pthread_t sniffer_thread;
if(network_config.use_symm_enc) if (network_config.use_symm_enc) {
{
if (pthread_create(&sniffer_thread, NULL, receive_msg_enc, NULL)) { if (pthread_create(&sniffer_thread, NULL, receive_msg_enc, NULL)) {
fprintf(stderr, "Could not create receiving thread!"); fprintf(stderr, "Could not create receiving thread!");
return -1; return -1;
} }
} else } else {
{
if (pthread_create(&sniffer_thread, NULL, receive_msg, NULL)) { if (pthread_create(&sniffer_thread, NULL, receive_msg, NULL)) {
fprintf(stderr, "Could not create receiving thread!"); fprintf(stderr, "Could not create receiving thread!");
return -1; return -1;

144
src/storage/datastorage.c
View file

@ -46,6 +46,7 @@ int is_connected_somehwere(uint8_t client_addr[]);
int compare_station_count(uint8_t *bssid_addr_own, uint8_t *bssid_addr_to_compare, uint8_t *client_addr, int compare_station_count(uint8_t *bssid_addr_own, uint8_t *bssid_addr_to_compare, uint8_t *client_addr,
int automatic_kick); int automatic_kick);
int compare_ssid(uint8_t *bssid_addr_own, uint8_t *bssid_addr_to_compare); int compare_ssid(uint8_t *bssid_addr_own, uint8_t *bssid_addr_to_compare);
void denied_req_array_insert(auth_entry entry); void denied_req_array_insert(auth_entry entry);
@ -88,8 +89,7 @@ struct uloop_timeout denied_req_timeout = {
.cb = denied_req_array_cb .cb = denied_req_array_cb
}; };
int build_hearing_map_sort_client(struct blob_buf *b) int build_hearing_map_sort_client(struct blob_buf *b) {
{
print_probe_array(); print_probe_array();
pthread_mutex_lock(&probe_array_mutex); pthread_mutex_lock(&probe_array_mutex);
@ -101,15 +101,13 @@ int build_hearing_map_sort_client(struct blob_buf *b)
int m; int m;
for (m = 0; m <= ap_entry_last; m++) { for (m = 0; m <= ap_entry_last; m++) {
printf("COMPARING!\n"); printf("COMPARING!\n");
if(m > 0) if (m > 0) {
{ if (strcmp((char *) ap_array[m].ssid, (char *) ap_array[m - 1].ssid) == 0) {
if(strcmp((char*)ap_array[m].ssid, (char*)ap_array[m-1].ssid) == 0)
{
continue; continue;
} }
} }
printf("OPEN TABLE!!!\n"); printf("OPEN TABLE!!!\n");
ssid_list = blobmsg_open_table(b, (char*)ap_array[m].ssid); ssid_list = blobmsg_open_table(b, (char *) ap_array[m].ssid);
int i; int i;
for (i = 0; i <= probe_entry_last; i++) { for (i = 0; i <= probe_entry_last; i++) {
@ -124,8 +122,7 @@ int build_hearing_map_sort_client(struct blob_buf *b)
continue; continue;
} }
if(strcmp((char*)ap_entry_i.ssid, (char*)ap_array[m].ssid) != 0) if (strcmp((char *) ap_entry_i.ssid, (char *) ap_array[m].ssid) != 0) {
{
continue; continue;
} }
@ -139,16 +136,14 @@ int build_hearing_map_sort_client(struct blob_buf *b)
continue; continue;
} }
if(strcmp((char*)ap_entry.ssid, (char*)ap_array[m].ssid) != 0) if (strcmp((char *) ap_entry.ssid, (char *) ap_array[m].ssid) != 0) {
{
continue; continue;
} }
if (!mac_is_equal(probe_array[k].client_addr, probe_array[i].client_addr)) { if (!mac_is_equal(probe_array[k].client_addr, probe_array[i].client_addr)) {
i = k - 1; i = k - 1;
break; break;
} else if(k == probe_entry_last) } else if (k == probe_entry_last) {
{
i = k; i = k;
} }
@ -177,8 +172,7 @@ int build_hearing_map_sort_client(struct blob_buf *b)
return 0; return 0;
} }
int build_network_overview(struct blob_buf *b) int build_network_overview(struct blob_buf *b) {
{
void *client_list, *ap_list, *ssid_list; void *client_list, *ap_list, *ssid_list;
char ap_mac_buf[20]; char ap_mac_buf[20];
char client_mac_buf[20]; char client_mac_buf[20];
@ -187,35 +181,30 @@ int build_network_overview(struct blob_buf *b)
int m; int m;
for (m = 0; m <= ap_entry_last; m++) { for (m = 0; m <= ap_entry_last; m++) {
printf("COMPARING!\n"); printf("COMPARING!\n");
if(m > 0) if (m > 0) {
{ if (strcmp((char *) ap_array[m].ssid, (char *) ap_array[m - 1].ssid) == 0) {
if(strcmp((char*)ap_array[m].ssid, (char*)ap_array[m-1].ssid) == 0)
{
continue; continue;
} }
} }
ssid_list = blobmsg_open_table(b, (char*)ap_array[m].ssid); ssid_list = blobmsg_open_table(b, (char *) ap_array[m].ssid);
int i; int i;
for (i = 0; i <= client_entry_last; i++) { for (i = 0; i <= client_entry_last; i++) {
ap ap_entry_i = ap_array_get_ap(client_array[i].bssid_addr); ap ap_entry_i = ap_array_get_ap(client_array[i].bssid_addr);
if(strcmp((char*)ap_entry_i.ssid, (char*)ap_array[m].ssid) != 0) if (strcmp((char *) ap_entry_i.ssid, (char *) ap_array[m].ssid) != 0) {
{
continue; continue;
} }
int k; int k;
sprintf(ap_mac_buf, MACSTR, MAC2STR(client_array[i].bssid_addr)); sprintf(ap_mac_buf, MACSTR, MAC2STR(client_array[i].bssid_addr));
ap_list = blobmsg_open_table(b, ap_mac_buf); ap_list = blobmsg_open_table(b, ap_mac_buf);
printf("AP MAC BUF: %s\n", ap_mac_buf); printf("AP MAC BUF: %s\n", ap_mac_buf);
for (k = i; k <= client_entry_last; k++){ for (k = i; k <= client_entry_last; k++) {
if(!mac_is_equal(client_array[k].bssid_addr, client_array[i].bssid_addr)) if (!mac_is_equal(client_array[k].bssid_addr, client_array[i].bssid_addr)) {
{
i = k - 1; i = k - 1;
break; break;
} else if(k == client_entry_last) } else if (k == client_entry_last) {
{
i = k; i = k;
} }
@ -246,8 +235,7 @@ int eval_probe_metric(struct probe_entry_s probe_entry) {
score += !probe_entry.ht_support && !ap_entry.ht ? dawn_metric.no_ht_support : 0; score += !probe_entry.ht_support && !ap_entry.ht ? dawn_metric.no_ht_support : 0;
// performance anomaly? // performance anomaly?
if(network_config.bandwidth >= 1000 || network_config.bandwidth == -1) if (network_config.bandwidth >= 1000 || network_config.bandwidth == -1) {
{
score += probe_entry.vht_support && ap_entry.vht ? dawn_metric.vht_support : 0; score += probe_entry.vht_support && ap_entry.vht ? dawn_metric.vht_support : 0;
} }
@ -260,7 +248,7 @@ int eval_probe_metric(struct probe_entry_s probe_entry) {
score += (probe_entry.signal >= dawn_metric.rssi_val) ? dawn_metric.rssi : 0; score += (probe_entry.signal >= dawn_metric.rssi_val) ? dawn_metric.rssi : 0;
score += (probe_entry.signal <= dawn_metric.low_rssi_val) ? dawn_metric.low_rssi : 0; score += (probe_entry.signal <= dawn_metric.low_rssi_val) ? dawn_metric.low_rssi : 0;
if(score < 0) if (score < 0)
score = -2; // -1 already used... score = -2; // -1 already used...
printf("SCORE: %d of:\n", score); printf("SCORE: %d of:\n", score);
@ -274,9 +262,8 @@ int compare_ssid(uint8_t *bssid_addr_own, uint8_t *bssid_addr_to_compare) {
ap ap_entry_to_compre = ap_array_get_ap(bssid_addr_to_compare); ap ap_entry_to_compre = ap_array_get_ap(bssid_addr_to_compare);
if (mac_is_equal(ap_entry_own.bssid_addr, bssid_addr_own) && if (mac_is_equal(ap_entry_own.bssid_addr, bssid_addr_own) &&
mac_is_equal(ap_entry_to_compre.bssid_addr, bssid_addr_to_compare)) mac_is_equal(ap_entry_to_compre.bssid_addr, bssid_addr_to_compare)) {
{ return (strcmp((char *) ap_entry_own.ssid, (char *) ap_entry_to_compre.ssid) == 0);
return (strcmp((char*)ap_entry_own.ssid, (char*)ap_entry_to_compre.ssid) == 0);
} }
return 0; return 0;
} }
@ -296,14 +283,12 @@ int compare_station_count(uint8_t *bssid_addr_own, uint8_t *bssid_addr_to_compar
int sta_count = ap_entry_own.station_count; int sta_count = ap_entry_own.station_count;
int sta_count_to_compare = ap_entry_to_compre.station_count; int sta_count_to_compare = ap_entry_to_compre.station_count;
if(is_connected(bssid_addr_own, client_addr)) if (is_connected(bssid_addr_own, client_addr)) {
{
printf("OWN IS ALREADY CONNECTED! DECREASE COUNTER!!!\n"); printf("OWN IS ALREADY CONNECTED! DECREASE COUNTER!!!\n");
sta_count--; sta_count--;
} }
if(is_connected(bssid_addr_to_compare, client_addr)) if (is_connected(bssid_addr_to_compare, client_addr)) {
{
printf("COMPARE IS ALREADY CONNECTED! DECREASE COUNTER!!!\n"); printf("COMPARE IS ALREADY CONNECTED! DECREASE COUNTER!!!\n");
sta_count_to_compare--; sta_count_to_compare--;
} }
@ -363,8 +348,7 @@ int better_ap_available(uint8_t bssid_addr[], uint8_t client_addr[], int automat
} }
// check if same ssid! // check if same ssid!
if(!compare_ssid(bssid_addr, probe_array[k].bssid_addr)) if (!compare_ssid(bssid_addr, probe_array[k].bssid_addr)) {
{
continue; continue;
} }
@ -377,7 +361,7 @@ int better_ap_available(uint8_t bssid_addr[], uint8_t client_addr[], int automat
if (dawn_metric.use_station_count && own_score == score_to_compare) { if (dawn_metric.use_station_count && own_score == score_to_compare) {
// only compare if score is bigger or equal 0 // only compare if score is bigger or equal 0
if(own_score >= 0) { if (own_score >= 0) {
// if ap have same value but station count is different... // if ap have same value but station count is different...
if (compare_station_count(bssid_addr, probe_array[k].bssid_addr, probe_array[k].client_addr, if (compare_station_count(bssid_addr, probe_array[k].bssid_addr, probe_array[k].client_addr,
@ -391,7 +375,8 @@ int better_ap_available(uint8_t bssid_addr[], uint8_t client_addr[], int automat
} }
int kick_client(struct client_s client_entry) { int kick_client(struct client_s client_entry) {
return !mac_in_maclist(client_entry.client_addr) && better_ap_available(client_entry.bssid_addr, client_entry.client_addr, 1); return !mac_in_maclist(client_entry.client_addr) &&
better_ap_available(client_entry.bssid_addr, client_entry.client_addr, 1);
} }
void kick_clients(uint8_t bssid[], uint32_t id) { void kick_clients(uint8_t bssid[], uint32_t id) {
@ -444,8 +429,9 @@ void kick_clients(uint8_t bssid[], uint32_t id) {
// + chan util is changing a lot // + chan util is changing a lot
// + ping pong behavior of clients will be reduced // + ping pong behavior of clients will be reduced
client_array[j].kick_count++; client_array[j].kick_count++;
printf("Comparing kick count kickcount: %d to min_kick_count: %d!\n", client_array[j].kick_count, dawn_metric.min_kick_count); printf("Comparing kick count kickcount: %d to min_kick_count: %d!\n", client_array[j].kick_count,
if(client_array[j].kick_count < dawn_metric.min_kick_count){ dawn_metric.min_kick_count);
if (client_array[j].kick_count < dawn_metric.min_kick_count) {
continue; continue;
} }
@ -546,7 +532,7 @@ int client_array_go_next_help(char sort_order[], int i, client entry,
// client-mac // client-mac
case 'c': case 'c':
return mac_is_greater(entry.client_addr, next_entry.client_addr) && return mac_is_greater(entry.client_addr, next_entry.client_addr) &&
mac_is_equal(entry.bssid_addr, next_entry.bssid_addr); mac_is_equal(entry.bssid_addr, next_entry.bssid_addr);
default: default:
break; break;
} }
@ -683,8 +669,7 @@ int probe_array_set_all_probe_count(uint8_t client_addr[], uint32_t probe_count)
if (mac_is_equal(client_addr, probe_array[i].client_addr)) { if (mac_is_equal(client_addr, probe_array[i].client_addr)) {
printf("SETTING MAC!!!\n"); printf("SETTING MAC!!!\n");
probe_array[i].counter = probe_count; probe_array[i].counter = probe_count;
}else if(!mac_is_greater(client_addr, probe_array[i].client_addr)) } else if (!mac_is_greater(client_addr, probe_array[i].client_addr)) {
{
printf("MAC NOT FOUND!!!\n"); printf("MAC NOT FOUND!!!\n");
break; break;
} }
@ -720,7 +705,7 @@ int probe_array_update_rssi(uint8_t bssid_addr[], uint8_t client_addr[], uint32_
probe_entry probe_array_get_entry(uint8_t bssid_addr[], uint8_t client_addr[]) { probe_entry probe_array_get_entry(uint8_t bssid_addr[], uint8_t client_addr[]) {
int i; int i;
probe_entry tmp = { .bssid_addr = {0,0,0,0,0,0}, .client_addr = {0,0,0,0,0,0}}; probe_entry tmp = {.bssid_addr = {0, 0, 0, 0, 0, 0}, .client_addr = {0, 0, 0, 0, 0, 0}};
if (probe_entry_last == -1) { if (probe_entry_last == -1) {
return tmp; return tmp;
@ -791,7 +776,7 @@ int ap_get_collision_count(int col_domain) {
int i; int i;
for (i = 0; i <= ap_entry_last; i++) { for (i = 0; i <= ap_entry_last; i++) {
if(ap_array[i].collision_domain == col_domain) if (ap_array[i].collision_domain == col_domain)
ret_sta_count += ap_array[i].station_count; ret_sta_count += ap_array[i].station_count;
} }
pthread_mutex_unlock(&ap_array_mutex); pthread_mutex_unlock(&ap_array_mutex);
@ -800,7 +785,7 @@ int ap_get_collision_count(int col_domain) {
} }
ap ap_array_get_ap(uint8_t bssid_addr[]) { ap ap_array_get_ap(uint8_t bssid_addr[]) {
ap ret = {.bssid_addr = {0,0,0,0,0,0}}; ap ret = {.bssid_addr = {0, 0, 0, 0, 0, 0}};
if (ap_entry_last == -1) { if (ap_entry_last == -1) {
return ret; return ret;
@ -810,8 +795,8 @@ ap ap_array_get_ap(uint8_t bssid_addr[]) {
int i; int i;
for (i = 0; i <= ap_entry_last; i++) { for (i = 0; i <= ap_entry_last; i++) {
if (mac_is_equal(bssid_addr, ap_array[i].bssid_addr)){ if (mac_is_equal(bssid_addr, ap_array[i].bssid_addr)) {
//|| mac_is_greater(ap_array[i].bssid_addr, bssid_addr)) { //|| mac_is_greater(ap_array[i].bssid_addr, bssid_addr)) {
break; break;
} }
} }
@ -831,11 +816,11 @@ void ap_array_insert(ap entry) {
int i; int i;
for (i = 0; i <= ap_entry_last; i++) { for (i = 0; i <= ap_entry_last; i++) {
if (mac_is_greater(entry.bssid_addr, ap_array[i].bssid_addr) && if (mac_is_greater(entry.bssid_addr, ap_array[i].bssid_addr) &&
strcmp((char*)entry.ssid, (char*)ap_array[i].ssid) == 0) { strcmp((char *) entry.ssid, (char *) ap_array[i].ssid) == 0) {
continue; continue;
} }
if(!string_is_greater(entry.ssid, ap_array[i].ssid)){ if (!string_is_greater(entry.ssid, ap_array[i].ssid)) {
break; break;
} }
@ -909,7 +894,7 @@ void uloop_add_data_cbs() {
uloop_timeout_add(&client_timeout); uloop_timeout_add(&client_timeout);
uloop_timeout_add(&ap_timeout); uloop_timeout_add(&ap_timeout);
if(dawn_metric.use_driver_recog){ if (dawn_metric.use_driver_recog) {
uloop_timeout_add(&denied_req_timeout); uloop_timeout_add(&denied_req_timeout);
} }
} }
@ -952,8 +937,7 @@ void denied_req_array_cb(struct uloop_timeout *t) {
if (denied_req_array[i].time < current_time - timeout_config.denied_req_threshold) { if (denied_req_array[i].time < current_time - timeout_config.denied_req_threshold) {
// client is not connected for a given time threshold! // client is not connected for a given time threshold!
if(!is_connected_somehwere(denied_req_array[i].client_addr)) if (!is_connected_somehwere(denied_req_array[i].client_addr)) {
{
printf("Client has propaly a BAD DRIVER!\n"); printf("Client has propaly a BAD DRIVER!\n");
// problem that somehow station will land into this list // problem that somehow station will land into this list
@ -986,10 +970,9 @@ void insert_client_to_array(client entry) {
pthread_mutex_unlock(&client_array_mutex); pthread_mutex_unlock(&client_array_mutex);
} }
void insert_macs_from_file() void insert_macs_from_file() {
{ FILE *fp;
FILE * fp; char *line = NULL;
char * line = NULL;
size_t len = 0; size_t len = 0;
ssize_t read; ssize_t read;
@ -1011,8 +994,7 @@ void insert_macs_from_file()
} }
printf("Printing MAC List:\n"); printf("Printing MAC List:\n");
for(int i = 0; i <= mac_list_entry_last; i++) for (int i = 0; i <= mac_list_entry_last; i++) {
{
char mac_buf_target[20]; char mac_buf_target[20];
sprintf(mac_buf_target, MACSTR, MAC2STR(mac_list[i])); sprintf(mac_buf_target, MACSTR, MAC2STR(mac_list[i]));
printf("%d: %s\n", i, mac_buf_target); printf("%d: %s\n", i, mac_buf_target);
@ -1024,10 +1006,8 @@ void insert_macs_from_file()
//exit(EXIT_SUCCESS); //exit(EXIT_SUCCESS);
} }
int insert_to_maclist(uint8_t mac[]) int insert_to_maclist(uint8_t mac[]) {
{ if (mac_in_maclist(mac)) {
if(mac_in_maclist(mac))
{
return -1; return -1;
} }
@ -1040,12 +1020,9 @@ int insert_to_maclist(uint8_t mac[])
} }
int mac_in_maclist(uint8_t mac[]) int mac_in_maclist(uint8_t mac[]) {
{ for (int i = 0; i <= mac_list_entry_last; i++) {
for(int i = 0; i <= mac_list_entry_last; i++) if (mac_is_equal(mac, mac_list[i])) {
{
if(mac_is_equal(mac, mac_list[i]))
{
return 1; return 1;
} }
} }
@ -1077,7 +1054,7 @@ auth_entry insert_to_denied_req_array(auth_entry entry, int inc_counter) {
} }
int denied_req_array_go_next_help(char sort_order[], int i, auth_entry entry, int denied_req_array_go_next_help(char sort_order[], int i, auth_entry entry,
auth_entry next_entry) { auth_entry next_entry) {
switch (sort_order[i]) { switch (sort_order[i]) {
// bssid-mac // bssid-mac
case 'b': case 'b':
@ -1093,7 +1070,7 @@ int denied_req_array_go_next_help(char sort_order[], int i, auth_entry entry,
} }
int denied_req_array_go_next(char sort_order[], int i, auth_entry entry, int denied_req_array_go_next(char sort_order[], int i, auth_entry entry,
auth_entry next_entry) { auth_entry next_entry) {
int conditions = 1; int conditions = 1;
for (int j = 0; j < i; j++) { for (int j = 0; j < i; j++) {
i &= !(denied_req_array_go_next(sort_order, j, entry, next_entry)); i &= !(denied_req_array_go_next(sort_order, j, entry, next_entry));
@ -1156,13 +1133,6 @@ auth_entry denied_req_array_delete(auth_entry entry) {
} }
node *delete_probe_req(node **ret_remove, node *head, uint8_t bssid_addr[], node *delete_probe_req(node **ret_remove, node *head, uint8_t bssid_addr[],
uint8_t client_addr[]); uint8_t client_addr[]);
@ -1481,8 +1451,9 @@ void print_probe_entry(probe_entry entry) {
printf( printf(
"bssid_addr: %s, client_addr: %s, signal: %d, freq: " "bssid_addr: %s, client_addr: %s, signal: %d, freq: "
"%d, counter: %d, vht: %d, min_rate: %d, max_rate: %d\n", "%d, counter: %d, vht: %d, min_rate: %d, max_rate: %d\n",
mac_buf_ap, mac_buf_client, entry.signal, entry.freq, entry.counter, entry.vht_support, entry.min_supp_datarate, entry.max_supp_datarate); mac_buf_ap, mac_buf_client, entry.signal, entry.freq, entry.counter, entry.vht_support,
entry.min_supp_datarate, entry.max_supp_datarate);
} }
void print_auth_entry(auth_entry entry) { void print_auth_entry(auth_entry entry) {
@ -1496,7 +1467,7 @@ void print_auth_entry(auth_entry entry) {
printf( printf(
"bssid_addr: %s, client_addr: %s, signal: %d, freq: " "bssid_addr: %s, client_addr: %s, signal: %d, freq: "
"%d\n", "%d\n",
mac_buf_ap, mac_buf_client, entry.signal, entry.freq); mac_buf_ap, mac_buf_client, entry.signal, entry.freq);
} }
@ -1508,7 +1479,8 @@ void print_client_entry(client entry) {
sprintf(mac_buf_client, MACSTR, MAC2STR(entry.client_addr)); sprintf(mac_buf_client, MACSTR, MAC2STR(entry.client_addr));
printf("bssid_addr: %s, client_addr: %s, freq: %d, ht_supported: %d, vht_supported: %d, ht: %d, vht: %d, kick: %d\n", printf("bssid_addr: %s, client_addr: %s, freq: %d, ht_supported: %d, vht_supported: %d, ht: %d, vht: %d, kick: %d\n",
mac_buf_ap, mac_buf_client, entry.freq, entry.ht_supported, entry.vht_supported, entry.ht, entry.vht, entry.kick_count); mac_buf_ap, mac_buf_client, entry.freq, entry.ht_supported, entry.vht_supported, entry.ht, entry.vht,
entry.kick_count);
} }
void print_client_array() { void print_client_array() {
@ -1527,7 +1499,7 @@ void print_ap_entry(ap entry) {
printf("ssid: %s, bssid_addr: %s, freq: %d, ht: %d, vht: %d, chan_utilz: %d, col_d: %d, bandwidth: %d, col_count: %d\n", printf("ssid: %s, bssid_addr: %s, freq: %d, ht: %d, vht: %d, chan_utilz: %d, col_d: %d, bandwidth: %d, col_count: %d\n",
entry.ssid, mac_buf_ap, entry.freq, entry.ht, entry.vht, entry.ssid, mac_buf_ap, entry.freq, entry.ht, entry.vht,
entry.channel_utilization, entry.collision_domain, entry.bandwidth, entry.channel_utilization, entry.collision_domain, entry.bandwidth,
ap_get_collision_count(entry.collision_domain) ap_get_collision_count(entry.collision_domain)
); );
} }

8
src/utils/ieee80211_utils.c
View file

@ -2,12 +2,10 @@
#include <stdint.h> #include <stdint.h>
double iee80211_calculate_bitrate(uint8_t supp_rate_val) double iee80211_calculate_bitrate(uint8_t supp_rate_val) {
{
return ((double) supp_rate_val) / 2; return ((double) supp_rate_val) / 2;
} }
double iee80211_calculate_expected_throughput_mbit(int exp_thr) double iee80211_calculate_expected_throughput_mbit(int exp_thr) {
{ return (((double) exp_thr) / 1000);
return (((double) exp_thr)/ 1000);
} }

6
src/utils/ubus.c
View file

@ -637,11 +637,9 @@ int send_blob_attr_via_network(struct blob_attr *msg, char *method) {
if (network_config.network_option == 2) { if (network_config.network_option == 2) {
send_tcp(str); send_tcp(str);
} else { } else {
if(network_config.use_symm_enc) if (network_config.use_symm_enc) {
{
send_string_enc(str); send_string_enc(str);
} else } else {
{
send_string(str); send_string(str);
} }
} }