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

Ren CW_MSG_DISCOVERY... -> CAPWAP_MSG_DISCOVERY... 

FossilOrigin-Name: 1a59f66389b747cd2a70a3ce4c187e61ba256fa8364df4fed6879bb0ba368a1a
This commit is contained in:
7u83@mail.ru 2018-02-23 12:59:36 +00:00
parent 8afa8a1c87
commit 106a1a451c
18 changed files with 53 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ac.project
View File

@ -25,8 +25,6 @@
</VirtualDirectory>
<Description/>
<Dependencies/>
<Dependencies Name="Debug"/>
<Dependencies Name="Release"/>
<Settings Type="Executable">
<GlobalSettings>
<Compiler Options="" C_Options="" Assembler="">
@ -114,4 +112,6 @@
</Completion>
</Configuration>
</Settings>
<Dependencies Name="Debug"/>
<Dependencies Name="Release"/>
</CodeLite_Project>

3
actube.workspace
View File

@ -6,6 +6,7 @@
<Project Name="mod_capwap" Path="mod_capwap.project" Active="No"/>
<Project Name="mod_cisco" Path="mod_cisco.project" Active="Yes"/>
<Project Name="libcw" Path="libcw.project" Active="No"/>
<Project Name="mod_capwap80211" Path="mod_capwap80211.project" Active="No"/>
<BuildMatrix>
<WorkspaceConfiguration Name="Debug" Selected="yes">
<Environment/>
@ -15,6 +16,7 @@
<Project Name="mod_capwap" ConfigName="Debug"/>
<Project Name="mod_cisco" ConfigName="Debug"/>
<Project Name="libcw" ConfigName="Debug"/>
<Project Name="mod_capwap80211" ConfigName="Debug"/>
</WorkspaceConfiguration>
<WorkspaceConfiguration Name="Release" Selected="yes">
<Environment/>
@ -24,6 +26,7 @@
<Project Name="mod_capwap" ConfigName="Release"/>
<Project Name="mod_cisco" ConfigName="Release"/>
<Project Name="libcw" ConfigName="Release"/>
<Project Name="mod_capwap80211" ConfigName="Release"/>
</WorkspaceConfiguration>
</BuildMatrix>
</CodeLite_Workspace>

2
src/ac/wtpman.c
View File

@ -119,7 +119,7 @@ int xprocess_message(struct conn *conn, uint8_t * rawmsg, int rawlen,
uint8_t *msgptr = rawmsg + cw_get_hdr_msg_offset(rawmsg);
uint32_t type = cw_get_msg_type(msgptr);
cw_log(LOG_ERR, "Hey: %d", type);
if (type == CW_MSG_DISCOVERY_REQUEST)
if (type == CAPWAP_MSG_DISCOVERY_REQUEST)
conn->capwap_state = CW_STATE_DISCOVERY;

2
src/cw/Doxyfile
View File

@ -330,7 +330,7 @@ IDL_PROPERTY_SUPPORT = YES
# all members of a group must be documented explicitly.
# The default value is: NO.
DISTRIBUTE_GROUP_DOC = NO
DISTRIBUTE_GROUP_DOC = YES
# Set the SUBGROUPING tag to YES to allow class member groups of the same type
# (for instance a group of public functions) to be put as a subgroup of that

20
src/cw/capwap.h
View File

@ -95,10 +95,10 @@
* @defgroup CAPWAPWBIDS CAPWAP Wireless binding IDs
* @{
*/
#define CW_WBID_RESERVED1 0
#define CW_WBID_IEEE80211 1
#define CW_WBID_RESERVED2 2
#define CW_WBID_EPCGLOBAL 3
#define CAPWAP_WBID_RESERVED1 0
#define CAPWAP_WBID_IEEE80211 1
#define CAPWAP_WBID_RESERVED2 2
#define CAPWAP_WBID_EPCGLOBAL 3
/**@}*/
#define CAPWAP_PACKET_PREAMBLE (CAPWAP_VERSION<<4)
@ -106,12 +106,12 @@
/*
* CAPWAP message types as defined in RFC 5416
/**
* @defgroup CAPWAPMessages CAPWAP message types as defined in RFC 5416
* @{
*/
#define CW_MSG_DISCOVERY_REQUEST 1
#define CAPWAP_MSG_DISCOVERY_REQUEST 1
#define CW_MSG_DISCOVERY_RESPONSE 2
#define CW_MSG_JOIN_REQUEST 3
#define CW_MSG_JOIN_RESPONSE 4
@ -151,6 +151,7 @@
#define CW_MSG_MAXMSG 26
/**@}*/
/**
@ -169,6 +170,7 @@
/**@{
* one for all
*/
/* yes one for alllll */
#define CW_ELEM_ADD_MAC_ACL_ENTRY 7
#define CW_ELEM_ADD_STATION 8
#define CW_ELEM_RESERVED_9 9

2
src/cw/capwap_80211_actions_ac.c
View File

@ -16,7 +16,7 @@ cw_action_in_t capwap_80211_actions_ac_in[] = {
* Discovery Resquest
*/
{0, 0, CW_STATE_DISCOVERY, CW_MSG_DISCOVERY_REQUEST,
{0, 0, CW_STATE_DISCOVERY, CAPWAP_MSG_DISCOVERY_REQUEST,
CW_ACTION_IN_80211_WTP_RADIO_INFORMATION, 1}
,
/* --------------------------------------------------------

2
src/cw/capwap_80211_actions_wtp.c
View File

@ -34,7 +34,7 @@ cw_action_out_t capwap_80211_actions_wtp_out[]={
*/
/* 802.11 Radio Information */
{CW_MSG_DISCOVERY_REQUEST, CW_ITEM_RADIO_INFOS /*CW_ELEM80211_WTP_RADIO_INFORMATION*/, 0,
{CAPWAP_MSG_DISCOVERY_REQUEST, CW_ITEM_RADIO_INFOS /*CW_ELEM80211_WTP_RADIO_INFORMATION*/, 0,
CW_ELEM80211_WTP_RADIO_INFORMATION, NULL,cw_out_radio_infos, NULL,1}
,

2
src/cw/capwap_strings_msg.c
View File

@ -26,7 +26,7 @@
* CAPWAP Message Strings
*/
struct cw_strlist_elem capwap_strings_msg[] = {
{ CW_MSG_DISCOVERY_REQUEST, "Discovery Request" },
{ CAPWAP_MSG_DISCOVERY_REQUEST, "Discovery Request" },
{ CW_MSG_DISCOVERY_RESPONSE,"Discovery Response" },
{ CW_MSG_JOIN_REQUEST, "Join Request"},
{ CW_MSG_JOIN_RESPONSE,"Join Response"},

2
src/cw/cw_in_radio_generic.c
View File

@ -26,7 +26,7 @@ int cw_in_radio_generic(struct conn *conn, struct cw_action_in *a, uint8_t * dat
mbag_t radio = mbag_i_get_mbag(conn->radios, rid, NULL);
if (!radio) {
if (a->vendor_id != 0
|| ( (a->vendor_id == 0) && (a->msg_id != CW_MSG_DISCOVERY_REQUEST
|| ( (a->vendor_id == 0) && (a->msg_id != CAPWAP_MSG_DISCOVERY_REQUEST
&& a->msg_id != CW_MSG_JOIN_REQUEST) )) {
cw_dbg(DBG_ELEM_ERR, "Radio not found %d", rid);
return 0;

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

@ -34,7 +34,7 @@ static cw_action_in_t actions_in[] = {
*/
{
.capwap_state = CW_STATE_DISCOVERY,
.msg_id = CW_MSG_DISCOVERY_REQUEST,
.msg_id = CAPWAP_MSG_DISCOVERY_REQUEST,
.end = cw_in_check_disc_req
}
,
@ -42,7 +42,7 @@ static cw_action_in_t actions_in[] = {
/* Element Discovery Type */
{
.capwap_state = CW_STATE_DISCOVERY,
.msg_id = CW_MSG_DISCOVERY_REQUEST,
.msg_id = CAPWAP_MSG_DISCOVERY_REQUEST,
.elem_id = CW_ELEM_DISCOVERY_TYPE,
.start = cw_in_generic2,
.item_id = "discovery_type",
@ -55,7 +55,7 @@ static cw_action_in_t actions_in[] = {
/* Element WTP Board Data - Discovery Request */
{
.capwap_state = CW_STATE_DISCOVERY,
.msg_id = CW_MSG_DISCOVERY_REQUEST,
.msg_id = CAPWAP_MSG_DISCOVERY_REQUEST,
.elem_id = CW_ELEM_WTP_BOARD_DATA,
.start = cw_in_wtp_board_data,
.item_id = CW_ITEM_WTP_BOARD_DATA,
@ -66,7 +66,7 @@ static cw_action_in_t actions_in[] = {
/* Element WTP Descriptor - Discovery */
{
.capwap_state = CW_STATE_DISCOVERY,
.msg_id = CW_MSG_DISCOVERY_REQUEST,
.msg_id = CAPWAP_MSG_DISCOVERY_REQUEST,
.elem_id = CW_ELEM_WTP_DESCRIPTOR,
.start = capwap_in_wtp_descriptor,
.item_id = "wtp_descriptor",
@ -78,7 +78,7 @@ static cw_action_in_t actions_in[] = {
/* Element WTP Frame Tunnel Mode */
{
.capwap_state = CW_STATE_DISCOVERY,
.msg_id = CW_MSG_DISCOVERY_REQUEST,
.msg_id = CAPWAP_MSG_DISCOVERY_REQUEST,
.elem_id = CW_ELEM_WTP_FRAME_TUNNEL_MODE,
.start = cw_in_generic2,
.item_id = CW_ITEM_WTP_FRAME_TUNNEL_MODE,
@ -91,7 +91,7 @@ static cw_action_in_t actions_in[] = {
/* Element WTP Mac Type */
{
.capwap_state = CW_STATE_DISCOVERY,
.msg_id = CW_MSG_DISCOVERY_REQUEST,
.msg_id = CAPWAP_MSG_DISCOVERY_REQUEST,
.elem_id = CW_ELEM_WTP_MAC_TYPE,
.start = cw_in_generic2,
.item_id = CW_ITEM_WTP_MAC_TYPE,
@ -104,7 +104,7 @@ static cw_action_in_t actions_in[] = {
/* MTU Discovery Padding */
{
.capwap_state = CW_STATE_DISCOVERY,
.msg_id = CW_MSG_DISCOVERY_REQUEST,
.msg_id = CAPWAP_MSG_DISCOVERY_REQUEST,
.elem_id = CW_ELEM_MTU_DISCOVERY_PADDING,
.start = cw_in_mtu_discovery_padding,
}
@ -113,7 +113,7 @@ static cw_action_in_t actions_in[] = {
/* Vendor Specific Payload */
{
.capwap_state = CW_STATE_DISCOVERY,
.msg_id = CW_MSG_DISCOVERY_REQUEST,
.msg_id = CAPWAP_MSG_DISCOVERY_REQUEST,
.elem_id = CW_ELEM_VENDOR_SPECIFIC_PAYLOAD,
.start = cw_in_vendor_specific_payload,
.min_len=7

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

@ -450,7 +450,7 @@ static cw_action_out_t actions_out[] = {
/* Discovery Type - Discovery Request */
{
.msg_id = CW_MSG_DISCOVERY_REQUEST,
.msg_id = CAPWAP_MSG_DISCOVERY_REQUEST,
.elem_id = CW_ELEM_DISCOVERY_TYPE,
.item_id = CW_ITEM_DISCOVERY_TYPE,
.out = cw_out_generic,
@ -461,7 +461,7 @@ static cw_action_out_t actions_out[] = {
/* WTP Board Data - Discovery Request */
{
.msg_id = CW_MSG_DISCOVERY_REQUEST,
.msg_id = CAPWAP_MSG_DISCOVERY_REQUEST,
.elem_id = CW_ELEM_WTP_BOARD_DATA,
.item_id = CW_ITEM_WTP_BOARD_DATA,
.out = cw_out_wtp_board_data,
@ -472,7 +472,7 @@ static cw_action_out_t actions_out[] = {
/* WTP Descriptor - Discover Request */
{
.msg_id = CW_MSG_DISCOVERY_REQUEST,
.msg_id = CAPWAP_MSG_DISCOVERY_REQUEST,
.elem_id = CW_ELEM_WTP_DESCRIPTOR,
.item_id = CW_ITEM_WTP_DESCRIPTOR,
.out = capwap_out_wtp_descriptor,
@ -484,7 +484,7 @@ static cw_action_out_t actions_out[] = {
/* WTP Frame TunnelMode - Discovery Request */
{
.msg_id = CW_MSG_DISCOVERY_REQUEST,
.msg_id = CAPWAP_MSG_DISCOVERY_REQUEST,
.elem_id = CW_ELEM_WTP_FRAME_TUNNEL_MODE,
.item_id = CW_ITEM_WTP_FRAME_TUNNEL_MODE,
.out = cw_out_generic,
@ -495,7 +495,7 @@ static cw_action_out_t actions_out[] = {
/* WTP Mac Type - Discovery Request */
{
.msg_id = CW_MSG_DISCOVERY_REQUEST,
.msg_id = CAPWAP_MSG_DISCOVERY_REQUEST,
.elem_id = CW_ELEM_WTP_MAC_TYPE,
.item_id = CW_ITEM_WTP_MAC_TYPE,
.out = cw_out_generic,

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

@ -28,7 +28,7 @@ static cw_action_in_t actions_ac_in[] = {
/* 802.11 Radio Information - Discovery Request */
{
.capwap_state = CW_STATE_DISCOVERY,
.msg_id = CW_MSG_DISCOVERY_REQUEST,
.msg_id = CAPWAP_MSG_DISCOVERY_REQUEST,
.elem_id = CW_ELEM80211_WTP_RADIO_INFORMATION,
.item_id = CW_RADIOITEM80211_WTP_RADIO_INFORMATION,
.start = cw_in_radio_generic,

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

@ -72,7 +72,7 @@ cw_action_out_t actions_out[]={
/* 802.11 Radio Information - Discovery Request */
{
.msg_id = CW_MSG_DISCOVERY_REQUEST,
.msg_id = CAPWAP_MSG_DISCOVERY_REQUEST,
.item_id = CW_ITEM_RADIO_INFOS ,
.elem_id = CW_ELEM80211_WTP_RADIO_INFORMATION,
.out = cw_out_radio_infos,

4
src/mod/capwap80211/mod_capwap80211_ac.c
View File

@ -31,8 +31,8 @@ static int detect(struct conn *conn, const uint8_t * rawmsg, int rawlen, int ele
return 0;
int wbid = cw_get_hdr_wbid(rawmsg);
if (wbid != CW_WBID_IEEE80211 ) {
cw_dbg(DBG_MOD,"CAPWAP80211 detected: no, my wbid=%d, remote wbid=%d",CW_WBID_IEEE80211,wbid);
if (wbid != CAPWAP_WBID_IEEE80211 ) {
cw_dbg(DBG_MOD,"CAPWAP80211 detected: no, my wbid=%d, remote wbid=%d",CAPWAP_WBID_IEEE80211,wbid);
return 0;
}
cw_dbg(DBG_MOD,"CAPWAP80211 detected: yes");

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

@ -51,7 +51,7 @@ static cw_action_in_t actions_in[] = {
/* Message Discovery Request */
{
.capwap_state = CW_STATE_DISCOVERY,
.msg_id = CW_MSG_DISCOVERY_REQUEST,
.msg_id = CAPWAP_MSG_DISCOVERY_REQUEST,
.end = cw_in_check_disc_req
}
,
@ -59,7 +59,7 @@ static cw_action_in_t actions_in[] = {
/* Element WTP Descriptor */
{
.capwap_state = CW_STATE_DISCOVERY,
.msg_id = CW_MSG_DISCOVERY_REQUEST,
.msg_id = CAPWAP_MSG_DISCOVERY_REQUEST,
.elem_id = CW_ELEM_WTP_DESCRIPTOR,
.start = cisco_in_wtp_descriptor,
.item_id = "wtp_descriptor",
@ -70,7 +70,7 @@ static cw_action_in_t actions_in[] = {
/* Element Cisco RAD Name */
{
.capwap_state = CW_STATE_DISCOVERY,
.msg_id = CW_MSG_DISCOVERY_REQUEST,
.msg_id = CAPWAP_MSG_DISCOVERY_REQUEST,
.vendor_id = CW_VENDOR_ID_CISCO,
.elem_id = CW_CISCO_RAD_NAME,
.start=cw_in_generic2,
@ -87,7 +87,7 @@ static cw_action_in_t actions_in[] = {
*/
{
.capwap_state = CW_STATE_DISCOVERY,
.msg_id = CW_MSG_DISCOVERY_REQUEST,
.msg_id = CAPWAP_MSG_DISCOVERY_REQUEST,
.elem_id = CW_ELEM_WTP_BOARD_DATA,
.start = cw_in_wtp_board_data,
.item_id = CW_ITEM_WTP_BOARD_DATA,
@ -504,7 +504,7 @@ static cw_action_in_t actions80211_in[] = {
so make it non-mandatory */
.capwap_state = CW_STATE_DISCOVERY,
.msg_id = CW_MSG_DISCOVERY_REQUEST,
.msg_id = CAPWAP_MSG_DISCOVERY_REQUEST,
.elem_id = CW_ELEM80211_WTP_RADIO_INFORMATION,
.item_id = CW_RADIOITEM80211_WTP_RADIO_INFORMATION,
.start = cw_in_radio_generic,

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

@ -268,7 +268,7 @@ static cw_action_out_t actions_out[]={
/* WTP Descriptor - Discovery */
{
.msg_id = CW_MSG_DISCOVERY_REQUEST,
.msg_id = CAPWAP_MSG_DISCOVERY_REQUEST,
.elem_id = CW_ELEM_WTP_DESCRIPTOR,
.item_id = CW_ITEM_WTP_DESCRIPTOR,
.out = cisco_out_wtp_descriptor,
@ -279,7 +279,7 @@ static cw_action_out_t actions_out[]={
/* Cisco RAD Name (WTP Name) - Discovery */
{
.msg_id = CW_MSG_DISCOVERY_REQUEST,
.msg_id = CAPWAP_MSG_DISCOVERY_REQUEST,
.vendor_id = CW_VENDOR_ID_CISCO,
.elem_id = CW_CISCO_RAD_NAME,
.item_id = CW_ITEM_WTP_NAME,

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

@ -40,7 +40,7 @@ static cw_action_in_t actions_in[] = {
/* Message Discovery Request */
{
.capwap_state = CW_STATE_DISCOVERY,
.msg_id = CW_MSG_DISCOVERY_REQUEST,
.msg_id = CAPWAP_MSG_DISCOVERY_REQUEST,
.end = cw_in_check_disc_req
}
,
@ -48,7 +48,7 @@ static cw_action_in_t actions_in[] = {
/* Element WTP Descriptor */
{
.capwap_state = CW_STATE_DISCOVERY,
.msg_id = CW_MSG_DISCOVERY_REQUEST,
.msg_id = CAPWAP_MSG_DISCOVERY_REQUEST,
.elem_id = CW_ELEM_WTP_DESCRIPTOR,
.start = cisco_in_wtp_descriptor,
.item_id = "wtp_descriptor",
@ -59,7 +59,7 @@ static cw_action_in_t actions_in[] = {
/* Element Cisco RAD Name */
{
.capwap_state = CW_STATE_DISCOVERY,
.msg_id = CW_MSG_DISCOVERY_REQUEST,
.msg_id = CAPWAP_MSG_DISCOVERY_REQUEST,
.vendor_id = CW_VENDOR_ID_CISCO,
.elem_id = CW_CISCO_RAD_NAME,
.start=cw_in_generic2,
@ -182,7 +182,7 @@ static cw_action_out_t actions_out[]={
* Important to get the WTP a DTLS connection established
*/
{
.msg_id = CW_MSG_DISCOVERY_RESPONSE,
.msg_id = CAPWAP_MSG_DISCOVERY_RESPONSE,
.item_id = CW_ITEM_AC_TIMESTAMP,
.vendor_id = CW_VENDOR_ID_CISCO,
.elem_id = CW_CISCO_AP_TIMESYNC,
@ -192,7 +192,7 @@ static cw_action_out_t actions_out[]={
,
/* AC Descriptor - Discovery Response */
{
.msg_id = CW_MSG_DISCOVERY_RESPONSE,
.msg_id = CAPWAP_MSG_DISCOVERY_RESPONSE,
.item_id = CW_ITEM_AC_DESCRIPTOR,
.elem_id = CW_ELEM_AC_DESCRIPTOR,
.out = cisco_out_ac_descriptor,
@ -250,7 +250,7 @@ static cw_action_in_t actions80211_in[] = {
so make it non-mandatory */
.capwap_state = CW_STATE_DISCOVERY,
.msg_id = CW_MSG_DISCOVERY_REQUEST,
.msg_id = CAPWAP_MSG_DISCOVERY_REQUEST,
.elem_id = CW_ELEM80211_WTP_RADIO_INFORMATION,
.item_id = "radio_information",
.start = cw_in_radio_generic,

2
src/wtp/discovery.c
View File

@ -127,7 +127,7 @@ static int run_discovery(struct conn *conn)
CAPWAP_DISCOVERY_TYPE_UNKNOWN);
cw_init_request(conn, CW_MSG_DISCOVERY_REQUEST);
cw_init_request(conn, CAPWAP_MSG_DISCOVERY_REQUEST);
cw_put_msg(conn, conn->req_buffer);
conn_send_msg(conn, conn->req_buffer);