CW_JOIN_REQ... to CAPWAP_JOIN_REQ...

FossilOrigin-Name: 809b5b2014e10f7c70001984d874908d6f6c63198c0883e63ee919c9d89451dd
This commit is contained in:
7u83@mail.ru
2018-02-23 16:23:53 +00:00
parent a54b6ea36c
commit d72cc6ef02
12 changed files with 47 additions and 43 deletions

View File

@ -105,7 +105,7 @@ static cw_action_in_t actions_in[] = {
/* WTP Descriptor - Join Request */
{
.capwap_state = CW_STATE_JOIN,
.msg_id = CW_MSG_JOIN_REQUEST,
.msg_id = CAPWAP_MSG_JOIN_REQUEST,
.elem_id = CW_ELEM_WTP_DESCRIPTOR,
.start = cisco_in_wtp_descriptor,
.item_id = "wtp_descriptor",
@ -117,7 +117,7 @@ static cw_action_in_t actions_in[] = {
{
/* Cisco uses 4 byte session ids */
.capwap_state = CW_STATE_JOIN,
.msg_id = CW_MSG_JOIN_REQUEST,
.msg_id = CAPWAP_MSG_JOIN_REQUEST,
.elem_id = CW_ELEM_SESSION_ID,
.start = capwap_in_session_id,
.item_id = CW_ITEM_SESSION_ID,
@ -130,7 +130,7 @@ static cw_action_in_t actions_in[] = {
/* Local IPv4 Address - Join Request */
{
.capwap_state = CW_STATE_JOIN,
.msg_id = CW_MSG_JOIN_REQUEST,
.msg_id = CAPWAP_MSG_JOIN_REQUEST,
.elem_id = CW_ELEM_WTP_IPV4_IP_ADDRESS,
.item_id = CW_ITEM_CAPWAP_LOCAL_IP_ADDRESS,
.start = cw_in_capwap_local_ipv4_address,
@ -143,7 +143,7 @@ static cw_action_in_t actions_in[] = {
/* Local IPv6 Address - Join Request */
{
.capwap_state = CW_STATE_JOIN,
.msg_id = CW_MSG_JOIN_REQUEST,
.msg_id = CAPWAP_MSG_JOIN_REQUEST,
.elem_id = CW_ELEM_WTP_IPV6_IP_ADDRESS,
.item_id = CW_ITEM_CAPWAP_LOCAL_IP_ADDRESS,
.start = cw_in_capwap_local_ipv4_address,
@ -158,7 +158,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,
.msg_id = CW_MSG_JOIN_REQUEST,
.msg_id = CAPWAP_MSG_JOIN_REQUEST,
.elem_id = CW_ELEM_ECN_SUPPORT,
.item_id = CW_ITEM_ECN_SUPPORT,
.start = cw_in_generic2,

View File

@ -297,7 +297,7 @@ static cw_action_out_t actions_out[]={
/* CAPWAP Local IP Address - Join Request */
{
/* use draft 7 elem ids */
.msg_id = CW_MSG_JOIN_REQUEST,
.msg_id = CAPWAP_MSG_JOIN_REQUEST,
.item_id = CW_ITEM_CAPWAP_LOCAL_IP_ADDRESS,
.out = cw_out_capwap_local_ip_address_7,
.mand = 1
@ -306,7 +306,7 @@ static cw_action_out_t actions_out[]={
/* WTP Descriptor - Join Request */
{
.msg_id = CW_MSG_JOIN_REQUEST,
.msg_id = CAPWAP_MSG_JOIN_REQUEST,
.elem_id = CW_ELEM_WTP_DESCRIPTOR,
.item_id = CW_ITEM_WTP_DESCRIPTOR,
.out = cisco_out_wtp_descriptor,
@ -316,7 +316,7 @@ static cw_action_out_t actions_out[]={
/* WTP Group Name (WTP Name) - Join Request */
{
.msg_id = CW_MSG_JOIN_REQUEST,
.msg_id = CAPWAP_MSG_JOIN_REQUEST,
.vendor_id = CW_VENDOR_ID_CISCO,
.elem_id = CW_CISCO_AP_GROUP_NAME,
.item_id = CIPWAP_ITEM_WTP_GROUP_NAME,
@ -328,7 +328,7 @@ static cw_action_out_t actions_out[]={
/* WTP Board Data Options - Join Request */
{
.msg_id = CW_MSG_JOIN_REQUEST,
.msg_id = CAPWAP_MSG_JOIN_REQUEST,
.vendor_id = CW_VENDOR_ID_CISCO,
.elem_id = CW_CISCO_BOARD_DATA_OPTIONS,
.item_id = CW_ITEM_CISCO_BOARD_DATA_OPTIONS,
@ -344,7 +344,7 @@ static cw_action_out_t actions_out[]={
{
/* Cisco doesn't know ECN support, so we
define no output method */
.msg_id = CW_MSG_JOIN_REQUEST,
.msg_id = CAPWAP_MSG_JOIN_REQUEST,
.elem_id = CW_ELEM_ECN_SUPPORT,
.item_id = CW_ITEM_ECN_SUPPORT,
.mand = 0