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

More CAPWAP sctrictness. 

FossilOrigin-Name: d7497af8567a692b4d9135001237330244621652c664f18be1c3017f898311ec
This commit is contained in:
7u83@mail.ru 2015-04-26 14:08:44 +00:00
parent e9b94947a9
commit a3065f0366
3 changed files with 33 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/ac/wtpman.c
View File

@ -222,6 +222,17 @@ static int wtpman_establish_dtls(void *arg)
static int wtpman_join(void *arg, time_t timer)
{
struct wtpman *wtpman = (struct wtpman *) arg;
struct conn * conn = wtpman->conn;
wtpman->conn->outgoing = mbag_create();
wtpman->conn->incomming = mbag_create();
wtpman->conn->local = ac_config;
mbag_set_str(conn->local,CW_ITEM_AC_NAME,conf_acname);
extern cw_actionlist_in_t the_tree;
wtpman->conn->actions = &capwap_actions;
@ -232,15 +243,10 @@ static int wtpman_join(void *arg, time_t timer)
// wtpman->conn->itemstore = mbag_create();
wtpman->conn->outgoing = mbag_create();
wtpman->conn->incomming = mbag_create();
wtpman->conn->local = ac_config;
struct conn * conn = wtpman->conn;
conn->strict_capwap=1;
cw_dbg(DBG_INFO,"Join State - %s",sock_addr2str(&conn->addr));
@ -478,6 +484,7 @@ struct wtpman *wtpman_create(int socklistindex, struct sockaddr *srcaddr)
wtpman->conn->strict_capwap = conf_strict_capwap;
wtpman->conn->strict_hdr = conf_strict_headers;
wtpman->conn->radios=mbag_create();
return wtpman;
}

14
src/capwap/capwap_80211_actions_ac.c
View File

@ -19,6 +19,14 @@ cw_action_in_t capwap_80211_actions_ac_in[] = {
{0, 0, CW_STATE_DISCOVERY, CW_MSG_DISCOVERY_REQUEST,
CW_ACTION_IN_80211_WTP_RADIO_INFORMATION, 1}
,
/* --------------------------------------------------------
* Discovery Resquest
*/
{0, 0, CW_STATE_JOIN, CW_MSG_JOIN_REQUEST,
CW_ACTION_IN_80211_WTP_RADIO_INFORMATION, 1}
,
{0, 0, 0}
@ -30,6 +38,12 @@ cw_action_out_t capwap_80211_actions_ac_out[]={
{CW_MSG_DISCOVERY_RESPONSE, CW_ELEM80211_WTP_RADIO_INFORMATION, 0,
CW_ELEM80211_WTP_RADIO_INFORMATION, NULL,cw_out_radio_infos, NULL,1}
,
/* Radio Infos */
{CW_MSG_JOIN_RESPONSE, CW_ELEM80211_WTP_RADIO_INFORMATION, 0,
CW_ELEM80211_WTP_RADIO_INFORMATION, NULL,cw_out_radio_infos, NULL,1}
,
{0,0,0}
};

14
src/capwap/capwap_actions_ac.c
View File

@ -72,22 +72,22 @@ cw_action_in_t capwap_actions_ac_in[] = {
0, cw_in_check_join_req}
,
/* Element Location Data */
/* Location Data */
{0, 0, CW_STATE_JOIN, CW_MSG_JOIN_REQUEST, CW_ACTION_IN_LOCATION_DATA, 1}
,
/* Element WTP Board Data */
/* WTP Board Data */
{0, 0, CW_STATE_JOIN, CW_MSG_JOIN_REQUEST, CW_ACTION_IN_WTP_BOARD_DATA, 1}
,
/* Element WTP Board Data */
/* WTP Board Descriptor */
{0, 0, CW_STATE_JOIN, CW_MSG_JOIN_REQUEST, CW_ACTION_IN_WTP_DESCRIPTOR, 1}
,
/* Element WTP Board Data */
/* Element WTP Name */
{0, 0, CW_STATE_JOIN, CW_MSG_JOIN_REQUEST, CW_ACTION_IN_WTP_NAME, 1}
,
/* Element WTP Board Data */
/* Element Session ID */
{0, 0, CW_STATE_JOIN, CW_MSG_JOIN_REQUEST, CW_ACTION_IN_SESSION_ID, 1}
,
/* Element WTP Board Data */
/* Element WTP Frame Tunnel Mode */
{0, 0, CW_STATE_JOIN, CW_MSG_JOIN_REQUEST, CW_ACTION_IN_WTP_FRAME_TUNNEL_MODE, 1}
,
/* Element WTP MAC Type */
@ -208,7 +208,7 @@ cw_action_out_t capwap_actions_ac_out[] = {
/* AC Name */
{CW_MSG_JOIN_RESPONSE, CW_ITEM_AC_NAME, 0,
CW_ELEM_AC_NAME, NULL, cw_out_generic, cw_out_get_outgoing}
CW_ELEM_AC_NAME, NULL, cw_out_generic, cw_out_get_local}
,