diff --git a/src/cw/capwap.h b/src/cw/capwap.h index adadd270..e62faaea 100644 --- a/src/cw/capwap.h +++ b/src/cw/capwap.h @@ -57,9 +57,12 @@ #define CAPWAP_IANA_ENTERPRISE_NUMBER 0 -/** CAPWAP Control Port*/ +/** CAPWAP Control Port. This port is defined by RFC5415 + * for the AC to listen on for CAPWAP control messages. */ #define CAPWAP_CONTROL_PORT 5246 -/** CAPWAP Control Port as String */ + +/** CAPWAP Control Port as String. + * @see CAPWAP_CONTROL_PORT */ #define CAPWAP_CONTROL_PORT_STR "5246" /** CAPWAP Data Port */ @@ -117,18 +120,27 @@ * find an AC on the network and inform the AC about some * basic capabillities of the WTP. */ #define CAPWAP_MSG_DISCOVERY_REQUEST 1 + /** * A Discovery Response message is send by the AP to * the WTP after receiving a Discovery Request message. */ #define CAPWAP_MSG_DISCOVERY_RESPONSE 2 + /** * The CAPWAP Join Request message type. A Join Request is * snet by the WTP to join an AC */ #define CAPWAP_MSG_JOIN_REQUEST 3 -#define CW_MSG_JOIN_RESPONSE 4 +/** + * Join Response, sent by the AC to the WTP in response to + * Join Request message */ +#define CAPWAP_MSG_JOIN_RESPONSE 4 + +/** + * The Config Status Request message is sent by the WTP + * to report ist status to the AC*/ +#define CAPWAP_MSG_CONFIGURATION_STATUS_REQUEST 5 -#define CW_MSG_CONFIGURATION_STATUS_REQUEST 5 #define CW_MSG_CONFIGURATION_STATUS_RESPONSE 6 #define CW_MSG_CONFIGURATION_UPDATE_REQUEST 7 diff --git a/src/cw/capwap_80211_actions_ac.c b/src/cw/capwap_80211_actions_ac.c index 98057ccf..81e77a30 100644 --- a/src/cw/capwap_80211_actions_ac.c +++ b/src/cw/capwap_80211_actions_ac.c @@ -40,7 +40,7 @@ cw_action_out_t capwap_80211_actions_ac_out[]={ , /* Radio Infos */ - {CW_MSG_JOIN_RESPONSE, NULL /*CW_ELEM80211_WTP_RADIO_INFORMATION*/, 0, + {CAPWAP_MSG_JOIN_RESPONSE, NULL /*CW_ELEM80211_WTP_RADIO_INFORMATION*/, 0, CW_ELEM80211_WTP_RADIO_INFORMATION, NULL,cw_out_radio_infos, NULL,1} , diff --git a/src/cw/capwap_80211_actions_wtp.c b/src/cw/capwap_80211_actions_wtp.c index 17083c0e..aa2024f8 100644 --- a/src/cw/capwap_80211_actions_wtp.c +++ b/src/cw/capwap_80211_actions_wtp.c @@ -18,7 +18,7 @@ cw_action_in_t capwap_80211_actions_wtp_in[] = { , /* Join Response */ - {0, 0, CW_STATE_JOIN, CW_MSG_JOIN_RESPONSE, + {0, 0, CW_STATE_JOIN, CAPWAP_MSG_JOIN_RESPONSE, CW_ACTION_IN_80211_WTP_RADIO_INFORMATION, 1} , diff --git a/src/cw/capwap_strings_msg.c b/src/cw/capwap_strings_msg.c index e99cd2ed..66eaa868 100644 --- a/src/cw/capwap_strings_msg.c +++ b/src/cw/capwap_strings_msg.c @@ -29,8 +29,8 @@ struct cw_strlist_elem capwap_strings_msg[] = { { CAPWAP_MSG_DISCOVERY_REQUEST, "Discovery Request" }, { CAPWAP_MSG_DISCOVERY_RESPONSE,"Discovery Response" }, { CAPWAP_MSG_JOIN_REQUEST, "Join Request"}, -{ CW_MSG_JOIN_RESPONSE,"Join Response"}, -{ CW_MSG_CONFIGURATION_STATUS_REQUEST,"Configuration Status Request"}, +{ CAPWAP_MSG_JOIN_RESPONSE,"Join Response"}, +{ CAPWAP_MSG_CONFIGURATION_STATUS_REQUEST,"Configuration Status Request"}, { CW_MSG_CONFIGURATION_STATUS_RESPONSE,"Configuration Status Response"}, { CW_MSG_CONFIGURATION_UPDATE_REQUEST,"Configuration Update Request"}, { CW_MSG_CONFIGURATION_UPDATE_RESPONSE,"Configuration Update Response"}, diff --git a/src/cw/cw_prepare_configuration_status_request.c b/src/cw/cw_prepare_configuration_status_request.c index 036a5f04..d83eb581 100644 --- a/src/cw/cw_prepare_configuration_status_request.c +++ b/src/cw/cw_prepare_configuration_status_request.c @@ -12,7 +12,7 @@ void cw_prepare_configuration_status_request(struct conn * conn, struct radioinf struct cwmsg * cwmsg = &conn->req_msg; uint8_t * buffer = conn->req_buffer; - cwmsg_init(cwmsg,buffer,CW_MSG_CONFIGURATION_STATUS_REQUEST,conn_get_next_seqnum(conn),radioinfo); + cwmsg_init(cwmsg,buffer,CAPWAP_MSG_CONFIGURATION_STATUS_REQUEST,conn_get_next_seqnum(conn),radioinfo); cwmsg->capwap_mode=conn->capwap_mode; cwmsg_addelem_ac_name(cwmsg,(uint8_t *)"AC-iMaxi"); diff --git a/src/cw/cw_readmsg_configuration_status_request.c b/src/cw/cw_readmsg_configuration_status_request.c index 228dd82d..41792941 100644 --- a/src/cw/cw_readmsg_configuration_status_request.c +++ b/src/cw/cw_readmsg_configuration_status_request.c @@ -11,7 +11,7 @@ int cw_readmsg_configuration_update_request(uint8_t *elems,int elems_len) int len = cw_get_elem_len(elem); uint8_t *data = cw_get_elem_data(elem); - cw_dbg_msgelem(CW_MSG_CONFIGURATION_STATUS_REQUEST, type, data, len); + cw_dbg_msgelem(CAPWAP_MSG_CONFIGURATION_STATUS_REQUEST, type, data, len); // cw_readelem_vendor_specific_payload(elem,CW_MSG_CONFIGURATION_STATUS_RESPONSE, type,data,len ); diff --git a/src/mod/capwap/capwap_actions_ac.c b/src/mod/capwap/capwap_actions_ac.c index bbf99b12..0e0d6cc0 100644 --- a/src/mod/capwap/capwap_actions_ac.c +++ b/src/mod/capwap/capwap_actions_ac.c @@ -318,7 +318,7 @@ static cw_action_in_t actions_in[] = { */ { .capwap_state = CW_STATE_CONFIGURE, - .msg_id = CW_MSG_CONFIGURATION_STATUS_REQUEST, + .msg_id = CAPWAP_MSG_CONFIGURATION_STATUS_REQUEST, .end = cw_in_check_generic_req } , @@ -326,7 +326,7 @@ static cw_action_in_t actions_in[] = { /* AC Name - Config Status Request */ { .capwap_state = CW_STATE_CONFIGURE, - .msg_id = CW_MSG_CONFIGURATION_STATUS_REQUEST, + .msg_id = CAPWAP_MSG_CONFIGURATION_STATUS_REQUEST, .elem_id = CW_ELEM_AC_NAME, .item_id = CW_ITEM_AC_NAME, .start = cw_in_generic2, @@ -340,7 +340,7 @@ static cw_action_in_t actions_in[] = { /* Radio Admin State (IN) - Config Status Request */ { .capwap_state = CW_STATE_CONFIGURE, - .msg_id = CW_MSG_CONFIGURATION_STATUS_REQUEST, + .msg_id = CAPWAP_MSG_CONFIGURATION_STATUS_REQUEST, .elem_id = CW_ELEM_RADIO_ADMINISTRATIVE_STATE, .item_id = CW_RADIOITEM_ADMIN_STATE, .start = cw_in_radio_generic, @@ -352,7 +352,7 @@ static cw_action_in_t actions_in[] = { /* Statistics Timer - Config Status Request */ { .capwap_state = CW_STATE_CONFIGURE, - .msg_id = CW_MSG_CONFIGURATION_STATUS_REQUEST, + .msg_id = CAPWAP_MSG_CONFIGURATION_STATUS_REQUEST, .elem_id = CW_ELEM_STATISTICS_TIMER, .item_id = CW_ITEM_STATISTICS_TIMER, .start = cw_in_generic2, @@ -367,7 +367,7 @@ static cw_action_in_t actions_in[] = { /* WTP Reboot Statistics - Config Status Request */ { .capwap_state = CW_STATE_CONFIGURE, - .msg_id = CW_MSG_CONFIGURATION_STATUS_REQUEST, + .msg_id = CAPWAP_MSG_CONFIGURATION_STATUS_REQUEST, .elem_id = CW_ELEM_WTP_REBOOT_STATISTICS, .start = cw_in_wtp_reboot_statistics, .item_id = CW_ITEM_WTP_REBOOT_STATISTICS, @@ -382,7 +382,7 @@ static cw_action_in_t actions_in[] = { /* Vendor Specific Payload - Config Status Request */ { .capwap_state = CW_STATE_CONFIGURE, - .msg_id = CW_MSG_CONFIGURATION_STATUS_REQUEST, + .msg_id = CAPWAP_MSG_CONFIGURATION_STATUS_REQUEST, .elem_id = CW_ELEM_VENDOR_SPECIFIC_PAYLOAD, .start = cw_in_vendor_specific_payload, } @@ -594,7 +594,7 @@ static cw_action_out_t actions_out[]={ /* Result Code - Join Response */ { - .msg_id = CW_MSG_JOIN_RESPONSE, + .msg_id = CAPWAP_MSG_JOIN_RESPONSE, .elem_id = CW_ELEM_RESULT_CODE, .item_id = CW_ITEM_RESULT_CODE, .out = cw_out_generic, @@ -605,7 +605,7 @@ static cw_action_out_t actions_out[]={ /* AC Name - Join Response */ { - .msg_id = CW_MSG_JOIN_RESPONSE, + .msg_id = CAPWAP_MSG_JOIN_RESPONSE, .elem_id = CW_ELEM_AC_NAME, .item_id = CW_ITEM_AC_NAME, .out = cw_out_generic, @@ -616,7 +616,7 @@ static cw_action_out_t actions_out[]={ /* AC Descriptor - Join Response */ { - .msg_id = CW_MSG_JOIN_RESPONSE, + .msg_id = CAPWAP_MSG_JOIN_RESPONSE, .item_id = CW_ITEM_AC_DESCRIPTOR, .elem_id = CW_ELEM_AC_DESCRIPTOR, .out = capwap_out_ac_descriptor, @@ -627,7 +627,7 @@ static cw_action_out_t actions_out[]={ /* Capwap Local IPv4/IPv6 Address - Join Response */ { - .msg_id = CW_MSG_JOIN_RESPONSE, + .msg_id = CAPWAP_MSG_JOIN_RESPONSE, .item_id = CW_ITEM_CAPWAP_CONTROL_IP_ADDRESS_LIST, .out = cw_out_capwap_control_ip_addr_list, .get = cw_out_get_outgoing, @@ -637,7 +637,7 @@ static cw_action_out_t actions_out[]={ /* ECN Support - Join Response */ { - .msg_id = CW_MSG_JOIN_RESPONSE, + .msg_id = CAPWAP_MSG_JOIN_RESPONSE, .elem_id = CW_ELEM_ECN_SUPPORT, .item_id = CW_ITEM_ECN_SUPPORT, .out = cw_out_generic, @@ -649,7 +649,7 @@ static cw_action_out_t actions_out[]={ { - .msg_id = CW_MSG_JOIN_RESPONSE, + .msg_id = CAPWAP_MSG_JOIN_RESPONSE, .elem_id = CW_ELEM_AC_IPV4_LIST, .out = capwap_out_ac_ip_list diff --git a/src/mod/capwap/capwap_actions_wtp.c b/src/mod/capwap/capwap_actions_wtp.c index f6d001d2..8caccec8 100644 --- a/src/mod/capwap/capwap_actions_wtp.c +++ b/src/mod/capwap/capwap_actions_wtp.c @@ -103,14 +103,14 @@ static cw_action_in_t actions_in[] = { */ { .capwap_state = CW_STATE_JOIN, - .msg_id = CW_MSG_JOIN_RESPONSE, + .msg_id = CAPWAP_MSG_JOIN_RESPONSE, .end = cw_in_check_generic_resp } , /* Result Code - Join Response */ { .capwap_state = CW_STATE_JOIN, - .msg_id = CW_MSG_JOIN_RESPONSE, + .msg_id = CAPWAP_MSG_JOIN_RESPONSE, .elem_id = CW_ELEM_RESULT_CODE, .item_id = CW_ITEM_RESULT_CODE, .start = cw_in_generic2, @@ -123,7 +123,7 @@ static cw_action_in_t actions_in[] = { /* AC Descriptor - Join Response */ { .capwap_state = CW_STATE_JOIN, - .msg_id = CW_MSG_JOIN_RESPONSE, + .msg_id = CAPWAP_MSG_JOIN_RESPONSE, .elem_id = CW_ELEM_AC_DESCRIPTOR, .item_id = CW_ITEM_AC_DESCRIPTOR, .start = cw_in_ac_descriptor, @@ -136,7 +136,7 @@ static cw_action_in_t actions_in[] = { /* AC Name - Join Response */ { .capwap_state = CW_STATE_JOIN, - .msg_id = CW_MSG_JOIN_RESPONSE, + .msg_id = CAPWAP_MSG_JOIN_RESPONSE, .elem_id = CW_ELEM_AC_NAME, .item_id = CW_ITEM_AC_NAME, .start = cw_in_generic2, @@ -149,7 +149,7 @@ static cw_action_in_t actions_in[] = { /* ECN Support - Join Response */ { .capwap_state = CW_STATE_JOIN, - .msg_id = CW_MSG_JOIN_RESPONSE, + .msg_id = CAPWAP_MSG_JOIN_RESPONSE, .elem_id = CW_ELEM_ECN_SUPPORT, .item_id = CW_ITEM_ECN_SUPPORT, .start = cw_in_generic2, @@ -162,7 +162,7 @@ static cw_action_in_t actions_in[] = { /* CAPWAP Control IPv4 Address - Join Response*/ { .capwap_state = CW_STATE_JOIN, - .msg_id = CW_MSG_JOIN_RESPONSE, + .msg_id = CAPWAP_MSG_JOIN_RESPONSE, .elem_id = CW_ELEM_CAPWAP_CONTROL_IPV4_ADDRESS, .item_id = CW_ITEM_CAPWAP_CONTROL_IP_ADDRESS_LIST, .start = cw_in_capwap_control_ip_address, @@ -175,7 +175,7 @@ static cw_action_in_t actions_in[] = { /* CAPWAP Control IPv6 Address - Join Response*/ { .capwap_state = CW_STATE_JOIN, - .msg_id = CW_MSG_JOIN_RESPONSE, + .msg_id = CAPWAP_MSG_JOIN_RESPONSE, .elem_id = CW_ELEM_CAPWAP_CONTROL_IPV6_ADDRESS, .item_id = CW_ITEM_CAPWAP_CONTROL_IP_ADDRESS_LIST, .start = cw_in_capwap_control_ip_address, // Change to v6 handler @@ -189,7 +189,7 @@ static cw_action_in_t actions_in[] = { /* Maximum Message Length - Join Response */ { .capwap_state = CW_STATE_JOIN, - .msg_id = CW_MSG_JOIN_RESPONSE, + .msg_id = CAPWAP_MSG_JOIN_RESPONSE, .elem_id = CW_ELEM_MAXIMUM_MESSAGE_LENGTH, .start = cw_in_generic2, .item_id = CW_ITEM_MAXIMUM_MESSAGE_LENGTH, @@ -627,7 +627,7 @@ static cw_action_out_t actions_out[] = { /* AC Name - Config Status Request - OUT */ { - .msg_id = CW_MSG_CONFIGURATION_STATUS_REQUEST, + .msg_id = CAPWAP_MSG_CONFIGURATION_STATUS_REQUEST, .elem_id = CW_ELEM_AC_NAME, .item_id = CW_ITEM_AC_NAME, .out = cw_out_generic, @@ -638,7 +638,7 @@ static cw_action_out_t actions_out[] = { /* Radio Admin State - Config Status Request - OUT */ { - .msg_id = CW_MSG_CONFIGURATION_STATUS_REQUEST, + .msg_id = CAPWAP_MSG_CONFIGURATION_STATUS_REQUEST, .elem_id = CW_ELEM_RADIO_ADMINISTRATIVE_STATE, .item_id = CW_RADIOITEM_ADMIN_STATE, .out = cw_out_radio_generic, @@ -652,7 +652,7 @@ static cw_action_out_t actions_out[] = { /* WTP Reboot Statistics - Config Status Request */ { - .msg_id = CW_MSG_CONFIGURATION_STATUS_REQUEST, + .msg_id = CAPWAP_MSG_CONFIGURATION_STATUS_REQUEST, .elem_id = CW_ELEM_WTP_REBOOT_STATISTICS, .item_id = CW_ITEM_WTP_REBOOT_STATISTICS, .out = cw_out_wtp_reboot_statistics, @@ -664,7 +664,7 @@ static cw_action_out_t actions_out[] = { /* Statistics Timer - Join Request */ { - .msg_id = CW_MSG_CONFIGURATION_STATUS_REQUEST, + .msg_id = CAPWAP_MSG_CONFIGURATION_STATUS_REQUEST, .elem_id = CW_ELEM_STATISTICS_TIMER, .item_id = CW_ITEM_STATISTICS_TIMER, .out = cw_out_generic, diff --git a/src/mod/capwap80211/capwap80211_actions_ac.c b/src/mod/capwap80211/capwap80211_actions_ac.c index caf0c1d2..8ac3ff0b 100644 --- a/src/mod/capwap80211/capwap80211_actions_ac.c +++ b/src/mod/capwap80211/capwap80211_actions_ac.c @@ -63,7 +63,7 @@ static cw_action_in_t actions_ac_in[] = { /* 802.11 Supported Rates - Config Status Request */ { .capwap_state = CW_STATE_CONFIGURE, - .msg_id = CW_MSG_CONFIGURATION_STATUS_REQUEST, + .msg_id = CAPWAP_MSG_CONFIGURATION_STATUS_REQUEST, .elem_id = CW_ELEM80211_SUPPORTED_RATES, .item_id = CW_RADIOITEM80211_SUPPORTED_RATES, .start = cw_in_radio_generic, @@ -76,7 +76,7 @@ static cw_action_in_t actions_ac_in[] = { /* 802.11 MAC Operation - Config Status Request */ { .capwap_state = CW_STATE_CONFIGURE, - .msg_id = CW_MSG_CONFIGURATION_STATUS_REQUEST, + .msg_id = CAPWAP_MSG_CONFIGURATION_STATUS_REQUEST, .elem_id = CW_ELEM80211_MAC_OPERATION, .item_id = "80111_mac_operation", //CW_iTEM80211_MAC_SUPPORTED_RATES, .start = cw_in_80211_mac_operation, @@ -118,7 +118,7 @@ cw_action_out_t actions_ac_out[]={ /* 802.11 Radio Information - Discovery Response */ { - .msg_id = CW_MSG_JOIN_RESPONSE, + .msg_id = CAPWAP_MSG_JOIN_RESPONSE, .elem_id = CW_ELEM80211_WTP_RADIO_INFORMATION, .item_id = CW_RADIOITEM80211_WTP_RADIO_INFORMATION, .out = cw_out_radio_infos, diff --git a/src/mod/capwap80211/capwap80211_actions_wtp.c b/src/mod/capwap80211/capwap80211_actions_wtp.c index 6434a91b..83fb534c 100644 --- a/src/mod/capwap80211/capwap80211_actions_wtp.c +++ b/src/mod/capwap80211/capwap80211_actions_wtp.c @@ -37,7 +37,7 @@ static cw_action_in_t actions_wtp_in[] = { /* 802.11 Radio Inmformation - Join Response */ { .capwap_state = CW_STATE_JOIN, - .msg_id = CW_MSG_JOIN_RESPONSE, + .msg_id = CAPWAP_MSG_JOIN_RESPONSE, .elem_id = CW_ELEM80211_WTP_RADIO_INFORMATION, .item_id = CW_RADIOITEM80211_WTP_RADIO_INFORMATION, // .start = cw_in_radio_generic, @@ -97,7 +97,7 @@ cw_action_out_t actions_out[]={ */ /* 802.11 Radio Information */ { - .msg_id = CW_MSG_CONFIGURATION_STATUS_REQUEST, + .msg_id = CAPWAP_MSG_CONFIGURATION_STATUS_REQUEST, .item_id = CW_RADIO_SUPPORTED_RATES , .elem_id = CW_ELEM80211_SUPPORTED_RATES, .out = cw_out_80211_supported_rates, diff --git a/src/mod/cisco/cisco_actions_ac.c b/src/mod/cisco/cisco_actions_ac.c index bd8a75ca..101258b0 100644 --- a/src/mod/cisco/cisco_actions_ac.c +++ b/src/mod/cisco/cisco_actions_ac.c @@ -179,7 +179,7 @@ static cw_action_in_t actions_in[] = { { /* We have to deal with zero-length strings */ .capwap_state = CW_STATE_CONFIGURE, - .msg_id = CW_MSG_CONFIGURATION_STATUS_REQUEST, + .msg_id = CAPWAP_MSG_CONFIGURATION_STATUS_REQUEST, .elem_id = CW_ELEM_AC_NAME, .item_id = CW_ITEM_AC_NAME, .start = cw_in_generic2, @@ -194,7 +194,7 @@ static cw_action_in_t actions_in[] = { { .capwap_state = CW_STATE_CONFIGURE, - .msg_id = CW_MSG_CONFIGURATION_STATUS_REQUEST, + .msg_id = CAPWAP_MSG_CONFIGURATION_STATUS_REQUEST, .vendor_id = CW_VENDOR_ID_CISCO, .elem_id = CW_CISCO_WTP_RADIO_CFG, .start=cisco80211_in_wtp_radio_configuration, @@ -206,7 +206,7 @@ static cw_action_in_t actions_in[] = { /* LED State Config */ { .capwap_state = CW_STATE_CONFIGURE, - .msg_id = CW_MSG_CONFIGURATION_STATUS_REQUEST, + .msg_id = CAPWAP_MSG_CONFIGURATION_STATUS_REQUEST, .vendor_id = CW_VENDOR_ID_CISCO, .elem_id = CW_CISCO_AP_LED_STATE_CONFIG, .item_id = CISCO_ITEM_AP_LED_STATE_CONFIG, @@ -218,7 +218,7 @@ static cw_action_in_t actions_in[] = { /* LED Flash Config */ { .capwap_state = CW_STATE_CONFIGURE, - .msg_id = CW_MSG_CONFIGURATION_STATUS_REQUEST, + .msg_id = CAPWAP_MSG_CONFIGURATION_STATUS_REQUEST, .vendor_id = CW_VENDOR_ID_CISCO, .elem_id = CW_CISCO_AP_LED_FLASH_CONFIG, .item_id = CISCO_ITEM_AP_LED_FLASH_CONFIG, @@ -234,7 +234,7 @@ static cw_action_in_t actions_in[] = { * of LWAPP elements */ .capwap_state = CW_STATE_CONFIGURE, - .msg_id = CW_MSG_CONFIGURATION_STATUS_REQUEST, + .msg_id = CAPWAP_MSG_CONFIGURATION_STATUS_REQUEST, .vendor_id = CW_VENDOR_ID_CISCO, .elem_id = CW_CISCO_SPAM_VENDOR_SPECIFIC, .start = lw_in_vendor_specific, @@ -250,7 +250,7 @@ static cw_action_in_t actions_in[] = { .proto = CW_ACTION_PROTO_LWAPP, .capwap_state = CW_STATE_CONFIGURE, - .msg_id = CW_MSG_CONFIGURATION_STATUS_REQUEST, + .msg_id = CAPWAP_MSG_CONFIGURATION_STATUS_REQUEST, .vendor_id = LW_VENDOR_ID_CISCO, .elem_id = LW_CISCO_TELNET_SSH, .start = cisco_in_telnet_ssh @@ -262,7 +262,7 @@ static cw_action_in_t actions_in[] = { { .capwap_state = CW_STATE_CONFIGURE, - .msg_id = CW_MSG_CONFIGURATION_STATUS_REQUEST, + .msg_id = CAPWAP_MSG_CONFIGURATION_STATUS_REQUEST, .vendor_id = CW_VENDOR_ID_CISCO, .elem_id = CW_CISCO_AP_MODE_AND_TYPE, .item_id = CISCO_ITEM_AP_MODE_AND_TYPE, @@ -274,7 +274,7 @@ static cw_action_in_t actions_in[] = { { .capwap_state = CW_STATE_CONFIGURE, - .msg_id = CW_MSG_CONFIGURATION_STATUS_REQUEST, + .msg_id = CAPWAP_MSG_CONFIGURATION_STATUS_REQUEST, .vendor_id = CW_VENDOR_ID_CISCO, .elem_id = CW_CISCO_AP_LOG_FACILITY, .item_id = CIPWAP_ITEM_LOG_FACILITY, @@ -351,7 +351,7 @@ static cw_action_out_t actions_out[]={ /* AC Descriptor - Join Response */ { - .msg_id = CW_MSG_JOIN_RESPONSE, + .msg_id = CAPWAP_MSG_JOIN_RESPONSE, .item_id = CW_ITEM_AC_DESCRIPTOR, .elem_id = CW_ELEM_AC_DESCRIPTOR, .out = cisco_out_ac_descriptor, @@ -363,7 +363,7 @@ static cw_action_out_t actions_out[]={ /* ECN Support - Join Response */ { - .msg_id = CW_MSG_JOIN_RESPONSE, + .msg_id = CAPWAP_MSG_JOIN_RESPONSE, .elem_id = CW_ELEM_ECN_SUPPORT, .item_id = CW_ITEM_ECN_SUPPORT } @@ -521,7 +521,7 @@ static cw_action_in_t actions80211_in[] = { { .capwap_state = CW_STATE_CONFIGURE, .vendor_id = CW_VENDOR_ID_CISCO, - .msg_id = CW_MSG_CONFIGURATION_STATUS_REQUEST, + .msg_id = CAPWAP_MSG_CONFIGURATION_STATUS_REQUEST, .elem_id = CW_CISCO_SUPPORTED_RATES, .item_id = CW_RADIOITEM80211_SUPPORTED_RATES, .start = cw_in_radio_generic, @@ -537,7 +537,7 @@ static cw_action_in_t actions80211_in[] = { { .capwap_state = CW_STATE_CONFIGURE, .vendor_id = CW_VENDOR_ID_CISCO, - .msg_id = CW_MSG_CONFIGURATION_STATUS_REQUEST, + .msg_id = CAPWAP_MSG_CONFIGURATION_STATUS_REQUEST, .elem_id = CW_CISCO_MAC_OPERATION, .item_id = "mac operation", .start = cisco80211_in_mac_operation, @@ -553,7 +553,7 @@ static cw_action_in_t actions80211_in[] = { /* Radio Admin State (IN) - Config Status Request */ { .capwap_state = CW_STATE_CONFIGURE, - .msg_id = CW_MSG_CONFIGURATION_STATUS_REQUEST, + .msg_id = CAPWAP_MSG_CONFIGURATION_STATUS_REQUEST, .elem_id = CW_ELEM_RADIO_ADMINISTRATIVE_STATE, .item_id = CW_RADIOITEM_ADMIN_STATE, .start = cisco_in_radio_administrative_state, diff --git a/src/mod/cisco/cisco_actions_wtp.c b/src/mod/cisco/cisco_actions_wtp.c index 68f4c400..d234cd83 100644 --- a/src/mod/cisco/cisco_actions_wtp.c +++ b/src/mod/cisco/cisco_actions_wtp.c @@ -67,7 +67,7 @@ static cw_action_in_t actions_in[] = { { /* Make ECN Support non-mand */ .capwap_state = CW_STATE_JOIN, - .msg_id = CW_MSG_JOIN_RESPONSE, + .msg_id = CAPWAP_MSG_JOIN_RESPONSE, .elem_id = CW_ELEM_ECN_SUPPORT, .item_id = CW_ITEM_ECN_SUPPORT, .start = cw_in_generic2, @@ -81,7 +81,7 @@ static cw_action_in_t actions_in[] = { { /* Cisco's AC Descriptor */ .capwap_state = CW_STATE_JOIN, - .msg_id = CW_MSG_JOIN_RESPONSE, + .msg_id = CAPWAP_MSG_JOIN_RESPONSE, .elem_id = CW_ELEM_AC_DESCRIPTOR, .item_id = CW_ITEM_AC_DESCRIPTOR, .start = cisco_in_ac_descriptor, @@ -354,7 +354,7 @@ static cw_action_out_t actions_out[]={ /* AP Mode and Type - Configuration Status Request OUT */ { - .msg_id = CW_MSG_CONFIGURATION_STATUS_REQUEST, + .msg_id = CAPWAP_MSG_CONFIGURATION_STATUS_REQUEST, .vendor_id = CW_VENDOR_ID_CISCO, .elem_id = CW_CISCO_AP_MODE_AND_TYPE, .item_id = CISCO_ITEM_AP_MODE_AND_TYPE, @@ -367,7 +367,7 @@ static cw_action_out_t actions_out[]={ /* Cisco WTP Admin state - OUT */ { - .msg_id = CW_MSG_CONFIGURATION_STATUS_REQUEST, + .msg_id = CAPWAP_MSG_CONFIGURATION_STATUS_REQUEST, .vendor_id = CW_VENDOR_ID_CISCO, .item_id = CISCO_ITEM_WTP_ADMIN_STATE, .out = cisco_out_wtp_administrative_state, @@ -489,7 +489,7 @@ static cw_action_out_t actions80211_out[]={ */ { .vendor_id = CW_VENDOR_ID_CISCO, - .msg_id = CW_MSG_CONFIGURATION_STATUS_REQUEST, + .msg_id = CAPWAP_MSG_CONFIGURATION_STATUS_REQUEST, .elem_id = CW_ELEM80211_WTP_RADIO_INFORMATION, .item_id = CW_RADIOITEM80211_WTP_RADIO_INFORMATION, .out = cisco_out_80211_wtp_radio_cfg, @@ -501,7 +501,7 @@ static cw_action_out_t actions80211_out[]={ { - .msg_id = CW_MSG_CONFIGURATION_STATUS_REQUEST, + .msg_id = CAPWAP_MSG_CONFIGURATION_STATUS_REQUEST, .item_id = CW_RADIO_SUPPORTED_RATES , .elem_id = CW_ELEM80211_SUPPORTED_RATES, .mand = 0, diff --git a/src/wtp/configure.c b/src/wtp/configure.c index b98f66e6..529cfb09 100644 --- a/src/wtp/configure.c +++ b/src/wtp/configure.c @@ -25,7 +25,7 @@ int configure() mbag_t radios_upd = conn->radios_upd; conn->radios_upd=conn->radios; - int rc = cw_send_request(conn, CW_MSG_CONFIGURATION_STATUS_REQUEST); + int rc = cw_send_request(conn, CAPWAP_MSG_CONFIGURATION_STATUS_REQUEST); conn->radios_upd=radios_upd; if (!cw_rcok(rc)) {