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

Improved mod detection, also for bindings. detections are cached.

Browse Source 
FossilOrigin-Name: bb2a4cd9c18aded4fa028aa8d385c811d7550a37ddaf3da17f90399315abf637
This commit is contained in:
7u83@mail.ru
2016-03-08 00:20:22 +00:00
parent 43401093ea
commit be07b0aa0a
12 changed files with 258 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -296,6 +296,18 @@ static cw_action_in_t actions_in[] = {
}
,
{
.capwap_state = CW_STATE_CONFIGURE,
.msg_id = CW_MSG_CONFIGURATION_STATUS_REQUEST,
.elem_id = CW_ELEM_RADIO_ADMINISTRATIVE_STATE,
.item_id = CW_ITEM_RADIO_ADMINISTRATIVE_STATE,
.start = cw_in_radio_administrative_state,
.mand = 1
}
,
/* End of list */

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

@ -325,7 +325,7 @@ static cw_action_out_t actions_out[] = {
}
,
/* Radio Admin State - Config Status Request */
/* {
{
.msg_id = CW_MSG_CONFIGURATION_STATUS_REQUEST,
.item_id = CW_ITEM_RADIO_ADMINISTRATIVE_STATE,
.out = cw_out_radio_administrative_states,
@ -333,7 +333,7 @@ static cw_action_out_t actions_out[] = {
.mand = 1
}
,
*/

22
src/mod/capwap/mod_capwap_ac.c
View File

@ -17,30 +17,30 @@ extern int capwap_register_actions_ac(struct cw_actiondef *def);
static int init()
{
cw_dbg(DBG_INFO,"Initialiazing mod_capwap ...");
int rc = capwap_register_actions_ac(&actions);
cw_dbg(DBG_INFO,"Initialized mod capwap with %d actions",rc);
cw_dbg(DBG_INFO, "Initialiazing mod_capwap ...");
// int rc = capwap_register_actions_ac(&actions);
// cw_dbg(DBG_INFO, "Initialized mod capwap with %d actions", rc);
return 0;
}
static int detect(struct conn *conn,const uint8_t *rawmsg, int rawlen,int elems_len,struct sockaddr *from)
static int detect(struct conn *conn, const uint8_t * rawmsg, int rawlen, int elems_len,
struct sockaddr *from, int mode)
{
cw_log(LOG_INFO,"Detecting ...");
conn->detected=1;
conn->actions=&actions;
if (mode != MOD_DETECT_CAPWAP)
return 0;
return 1;
}
static struct mod_ac capwap_ac = {
.name ="capwap",
.name = "capwap",
.init = init,
.detect = detect,
.register_actions = capwap_register_actions_ac
};
struct mod_ac * mod_capwap_ac(){
struct mod_ac *mod_capwap_ac()
{
return &capwap_ac;
};

23
src/mod/capwap/mod_capwap_wtp.c
View File

@ -17,30 +17,33 @@ extern int capwap_register_actions_wtp(struct cw_actiondef *def);
static int init()
{
cw_dbg(DBG_INFO,"Initialiazing mod_capwap ...");
cw_dbg(DBG_INFO, "Initialiazing mod_capwap ...");
int rc = capwap_register_actions_wtp(&actions);
cw_dbg(DBG_INFO,"Initialized mod capwap with %d actions",rc);
cw_dbg(DBG_INFO, "Initialized mod capwap with %d actions", rc);
return 0;
}
static int detect(struct conn *conn,const uint8_t *rawmsg, int rawlen,int elems_len,struct sockaddr *from)
static int detect(struct conn *conn, const uint8_t * rawmsg, int rawlen, int elems_len,
struct sockaddr *from, int mode)
{
cw_log(LOG_INFO,"Detecting ...");
conn->detected=1;
conn->actions=&actions;
if (mode != MOD_DETECT_CAPWAP)
return 0;
cw_log(LOG_INFO, "Detecting ...");
conn->detected = 1;
conn->actions = &actions;
return 1;
}
static struct mod_wtp capwap_wtp = {
.name ="capwap",
.name = "capwap",
.init = init,
.detect = detect,
.register_actions = capwap_register_actions_wtp
};
struct mod_wtp * mod_capwap_wtp(){
struct mod_wtp *mod_capwap_wtp()
{
return &capwap_wtp;
};

3
src/mod/cipwap/mod_cipwap_ac.c
View File

@ -12,8 +12,9 @@ int cipwap_init()
}
static int detect(struct conn *conn,const uint8_t *rawmsg, int rawlen,int elems_len, struct sockaddr *from)
static int detect(struct conn *conn,const uint8_t *rawmsg, int rawlen,int elems_len, struct sockaddr *from, int mode)
{
cw_log(LOG_INFO,"Detecting ...");
return 0;
}

35
src/mod/cisco/mod_cisco_ac.c
View File

@ -19,39 +19,42 @@ extern int cisco_register_actions_ac(struct cw_actiondef *def);
static int init()
{
cw_dbg(DBG_INFO,"Initialiazing mod_cisco ...");
struct mod_ac * cmod = modload_ac("capwap");
cw_dbg(DBG_INFO, "Initialiazing mod_cisco ...");
struct mod_ac *cmod = modload_ac("capwap");
cmod->register_actions(&actions);
if (!cmod ){
cw_log(LOG_ERR,"Can't initzialize mod_cisco, failed to load bas mod mod_capwap");
if (!cmod) {
cw_log(LOG_ERR,
"Can't initzialize mod_cisco, failed to load base mod mod_capwap");
return 1;
}
int rc = cisco_register_actions_ac(&actions);
cw_dbg(DBG_INFO,"Initialized mod cisco with %d actions",rc);
cw_dbg(DBG_INFO, "Initialized mod cisco with %d actions", rc);
return 0;
}
static int detect(struct conn *conn,const uint8_t *rawmsg, int rawlen,int elems_len,struct sockaddr *from)
static int detect(struct conn *conn, const uint8_t * rawmsg, int rawlen, int elems_len,
struct sockaddr *from, int mode)
{
if (mode != MOD_DETECT_CAPWAP)
return 0;
int offset = cw_get_hdr_msg_offset(rawmsg);
const uint8_t *msg_ptr = rawmsg + offset;
const uint8_t *elems_ptr = cw_get_msg_elems_ptr(msg_ptr);
const uint8_t *elem;
/* To detect a Cisco AP we look for any vendor
* specific payload Cisco identifier */
cw_foreach_elem(elem, elems_ptr, elems_len) {
int id = cw_get_elem_id(elem);
if (id==CW_ELEM_VENDOR_SPECIFIC_PAYLOAD){
if (id == CW_ELEM_VENDOR_SPECIFIC_PAYLOAD) {
uint32_t vendor_id = cw_get_dword(cw_get_elem_data(elem));
if (vendor_id==CW_VENDOR_ID_CISCO){
conn->detected=1;
conn->actions=&actions;
if (vendor_id == CW_VENDOR_ID_CISCO) {
conn->actions = &actions;
return 1;
}
@ -64,13 +67,13 @@ static int detect(struct conn *conn,const uint8_t *rawmsg, int rawlen,int elems_
}
static struct mod_ac capwap_ac = {
.name ="cisco",
.name = "cisco",
.init = init,
.detect = detect
.detect = detect,
.register_actions = cisco_register_actions_ac
};
struct mod_ac * mod_cisco_ac(){
struct mod_ac *mod_cisco_ac()
{
return &capwap_ac;
};