diff --git a/ac.project b/ac.project
index 6e726f64..603fab39 100644
--- a/ac.project
+++ b/ac.project
@@ -25,8 +25,6 @@
-
-
@@ -114,4 +112,6 @@
+
+
diff --git a/actube.workspace b/actube.workspace
index 7675c5e5..82e47a8f 100644
--- a/actube.workspace
+++ b/actube.workspace
@@ -6,6 +6,7 @@
+
@@ -15,6 +16,7 @@
+
@@ -24,6 +26,7 @@
+
diff --git a/src/ac/wtpman.c b/src/ac/wtpman.c
index 448885ea..6b69ef0b 100644
--- a/src/ac/wtpman.c
+++ b/src/ac/wtpman.c
@@ -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;
diff --git a/src/cw/Doxyfile b/src/cw/Doxyfile
index 04a16f70..4c5030de 100644
--- a/src/cw/Doxyfile
+++ b/src/cw/Doxyfile
@@ -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
diff --git a/src/cw/capwap.h b/src/cw/capwap.h
index 27ed41b4..18901a7a 100644
--- a/src/cw/capwap.h
+++ b/src/cw/capwap.h
@@ -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
diff --git a/src/cw/capwap_80211_actions_ac.c b/src/cw/capwap_80211_actions_ac.c
index 117e3437..ebbaea98 100644
--- a/src/cw/capwap_80211_actions_ac.c
+++ b/src/cw/capwap_80211_actions_ac.c
@@ -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}
,
/* --------------------------------------------------------
diff --git a/src/cw/capwap_80211_actions_wtp.c b/src/cw/capwap_80211_actions_wtp.c
index 3c1a1d4c..f1c5a042 100644
--- a/src/cw/capwap_80211_actions_wtp.c
+++ b/src/cw/capwap_80211_actions_wtp.c
@@ -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}
,
diff --git a/src/cw/capwap_strings_msg.c b/src/cw/capwap_strings_msg.c
index 0a4d1f42..ecab6e4f 100644
--- a/src/cw/capwap_strings_msg.c
+++ b/src/cw/capwap_strings_msg.c
@@ -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"},
diff --git a/src/cw/cw_in_radio_generic.c b/src/cw/cw_in_radio_generic.c
index 21c312d5..6d40cc3f 100644
--- a/src/cw/cw_in_radio_generic.c
+++ b/src/cw/cw_in_radio_generic.c
@@ -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;
diff --git a/src/mod/capwap/capwap_actions_ac.c b/src/mod/capwap/capwap_actions_ac.c
index b3100595..3a4fbde7 100644
--- a/src/mod/capwap/capwap_actions_ac.c
+++ b/src/mod/capwap/capwap_actions_ac.c
@@ -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
diff --git a/src/mod/capwap/capwap_actions_wtp.c b/src/mod/capwap/capwap_actions_wtp.c
index 855e07a6..6c8c0026 100644
--- a/src/mod/capwap/capwap_actions_wtp.c
+++ b/src/mod/capwap/capwap_actions_wtp.c
@@ -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,
diff --git a/src/mod/capwap80211/capwap80211_actions_ac.c b/src/mod/capwap80211/capwap80211_actions_ac.c
index a997896a..044639f9 100644
--- a/src/mod/capwap80211/capwap80211_actions_ac.c
+++ b/src/mod/capwap80211/capwap80211_actions_ac.c
@@ -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,
diff --git a/src/mod/capwap80211/capwap80211_actions_wtp.c b/src/mod/capwap80211/capwap80211_actions_wtp.c
index 2a7a431d..e412c42a 100644
--- a/src/mod/capwap80211/capwap80211_actions_wtp.c
+++ b/src/mod/capwap80211/capwap80211_actions_wtp.c
@@ -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,
diff --git a/src/mod/capwap80211/mod_capwap80211_ac.c b/src/mod/capwap80211/mod_capwap80211_ac.c
index 4be4a618..12884259 100644
--- a/src/mod/capwap80211/mod_capwap80211_ac.c
+++ b/src/mod/capwap80211/mod_capwap80211_ac.c
@@ -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");
diff --git a/src/mod/cisco/cisco_actions_ac.c b/src/mod/cisco/cisco_actions_ac.c
index e42da2a5..428c84c2 100644
--- a/src/mod/cisco/cisco_actions_ac.c
+++ b/src/mod/cisco/cisco_actions_ac.c
@@ -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,
diff --git a/src/mod/cisco/cisco_actions_wtp.c b/src/mod/cisco/cisco_actions_wtp.c
index f35755ce..9b37e2ac 100644
--- a/src/mod/cisco/cisco_actions_wtp.c
+++ b/src/mod/cisco/cisco_actions_wtp.c
@@ -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,
diff --git a/src/mod/fortinet/fortinet_actions_ac.c b/src/mod/fortinet/fortinet_actions_ac.c
index eb36533e..3f0c6e3e 100644
--- a/src/mod/fortinet/fortinet_actions_ac.c
+++ b/src/mod/fortinet/fortinet_actions_ac.c
@@ -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,
diff --git a/src/wtp/discovery.c b/src/wtp/discovery.c
index 604f2a2a..01ea45e7 100644
--- a/src/wtp/discovery.c
+++ b/src/wtp/discovery.c
@@ -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);