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

Add ht and vht supported

Browse source
This commit is contained in:
PolynomialDivision 2017-07-18 22:03:31 +02:00
parent cfd6944b97
commit e9daee896c
3 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/include/datastorage.h
View file

@ -34,6 +34,8 @@ typedef struct {
typedef struct client_s { typedef struct client_s {
uint8_t bssid_addr[ETH_ALEN]; uint8_t bssid_addr[ETH_ALEN];
uint8_t client_addr[ETH_ALEN]; uint8_t client_addr[ETH_ALEN];
uint8_t ht_supported;
uint8_t vht_supported;
uint32_t freq; uint32_t freq;
uint8_t auth; uint8_t auth;
uint8_t assoc; uint8_t assoc;

6
src/storage/datastorage.c
View file

@ -63,7 +63,7 @@ void kick_clients(uint8_t bssid[])
TODO: KICK ONLY FROM ONE BSSID? TODO: KICK ONLY FROM ONE BSSID?
*/ */
printf("KICKING CLIENT!!!!!!!!!!!!!\n"); printf("KICKING CLIENT!!!!!!!!!!!!!\n");
del_client(client_array[j].client_addr, 5, 1, 60000); //del_client(client_array[j].client_addr, 5, 1, 60000);
} else } else
{ {
printf("STAAAY CLIENT!!!!!!!!!!!!!\n"); printf("STAAAY CLIENT!!!!!!!!!!!!!\n");
@ -673,8 +673,8 @@ void print_client_entry(client entry) {
sprintf(mac_buf_ap, "%x:%x:%x:%x:%x:%x", MAC2STR(entry.bssid_addr)); sprintf(mac_buf_ap, "%x:%x:%x:%x:%x:%x", MAC2STR(entry.bssid_addr));
sprintf(mac_buf_client, "%x:%x:%x:%x:%x:%x", MAC2STR(entry.client_addr)); sprintf(mac_buf_client, "%x:%x:%x:%x:%x:%x", MAC2STR(entry.client_addr));
printf("bssid_addr: %s, client_addr: %s, freq: %d\n", printf("bssid_addr: %s, client_addr: %s, freq: %d, ht_supported: %d, vht_supported: %d, ht: %d, vht: %d\n",
mac_buf_ap, mac_buf_client, entry.freq); mac_buf_ap, mac_buf_client, entry.freq, entry.ht_supported, entry.vht_supported, entry.ht, entry.vht);
} }
void print_client_array() { void print_client_array() {

17
src/utils/ubus.c
View file

@ -38,6 +38,8 @@ enum {
CLIENT_TABLE, CLIENT_TABLE,
CLIENT_TABLE_BSSID, CLIENT_TABLE_BSSID,
CLIENT_TABLE_FREQ, CLIENT_TABLE_FREQ,
CLIENT_TABLE_HT,
CLIENT_TABLE_VHT,
__CLIENT_TABLE_MAX, __CLIENT_TABLE_MAX,
}; };
@ -45,6 +47,8 @@ static const struct blobmsg_policy client_table_policy[__CLIENT_TABLE_MAX] = {
[CLIENT_TABLE] = {.name = "clients", .type = BLOBMSG_TYPE_TABLE}, [CLIENT_TABLE] = {.name = "clients", .type = BLOBMSG_TYPE_TABLE},
[CLIENT_TABLE_BSSID] = {.name = "bssid", .type = BLOBMSG_TYPE_STRING}, [CLIENT_TABLE_BSSID] = {.name = "bssid", .type = BLOBMSG_TYPE_STRING},
[CLIENT_TABLE_FREQ] = {.name = "freq", .type = BLOBMSG_TYPE_INT32}, [CLIENT_TABLE_FREQ] = {.name = "freq", .type = BLOBMSG_TYPE_INT32},
[CLIENT_TABLE_HT] = {.name = "ht_supported", .type = BLOBMSG_TYPE_INT8},
[CLIENT_TABLE_VHT] = {.name = "vht_supported", .type = BLOBMSG_TYPE_INT8},
}; };
enum { enum {
@ -248,7 +252,7 @@ int dawn_init_ubus(const char *ubus_socket, char *hostapd_dir) {
} }
static void static void
dump_client(struct blob_attr **tb, uint8_t client_addr[], const char* bssid_addr, uint32_t freq) dump_client(struct blob_attr **tb, uint8_t client_addr[], const char* bssid_addr, uint32_t freq, uint8_t ht_supported, uint8_t vht_supported)
{ {
client client_entry; client client_entry;
@ -263,6 +267,9 @@ dump_client(struct blob_attr **tb, uint8_t client_addr[], const char* bssid_addr
//sprintf(mac_buf_client, "%x:%x:%x:%x:%x:%x", MAC2STR(client_entry.client_addr)); //sprintf(mac_buf_client, "%x:%x:%x:%x:%x:%x", MAC2STR(client_entry.client_addr));
client_entry.freq = freq; client_entry.freq = freq;
client_entry.ht_supported = ht_supported;
client_entry.vht_supported = vht_supported;
if (tb[CLIENT_AUTH]) { if (tb[CLIENT_AUTH]) {
client_entry.auth = blobmsg_get_u8(tb[CLIENT_AUTH]); client_entry.auth = blobmsg_get_u8(tb[CLIENT_AUTH]);
} }
@ -302,7 +309,7 @@ dump_client(struct blob_attr **tb, uint8_t client_addr[], const char* bssid_addr
} }
static void static void
dump_client_table(struct blob_attr *head, int len, const char* bssid_addr, uint32_t freq) dump_client_table(struct blob_attr *head, int len, const char* bssid_addr, uint32_t freq, uint8_t ht_supported, uint8_t vht_supported)
{ {
struct blob_attr *attr; struct blob_attr *attr;
struct blobmsg_hdr *hdr; struct blobmsg_hdr *hdr;
@ -320,7 +327,7 @@ dump_client_table(struct blob_attr *head, int len, const char* bssid_addr, uint3
for(int i = 0; i < ETH_ALEN; ++i ) for(int i = 0; i < ETH_ALEN; ++i )
tmp_mac[i] = (uint8_t) tmp_int_mac[i]; tmp_mac[i] = (uint8_t) tmp_int_mac[i];
dump_client(tb, tmp_mac, bssid_addr, freq); dump_client(tb, tmp_mac, bssid_addr, freq, ht_supported, vht_supported);
} }
} }
@ -329,8 +336,8 @@ int parse_to_clients(struct blob_attr *msg) {
blobmsg_parse(client_table_policy, __CLIENT_TABLE_MAX, tb, blob_data(msg), blob_len(msg)); blobmsg_parse(client_table_policy, __CLIENT_TABLE_MAX, tb, blob_data(msg), blob_len(msg));
if (tb[CLIENT_TABLE] && tb[CLIENT_TABLE_BSSID] && tb[CLIENT_TABLE_FREQ]) { if (tb[CLIENT_TABLE] && tb[CLIENT_TABLE_BSSID] && tb[CLIENT_TABLE_FREQ] && tb[CLIENT_TABLE_HT] && tb[CLIENT_TABLE_VHT]) {
dump_client_table(blobmsg_data(tb[CLIENT_TABLE]), blobmsg_data_len(tb[CLIENT_TABLE]), blobmsg_data(tb[CLIENT_TABLE_BSSID]), blobmsg_get_u32(tb[CLIENT_TABLE_FREQ])); dump_client_table(blobmsg_data(tb[CLIENT_TABLE]), blobmsg_data_len(tb[CLIENT_TABLE]), blobmsg_data(tb[CLIENT_TABLE_BSSID]), blobmsg_get_u32(tb[CLIENT_TABLE_FREQ]), blobmsg_get_u8(tb[CLIENT_TABLE_HT]), blobmsg_get_u8(tb[CLIENT_TABLE_VHT]));
/* BSSID */ /* BSSID */
/* /*