From f866dc6b254b51764c0d74fb11f7d56dc4c3e64f Mon Sep 17 00:00:00 2001 From: "7u83@mail.ru" <7u83@mail.ru@noemail.net> Date: Mon, 5 Mar 2018 06:24:48 +0000 Subject: [PATCH] Renamed some CW_... to CAPWAP... FossilOrigin-Name: dbf63bf0d47b8820190c86c85e0ecfd4ad75854aaf14c82a29db9710fbe00c92 --- src/ac/wtpman.c | 4 +-- src/cw/capwap.h | 9 +++--- src/cw/capwap_strings_elem.c | 2 +- src/cw/capwap_strings_msg.c | 6 ++-- src/mod/capwap/capwap_actions_wtp.c | 30 +++++++++---------- src/mod/capwap/capwap_out_ac_ip_list.c | 2 +- src/mod/capwap80211/capwap80211_actions_wtp.c | 2 +- src/mod/cisco/cisco_actions_ac.c | 22 +++++++------- src/mod/cisco/cisco_actions_wtp.c | 30 +++++++++---------- src/mod/fortinet/fortinet_actions_wtp.c | 6 ++-- src/wtp/run.c | 2 +- 11 files changed, 58 insertions(+), 57 deletions(-) diff --git a/src/ac/wtpman.c b/src/ac/wtpman.c index a0a9c383..32621010 100644 --- a/src/ac/wtpman.c +++ b/src/ac/wtpman.c @@ -600,7 +600,7 @@ static void wtpman_run(void *arg) cw_dbg(DBG_INFO, "Updating WTP %s",sock_addr2str(&conn->addr)); - rc = cw_send_request(conn, CW_MSG_CONFIGURATION_UPDATE_REQUEST); + rc = cw_send_request(conn, CAPWAP_MSG_CONFIGURATION_UPDATE_REQUEST); mavl_merge(conn->config, conn->outgoing); mavl_destroy(conn->outgoing); conn->outgoing = mbag_create(); @@ -616,7 +616,7 @@ static void wtpman_run(void *arg) continue; cw_dbg(DBG_INFO, "Updating Radios for %s",sock_addr2str(&conn->addr)); - rc = cw_send_request(conn, CW_MSG_CONFIGURATION_UPDATE_REQUEST); + rc = cw_send_request(conn, CAPWAP_MSG_CONFIGURATION_UPDATE_REQUEST); conn_clear_upd(conn,1); diff --git a/src/cw/capwap.h b/src/cw/capwap.h index f063d8a7..04790b09 100644 --- a/src/cw/capwap.h +++ b/src/cw/capwap.h @@ -140,10 +140,11 @@ * to report ist status to the AC*/ #define CAPWAP_MSG_CONFIGURATION_STATUS_REQUEST 5 -#define CW_MSG_CONFIGURATION_STATUS_RESPONSE 6 +#define CAPWAP_MSG_CONFIGURATION_STATUS_RESPONSE 6 -#define CW_MSG_CONFIGURATION_UPDATE_REQUEST 7 -#define CW_MSG_CONFIGURATION_UPDATE_RESPONSE 8 +#define CAPWAP_MSG_CONFIGURATION_UPDATE_REQUEST 7 + +#define CAPWAP_MSG_CONFIGURATION_UPDATE_RESPONSE 8 #define CW_MSG_WTP_EVENT_REQUEST 9 #define CW_MSG_WTP_EVENT_RESPONSE 10 @@ -186,7 +187,7 @@ #define CAPWAP_ELEM_AC_DESCRIPTOR 1 /**< AC Descriptor */ -#define CW_ELEM_AC_IPV4_LIST 2 /**< AC IP V4 List */ +#define CAPWAP_ELEM_AC_IPV4_LIST 2 /**< AC IP V4 List */ #define CW_ELEM_AC_IPV6_LIST 3 /**< AC IP V6 List */ #define CW_ELEM_AC_NAME 4 /**< AC Name */ #define CW_ELEM_AC_NAME_WITH_PRIORITY 5 diff --git a/src/cw/capwap_strings_elem.c b/src/cw/capwap_strings_elem.c index bc679a65..9c383121 100644 --- a/src/cw/capwap_strings_elem.c +++ b/src/cw/capwap_strings_elem.c @@ -4,7 +4,7 @@ struct cw_strlist_elem capwap_strings_elem[] = { {CAPWAP_ELEM_AC_DESCRIPTOR, "AC Descriptor"}, - {CW_ELEM_AC_IPV4_LIST, "AC IPv4 List"}, + {CAPWAP_ELEM_AC_IPV4_LIST, "AC IPv4 List"}, {CW_ELEM_AC_IPV6_LIST, "AC IPv6 List"}, {CW_ELEM_AC_NAME, "AC Name"}, {CW_ELEM_AC_NAME_WITH_PRIORITY, "AC Name with Priority"}, diff --git a/src/cw/capwap_strings_msg.c b/src/cw/capwap_strings_msg.c index 59e35a45..bd09f2ad 100644 --- a/src/cw/capwap_strings_msg.c +++ b/src/cw/capwap_strings_msg.c @@ -31,9 +31,9 @@ struct cw_strlist_elem capwap_strings_msg[] = { { CAPWAP_MSG_JOIN_REQUEST, "Join 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"}, +{ CAPWAP_MSG_CONFIGURATION_STATUS_RESPONSE,"Configuration Status Response"}, +{ CAPWAP_MSG_CONFIGURATION_UPDATE_REQUEST,"Configuration Update Request"}, +{ CAPWAP_MSG_CONFIGURATION_UPDATE_RESPONSE,"Configuration Update Response"}, { CW_MSG_WTP_EVENT_REQUEST,"WTP Event Request"}, { CW_MSG_WTP_EVENT_RESPONSE,"WTP Event Response"}, { CW_MSG_CHANGE_STATE_EVENT_REQUEST,"Change State Event Request"}, diff --git a/src/mod/capwap/capwap_actions_wtp.c b/src/mod/capwap/capwap_actions_wtp.c index 05e962d9..c8f0d404 100644 --- a/src/mod/capwap/capwap_actions_wtp.c +++ b/src/mod/capwap/capwap_actions_wtp.c @@ -204,7 +204,7 @@ static cw_action_in_t actions_in[] = { */ { .capwap_state = CW_STATE_CONFIGURE, - .msg_id = CW_MSG_CONFIGURATION_STATUS_RESPONSE, + .msg_id = CAPWAP_MSG_CONFIGURATION_STATUS_RESPONSE, .end = cw_in_check_generic_resp } , @@ -213,7 +213,7 @@ static cw_action_in_t actions_in[] = { /* Capwap Timers - Config Status Resp */ { .capwap_state = CW_STATE_CONFIGURE, - .msg_id = CW_MSG_CONFIGURATION_STATUS_RESPONSE, + .msg_id = CAPWAP_MSG_CONFIGURATION_STATUS_RESPONSE, .elem_id = CW_ELEM_CAPWAP_TIMERS, .item_id = CW_ITEM_CAPWAP_TIMERS, .start = cw_in_generic2, @@ -226,7 +226,7 @@ static cw_action_in_t actions_in[] = { /* Decryption Error Report - Config Status Resp */ { .capwap_state = CW_STATE_CONFIGURE, - .msg_id = CW_MSG_CONFIGURATION_STATUS_RESPONSE, + .msg_id = CAPWAP_MSG_CONFIGURATION_STATUS_RESPONSE, .elem_id = CW_ELEM_DECRYPTION_ERROR_REPORT_PERIOD, .item_id = CW_RADIOITEM_DECRYPTION_ERROR_REPORT_PERIOD, .start = cw_in_radio_generic, @@ -240,7 +240,7 @@ static cw_action_in_t actions_in[] = { /* Idle Timeout - Config Status Resp */ { .capwap_state = CW_STATE_CONFIGURE, - .msg_id = CW_MSG_CONFIGURATION_STATUS_RESPONSE, + .msg_id = CAPWAP_MSG_CONFIGURATION_STATUS_RESPONSE, .elem_id = CW_ELEM_IDLE_TIMEOUT, .item_id = CW_ITEM_IDLE_TIMEOUT, .start = cw_in_generic2, @@ -254,7 +254,7 @@ static cw_action_in_t actions_in[] = { /* WTP Fallback - Config Status Resp */ { .capwap_state = CW_STATE_CONFIGURE, - .msg_id = CW_MSG_CONFIGURATION_STATUS_RESPONSE, + .msg_id = CAPWAP_MSG_CONFIGURATION_STATUS_RESPONSE, .elem_id = CW_ELEM_WTP_FALLBACK, .item_id = CW_ITEM_WTP_FALLBACK, .start = cw_in_generic2, @@ -270,7 +270,7 @@ static cw_action_in_t actions_in[] = { /* Result Code - Config Status Resp */ { .capwap_state = CW_STATE_CONFIGURE, - .msg_id = CW_MSG_CONFIGURATION_STATUS_RESPONSE, + .msg_id = CAPWAP_MSG_CONFIGURATION_STATUS_RESPONSE, .elem_id = CW_ELEM_RESULT_CODE, .item_id = CW_ITEM_RESULT_CODE, .start = cw_in_generic2, @@ -284,8 +284,8 @@ static cw_action_in_t actions_in[] = { /* AC IPv4 List - Config Status Resp */ { .capwap_state = CW_STATE_CONFIGURE, - .msg_id = CW_MSG_CONFIGURATION_STATUS_RESPONSE, - .elem_id = CW_ELEM_AC_IPV4_LIST, + .msg_id = CAPWAP_MSG_CONFIGURATION_STATUS_RESPONSE, + .elem_id = CAPWAP_ELEM_AC_IPV4_LIST, .item_id = CW_ITEM_AC_IP_LIST, .start = NULL, .min_len = 4, @@ -298,7 +298,7 @@ static cw_action_in_t actions_in[] = { /* Vendor Specific Payload - Cponfig Status Resp */ { .capwap_state = CW_STATE_CONFIGURE, - .msg_id = CW_MSG_CONFIGURATION_STATUS_RESPONSE, + .msg_id = CAPWAP_MSG_CONFIGURATION_STATUS_RESPONSE, .elem_id = CAPWAP_ELEM_VENDOR_SPECIFIC_PAYLOAD, .start = cw_in_vendor_specific_payload } @@ -382,7 +382,7 @@ static cw_action_in_t actions_in[] = { */ { .capwap_state = CW_STATE_RUN, - .msg_id = CW_MSG_CONFIGURATION_UPDATE_REQUEST, + .msg_id = CAPWAP_MSG_CONFIGURATION_UPDATE_REQUEST, } , @@ -390,7 +390,7 @@ static cw_action_in_t actions_in[] = { /* WTP Name - Config Update Req */ { .capwap_state = CW_STATE_RUN, - .msg_id = CW_MSG_CONFIGURATION_UPDATE_REQUEST, + .msg_id = CAPWAP_MSG_CONFIGURATION_UPDATE_REQUEST, .elem_id = CW_ELEM_WTP_NAME, .item_id = CW_ITEM_WTP_NAME, .start = cw_in_generic2, @@ -406,7 +406,7 @@ static cw_action_in_t actions_in[] = { /* Location Data - Config Update Req */ { .capwap_state = CW_STATE_RUN, - .msg_id = CW_MSG_CONFIGURATION_UPDATE_REQUEST, + .msg_id = CAPWAP_MSG_CONFIGURATION_UPDATE_REQUEST, .elem_id = CW_ELEM_LOCATION_DATA, .item_id = CW_ITEM_LOCATION_DATA, .start = cw_in_generic2, @@ -420,7 +420,7 @@ static cw_action_in_t actions_in[] = { /* Radio Admin State - Config Update Request */ { .capwap_state = CW_STATE_RUN, - .msg_id = CW_MSG_CONFIGURATION_UPDATE_REQUEST, + .msg_id = CAPWAP_MSG_CONFIGURATION_UPDATE_REQUEST, .elem_id = CW_ELEM_RADIO_ADMINISTRATIVE_STATE, .item_id = CW_RADIOITEM_ADMIN_STATE, .start = cw_in_radio_generic, @@ -434,7 +434,7 @@ static cw_action_in_t actions_in[] = { /* Vendor Specific Payload - Config Update Req */ { .capwap_state = CW_STATE_RUN, - .msg_id = CW_MSG_CONFIGURATION_UPDATE_REQUEST, + .msg_id = CAPWAP_MSG_CONFIGURATION_UPDATE_REQUEST, .elem_id = CAPWAP_ELEM_VENDOR_SPECIFIC_PAYLOAD, .start = cw_in_vendor_specific_payload } @@ -721,7 +721,7 @@ static cw_action_out_t actions_out[] = { * Configuration Update REsponse - Out */ { - .msg_id = CW_MSG_CONFIGURATION_UPDATE_RESPONSE, + .msg_id = CAPWAP_MSG_CONFIGURATION_UPDATE_RESPONSE, .mand = 1 } , diff --git a/src/mod/capwap/capwap_out_ac_ip_list.c b/src/mod/capwap/capwap_out_ac_ip_list.c index 46a8a8f4..791e0fd3 100644 --- a/src/mod/capwap/capwap_out_ac_ip_list.c +++ b/src/mod/capwap/capwap_out_ac_ip_list.c @@ -23,5 +23,5 @@ int capwap_out_ac_ip_list(struct conn *conn, struct cw_action_out *a, uint8_t * struct sockaddr sa; sock_strtoaddr( "192.168.0.11", &sa); cw_put_sockaddr(dst+4,(struct sockaddr_storage*)&sa); - return 4 + cw_put_elem_hdr(dst,CW_ELEM_AC_IPV4_LIST,4); + return 4 + cw_put_elem_hdr(dst,CAPWAP_ELEM_AC_IPV4_LIST,4); } diff --git a/src/mod/capwap80211/capwap80211_actions_wtp.c b/src/mod/capwap80211/capwap80211_actions_wtp.c index 4f148de3..5e14b1a1 100644 --- a/src/mod/capwap80211/capwap80211_actions_wtp.c +++ b/src/mod/capwap80211/capwap80211_actions_wtp.c @@ -54,7 +54,7 @@ static cw_action_in_t actions_wtp_in[] = { /* Rate Set - Config Status Resp */ { .capwap_state = CW_STATE_CONFIGURE, - .msg_id = CW_MSG_CONFIGURATION_STATUS_RESPONSE, + .msg_id = CAPWAP_MSG_CONFIGURATION_STATUS_RESPONSE, .elem_id = CW_ELEM80211_RATE_SET, .item_id = CW_RADIOITEM80211_RATE_SET, .start = cw_in_radio_generic diff --git a/src/mod/cisco/cisco_actions_ac.c b/src/mod/cisco/cisco_actions_ac.c index 7d738c34..8a1dedbb 100644 --- a/src/mod/cisco/cisco_actions_ac.c +++ b/src/mod/cisco/cisco_actions_ac.c @@ -451,7 +451,7 @@ static cw_action_out_t actions_out[]={ */ /* Manager IP Address */ { - .msg_id = CW_MSG_CONFIGURATION_STATUS_RESPONSE, + .msg_id = CAPWAP_MSG_CONFIGURATION_STATUS_RESPONSE, .out = cisco_out_manager_ip_addr, .mand = 1 } @@ -463,7 +463,7 @@ static cw_action_out_t actions_out[]={ */ { - .msg_id = CW_MSG_CONFIGURATION_UPDATE_REQUEST, + .msg_id = CAPWAP_MSG_CONFIGURATION_UPDATE_REQUEST, .out = cisco_out_telnet_ssh, } , @@ -474,7 +474,7 @@ static cw_action_out_t actions_out[]={ But the method here used to silence the element isn't effective. TODO: There shuld be a way to remove or replace such elemenns */ - .msg_id = CW_MSG_CONFIGURATION_UPDATE_REQUEST, + .msg_id = CAPWAP_MSG_CONFIGURATION_UPDATE_REQUEST, .item_id = CW_ITEM_WTP_NAME, .elem_id = CW_ELEM_WTP_NAME, } @@ -483,7 +483,7 @@ static cw_action_out_t actions_out[]={ /* WTP Name */ { - .msg_id = CW_MSG_CONFIGURATION_UPDATE_REQUEST, + .msg_id = CAPWAP_MSG_CONFIGURATION_UPDATE_REQUEST, .item_id = CW_ITEM_WTP_NAME, .vendor_id = CW_VENDOR_ID_CISCO, .elem_id = CW_CISCO_RAD_NAME, @@ -494,7 +494,7 @@ static cw_action_out_t actions_out[]={ /* Radio Operational State - OUT */ { - .msg_id = CW_MSG_CONFIGURATION_UPDATE_REQUEST, + .msg_id = CAPWAP_MSG_CONFIGURATION_UPDATE_REQUEST, .elem_id = CW_ELEM_RADIO_OPERATIONAL_STATE, .item_id = CW_RADIOITEM_OPER_STATE, .out = cisco_out_radio_operational_state, @@ -504,7 +504,7 @@ static cw_action_out_t actions_out[]={ /* LED State Config - OUT */ { - .msg_id = CW_MSG_CONFIGURATION_UPDATE_REQUEST, + .msg_id = CAPWAP_MSG_CONFIGURATION_UPDATE_REQUEST, .vendor_id = CW_VENDOR_ID_CISCO, .elem_id = CW_CISCO_AP_LED_STATE_CONFIG, .item_id = CISCO_ITEM_AP_LED_STATE_CONFIG, @@ -517,7 +517,7 @@ static cw_action_out_t actions_out[]={ /* LED Flash Config - OUT */ { - .msg_id = CW_MSG_CONFIGURATION_UPDATE_REQUEST, + .msg_id = CAPWAP_MSG_CONFIGURATION_UPDATE_REQUEST, .vendor_id = CW_VENDOR_ID_CISCO, .elem_id = CW_CISCO_AP_LED_FLASH_CONFIG, .item_id = CISCO_ITEM_AP_LED_FLASH_CONFIG, @@ -529,7 +529,7 @@ static cw_action_out_t actions_out[]={ /* AP Mode and Type - OUT */ { - .msg_id = CW_MSG_CONFIGURATION_UPDATE_REQUEST, + .msg_id = CAPWAP_MSG_CONFIGURATION_UPDATE_REQUEST, .vendor_id = CW_VENDOR_ID_CISCO, .elem_id = CW_CISCO_AP_MODE_AND_TYPE, .item_id = CISCO_ITEM_AP_MODE_AND_TYPE, @@ -541,7 +541,7 @@ static cw_action_out_t actions_out[]={ /* Cisco WTP Admin state - OUT */ { - .msg_id = CW_MSG_CONFIGURATION_UPDATE_REQUEST, + .msg_id = CAPWAP_MSG_CONFIGURATION_UPDATE_REQUEST, .vendor_id = CW_VENDOR_ID_CISCO, // .elem_id = CW_CISCO_AP_MODE_AND_TYPE, .item_id = CISCO_ITEM_WTP_ADMIN_STATE, @@ -650,14 +650,14 @@ extern int cisco_out_capwap_up(struct conn *conn, struct cw_action_out *a, uint8 static cw_action_out_t actions80211_out[]={ { - .msg_id = CW_MSG_CONFIGURATION_UPDATE_REQUEST, + .msg_id = CAPWAP_MSG_CONFIGURATION_UPDATE_REQUEST, .vendor_id = CW_VENDOR_ID_CISCO, .elem_id = CW_CISCO_WTP_RADIO_CFG, .out = cisco80211_out_wtp_radio_configuration, } , { - .msg_id = CW_MSG_CONFIGURATION_STATUS_RESPONSE, + .msg_id = CAPWAP_MSG_CONFIGURATION_STATUS_RESPONSE, .out = cisco_out_capwap_up, } , diff --git a/src/mod/cisco/cisco_actions_wtp.c b/src/mod/cisco/cisco_actions_wtp.c index a65ce24e..f96614fd 100644 --- a/src/mod/cisco/cisco_actions_wtp.c +++ b/src/mod/cisco/cisco_actions_wtp.c @@ -100,7 +100,7 @@ static cw_action_in_t actions_in[] = { { .capwap_state = CW_STATE_RUN, .vendor_id = CW_VENDOR_ID_CISCO, - .msg_id = CW_MSG_CONFIGURATION_UPDATE_REQUEST, + .msg_id = CAPWAP_MSG_CONFIGURATION_UPDATE_REQUEST, .elem_id = LW_ELEM_LOCATION_DATA, .item_id = CW_ITEM_LOCATION_DATA, .start = cw_in_generic2, @@ -114,7 +114,7 @@ static cw_action_in_t actions_in[] = { { .capwap_state = CW_STATE_RUN, .vendor_id = CW_VENDOR_ID_CISCO, - .msg_id = CW_MSG_CONFIGURATION_UPDATE_REQUEST, + .msg_id = CAPWAP_MSG_CONFIGURATION_UPDATE_REQUEST, .elem_id = CW_CISCO_RAD_NAME, .item_id = CW_ITEM_WTP_NAME, .start = cw_in_generic2, @@ -129,7 +129,7 @@ static cw_action_in_t actions_in[] = { { .capwap_state = CW_STATE_RUN, .vendor_id = CW_VENDOR_ID_CISCO, - .msg_id = CW_MSG_CONFIGURATION_UPDATE_REQUEST, + .msg_id = CAPWAP_MSG_CONFIGURATION_UPDATE_REQUEST, .elem_id = CW_CISCO_AP_GROUP_NAME, .item_id = CIPWAP_ITEM_WTP_GROUP_NAME, .start = cw_in_generic2, @@ -144,7 +144,7 @@ static cw_action_in_t actions_in[] = { /* Radio Admin State - Config Update Request */ { .capwap_state = CW_STATE_RUN, - .msg_id = CW_MSG_CONFIGURATION_UPDATE_REQUEST, + .msg_id = CAPWAP_MSG_CONFIGURATION_UPDATE_REQUEST, .elem_id = CW_ELEM_RADIO_ADMINISTRATIVE_STATE, .item_id = CW_RADIOITEM_ADMIN_STATE, .start = cisco_in_radio_administrative_state, @@ -158,7 +158,7 @@ static cw_action_in_t actions_in[] = { { .capwap_state = CW_STATE_RUN, - .msg_id = CW_MSG_CONFIGURATION_UPDATE_REQUEST, + .msg_id = CAPWAP_MSG_CONFIGURATION_UPDATE_REQUEST, .vendor_id = CW_VENDOR_ID_CISCO, .elem_id = CW_CISCO_AP_MODE_AND_TYPE, .item_id = CISCO_ITEM_AP_MODE_AND_TYPE, @@ -174,7 +174,7 @@ static cw_action_in_t actions_in[] = { /* Element Cisco 802.11 Radio Config - Config Update Resp */ { .capwap_state = CW_STATE_RUN, - .msg_id = CW_MSG_CONFIGURATION_UPDATE_REQUEST, + .msg_id = CAPWAP_MSG_CONFIGURATION_UPDATE_REQUEST, .vendor_id = CW_VENDOR_ID_CISCO, .elem_id = CW_CISCO_WTP_RADIO_CFG, .start=cisco80211_in_wtp_radio_configuration, @@ -192,7 +192,7 @@ static cw_action_in_t actions_in[] = { /* Element Cisco 802.11 Radio Conffig - Config Status Resp */ { .capwap_state = CW_STATE_CONFIGURE, - .msg_id = CW_MSG_CONFIGURATION_STATUS_RESPONSE, + .msg_id = CAPWAP_MSG_CONFIGURATION_STATUS_RESPONSE, .vendor_id = CW_VENDOR_ID_CISCO, .elem_id = CW_CISCO_WTP_RADIO_CFG, .start=cisco80211_in_wtp_radio_configuration, @@ -204,7 +204,7 @@ static cw_action_in_t actions_in[] = { /* Radio Admin State - Config Status Response */ { .capwap_state = CW_STATE_CONFIGURE, - .msg_id = CW_MSG_CONFIGURATION_STATUS_RESPONSE, + .msg_id = CAPWAP_MSG_CONFIGURATION_STATUS_RESPONSE, .elem_id = CW_ELEM_RADIO_ADMINISTRATIVE_STATE, .item_id = CW_RADIOITEM_ADMIN_STATE, // .start = cw_in_radio_generic, @@ -221,7 +221,7 @@ static cw_action_in_t actions_in[] = { { .capwap_state = CW_STATE_CONFIGURE, - .msg_id = CW_MSG_CONFIGURATION_STATUS_RESPONSE, + .msg_id = CAPWAP_MSG_CONFIGURATION_STATUS_RESPONSE, .vendor_id = CW_VENDOR_ID_CISCO, .elem_id = CW_CISCO_SPAM_VENDOR_SPECIFIC, .start = lw_in_vendor_specific, @@ -231,7 +231,7 @@ static cw_action_in_t actions_in[] = { { .capwap_state = CW_STATE_RUN, - .msg_id = CW_MSG_CONFIGURATION_UPDATE_REQUEST, + .msg_id = CAPWAP_MSG_CONFIGURATION_UPDATE_REQUEST, .vendor_id = CW_VENDOR_ID_CISCO, .elem_id = CW_CISCO_SPAM_VENDOR_SPECIFIC, .start = lw_in_vendor_specific, @@ -246,7 +246,7 @@ static cw_action_in_t actions_in[] = { .proto = CW_ACTION_PROTO_LWAPP, .capwap_state = CW_STATE_CONFIGURE, - .msg_id = CW_MSG_CONFIGURATION_STATUS_RESPONSE, + .msg_id = CAPWAP_MSG_CONFIGURATION_STATUS_RESPONSE, .vendor_id = LW_VENDOR_ID_CISCO, .elem_id = LW_CISCO_MWAR_HASH_VALUE, .item_id = CIPWAP_ITEM_AC_HASH_VALUE, @@ -426,7 +426,7 @@ static cw_action_in_t actions80211_in[] = { /* Radio Operational State - Status Resp */ { .capwap_state = CW_STATE_CONFIGURE, - .msg_id= CW_MSG_CONFIGURATION_STATUS_RESPONSE, + .msg_id= CAPWAP_MSG_CONFIGURATION_STATUS_RESPONSE, .elem_id = CW_ELEM_RADIO_OPERATIONAL_STATE, .item_id = CW_RADIOITEM_OPER_STATE, // .start = cw_in_radio_generic, //operational_state, @@ -440,7 +440,7 @@ static cw_action_in_t actions80211_in[] = { /* Radio Operational State - Update Req */ { .capwap_state = CW_STATE_RUN, - .msg_id= CW_MSG_CONFIGURATION_UPDATE_REQUEST, + .msg_id= CAPWAP_MSG_CONFIGURATION_UPDATE_REQUEST, .elem_id = CW_ELEM_RADIO_OPERATIONAL_STATE, .item_id = CW_RADIOITEM_OPER_STATE, // .start = cw_in_radio_generic, //operational_state, @@ -456,7 +456,7 @@ static cw_action_in_t actions80211_in[] = { { .capwap_state = CW_STATE_RUN, - .msg_id = CW_MSG_CONFIGURATION_UPDATE_REQUEST, + .msg_id = CAPWAP_MSG_CONFIGURATION_UPDATE_REQUEST, .vendor_id = CW_VENDOR_ID_CISCO, .elem_id = CW_CISCO_ADD_WLAN, // .item_id = CISCO_ITEM_ADD_WLAN, @@ -469,7 +469,7 @@ static cw_action_in_t actions80211_in[] = { { .proto = CW_ACTION_PROTO_LWAPP, .capwap_state = CW_STATE_RUN, - .msg_id = CW_MSG_CONFIGURATION_UPDATE_REQUEST, + .msg_id = CAPWAP_MSG_CONFIGURATION_UPDATE_REQUEST, .vendor_id = LW_VENDOR_ID_CISCO, .elem_id = LW_CISCO_ADD_WLAN, // .item_id = CIPWAP_ITEM_AC_HASH_VALUE, diff --git a/src/mod/fortinet/fortinet_actions_wtp.c b/src/mod/fortinet/fortinet_actions_wtp.c index 4ae3ce7c..a5befb90 100644 --- a/src/mod/fortinet/fortinet_actions_wtp.c +++ b/src/mod/fortinet/fortinet_actions_wtp.c @@ -94,7 +94,7 @@ static cw_action_in_t actions_in[] = { { .capwap_state = CW_STATE_RUN, .vendor_id = CW_VENDOR_ID_CISCO, - .msg_id = CW_MSG_CONFIGURATION_UPDATE_REQUEST, + .msg_id = CAPWAP_MSG_CONFIGURATION_UPDATE_REQUEST, .elem_id = LW_ELEM_LOCATION_DATA, .item_id = CW_ITEM_LOCATION_DATA, .start = cw_in_generic2, @@ -108,7 +108,7 @@ static cw_action_in_t actions_in[] = { { .capwap_state = CW_STATE_RUN, .vendor_id = CW_VENDOR_ID_CISCO, - .msg_id = CW_MSG_CONFIGURATION_UPDATE_REQUEST, + .msg_id = CAPWAP_MSG_CONFIGURATION_UPDATE_REQUEST, .elem_id = CW_CISCO_RAD_NAME, .item_id = CW_ITEM_WTP_NAME, .start = cw_in_generic2, @@ -121,7 +121,7 @@ static cw_action_in_t actions_in[] = { /* Radio Admin State - Config Status Request */ { .capwap_state = CW_STATE_RUN, - .msg_id = CW_MSG_CONFIGURATION_UPDATE_REQUEST, + .msg_id = CAPWAP_MSG_CONFIGURATION_UPDATE_REQUEST, .elem_id = CW_ELEM_RADIO_ADMINISTRATIVE_STATE, .item_id = CW_ITEM_RADIO_ADMINISTRATIVE_STATE, .start = cisco_in_radio_administrative_state_wtp, diff --git a/src/wtp/run.c b/src/wtp/run.c index 975331e3..d9a1ab9e 100644 --- a/src/wtp/run.c +++ b/src/wtp/run.c @@ -32,7 +32,7 @@ int update =0; int handle_update_req(struct conn *conn, struct cw_action_in *a, uint8_t * data, int len, struct sockaddr *from) { - if (a->msg_id == CW_MSG_CONFIGURATION_UPDATE_REQUEST){ + if (a->msg_id == CAPWAP_MSG_CONFIGURATION_UPDATE_REQUEST){ update =1; }