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

Rename some CW_... -> CAPWAP_... names

Browse Source 
FossilOrigin-Name: 4ef2f734105654f472a99c7ea68f1831a13bb393997112dd3e9f6f045a11ad6b
This commit is contained in:
7u83@mail.ru 2018-02-23 16:57:13 +00:00
parent 78b3d4871e
commit c2c9087017
7 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/cw/capwap.h
View File

@ -184,12 +184,21 @@
* @{ * @{
*/ //namin */ //namin
#define CW_ELEM_AC_DESCRIPTOR 1 /**< AC Descriptor */
#define CAPWAP_ELEM_AC_DESCRIPTOR 1 /**< AC Descriptor */
#define CW_ELEM_AC_IPV4_LIST 2 /**< AC IP V4 List */ #define CW_ELEM_AC_IPV4_LIST 2 /**< AC IP V4 List */
#define CW_ELEM_AC_IPV6_LIST 3 /**< AC IP V6 List */ #define CW_ELEM_AC_IPV6_LIST 3 /**< AC IP V6 List */
#define CW_ELEM_AC_NAME 4 #define CW_ELEM_AC_NAME 4 /**< AC Name */
#define CW_ELEM_AC_NAME_WITH_PRIORITY 5 #define CW_ELEM_AC_NAME_WITH_PRIORITY 5
#define CW_ELEM_AC_NAME_WITH_INDEX CW_ELEM_AC_NAME_WITH_PRIORITY /**< Draft 7 naming */
/**
* In CAPWAP RFC draft 7 the message element 5 was named
* AC Name With Index. So we define it here with this name
* to be compatible.
* @see CW_ELEM_AC_NAME_WITH_PRIORITY */
#define CW_ELEM_AC_NAME_WITH_INDEX CW_ELEM_AC_NAME_WITH_PRIORITY
#define CW_ELEM_AC_TIMESTAMP 6 #define CW_ELEM_AC_TIMESTAMP 6
/**@{ /**@{
* one for all * one for all

2
src/cw/capwap_strings_elem.c
View File

@ -2,7 +2,7 @@
struct cw_strlist_elem capwap_strings_elem[] = { struct cw_strlist_elem capwap_strings_elem[] = {
{CW_ELEM_AC_DESCRIPTOR, "AC Descriptor"}, {CAPWAP_ELEM_AC_DESCRIPTOR, "AC Descriptor"},
{CW_ELEM_AC_IPV4_LIST, "AC IPv4 List"}, {CW_ELEM_AC_IPV4_LIST, "AC IPv4 List"},
{CW_ELEM_AC_IPV6_LIST, "AC IPv6 List"}, {CW_ELEM_AC_IPV6_LIST, "AC IPv6 List"},
{CW_ELEM_AC_NAME, "AC Name"}, {CW_ELEM_AC_NAME, "AC Name"},

2
src/cw/cw_readelem_ac_descriptor.c
View File

@ -77,7 +77,7 @@ static int read_subelem(struct ac_info* acinfo,int subtype,uint8_t *elem, int le
*/ */
int cw_readelem_ac_descriptor(struct ac_info * acinfo,int type, uint8_t *msgelem, int len) int cw_readelem_ac_descriptor(struct ac_info * acinfo,int type, uint8_t *msgelem, int len)
{ {
if (type != CW_ELEM_AC_DESCRIPTOR) if (type != CAPWAP_ELEM_AC_DESCRIPTOR)
return 0; return 0;
if (len<12) if (len<12)

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

@ -552,7 +552,7 @@ static cw_action_out_t actions_out[]={
{ {
.msg_id = CAPWAP_MSG_DISCOVERY_RESPONSE, .msg_id = CAPWAP_MSG_DISCOVERY_RESPONSE,
.item_id = CW_ITEM_AC_DESCRIPTOR, .item_id = CW_ITEM_AC_DESCRIPTOR,
.elem_id = CW_ELEM_AC_DESCRIPTOR, .elem_id = CAPWAP_ELEM_AC_DESCRIPTOR,
.out = capwap_out_ac_descriptor, .out = capwap_out_ac_descriptor,
.mand = 1 .mand = 1
} }
@ -618,7 +618,7 @@ static cw_action_out_t actions_out[]={
{ {
.msg_id = CAPWAP_MSG_JOIN_RESPONSE, .msg_id = CAPWAP_MSG_JOIN_RESPONSE,
.item_id = CW_ITEM_AC_DESCRIPTOR, .item_id = CW_ITEM_AC_DESCRIPTOR,
.elem_id = CW_ELEM_AC_DESCRIPTOR, .elem_id = CAPWAP_ELEM_AC_DESCRIPTOR,
.out = capwap_out_ac_descriptor, .out = capwap_out_ac_descriptor,
.mand = 1 .mand = 1
} }

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

@ -20,7 +20,7 @@ static cw_action_in_t actions_in[] = {
{ {
.capwap_state = CW_STATE_DISCOVERY, .capwap_state = CW_STATE_DISCOVERY,
.msg_id = CAPWAP_MSG_DISCOVERY_RESPONSE, .msg_id = CAPWAP_MSG_DISCOVERY_RESPONSE,
.elem_id = CW_ELEM_AC_DESCRIPTOR, .elem_id = CAPWAP_ELEM_AC_DESCRIPTOR,
.item_id = CW_ITEM_AC_DESCRIPTOR, .item_id = CW_ITEM_AC_DESCRIPTOR,
.start = cw_in_ac_descriptor, .start = cw_in_ac_descriptor,
.min_len = 12, .min_len = 12,
@ -124,7 +124,7 @@ static cw_action_in_t actions_in[] = {
{ {
.capwap_state = CW_STATE_JOIN, .capwap_state = CW_STATE_JOIN,
.msg_id = CAPWAP_MSG_JOIN_RESPONSE, .msg_id = CAPWAP_MSG_JOIN_RESPONSE,
.elem_id = CW_ELEM_AC_DESCRIPTOR, .elem_id = CAPWAP_ELEM_AC_DESCRIPTOR,
.item_id = CW_ITEM_AC_DESCRIPTOR, .item_id = CW_ITEM_AC_DESCRIPTOR,
.start = cw_in_ac_descriptor, .start = cw_in_ac_descriptor,
.min_len = 12, .min_len = 12,

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

@ -328,7 +328,7 @@ static cw_action_out_t actions_out[]={
{ {
.msg_id = CAPWAP_MSG_DISCOVERY_RESPONSE, .msg_id = CAPWAP_MSG_DISCOVERY_RESPONSE,
.item_id = CW_ITEM_AC_DESCRIPTOR, .item_id = CW_ITEM_AC_DESCRIPTOR,
.elem_id = CW_ELEM_AC_DESCRIPTOR, .elem_id = CAPWAP_ELEM_AC_DESCRIPTOR,
.out = cisco_out_ac_descriptor, .out = cisco_out_ac_descriptor,
.mand = 1 .mand = 1
} }
@ -353,7 +353,7 @@ static cw_action_out_t actions_out[]={
{ {
.msg_id = CAPWAP_MSG_JOIN_RESPONSE, .msg_id = CAPWAP_MSG_JOIN_RESPONSE,
.item_id = CW_ITEM_AC_DESCRIPTOR, .item_id = CW_ITEM_AC_DESCRIPTOR,
.elem_id = CW_ELEM_AC_DESCRIPTOR, .elem_id = CAPWAP_ELEM_AC_DESCRIPTOR,
.out = cisco_out_ac_descriptor, .out = cisco_out_ac_descriptor,
.mand = 1 .mand = 1
} }

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

@ -48,7 +48,7 @@ static cw_action_in_t actions_in[] = {
{ {
.capwap_state = CW_STATE_DISCOVERY, .capwap_state = CW_STATE_DISCOVERY,
.msg_id = CAPWAP_MSG_DISCOVERY_RESPONSE, .msg_id = CAPWAP_MSG_DISCOVERY_RESPONSE,
.elem_id = CW_ELEM_AC_DESCRIPTOR, .elem_id = CAPWAP_ELEM_AC_DESCRIPTOR,
.item_id = CW_ITEM_AC_DESCRIPTOR, .item_id = CW_ITEM_AC_DESCRIPTOR,
.start = cisco_in_ac_descriptor, .start = cisco_in_ac_descriptor,
.min_len = 12, .min_len = 12,
@ -82,7 +82,7 @@ static cw_action_in_t actions_in[] = {
/* Cisco's AC Descriptor */ /* Cisco's AC Descriptor */
.capwap_state = CW_STATE_JOIN, .capwap_state = CW_STATE_JOIN,
.msg_id = CAPWAP_MSG_JOIN_RESPONSE, .msg_id = CAPWAP_MSG_JOIN_RESPONSE,
.elem_id = CW_ELEM_AC_DESCRIPTOR, .elem_id = CAPWAP_ELEM_AC_DESCRIPTOR,
.item_id = CW_ITEM_AC_DESCRIPTOR, .item_id = CW_ITEM_AC_DESCRIPTOR,
.start = cisco_in_ac_descriptor, .start = cisco_in_ac_descriptor,
.min_len = 12, .min_len = 12,