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 collision domain

Browse source
This commit is contained in:
PolynomialDivision 2018-01-27 17:19:44 +01:00
parent 1cf72783e3
commit 7b6db238f7
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/utils/ubus.c
View file

@ -122,6 +122,7 @@ enum {
CLIENT_TABLE_VHT, CLIENT_TABLE_VHT,
CLIENT_TABLE_CHAN_UTIL, CLIENT_TABLE_CHAN_UTIL,
CLIENT_TABLE_NUM_STA, CLIENT_TABLE_NUM_STA,
CLIENT_TABLE_COL_DOMAIN,
__CLIENT_TABLE_MAX, __CLIENT_TABLE_MAX,
}; };
@ -134,6 +135,7 @@ static const struct blobmsg_policy client_table_policy[__CLIENT_TABLE_MAX] = {
[CLIENT_TABLE_VHT] = {.name = "vht_supported", .type = BLOBMSG_TYPE_INT8}, [CLIENT_TABLE_VHT] = {.name = "vht_supported", .type = BLOBMSG_TYPE_INT8},
[CLIENT_TABLE_CHAN_UTIL] = {.name = "channel_utilization", .type = BLOBMSG_TYPE_INT32}, [CLIENT_TABLE_CHAN_UTIL] = {.name = "channel_utilization", .type = BLOBMSG_TYPE_INT32},
[CLIENT_TABLE_NUM_STA] = {.name = "num_sta", .type = BLOBMSG_TYPE_INT32}, [CLIENT_TABLE_NUM_STA] = {.name = "num_sta", .type = BLOBMSG_TYPE_INT32},
[CLIENT_TABLE_COL_DOMAIN] = {.name = "collision_domain", .type = BLOBMSG_TYPE_INT32},
}; };
enum { enum {
@ -183,7 +185,6 @@ enum {
static const struct blobmsg_policy dawn_umdns_policy[__DAWN_UMDNS_MAX] = { static const struct blobmsg_policy dawn_umdns_policy[__DAWN_UMDNS_MAX] = {
[DAWN_UMDNS_IPV4] = {.name = "ipv4", .type = BLOBMSG_TYPE_STRING}, [DAWN_UMDNS_IPV4] = {.name = "ipv4", .type = BLOBMSG_TYPE_STRING},
[DAWN_UMDNS_PORT] = {.name = "port", .type = BLOBMSG_TYPE_INT32}, [DAWN_UMDNS_PORT] = {.name = "port", .type = BLOBMSG_TYPE_INT32},
}; };
/* Function Definitions */ /* Function Definitions */
@ -856,10 +857,11 @@ int parse_to_clients(struct blob_attr *msg, int do_kick, uint32_t id) {
ap_entry.channel_utilization = blobmsg_get_u32(tb[CLIENT_TABLE_CHAN_UTIL]); ap_entry.channel_utilization = blobmsg_get_u32(tb[CLIENT_TABLE_CHAN_UTIL]);
strcpy((char *) ap_entry.ssid, blobmsg_get_string(tb[CLIENT_TABLE_SSID])); strcpy((char *) ap_entry.ssid, blobmsg_get_string(tb[CLIENT_TABLE_SSID]));
// ap is own ap if (tb[CLIENT_TABLE_COL_DOMAIN])
if(id != 0)
{ {
ap_entry.collision_domain = network_config.collision_domain; ap_entry.collision_domain = blobmsg_get_u32(tb[CLIENT_TABLE_COL_DOMAIN]);
} else {
ap_entry.collision_domain = -1;
} }
if (tb[CLIENT_TABLE_NUM_STA]) { if (tb[CLIENT_TABLE_NUM_STA]) {
@ -882,8 +884,6 @@ static void ubus_get_clients_cb(struct ubus_request *req, int type, struct blob_
if (!msg) if (!msg)
return; return;
char* data_str = blobmsg_format_json(msg, 1); char* data_str = blobmsg_format_json(msg, 1);
blob_buf_init(&b_domain, 0); blob_buf_init(&b_domain, 0);
blobmsg_add_json_from_string(&b_domain, data_str); blobmsg_add_json_from_string(&b_domain, data_str);
@ -891,8 +891,8 @@ static void ubus_get_clients_cb(struct ubus_request *req, int type, struct blob_
char* collision_string = blobmsg_format_json(b_domain.head, 1); char* collision_string = blobmsg_format_json(b_domain.head, 1);
printf("ADDED COLLISION DOMAIN: %s\n", collision_string); printf("ADDED COLLISION DOMAIN: %s\n", collision_string);
send_blob_attr_via_network(msg, "clients"); send_blob_attr_via_network(b_domain.head, "clients");
parse_to_clients(msg, 1, req->peer); parse_to_clients(b_domain.head, 1, req->peer);
print_client_array(); print_client_array();
print_ap_array(); print_ap_array();