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

Some work on wtp and ktv config files

Browse Source 
FossilOrigin-Name: 3747732055809fd587f96cff65c389a0878a09a197947c1e68a76f605bdb44a0
This commit is contained in:
7u83@mail.ru
2018-03-12 10:22:06 +00:00
parent 27869b8c11
commit d6133e0434
74 changed files with 775 additions and 565 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/mod/cisco/Makefile
View File

@ -40,7 +40,7 @@ OBJDIR := ../../../obj/mod_cisco/$(ARCH)
SNAME := $(LIBARCHDIR)/libmod_cisco.a
DNAME := $(LIBARCHDIR)/mod_cisco.so
MODNAME := $(LIBDIR)/mod_cisco.so
SLIBS := -lcw -lmod_cipwap -lmod_capwap
SLIBS := -lcw -lmod_cipwap -lmod_capwap -lconfuse
include ../Mod.mak

5
src/mod/cisco/cisco_actions_ac.c
View File

@ -41,8 +41,8 @@
#include "include/cipwap_items.h"
#include "cw/msget.h"
#include "cw/kvt.h"
#include "cw/msgset.h"
#include "cw/ktv.h"
static struct cw_ElemHandler handlers[] = {
@ -86,6 +86,7 @@ static int discovery_request_states[] = {CAPWAP_STATE_DISCOVERY,0};
static struct cw_ElemDef discovery_request_elements[] ={
{0,0, CAPWAP_ELEM_WTP_DESCRIPTOR, 1, 0},
{0,CW_VENDOR_ID_CISCO, CW_CISCO_RAD_NAME, 1, 0},
{0,CW_VENDOR_ID_CISCO, CW_CISCO_BOARD_DATA_OPTIONS, 1, 0},
{0,0,0,00}
};

4
src/mod/cisco/cisco_out_ac_descriptor.c
View File

@ -47,7 +47,7 @@ int cisco_out_ac_descriptor(struct conn *conn,struct cw_action_out * a,uint8_t *
otherwise the AP wants us to send an image */
i = mbag_get(conn->incomming,CW_ITEM_WTP_SOFTWARE_VERSION);
}
/*
if ( i ) {
d += cw_put_version(d,1,i->u2.data);
}
@ -62,7 +62,7 @@ int cisco_out_ac_descriptor(struct conn *conn,struct cw_action_out * a,uint8_t *
else {
cw_log(LOG_ERR, "Can't set Cisco Hardware Version in AC descriptor, No value defined.");
}
*/
int len = d-dst-4;

8
src/mod/cisco/cisco_out_wtp_descriptor.c
View File

@ -28,16 +28,16 @@ mbag_t mbag = NULL;
mbag_item_t * i;
i = mbag_get(mbag,CW_ITEM_WTP_HARDWARE_VERSION);
if ( i ) {
/* if ( i ) {
d += cw_put_version(d,CW_SUBELEM_WTP_HARDWARE_VERSION,i->u2.data);
}
else {
cw_log(LOG_ERR, "Can't send Hardware Version in WTP Descriptor, not set.");
}
*/
i = mbag_get(mbag,CW_ITEM_WTP_SOFTWARE_VERSION);
/*
if ( i ) {
d += cw_put_version(d,CW_SUBELEM_WTP_SOFTWARE_VERSION,i->u2.data);
}
@ -52,7 +52,7 @@ mbag_t mbag = NULL;
else {
cw_log(LOG_ERR, "Can't send Bootloader Version in WTP descriptor, not set.");
}
*/
int len = d-dst-4;
return len + cw_put_elem_hdr(dst,a->elem_id,len);

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

@ -26,7 +26,7 @@ static struct cw_MsgSet * register_messages(struct cw_MsgSet *set, int mode)
switch (mode) {
case CW_MOD_MODE_CAPWAP:
{
cw_dbg(DBG_MOD,"Cisco: loading base med capwap");
cw_dbg(DBG_MOD,"Cisco: loading base mod capwap");
struct cw_Mod *cmod = cw_mod_load("capwap");
if (!cmod) {
@ -40,18 +40,19 @@ static struct cw_MsgSet * register_messages(struct cw_MsgSet *set, int mode)
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 messafe", 7);
cw_dbg(DBG_INFO, "Initialized mod_cisco with %d messages", 7);
return 0;
}
case MOD_MODE_BINDINGS:
case CW_MOD_MODE_BINDINGS:
{
struct cw_Mod *cmod = NULL; //modload_ac("capwap80211");
return 0;
struct cw_Mod *cmod = cw_mod_load("capwap80211"); //modload_ac("capwap80211");
if (!cmod) {
cw_log(LOG_ERR,
"Can't initialize mod_cisco, failed to load base mod mod_capwap80211");
return 1;
}
cmod->register_messages(set, MOD_MODE_BINDINGS);
cmod->register_messages(set, CW_MOD_MODE_BINDINGS);
int rc = cisco_register_actions80211_ac(set);
cw_dbg(DBG_INFO, "Initialized mod_cisco 80211 with %d actions", 12);
return 0;

4
src/mod/cisco/mod_cisco_wtp.c
View File

@ -39,7 +39,7 @@ static int register_actions(struct cw_actiondef *actions, int mode)
cw_dbg(DBG_INFO, "Initialized mod cisco with %d actions", rc);
return rc;
}
case MOD_MODE_BINDINGS:
case CW_MOD_MODE_BINDINGS:
{
struct cw_Mod *cmod = modload_wtp("capwap80211");
if (!cmod) {
@ -47,7 +47,7 @@ static int register_actions(struct cw_actiondef *actions, int mode)
"Can't initzialize mod_cisco, failed to load base mod mod_capwap80211");
return 1;
}
cmod->register_actions(actions, MOD_MODE_BINDINGS);
cmod->register_actions(actions, CW_MOD_MODE_BINDINGS);
int rc = cisco_register_actions80211_wtp(actions);
cw_dbg(DBG_INFO, "Initialized mod cisco 80211 with %d actions", rc);
return 0;