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 2017-12-21 18:47:11 +01:00
parent 7a7519d420
commit dc26e1a03a
7 changed files with 110 additions and 150 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/crypto/base64.c
View file

@ -108,8 +108,7 @@ static const unsigned char pr2six[256] =
64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64
};
int Base64decode_len(const char *bufcoded)
{
int Base64decode_len(const char *bufcoded) {
int nbytesdecoded;
register const unsigned char *bufin;
register int nprbytes;
@ -123,8 +122,7 @@ int Base64decode_len(const char *bufcoded)
return nbytesdecoded + 1;
}
int Base64decode(char *bufplain, const char *bufcoded)
{
int Base64decode(char *bufplain, const char *bufcoded) {
int nbytesdecoded;
register const unsigned char *bufin;
register unsigned char *bufout;
@ -171,13 +169,11 @@ int Base64decode(char *bufplain, const char *bufcoded)
static const char basis_64[] =
"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
int Base64encode_len(int len)
{
int Base64encode_len(int len) {
return ((len + 2) / 3 * 4) + 1;
}
int Base64encode(char *encoded, const char *string, int len)
{
int Base64encode(char *encoded, const char *string, int len) {
int i;
char *p;
@ -195,8 +191,7 @@ int Base64encode(char *encoded, const char *string, int len)
if (i == (len - 1)) {
*p++ = basis_64[((string[i] & 0x3) << 4)];
*p++ = '=';
}
else {
} else {
*p++ = basis_64[((string[i] & 0x3) << 4) |
((int) (string[i + 1] & 0xF0) >> 4)];
*p++ = basis_64[((string[i + 1] & 0xF) << 2)];

3
src/network/multicastsocket.c
View file

@ -69,8 +69,7 @@ int setup_multicast_socket(const char *_multicast_ip, unsigned short _multicast_
return sock;
}
int remove_multicast_socket(int socket)
{
int remove_multicast_socket(int socket) {
if (setsockopt(socket,
IPPROTO_IP,
IP_DROP_MEMBERSHIP,

24
src/storage/datastorage.c
View file

@ -148,13 +148,11 @@ int better_ap_available(uint8_t bssid_addr[], uint8_t client_addr[], int automat
for (k = i; k <= probe_entry_last; k++) {
int score_to_compare;
if (!mac_is_equal(probe_array[k].client_addr, client_addr))
{
if (!mac_is_equal(probe_array[k].client_addr, client_addr)) {
break;
}
if(mac_is_equal(bssid_addr, probe_array[k].bssid_addr))
{
if (mac_is_equal(bssid_addr, probe_array[k].bssid_addr)) {
printf("Own Score! Skipping!\n");
print_probe_entry(probe_array[k]);
continue;
@ -163,15 +161,12 @@ int better_ap_available(uint8_t bssid_addr[], uint8_t client_addr[], int automat
printf("Calculating score to compare!\n");
score_to_compare = eval_probe_metric(probe_array[k]);
if(own_score < score_to_compare)
{
if (own_score < score_to_compare) {
return 1;
}
if (dawn_metric.use_station_count && own_score == score_to_compare)
{
if (dawn_metric.use_station_count && own_score == score_to_compare) {
// if ap have same value but station count is different...
if(compare_station_count(bssid_addr, probe_array[k].bssid_addr, automatic_kick))
{
if (compare_station_count(bssid_addr, probe_array[k].bssid_addr, automatic_kick)) {
return 1;
}
}
@ -228,8 +223,7 @@ void kick_clients(uint8_t bssid[], uint32_t id) {
printf("Check if client is active receiving!\n");
float rx_rate, tx_rate;
if(get_bandwidth_iwinfo(client_array[j].client_addr, &rx_rate, &tx_rate))
{
if (get_bandwidth_iwinfo(client_array[j].client_addr, &rx_rate, &tx_rate)) {
// only use rx_rate for indicating if transmission is going on
// <= 6MBits <- probably no transmission
// tx_rate has always some weird value so don't use ist
@ -633,8 +627,7 @@ void remove_old_ap_entries(time_t current_time, long long int threshold) {
}
}
void uloop_add_data_cbs()
{
void uloop_add_data_cbs() {
uloop_timeout_add(&probe_timeout);
uloop_timeout_add(&client_timeout);
uloop_timeout_add(&ap_timeout);
@ -648,8 +641,7 @@ void remove_probe_array_cb(struct uloop_timeout *t) {
uloop_timeout_set(&probe_timeout, timeout_config.remove_probe * 1000);
}
void remove_client_array_cb(struct uloop_timeout *t)
{
void remove_client_array_cb(struct uloop_timeout *t) {
pthread_mutex_lock(&client_array_mutex);
printf("[Thread] : Removing old client entries!\n");
remove_old_client_entries(time(0), timeout_config.update_client);

26
src/utils/dawn_iwinfo.c
View file

@ -33,8 +33,7 @@ int get_bandwidth_iwinfo(__uint8_t *client_addr, float *rx_rate, float *tx_rate)
while ((entry = readdir(dirp)) != NULL) {
if (entry->d_type == DT_SOCK) {
if(get_bandwith(entry->d_name, client_addr, rx_rate, tx_rate))
{
if (get_bandwith(entry->d_name, client_addr, rx_rate, tx_rate)) {
sucess = 1;
break;
}
@ -53,23 +52,18 @@ int get_bandwith(const char *ifname, uint8_t *client_addr, float *rx_rate, float
iw = iwinfo_backend(ifname);
if (iw->assoclist(ifname, buf, &len))
{
if (iw->assoclist(ifname, buf, &len)) {
printf("No information available\n");
return 0;
}
else if (len <= 0)
{
} else if (len <= 0) {
printf("No station connected\n");
return 0;
}
for (i = 0; i < len; i += sizeof(struct iwinfo_assoclist_entry))
{
for (i = 0; i < len; i += sizeof(struct iwinfo_assoclist_entry)) {
e = (struct iwinfo_assoclist_entry *) &buf[i];
if(mac_is_equal(client_addr, e->mac))
{
if (mac_is_equal(client_addr, e->mac)) {
//struct iwinfo_assoclist_entry * rx_rate = e->rx_rate;
//struct iwinfo_assoclist_entry * tx_rate = e->tx_rate;
*rx_rate = e->rx_rate.rate / 1000;
@ -116,19 +110,15 @@ int get_rssi(const char *ifname, uint8_t *client_addr){
iw = iwinfo_backend(ifname);
if (iw->assoclist(ifname, buf, &len))
{
if (iw->assoclist(ifname, buf, &len)) {
printf("No information available\n");
return INT_MIN;
}
else if (len <= 0)
{
} else if (len <= 0) {
printf("No station connected\n");
return INT_MIN;
}
for (i = 0; i < len; i += sizeof(struct iwinfo_assoclist_entry))
{
for (i = 0; i < len; i += sizeof(struct iwinfo_assoclist_entry)) {
e = (struct iwinfo_assoclist_entry *) &buf[i];
if (mac_is_equal(client_addr, e->mac))

56
src/utils/ubus.c
View file

@ -138,20 +138,18 @@ static int subscribe_to_hostapd_interfaces(char *hostapd_dir);
static int ubus_get_clients();
int hostapd_array_check_id(uint32_t id);
void hostapd_array_insert(uint32_t id);
void hostapd_array_delete(uint32_t id);
void add_client_update_timer(time_t time)
{
void add_client_update_timer(time_t time) {
uloop_timeout_set(&client_timer, time);
}
int hostapd_array_check_id(uint32_t id)
{
for(int i = 0; i <= hostapd_sock_last; i++)
{
if(hostapd_sock_arr[i] == id)
{
int hostapd_array_check_id(uint32_t id) {
for (int i = 0; i <= hostapd_sock_last; i++) {
if (hostapd_sock_arr[i] == id) {
return 1;
}
}
@ -159,21 +157,18 @@ int hostapd_array_check_id(uint32_t id)
}
void hostapd_array_insert(uint32_t id)
{
void hostapd_array_insert(uint32_t id) {
if (hostapd_sock_last < MAX_HOSTAPD_SOCKETS) {
hostapd_sock_last++;
hostapd_sock_arr[hostapd_sock_last] = id;
}
for(int i = 0; i <= hostapd_sock_last; i++)
{
for (int i = 0; i <= hostapd_sock_last; i++) {
printf("%d: %d\n", i, hostapd_sock_arr[i]);
}
}
void hostapd_array_delete(uint32_t id)
{
void hostapd_array_delete(uint32_t id) {
int i = 0;
int found_in_array = 0;
@ -181,8 +176,7 @@ void hostapd_array_delete(uint32_t id)
return;
}
for(i = 0; i <= hostapd_sock_last; i++)
{
for (i = 0; i <= hostapd_sock_last; i++) {
if (hostapd_sock_arr[i] == id) {
found_in_array = 1;
break;
@ -217,8 +211,7 @@ static int decide_function(probe_entry *prob_req) {
return 0;
}
if(better_ap_available(prob_req->bssid_addr, prob_req->client_addr, 0))
{
if (better_ap_available(prob_req->bssid_addr, prob_req->client_addr, 0)) {
return 0;
}
@ -309,8 +302,7 @@ static int handle_auth_req(struct blob_attr *msg) {
print_probe_entry(tmp);
// block if entry was not already found in probe database
if(!(mac_is_equal(tmp.bssid_addr, auth_req.bssid_addr) && mac_is_equal(tmp.client_addr, auth_req.client_addr)))
{
if (!(mac_is_equal(tmp.bssid_addr, auth_req.bssid_addr) && mac_is_equal(tmp.client_addr, auth_req.client_addr))) {
printf("DENY AUTH!\n");
return UBUS_STATUS_UNKNOWN_ERROR;
}
@ -351,8 +343,7 @@ static int handle_probe_req(struct blob_attr *msg) {
// deny access
if(!dawn_metric.eval_probe_req)
{
if (!dawn_metric.eval_probe_req) {
return 0;
}
@ -390,8 +381,7 @@ static int add_subscriber(char *name) {
return -1;
}
if(hostapd_array_check_id(id))
{
if (hostapd_array_check_id(id)) {
return 0;
}
@ -406,8 +396,7 @@ static int subscribe_to_hostapd_interfaces(char *hostapd_dir) {
DIR *dirp;
struct dirent *entry;
if(ctx == NULL)
{
if (ctx == NULL) {
return 0;
}
@ -429,8 +418,7 @@ static int subscribe_to_hostapd_interfaces(char *hostapd_dir) {
static int subscribe_to_hostapd(char *hostapd_dir) {
if(ctx == NULL)
{
if (ctx == NULL) {
return 0;
}
@ -583,11 +571,9 @@ int parse_to_clients(struct blob_attr *msg, int do_kick, uint32_t id) {
ap_entry.vht = blobmsg_get_u8(tb[CLIENT_TABLE_VHT]);
ap_entry.channel_utilization = blobmsg_get_u32(tb[CLIENT_TABLE_CHAN_UTIL]);
if(tb[CLIENT_TABLE_NUM_STA])
{
if (tb[CLIENT_TABLE_NUM_STA]) {
ap_entry.station_count = blobmsg_get_u32(tb[CLIENT_TABLE_NUM_STA]);
} else
{
} else {
ap_entry.station_count = 0;
}
@ -615,8 +601,7 @@ static void ubus_get_clients_cb(struct ubus_request *req, int type, struct blob_
}
static int ubus_get_clients() {
for(int i = 0; i <= hostapd_sock_last; i++)
{
for (int i = 0; i <= hostapd_sock_last; i++) {
int timeout = 1;
ubus_invoke(ctx_clients, hostapd_sock_arr[i], "get_clients", NULL, ubus_get_clients_cb, NULL, timeout * 1000);
}
@ -651,8 +636,7 @@ void del_client_all_interfaces(const uint8_t *client_addr, uint32_t reason, uint
blobmsg_add_u8(&b, "deauth", deauth);
blobmsg_add_u32(&b, "ban_time", ban_time);
for(int i = 0; i <= hostapd_sock_last; i++)
{
for (int i = 0; i <= hostapd_sock_last; i++) {
int timeout = 1;
ubus_invoke(ctx_clients, hostapd_sock_arr[i], "del_client", b.head, NULL, NULL, timeout * 1000);
}