Rename some CW_.. to CAPWAP_..

FossilOrigin-Name: ad9b7ebb54305c7510d42ea43037e5e540192931b1d01c9decee8870a2e34ed2
This commit is contained in:
7u83@mail.ru
2018-02-23 16:36:11 +00:00
parent d72cc6ef02
commit 78b3d4871e
13 changed files with 71 additions and 59 deletions

View File

@ -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

View File

@ -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}
,

View File

@ -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}
,

View File

@ -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"},

View File

@ -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");

View File

@ -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 );