diff --git a/src/core/cntlr_map.c b/src/core/cntlr_map.c index d61c47ccac59ef3021be0e228ac7bc35d755ae38..951ce3d8a5ca8b44ad0a7fe863b46ed02d1f8d11 100644 --- a/src/core/cntlr_map.c +++ b/src/core/cntlr_map.c @@ -342,45 +342,6 @@ int handle_ap_autoconfig_response(void *cntlr, struct cmdu_buff *rx_cmdu) } return 0; -// struct controller *c = (struct controller *) cntlr; -// struct tlv_supp_service *tlv; -// int i; -// bool has_cntlr = false; -// -// tlv = extract_tlv_by_type(cmdu, MAP_TLV_SUPPORTED_SERVICE); -// if (!tlv) -// return 0; -// -// /* find if supported services containts controller */ -// for (i = 0; i < tlv->supported_services_list; i++) { -// if (tlv->supported_services[i].service == SUPPORTED_SERVICE_MULTIAP_CONTROLLER) { -// has_cntlr = true; -// break; -// } -// } -// /* if does not support controller - return */ -// if (!has_cntlr) -// return 0; -// -// /* discard self response */ -// if (!memcmp(cmdu->origin, c->almac, 6)) -// return 0; -// -// trace("Received AP-Autoconfig Response which was not from self\n"); -// -// if (c->state == CNTLR_INIT) { -// trace("Disable and exit\n"); -// set_value_by_string("mapcontroller", "controller", "enabled", "0", -// UCI_TYPE_STRING); -// exit(0); -// } else { -// char data[128] = {0}; -// -// snprintf(data, sizeof(data), "{\"type\":\"error\", \"reason\":\"multiple controllers\", \"almac\":\""MACFMT"\"}", MAC2STR(cmdu->origin)); -// cntlr_notify_event(c, "map.controller", data); -// } -// -// return 0; } int handle_ap_autoconfig_wsc(void *cntlr, struct cmdu_buff *rx_cmdu) diff --git a/src/core/cntlr_map_debug.c b/src/core/cntlr_map_debug.c index a4a66bbee0a8913a7a839e108606c39f70371963..7d9ea1d9f322f47288e780ca2ed2c853b6c35ff8 100644 --- a/src/core/cntlr_map_debug.c +++ b/src/core/cntlr_map_debug.c @@ -196,174 +196,6 @@ struct tlv_map_profile { dbg("%s %d\n", __func__, __LINE__); return 0; -// uint8_t *tlv; -// int i, j, k; -// -// trace("%s: --->\n", __func__); -// trace("parsing topology response |" MACFMT "|CMDU: %s\n", -// MAC2STR(cmdu->origin), -// map_stringify_cmdu_type(cmdu->message_type)); -// -// for (i = 0; i < cmdu->num_tlvs; i++) { -// tlv = (uint8_t *)cmdu->tlvs[i]; -// trace("TLV: %s\n", map_stringify_tlv_type(*tlv)); -// switch (*tlv) { -// case TLV_TYPE_DEVICE_INFORMATION_TYPE: -// { -// struct tlv_device_info *p = -// (struct tlv_device_info *)tlv; -// -// trace("\tal_mac_address: " MACFMT "\n", -// MAC2STR(p->al_mac_address)); -// trace("\tlocal_interfaces_nr: %d\n", -// p->local_interfaces_nr); -// for (j = 0; j < p->local_interfaces_nr; j++) { -// trace("\t\tmac_address: " MACFMT "\n", -// MAC2STR(p->local_interfaces[j].mac_address)); -// trace("\t\tmedia_type: 0x%04hx\n", -// p->local_interfaces[j].media_type); -// trace("\t\tmedia_specific_data_size: %d\n", -// p->local_interfaces[j].media_specific_data_size); -// if ((p->local_interfaces[j].media_type & 0xff00) == 0x0100) { -// /* IEEE 802.11 devices */ -// trace("\t\tnetwork_membership: " MACFMT "\n", -// MAC2STR(p->local_interfaces[j].media_specific_data.ieee80211.network_membership)); -// trace("\t\trole: "); -// print_bits(p->local_interfaces[j].media_specific_data.ieee80211.role, -// 4, 4); -// trace("\t\tap_channel_band: 0x%02hx\n", -// p->local_interfaces[j].media_specific_data.ieee80211.ap_channel_band); -// trace("\t\tap_ch_freq_1: 0x%02hx\n", -// p->local_interfaces[j].media_specific_data.ieee80211.ap_ch_freq_1); -// trace("\t\tap_ch_freq_2: 0x%02hx\n", -// p->local_interfaces[j].media_specific_data.ieee80211.ap_ch_freq_2); -// } -// } -// break; -// } -// case TLV_TYPE_DEVICE_BRIDGING_CAPABILITIES: -// { -// struct tlv_device_bridge_cap *p = -// (struct tlv_device_bridge_cap *)tlv; -// -// trace("\tbridging_tuples_nr: %d\n", -// p->bridging_tuples_nr); -// for (j = 0; j < p->bridging_tuples_nr; j++) { -// trace("\t\tbridging_tuple_macs_nr: %d\n", -// p->bridging_tuples[j].bridging_tuple_macs_nr); -// for (k = 0; k < p->bridging_tuples[j].bridging_tuple_macs_nr; k++) { -// trace("\t\t\tmac_address: " MACFMT "\n", -// MAC2STR(p->bridging_tuples[j].bridging_tuple_macs[k].mac_address)); -// } -// } -// break; -// } -// case TLV_TYPE_NON_1905_NEIGHBOR_DEVICE_LIST: -// { -// struct tlv_non1905_neighbor *p = -// (struct tlv_non1905_neighbor *)tlv; -// -// trace("\tlocal_mac_address: " MACFMT "\n", -// MAC2STR(p->local_mac_address)); -// trace("\tnon_1905_neighbors_nr: %d\n", -// p->non_1905_neighbors_nr); -// for (j = 0; j < p->non_1905_neighbors_nr; j++) { -// trace("\t\tmac_address: " MACFMT "\n", -// MAC2STR(p->non_1905_neighbors[j].mac_address)); -// } -// break; -// } -// case TLV_TYPE_NEIGHBOR_DEVICE_LIST: -// { -// struct tlv_neighbor_device *p = -// (struct tlv_neighbor_device *)tlv; -// -// trace("\tlocal_mac_address: " MACFMT "\n", -// MAC2STR(p->local_mac_address)); -// trace("\tneighbors_nr: %d\n", -// p->neighbors_nr); -// for (j = 0; j < p->neighbors_nr; j++) { -// trace("\t\tmac_address: " MACFMT "\n", -// MAC2STR(p->neighbors[j].mac_address)); -// trace("\t\tbridge_flag: %s\n", -// (p->neighbors[j].bridge_flag ? "true" : "false")); -// } -// break; -// } -// case MAP_TLV_SUPPORTED_SERVICE: -// { -// struct tlv_supp_service *p = -// (struct tlv_supp_service *)tlv; -// -// trace("\tsupported_services_list: %d\n", -// p->supported_services_list); -// for (j = 0; j < p->supported_services_list; j++) { -// trace("\t\tservice: %s\n", -// (p->supported_services[j].service ? -// "Multi-AP Agent" : "Multi-AP Controller")); -// } -// break; -// } -// case MAP_TLV_AP_OPERATIONAL_BSS: -// { -// struct tlv_ap_oper_bss *p = -// (struct tlv_ap_oper_bss *)tlv; -// -// trace("\tradios_nr: %d\n", p->radios_nr); -// for (j = 0; j < p->radios_nr; j++) { -// trace("\t\tradio_id: " MACFMT "\n", -// MAC2STR(p->radio[j].radio_id)); -// trace("\t\tbss_nr: %d\n", -// p->radio[j].bss_nr); -// for (k = 0; k < p->radio[j].bss_nr; k++) { -// trace("\t\t\tbssid: " MACFMT "\n", -// MAC2STR(p->radio[j].bss[k].bssid)); -// trace("\t\t\tssid_len: %d\n", -// p->radio[j].bss[k].ssid_len); -// trace("\t\t\tssid: %.*s\n", -// p->radio[j].bss[k].ssid_len, -// p->radio[j].bss[k].ssid); -// } -// } -// break; -// } -// case MAP_TLV_ASSOCIATED_CLIENTS: -// { -// struct tlv_assoc_client *p = -// (struct tlv_assoc_client *)tlv; -// -// trace("\tbss_nr: %d\n", p->bss_nr); -// for (j = 0; j < p->bss_nr; j++) { -// trace("\t\tbssid: " MACFMT "\n", -// MAC2STR(p->bss[j].bssid)); -// trace("\t\tassoc_clients_nr: %d\n", -// p->bss[j].assoc_clients_nr); -// for (k = 0; k < p->bss[j].assoc_clients_nr; k++) { -// trace("\t\t\tclient_addr: " MACFMT "\n", -// MAC2STR(p->bss[j].clients[k].client_addr)); -// trace("\t\t\tuptime: 0x%04x\n", -// p->bss[j].clients[k].uptime); -// } -// } -// break; -// } -// case MAP_TLV_MULTIAP_PROFILE: -// { -// struct tlv_map_profile *p = -// (struct tlv_map_profile *)tlv; -// -// trace("\tprofile: 0x%02hx\n", p->profile); -// break; -// } -// default: -// { -// trace("unknown TLV\n"); -// break; -// } -// } -// trace("\n"); -// } -// return 0; } int debug_ap_autoconfig_search(void *cntlr, struct cmdu_buff *cmdu)