planix.org/actube
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename CW_ -> CAPWAP_

Browse Source 
FossilOrigin-Name: 815905c068277bbfc6cf94cea5cbf44bb71258d56d748028b865ab76346ba085
This commit is contained in:
7u83@mail.ru
2018-02-28 06:38:02 +00:00
parent f0e838de0a
commit ad79d0a3a4
29 changed files with 107 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/mod/capwap/capwap_actions_ac.c
View File

@ -101,8 +101,8 @@ static cw_msgdef_t messages[] = {
/* Discovery Request Message*/
{
.name = "Discovery Request",
// .type = CAPWAP_MSG_DISCOVERY_REQUEST,
.type = 7,
.type = CAPWAP_MSG_DISCOVERY_REQUEST,
.receiver = CW_RECEIVER_AC,
.states = (int[]){CAPWAP_STATE_DISCOVERY,0},
.elements = (cw_msgelemprops_t []){
{&_DISCOVERY_TYPE,1},
@ -119,6 +119,7 @@ static cw_msgdef_t messages[] = {
{
.name = "Discovery Response",
.type = CAPWAP_MSG_DISCOVERY_RESPONSE,
.receiver = CW_RECEIVER_WTP,
.states = (int[]){CAPWAP_STATE_DISCOVERY,0},
.elements = (cw_msgelemprops_t[]){
{&_AC_DESCRIPTOR,1},
@ -300,7 +301,7 @@ static cw_action_in_t actions_in[] = {
* Join Request
*/
{
.capwap_state = CW_STATE_JOIN,
.capwap_state = CAPWAP_STATE_JOIN,
.msg_id = CAPWAP_MSG_JOIN_REQUEST,
.end = cw_in_check_join_req
}
@ -308,7 +309,7 @@ static cw_action_in_t actions_in[] = {
/* Location Data - Join Request */
{
.capwap_state = CW_STATE_JOIN,
.capwap_state = CAPWAP_STATE_JOIN,
.msg_id =CAPWAP_MSG_JOIN_REQUEST,
.elem_id = CW_ELEM_LOCATION_DATA,
.item_id = CW_ITEM_LOCATION_DATA,
@ -321,7 +322,7 @@ static cw_action_in_t actions_in[] = {
/* Element WTP Board Data - Join Request */
{
.capwap_state = CW_STATE_JOIN,
.capwap_state = CAPWAP_STATE_JOIN,
.msg_id = CAPWAP_MSG_JOIN_REQUEST,
.elem_id = CAPWAP_ELEM_WTP_BOARD_DATA,
.start = cw_in_wtp_board_data,
@ -332,7 +333,7 @@ static cw_action_in_t actions_in[] = {
/* Element WTP Descriptor - Join Request */
{
.capwap_state = CW_STATE_JOIN,
.capwap_state = CAPWAP_STATE_JOIN,
.msg_id = CAPWAP_MSG_JOIN_REQUEST,
.elem_id = CAPWAP_ELEM_WTP_DESCRIPTOR,
.start = capwap_in_wtp_descriptor,
@ -343,7 +344,7 @@ static cw_action_in_t actions_in[] = {
/* Element WTP Name - Join Request */
{
.capwap_state = CW_STATE_JOIN,
.capwap_state = CAPWAP_STATE_JOIN,
.msg_id = CAPWAP_MSG_JOIN_REQUEST,
.elem_id = CW_ELEM_WTP_NAME,
.start = cw_in_generic2,
@ -356,7 +357,7 @@ static cw_action_in_t actions_in[] = {
/* Element Session ID - Join Request */
{
.capwap_state = CW_STATE_JOIN,
.capwap_state = CAPWAP_STATE_JOIN,
.msg_id = CAPWAP_MSG_JOIN_REQUEST,
.elem_id = CW_ELEM_SESSION_ID,
.start = capwap_in_session_id,
@ -369,7 +370,7 @@ static cw_action_in_t actions_in[] = {
/* WTP Frame Tunnel Mode - Join Request */
{
.capwap_state = CW_STATE_JOIN,
.capwap_state = CAPWAP_STATE_JOIN,
.msg_id = CAPWAP_MSG_JOIN_REQUEST,
.elem_id = CAPWAP_ELEM_WTP_FRAME_TUNNEL_MODE,
.start = cw_in_generic2,
@ -382,7 +383,7 @@ static cw_action_in_t actions_in[] = {
/* WTP Mac Type - Join Request */
{
.capwap_state = CW_STATE_JOIN,
.capwap_state = CAPWAP_STATE_JOIN,
.msg_id = CAPWAP_MSG_JOIN_REQUEST,
.elem_id = CAPWAP_ELEM_WTP_MAC_TYPE,
.start = cw_in_generic2,
@ -400,7 +401,7 @@ static cw_action_in_t actions_in[] = {
/* ECN Support - Join Request */
{
.capwap_state = CW_STATE_JOIN,
.capwap_state = CAPWAP_STATE_JOIN,
.msg_id = CAPWAP_MSG_JOIN_REQUEST,
.elem_id = CW_ELEM_ECN_SUPPORT,
.item_id = CW_ITEM_ECN_SUPPORT,
@ -414,7 +415,7 @@ static cw_action_in_t actions_in[] = {
/* Local IPv4 Address - Join Request */
{
.capwap_state = CW_STATE_JOIN,
.capwap_state = CAPWAP_STATE_JOIN,
.msg_id = CAPWAP_MSG_JOIN_REQUEST,
.elem_id = CW_ELEM_CAPWAP_LOCAL_IPV4_ADDRESS,
.item_id = CW_ITEM_CAPWAP_LOCAL_IP_ADDRESS,
@ -427,7 +428,7 @@ static cw_action_in_t actions_in[] = {
/* Local IPv6 Address - Join Request */
{
.capwap_state = CW_STATE_JOIN,
.capwap_state = CAPWAP_STATE_JOIN,
.msg_id = CAPWAP_MSG_JOIN_REQUEST,
.elem_id = CW_ELEM_CAPWAP_LOCAL_IPV6_ADDRESS,
.item_id = CW_ITEM_CAPWAP_LOCAL_IP_ADDRESS,
@ -442,7 +443,7 @@ static cw_action_in_t actions_in[] = {
/* CAPWAP Transport Protocol - Join Request */
{
.capwap_state = CW_STATE_JOIN,
.capwap_state = CAPWAP_STATE_JOIN,
.msg_id = CAPWAP_MSG_JOIN_REQUEST,
.elem_id = CW_ELEM_CAPWAP_TRANSPORT_PROTOCOL,
.item_id = CW_ITEM_CAPWAP_TRANSPORT_PROTOCOL,
@ -454,7 +455,7 @@ static cw_action_in_t actions_in[] = {
/* Maximum Message Length - Join Request */
{
.capwap_state = CW_STATE_JOIN,
.capwap_state = CAPWAP_STATE_JOIN,
.msg_id = CAPWAP_MSG_JOIN_REQUEST,
.elem_id = CW_ELEM_MAXIMUM_MESSAGE_LENGTH,
.start = cw_in_generic2,
@ -466,7 +467,7 @@ static cw_action_in_t actions_in[] = {
/* WTP Reboot Statistics - Join Request */
{
.capwap_state = CW_STATE_JOIN,
.capwap_state = CAPWAP_STATE_JOIN,
.msg_id = CAPWAP_MSG_JOIN_REQUEST,
.elem_id = CW_ELEM_WTP_REBOOT_STATISTICS,
.start = cw_in_wtp_reboot_statistics,
@ -478,7 +479,7 @@ static cw_action_in_t actions_in[] = {
/* Vendor Specific Payload - Join Request*/
{
.capwap_state = CW_STATE_JOIN,
.capwap_state = CAPWAP_STATE_JOIN,
.msg_id = CAPWAP_MSG_JOIN_REQUEST,
.elem_id = CAPWAP_ELEM_VENDOR_SPECIFIC_PAYLOAD,
.start = cw_in_vendor_specific_payload,

16
src/mod/capwap/capwap_actions_wtp.c
View File

@ -102,14 +102,14 @@ static cw_action_in_t actions_in[] = {
* Message Join Response
*/
{
.capwap_state = CW_STATE_JOIN,
.capwap_state = CAPWAP_STATE_JOIN,
.msg_id = CAPWAP_MSG_JOIN_RESPONSE,
.end = cw_in_check_generic_resp
}
,
/* Result Code - Join Response */
{
.capwap_state = CW_STATE_JOIN,
.capwap_state = CAPWAP_STATE_JOIN,
.msg_id = CAPWAP_MSG_JOIN_RESPONSE,
.elem_id = CW_ELEM_RESULT_CODE,
.item_id = CW_ITEM_RESULT_CODE,
@ -122,7 +122,7 @@ static cw_action_in_t actions_in[] = {
/* AC Descriptor - Join Response */
{
.capwap_state = CW_STATE_JOIN,
.capwap_state = CAPWAP_STATE_JOIN,
.msg_id = CAPWAP_MSG_JOIN_RESPONSE,
.elem_id = CAPWAP_ELEM_AC_DESCRIPTOR,
.item_id = CW_ITEM_AC_DESCRIPTOR,
@ -135,7 +135,7 @@ static cw_action_in_t actions_in[] = {
/* AC Name - Join Response */
{
.capwap_state = CW_STATE_JOIN,
.capwap_state = CAPWAP_STATE_JOIN,
.msg_id = CAPWAP_MSG_JOIN_RESPONSE,
.elem_id = CW_ELEM_AC_NAME,
.item_id = CW_ITEM_AC_NAME,
@ -148,7 +148,7 @@ static cw_action_in_t actions_in[] = {
/* ECN Support - Join Response */
{
.capwap_state = CW_STATE_JOIN,
.capwap_state = CAPWAP_STATE_JOIN,
.msg_id = CAPWAP_MSG_JOIN_RESPONSE,
.elem_id = CW_ELEM_ECN_SUPPORT,
.item_id = CW_ITEM_ECN_SUPPORT,
@ -161,7 +161,7 @@ static cw_action_in_t actions_in[] = {
/* CAPWAP Control IPv4 Address - Join Response*/
{
.capwap_state = CW_STATE_JOIN,
.capwap_state = CAPWAP_STATE_JOIN,
.msg_id = CAPWAP_MSG_JOIN_RESPONSE,
.elem_id = CW_ELEM_CAPWAP_CONTROL_IPV4_ADDRESS,
.item_id = CW_ITEM_CAPWAP_CONTROL_IP_ADDRESS_LIST,
@ -174,7 +174,7 @@ static cw_action_in_t actions_in[] = {
/* CAPWAP Control IPv6 Address - Join Response*/
{
.capwap_state = CW_STATE_JOIN,
.capwap_state = CAPWAP_STATE_JOIN,
.msg_id = CAPWAP_MSG_JOIN_RESPONSE,
.elem_id = CW_ELEM_CAPWAP_CONTROL_IPV6_ADDRESS,
.item_id = CW_ITEM_CAPWAP_CONTROL_IP_ADDRESS_LIST,
@ -188,7 +188,7 @@ static cw_action_in_t actions_in[] = {
/* Maximum Message Length - Join Response */
{
.capwap_state = CW_STATE_JOIN,
.capwap_state = CAPWAP_STATE_JOIN,
.msg_id = CAPWAP_MSG_JOIN_RESPONSE,
.elem_id = CW_ELEM_MAXIMUM_MESSAGE_LENGTH,
.start = cw_in_generic2,

2
src/mod/capwap80211/capwap80211_actions_ac.c
View File

@ -45,7 +45,7 @@ static cw_action_in_t actions_ac_in[] = {
/* 802.11 Radio Information - Join Request */
{
.capwap_state = CW_STATE_JOIN,
.capwap_state = CAPWAP_STATE_JOIN,
.msg_id = CAPWAP_MSG_JOIN_REQUEST,
.elem_id = CW_ELEM80211_WTP_RADIO_INFORMATION,
.item_id = CW_RADIOITEM80211_WTP_RADIO_INFORMATION,

2
src/mod/capwap80211/capwap80211_actions_wtp.c
View File

@ -36,7 +36,7 @@ static cw_action_in_t actions_wtp_in[] = {
/* 802.11 Radio Inmformation - Join Response */
{
.capwap_state = CW_STATE_JOIN,
.capwap_state = CAPWAP_STATE_JOIN,
.msg_id = CAPWAP_MSG_JOIN_RESPONSE,
.elem_id = CW_ELEM80211_WTP_RADIO_INFORMATION,
.item_id = CW_RADIOITEM80211_WTP_RADIO_INFORMATION,

10
src/mod/cisco/cisco_actions_ac.c
View File

@ -160,7 +160,7 @@ static cw_action_in_t actions_in[] = {
/* WTP Descriptor - Join Request */
{
.capwap_state = CW_STATE_JOIN,
.capwap_state = CAPWAP_STATE_JOIN,
.msg_id = CAPWAP_MSG_JOIN_REQUEST,
.elem_id = CAPWAP_ELEM_WTP_DESCRIPTOR,
.start = cisco_in_wtp_descriptor,
@ -172,7 +172,7 @@ static cw_action_in_t actions_in[] = {
/* Session ID - Join Request */
{
/* Cisco uses 4 byte session ids */
.capwap_state = CW_STATE_JOIN,
.capwap_state = CAPWAP_STATE_JOIN,
.msg_id = CAPWAP_MSG_JOIN_REQUEST,
.elem_id = CW_ELEM_SESSION_ID,
.start = capwap_in_session_id,
@ -185,7 +185,7 @@ static cw_action_in_t actions_in[] = {
/* Local IPv4 Address - Join Request */
{
.capwap_state = CW_STATE_JOIN,
.capwap_state = CAPWAP_STATE_JOIN,
.msg_id = CAPWAP_MSG_JOIN_REQUEST,
.elem_id = CW_ELEM_WTP_IPV4_IP_ADDRESS,
.item_id = CW_ITEM_CAPWAP_LOCAL_IP_ADDRESS,
@ -198,7 +198,7 @@ static cw_action_in_t actions_in[] = {
/* Local IPv6 Address - Join Request */
{
.capwap_state = CW_STATE_JOIN,
.capwap_state = CAPWAP_STATE_JOIN,
.msg_id = CAPWAP_MSG_JOIN_REQUEST,
.elem_id = CW_ELEM_WTP_IPV6_IP_ADDRESS,
.item_id = CW_ITEM_CAPWAP_LOCAL_IP_ADDRESS,
@ -213,7 +213,7 @@ static cw_action_in_t actions_in[] = {
{
/* Cisco (using draft 7) does nothing know
* about ECN support, so make it non-mandatory */
.capwap_state = CW_STATE_JOIN,
.capwap_state = CAPWAP_STATE_JOIN,
.msg_id = CAPWAP_MSG_JOIN_REQUEST,
.elem_id = CW_ELEM_ECN_SUPPORT,
.item_id = CW_ITEM_ECN_SUPPORT,

4
src/mod/cisco/cisco_actions_wtp.c
View File

@ -66,7 +66,7 @@ static cw_action_in_t actions_in[] = {
/* ECN Support - Join Response */
{
/* Make ECN Support non-mand */
.capwap_state = CW_STATE_JOIN,
.capwap_state = CAPWAP_STATE_JOIN,
.msg_id = CAPWAP_MSG_JOIN_RESPONSE,
.elem_id = CW_ELEM_ECN_SUPPORT,
.item_id = CW_ITEM_ECN_SUPPORT,
@ -80,7 +80,7 @@ static cw_action_in_t actions_in[] = {
/* AC Descriptor - Join Response */
{
/* Cisco's AC Descriptor */
.capwap_state = CW_STATE_JOIN,
.capwap_state = CAPWAP_STATE_JOIN,
.msg_id = CAPWAP_MSG_JOIN_RESPONSE,
.elem_id = CAPWAP_ELEM_AC_DESCRIPTOR,
.item_id = CW_ITEM_AC_DESCRIPTOR,

10
src/mod/fortinet/fortinet_actions_ac.c
View File

@ -80,7 +80,7 @@ static cw_action_in_t actions_in[] = {
/* WTP Descriptor - Join Request */
{
.capwap_state = CW_STATE_JOIN,
.capwap_state = CAPWAP_STATE_JOIN,
.msg_id = CW_MSG_JOIN_REQUEST,
.elem_id = CW_ELEM_WTP_DESCRIPTOR,
.start = cisco_in_wtp_descriptor,
@ -92,7 +92,7 @@ static cw_action_in_t actions_in[] = {
/* Session ID - Join Request */
{
/* Cisco uses 4 byte session ids */
.capwap_state = CW_STATE_JOIN,
.capwap_state = CAPWAP_STATE_JOIN,
.msg_id = CW_MSG_JOIN_REQUEST,
.elem_id = CW_ELEM_SESSION_ID,
.start = cw_in_generic2,
@ -105,7 +105,7 @@ static cw_action_in_t actions_in[] = {
/* Local IPv4 Address - Join Request */
{
.capwap_state = CW_STATE_JOIN,
.capwap_state = CAPWAP_STATE_JOIN,
.msg_id = CW_MSG_JOIN_REQUEST,
.elem_id = CW_ELEM_WTP_IPV4_IP_ADDRESS,
.item_id = CW_ITEM_CAPWAP_LOCAL_IP_ADDRESS,
@ -118,7 +118,7 @@ static cw_action_in_t actions_in[] = {
/* Local IPv6 Address - Join Request */
{
.capwap_state = CW_STATE_JOIN,
.capwap_state = CAPWAP_STATE_JOIN,
.msg_id = CW_MSG_JOIN_REQUEST,
.elem_id = CW_ELEM_WTP_IPV6_IP_ADDRESS,
.item_id = CW_ITEM_CAPWAP_LOCAL_IP_ADDRESS,
@ -133,7 +133,7 @@ static cw_action_in_t actions_in[] = {
{
/* Cisco (using draft 7) does nothing know
* about ECN support, so make it non-mandatory */
.capwap_state = CW_STATE_JOIN,
.capwap_state = CAPWAP_STATE_JOIN,
.msg_id = CW_MSG_JOIN_REQUEST,
.elem_id = CW_ELEM_ECN_SUPPORT,
.item_id = CW_ITEM_ECN_SUPPORT,

4
src/mod/fortinet/fortinet_actions_wtp.c
View File

@ -60,7 +60,7 @@ static cw_action_in_t actions_in[] = {
/* ECN Support - Join Response */
{
/* Make ECN Support non-mand */
.capwap_state = CW_STATE_JOIN,
.capwap_state = CAPWAP_STATE_JOIN,
.msg_id = CW_MSG_JOIN_RESPONSE,
.elem_id = CW_ELEM_ECN_SUPPORT,
.item_id = CW_ITEM_ECN_SUPPORT,
@ -74,7 +74,7 @@ static cw_action_in_t actions_in[] = {
/* AC Descriptor - Join Response */
{
/* Cisco's AC Descriptor */
.capwap_state = CW_STATE_JOIN,
.capwap_state = CAPWAP_STATE_JOIN,
.msg_id = CW_MSG_JOIN_RESPONSE,
.elem_id = CW_ELEM_AC_DESCRIPTOR,
.item_id = CW_ITEM_AC_DESCRIPTOR,