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

code cleanup

Browse Source 
FossilOrigin-Name: 9a108e18195d7c46a978339d7818ac688dec8315eb4afdd826d39f8cebab82a3
This commit is contained in:
7u83@mail.ru
2018-03-19 19:00:58 +00:00
parent 34646183a1
commit 3ea831d90c
21 changed files with 106 additions and 1083 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,45 +5,38 @@
#include "cw/log.h"
#include "cw/dbg.h"
#include "cw/action.h"
/*#include "mod_cisco.h"*/
#include "../modload.h"
#include "cw/vendors.h"
#include "cw/capwap_items.h"
extern int cisco_register_actions80211_ac(struct cw_actiondef *def);
extern int cisco_register_actions_ac(struct cw_actiondef *def);
mbag_t cisco_config = NULL;
/*mbag_t cisco_config = NULL;*/
static struct cw_Mod * capwap_mod = NULL;
static struct cw_MsgSet * register_messages(struct cw_MsgSet *set, int mode)
{
cw_dbg(DBG_INFO,"CISCO: Register messages");
switch (mode) {
case CW_MOD_MODE_CAPWAP:
{
cw_dbg(DBG_MOD,"Cisco: loading base mod capwap");
capwap_mod->register_messages(set, CW_MOD_MODE_CAPWAP);
struct cw_Mod *cmod = cw_mod_load("capwap");
if (!cmod) {
cw_log(LOG_ERR,
"Can't initialize mod_cisco, failed to load base module mod_cipwap");
return 1;
}
\
cmod->register_messages(set, CW_MOD_MODE_CAPWAP);
cw_dbg(DBG_MOD,"Cisco: loading cisco message set");
/* cw_dbg(DBG_MOD,"Cisco: loading cisco message set");*/
cisco_register_msg_set(set,CW_MOD_MODE_CAPWAP);
cw_dbg(DBG_INFO, "Initialized mod_cisco with %d messages", 7);
return 0;
/* cw_dbg(DBG_INFO, "Initialized mod_cisco with %d messages", 7);*/
break;
}
case CW_MOD_MODE_BINDINGS:
/* case CW_MOD_MODE_BINDINGS:
{
return 0;
struct cw_Mod *cmod = cw_mod_load("capwap80211"); //modload_ac("capwap80211");
@ -57,11 +50,11 @@ static struct cw_MsgSet * register_messages(struct cw_MsgSet *set, int mode)
cw_dbg(DBG_INFO, "Initialized mod_cisco 80211 with %d actions", 12);
return 0;
}
*/
}
cw_dbg(DBG_INFO,"CISCO: Done register messages");
return 0;
@ -76,22 +69,32 @@ static void errfunc(cfg_t *cfg, const char *fmt, va_list ap){
cw_log(LOG_ERR, "MOD Cisco cfg file in %s:", cfg->filename);
}
static int init()
static int init(struct cw_Mod *mod, mavl_t global_cfg, int role)
{
uint8_t * str;
static char * hardware_version; /*strdup(".x01000001");*/
static char * software_version; /* = NULL; */
cfg_t *cfg;
int rc = 1;
cw_dbg(DBG_INFO, "Initialiazing mod_cisco ...");
cisco_config = mbag_create();
char * hardware_version = strdup(".x01000001");
char * software_version = NULL;
cfg_opt_t opts[] = {
CFG_SIMPLE_STR("hardware_version", &hardware_version),
CFG_SIMPLE_STR("software_version",&software_version),
CFG_END()
};
cfg_t *cfg;
cw_dbg(DBG_INFO, "CISCO: Initialiazing mod_cisco ...");
cw_dbg(DBG_MOD, "CISCO: Loading base module: capwap");
capwap_mod = cw_mod_load("capwap",global_cfg,role);
if (capwap_mod == NULL){
cw_log(LOG_ERR, "CISCO: failed to load base module 'capwap");
}
/*cisco_config = mbag_create();*/
/*
cfg = cfg_init(opts, CFGF_NONE);
cfg_set_error_function(cfg, errfunc);
@ -105,8 +108,9 @@ static int init()
goto errX;
}
}
*/
uint8_t * str;
/*
str = bstr_create_from_cfgstr(hardware_version);
mbag_set_bstrv(cisco_config, CW_ITEM_AC_HARDWARE_VERSION,
@ -150,7 +154,7 @@ static int detect(struct conn *conn, const uint8_t * rawmsg, int rawlen, int ele
if (id == CAPWAP_ELEM_VENDOR_SPECIFIC_PAYLOAD) {
uint32_t vendor_id = cw_get_dword(cw_get_elem_data(elem));
if (vendor_id == CW_VENDOR_ID_CISCO) {
// conn->actions = &actions;
/* // conn->actions = &actions;*/
if (mode == CW_MOD_MODE_CAPWAP) {
cw_dbg(DBG_MOD, "CISCO capwap detected: yes");
} else {
@ -174,6 +178,7 @@ static int detect(struct conn *conn, const uint8_t * rawmsg, int rawlen, int ele
return 0;
}
/*
static struct cw_Mod capwap_ac = {
.name = "cisco",
.init = init,
@ -181,14 +186,24 @@ static struct cw_Mod capwap_ac = {
// .register_actions = register_actions,
.register_messages = register_messages
};
*/
struct cw_Mod *mod_cisco_ac()
{
return &capwap_ac;
static struct cw_Mod cisco_data = {
"cisco", /* name */
init, /* init */
detect, /* detect */
register_messages, /* register_messages */
NULL, /* dll_handle */
NULL /* data */
};
struct cw_Mod *mod_cisco()
{
return &capwap_ac;
};
return &cisco_data;
}