More WTP work...

FossilOrigin-Name: afda76caa13c6b6daf59e1482844be8c1a0b6aa26760175f105c1b1aecbbb448
This commit is contained in:
7u83@mail.ru
2015-04-18 10:02:58 +00:00
parent 5a80bdecea
commit 5a71654ebd
11 changed files with 33 additions and 5 deletions

View File

@ -311,6 +311,7 @@ CWACTION=action.o \
cw_out_wtp_board_data.o \
cw_out_image_data.o \
cipwap_actions_ac.o \
cipwap_actions_wtp.o \
cipwap_strings_elem.o \
capwap_strings_result.o\
cw_put_msg.o \

View File

@ -197,6 +197,16 @@ cw_action_out_t capwap_actions_wtp_out[] = {
/* -------------------------------------------------------------------------------
* Configuration Status Request OUT
*/
{CW_MSG_CONFIGURATION_STATUS_REQUEST, CW_ITEM_NONE}
,
{0, 0}
};

View File

@ -2,7 +2,12 @@
#ifndef __CIPWAP_H
#define __CIPWAP_H
#include "strheap.h"
#include "action.h"
extern struct cw_str cipwap_strings_elem[];
extern int cw_register_actions_cipwap_wtp(struct cw_actiondef *def);
#endif

View File

@ -126,7 +126,7 @@ cw_action_out_t cipwap_actions_ac_out[] = {
,
/* Cisco AP Timesync - Important to get the WTP a DTLS
connection stablished*/
connection established*/
{CW_MSG_DISCOVERY_RESPONSE, CW_ITEM_AC_TIMESTAMP, CW_VENDOR_ID_CISCO,
CW_CISCO_AP_TIMESYNC, NULL,cw_out_cisco_ap_timesync, 0}
,

View File

@ -62,7 +62,7 @@ int cw_out_generic(struct conn *conn, struct cw_action_out *a, uint8_t * dst) //
);
}
else{
cw_dbg(DBG_ELEM,"No output for element %d -(%s) in %s. Item %d not found.",
cw_dbg(DBG_WARN,"No output for element %d -(%s) in %s. Item %d not found.",
a->elem_id, cw_strelemp(conn->actions, a->elem_id)
, cw_strmsg(a->msg_id),a->item_id);

View File

@ -50,6 +50,8 @@ uint32_t cw_dbg_opt_level = 0;
#define DBG_CLR_YELLO "\x1b[33m"
#define DBG_CLR_YELLO_I "\x1b[3;33m"
#define DBG_CLR_CYAN "\x1b[36m"
static struct cw_str color_on[] = {
{ DBG_PKT_IN, DBG_CLR_YELLO },
@ -67,6 +69,7 @@ static struct cw_str color_on[] = {
{ DBG_RFC, "\x1b[31m" },
{ DBG_X, "\x1b[31m" },
{ DBG_WARN, DBG_CLR_CYAN },
{ CW_STR_STOP, "" }
};
static struct cw_str color_ontext[] = {
@ -95,7 +98,9 @@ static struct cw_str prefix[] = {
{ DBG_RFC, " RFC Violation -" },
{ DBG_SUBELEM," Sub-Element - "},
{ DBG_DTLS, " DTLS - "},
{ DBG_WARN, " Warning - "},
{ DBG_X, "XXXXX - "},
{ CW_STR_STOP, "" }
};

View File

@ -39,6 +39,7 @@ struct cw_str cw_dbg_strings[] = {
{ DBG_ELEM_ERR, "elem_err" },
{ DBG_DTLS, "dtls" },
{ DBG_DTLS_BIO, "dtls_bio" },
{ DBG_WARN, "warn" },
{ DBG_X,"dbgx" },
{ CW_STR_STOP, NULL }

View File

@ -106,7 +106,7 @@ int cw_send_request(struct conn *conn,int msg_id)
}
if ( rc <0 && errno != EAGAIN) {
cw_log(LOG_ERR,"Error reading from %s:%s",sock_addr2str(&conn->addr),strerror(errno));
cw_log(LOG_ERR,"Can't read from %s: %s",sock_addr2str(&conn->addr),strerror(errno));
}
if ( rc <0 && errno == EAGAIN) {
errno=ETIMEDOUT;