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

New type cw_type_bits

Browse Source
This commit is contained in:
7u83 2022-09-03 17:27:19 +02:00
parent 0078c07e58
commit 66db979fdb
11 changed files with 323 additions and 213 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/cw/Makefile
View File

@ -60,6 +60,7 @@ CWSRC=\
cw_type_word.c\ cw_type_word.c\
cw_type_sysptr.c\ cw_type_sysptr.c\
cw_type_array.c\ cw_type_array.c\
cw_type_bits.c\
cw_write_descriptor_subelem.c\ cw_write_descriptor_subelem.c\
cw_write_radio_element.c\ cw_write_radio_element.c\
cw_detect_nat.c\ cw_detect_nat.c\

8
src/cw/cw.c
View File

@ -11,7 +11,7 @@ int cw_in_generic(struct cw_ElemHandler * handler, struct cw_ElemHandlerParams *
char mkey[CW_CFG_MAX_KEY_LEN]; char mkey[CW_CFG_MAX_KEY_LEN];
const char *key; const char *key;
// cw_dbg(DBG_X,"HK: %s",handler->key,);
if (!type){ if (!type){
cw_log(LOG_ERR,"Can't handle element: %s, no type defined",handler->name); cw_log(LOG_ERR,"Can't handle element: %s, no type defined",handler->name);
@ -25,11 +25,7 @@ int cw_in_generic(struct cw_ElemHandler * handler, struct cw_ElemHandlerParams *
else{ else{
key = handler->key; key = handler->key;
} }
// cw_dbg(DBG_X, "READ: %s / %s",type->name,key);
/* cw_dbg(DBG_X, "READ: %s / %s",type->name,key);*/
type->read(params->cfg, key,elem_data,elem_len,handler->param); type->read(params->cfg, key,elem_data,elem_len,handler->param);
return CAPWAP_RESULT_SUCCESS; return CAPWAP_RESULT_SUCCESS;
} }

2
src/cw/cw.h
View File

@ -560,6 +560,8 @@ int cw_put_descriptor_subelem (uint8_t *dst, cw_Cfg_t ** cfg_list,
int cw_send_request(struct cw_Conn *conn,int msg_id); int cw_send_request(struct cw_Conn *conn,int msg_id);
int cw_out_generic_walk(struct cw_ElemHandler * handler, struct cw_ElemHandlerParams * params int cw_out_generic_walk(struct cw_ElemHandler * handler, struct cw_ElemHandlerParams * params
, uint8_t * dst); , uint8_t * dst);
int cw_out_generic0(struct cw_ElemHandler * handler, struct cw_ElemHandlerParams * params
, uint8_t * dst,const char *key);
/** /**
*@} *@}

37
src/cw/cw_in_generic.c
View File

@ -1,37 +0,0 @@
#include "capwap.h"
#include "msgset.h"
#include "val.h"
#include "log.h"
#include "dbg.h"
int cw_in_generic(struct cw_ElemHandler * handler, struct cw_ElemHandlerParams * params,
uint8_t * elem_data, int elem_len)
{
cw_Type_t * type;
type = (cw_Type_t*)handler->type;
char mkey[CW_CFG_MAX_KEY_LEN];
const char *key;
if (!type){
cw_log(LOG_ERR,"Can't handle element: %s, no type defined",handler->name);
return CAPWAP_RESULT_UNRECOGNIZED_MESSAGE_ELEMENT;
}
if (handler->mkkey != NULL){
handler->mkkey(handler->key,elem_data,elem_len, mkey);
key = mkey;
}
else{
key = handler->key;
}
/* cw_dbg(DBG_X, "READ: %s / %s",type->name,key);*/
type->read(params->cfg, key,elem_data,elem_len,handler->param);
return CAPWAP_RESULT_SUCCESS;
}

54
src/cw/cw_type_bits.c Normal file
View File

@ -0,0 +1,54 @@
#include "val.h"
static int get_len(const struct cw_ValBit *bits)
{
int i;
for (i=0;bits[i].key!=NULL;i++);
return bits[i].bit;
}
static int get_bit(const uint8_t * src,int pos, int len)
{
int b;
uint8_t m;
b = len-1-pos/8;
m = 1<<(pos%8);
return src[b]&m ? 1:0;
}
static int bread(cw_Cfg_t *cfg, const char * key, const uint8_t *src, int len, const void *param)
{
const struct cw_ValBit * bits=param;
int l,i;
l = get_len(bits);
for(i=0;bits[i].key!=NULL;i++){
int rc;
printf("%s: %d\n",bits[i].key,get_bit(src,bits[i].bit,l));
}
return 1;
}
static int bwrite(cw_Cfg_t ** cfgs, const char *key, uint8_t *dst, const void * param)
{
return 0;
}
const struct cw_Type cw_type_bits = {
"Bits", /* name */
NULL, /* del */
NULL, /* put */
NULL, /* get */
NULL, /* to_str */
NULL, /* from_str */
NULL, /* len */
NULL, /* data */
NULL, /* get_type_name */
NULL,
bread,
bwrite
};

8
src/cw/cw_type_struct.c
View File

@ -37,12 +37,13 @@ static int read_struct(cw_Cfg_t * cfg,const cw_ValStruct_t * stru, const char *p
break; break;
default: default:
l = stru[i].len; l = stru[i].len;
cw_dbg(DBG_X,"pos: %d, l:%d. len: %d",pos,l,len);
if (pos+l > len){ if (pos+l > len){
l = len-pos; l = pos<len ? len-pos : 0 ;
} }
} }
cw_dbg(DBG_X,"This is l %d",l);
l=stru[i].type->read(cfg,key,data+pos,l,stru[i].valguard); l=stru[i].type->read(cfg,key,data+pos,l,stru[i].valguard);
@ -102,8 +103,9 @@ static int write_struct(cw_Cfg_t ** cfgs, const cw_ValStruct_t * stru, const ch
sprintf(key,"%s",pkey); sprintf(key,"%s",pkey);
// result = cw_cfg_get_l(cfgs,key,NULL); // result = cw_cfg_get_l(cfgs,key,NULL);
rc = cw_cfg_base_exists_l(cfgs,key); rc = cw_cfg_base_exists_l(cfgs,key);
// printf("Base? :%s, %d\n",key,rc); // cw_dbg(DBG_X,"Base? :'%s', %d\n",key,rc);
if(result) { if(result) {
// char s[2048]; // char s[2048];
// result->type->to_str(result,s,2048); // result->type->to_str(result,s,2048);

4
src/cw/dbg_strings.c
View File

@ -86,9 +86,7 @@ struct cw_StrListElem cw_dbg_strings[] = {
DBG_ELEM_IN | DBG_ELEM_OUT | DBG_ELEM_IN | DBG_ELEM_OUT |
DBG_MSG_ERR | DBG_ELEM_ERR | DBG_MSG_ERR | DBG_ELEM_ERR |
DBG_PKT_ERR | DBG_RFC | DBG_WARN DBG_PKT_ERR | DBG_RFC | DBG_WARN
| DBG_STATE | DBG_INFO), "std" },
| DBG_STATE), "std" },
{ DBG_ALL, "all"}, { DBG_ALL, "all"},

8
src/cw/val.h
View File

@ -52,6 +52,7 @@ typedef struct cw_Val cw_Val_t;
/** /**
* @class cw_Type * @class cw_Type
* @author 7u83 * @author 7u83
@ -117,7 +118,10 @@ struct cw_ValStruct {
typedef struct cw_ValStruct cw_ValStruct_t; typedef struct cw_ValStruct cw_ValStruct_t;
struct cw_ValBit {
uint16_t bit;
const char *key;
};
@ -147,6 +151,7 @@ struct cw_ValIndexed{
typedef struct cw_ValIndexed cw_ValIndexed_t; typedef struct cw_ValIndexed cw_ValIndexed_t;
extern const struct cw_Type cw_type_bits;
extern const struct cw_Type cw_type_byte; extern const struct cw_Type cw_type_byte;
extern const struct cw_Type cw_type_word; extern const struct cw_Type cw_type_word;
extern const struct cw_Type cw_type_dword; extern const struct cw_Type cw_type_dword;
@ -159,6 +164,7 @@ extern const struct cw_Type cw_type_bool;
extern const struct cw_Type cw_type_struct; extern const struct cw_Type cw_type_struct;
extern const struct cw_Type cw_type_array; extern const struct cw_Type cw_type_array;
#define CW_TYPE_BITS (&cw_type_bits)
#define CW_TYPE_BYTE (&cw_type_byte) #define CW_TYPE_BYTE (&cw_type_byte)
#define CW_TYPE_WORD (&cw_type_word) #define CW_TYPE_WORD (&cw_type_word)
#define CW_TYPE_DWORD (&cw_type_dword) #define CW_TYPE_DWORD (&cw_type_dword)

2
src/mod/cisco/cisco_out_lw_path_mtu.c
View File

@ -24,7 +24,7 @@ int cisco_out_lw_path_mtu(struct cw_ElemHandler * eh,
int wl = 1400-cl-hl; int wl = 1400-cl-hl;
printf("HL:%d CL:%d WL: %d\n",hl,cl,wl); //printf("HL:%d CL:%d WL: %d\n",hl,cl,wl);
if (wl<=40) if (wl<=40)
return 0; return 0;

394
src/mod/cisco/mod_cisco.c
View File

@ -220,7 +220,7 @@ static cw_ValStruct_t cisco_ap_static_domain[]={
static cw_ValStruct_t cisco_ap_regulatory_domain4[]={ static cw_ValStruct_t cisco_ap_regulatory_domain70[]={
{CW_TYPE_BOOL,"set",1,-1}, {CW_TYPE_BOOL,"set",1,-1},
{CW_TYPE_BYTE,"slot",1,-1}, {CW_TYPE_BYTE,"slot",1,-1},
{CW_TYPE_BYTE,"code0",1,-1}, {CW_TYPE_BYTE,"code0",1,-1},
@ -228,7 +228,14 @@ static cw_ValStruct_t cisco_ap_regulatory_domain4[]={
{NULL,NULL,0,0} {NULL,NULL,0,0}
}; };
static cw_ValStruct_t cisco_ap_regulatory_domain5[]={ static int mkkey_domain70(const char *pkey, uint8_t*data, int len, char *dst)
{
sprintf(dst,"radio.%d/%s",cw_get_byte(data+1),pkey);
return 0;
}
static cw_ValStruct_t cisco_ap_regulatory_domain75[]={
{CW_TYPE_BYTE,"band-id",1,-1}, {CW_TYPE_BYTE,"band-id",1,-1},
{CW_TYPE_BOOL,"set",1,-1}, {CW_TYPE_BOOL,"set",1,-1},
{CW_TYPE_BYTE,"slot",1,-1}, {CW_TYPE_BYTE,"slot",1,-1},
@ -237,6 +244,12 @@ static cw_ValStruct_t cisco_ap_regulatory_domain5[]={
{NULL,NULL,0,0} {NULL,NULL,0,0}
}; };
static int mkkey_domain75(const char *pkey, uint8_t*data, int len, char *dst)
{
sprintf(dst,"radio.%d/%s",cw_get_byte(data+2),pkey);
return 0;
}
static cw_ValStruct_t cisco_mac_operation70[]={ static cw_ValStruct_t cisco_mac_operation70[]={
{CW_TYPE_BYTE,"reserved",1,-1}, {CW_TYPE_BYTE,"reserved",1,-1},
@ -277,7 +290,7 @@ static cw_ValStruct_t cisco_ap_dot11h[]={
}; };
/*
int cisco_in_ap_regulatory_domain(struct cw_ElemHandler *eh, int cisco_in_ap_regulatory_domain(struct cw_ElemHandler *eh,
struct cw_ElemHandlerParams *params, struct cw_ElemHandlerParams *params,
uint8_t * data, int len) uint8_t * data, int len)
@ -300,81 +313,29 @@ int cisco_in_ap_regulatory_domain(struct cw_ElemHandler *eh,
return 1; return 1;
} }
*/
int cisco_out_ap_regulatory_domain(struct cw_ElemHandler * eh, int cisco_out_ap_regulatory_domain(struct cw_ElemHandler * eh,
struct cw_ElemHandlerParams * params, uint8_t * dst) struct cw_ElemHandlerParams * params, uint8_t * dst)
{ {
char key[CW_CFG_MAX_KEY_LEN]; char key[CW_CFG_MAX_KEY_LEN];
// char testkey[CW_CFG_MAX_KEY_LEN]; int l,i;
int idx; int len=0;
void * type; for (i=0; (i=cw_cfg_get_first_index_l(params->cfg_list,"radio",i))!=-1; i++){
cw_Val_t * result; if (i==255)
int len,start; continue;
uint8_t * ob; sprintf(key,"radio.%d/%s",i,eh->key);
l=cw_out_generic0(eh,params,dst+len,key);
if (l>0)
len+=l;
idx = 0;
ob = dst;
type = NULL;
result = cw_cfg_get_val_l(params->cfg_list,"capwap/wtp-descriptor/software/version",CW_TYPE_BSTR16);
if (result!=NULL){
if(result->type->len(result)==4){
uint32_t rv;
rv = cw_get_dword(result->type->data(result));
cw_dbg(DBG_X,"Version is %08X",rv);
//stop();
// if (rv >= 0x07056600){
if (rv > 0x07036500){
type = cisco_ap_regulatory_domain5;
}
else{
type = cisco_ap_regulatory_domain4;
}
}
} }
else { return len;
stop();
}
cw_val_destroy(result);
do {
sprintf(key,"%s.%d",eh->key,idx);
if (!cw_cfg_base_exists_l(params->cfg_list,key))
break;
if(type == NULL){
// sprintf(testkey,"%s/%s",key,"band-id");
stop();
// result = cw_ktv_get_val_l(params->cfg_list,key,CW_TYPE_BYTE);
if (result==NULL){
type = cisco_ap_regulatory_domain4;
}
else{
type = cisco_ap_regulatory_domain5;
cw_val_destroy(result);
}
}
start = params->msgset->header_len(eh);
len = CW_TYPE_STRUCT->write(params->cfg_list,key,ob+start,type);
// len = cw_ktv_write_struct(params->cfg,NULL,type,key,ob+start);
ob += params->msgset->write_header(eh,ob,len);
idx++;
}while(1);
sprintf(key,"%s.%d",eh->key,idx+1);
return ob-dst;
} }
static cw_ValStruct_t cisco_ap_model[]={ static cw_ValStruct_t cisco_ap_model[]={
{CW_TYPE_STR,"model",30,-1}, {CW_TYPE_STR,"model",30,-1},
{CW_TYPE_STR,"image",30,30}, {CW_TYPE_STR,"image",30,30},
@ -679,26 +640,6 @@ static cw_ValStruct_t dtls_data_cfg[]={
static cw_ValStruct_t cisco_add_wlan[]={
{CW_TYPE_BYTE,"radio-id",1,-1},
{CW_TYPE_WORD,"capwap80211/capability",2,-1},
{CW_TYPE_BYTE,"wlan-id",1,-1},
{CW_TYPE_DWORD,"cisco/encryption-policy",4,-1},
{CW_TYPE_BSTR16,"cisco/wep-key",13,9},
{CW_TYPE_BYTE,"cisco/wep-encryption",1,42},
{CW_TYPE_BOOL,"cisco/broadcast-ssid",1,426},
{CW_TYPE_WORD,"cisco/session-timout",2,475},
{CW_TYPE_BYTE, "cisco/dtim-period",1,541},
{CW_TYPE_STR, "cisco/ssid-a",30,545},
{CW_TYPE_BYTE, "cisco/allow-aaa-override",1,578},
{CW_TYPE_BYTE, "cisco/max-stations",1,580},
{NULL,NULL,0,0}
};
static cw_ValStruct_t cisco_add_wlan70[]={ static cw_ValStruct_t cisco_add_wlan70[]={
{CW_TYPE_BYTE,"radio-id",1,-1}, {CW_TYPE_BYTE,"radio-id",1,-1},
{CW_TYPE_WORD,"capwap80211/capability",2,-1}, {CW_TYPE_WORD,"capwap80211/capability",2,-1},
@ -724,6 +665,43 @@ static cw_ValStruct_t cisco_add_wlan70[]={
{NULL,NULL,0,0} {NULL,NULL,0,0}
}; };
static int cisco_add_wlan_mkkey70(const char *pkey, uint8_t*data, int len, char *dst)
{
int wlan_id,radio_id;
radio_id = cw_get_byte(data);
wlan_id = cw_get_byte(data+4);
sprintf(dst,"radio.%d/wlan.%d",radio_id,wlan_id);
return 1;
}
static cw_ValStruct_t cisco_add_wlan73[]={
{CW_TYPE_BYTE,"radio-id",1,-1},
{CW_TYPE_WORD,"capwap80211/capability",2,-1},
{CW_TYPE_WORD,"wlan-id",1,-1},
{CW_TYPE_DWORD,"cisco/encryption-policy",4,-1},
{CW_TYPE_BSTR16,"cisco/wep-key",13,9},
{CW_TYPE_BYTE,"cisco/wep-encryption",1,42},
{CW_TYPE_BOOL,"cisco/broadcast-ssid",1,426},
{CW_TYPE_WORD,"cisco/session-timout",2,475},
{CW_TYPE_BYTE, "cisco/dtim-period",1,541},
{CW_TYPE_STR, "cisco/profile-name",30,545},
{CW_TYPE_BYTE, "cisco/allow-aaa-override",1,578},
{CW_TYPE_BYTE, "cisco/max-stations",1,580},
{CW_TYPE_STR, "capwap80211/ssid", 512 , 583},
{NULL,NULL,0,0}
};
static int cisco_add_wlan_mkkey73(const char *pkey, uint8_t*data, int len, char *dst)
{
int wlan_id,radio_id;
radio_id = cw_get_byte(data);
wlan_id = cw_get_byte(data+4);
sprintf(dst,"radio.%d/wlan.%d",radio_id,wlan_id);
return 1;
}
@ -733,17 +711,16 @@ static int cisco_in_lw_del_wlan(struct cw_ElemHandler *eh,
struct cw_ElemHandlerParams *params, struct cw_ElemHandlerParams *params,
uint8_t * data, int len) uint8_t * data, int len)
{ {
stop();
/*
int wlan_id, radio_id; int wlan_id, radio_id;
char key[CW_CFG_MAX_KEY_LEN]; char key[CW_CFG_MAX_KEY_LEN];
radio_id=cw_get_byte(data); radio_id=cw_get_byte(data);
wlan_id=cw_get_word(data+1); wlan_id=cw_get_word(data+2);
sprintf(key,"radio.%d/wlan.%d",radio_id,wlan_id); sprintf(key,"radio.%d/wlan.%d/@actube/enable",radio_id,wlan_id);
cw_ktv_del_sub(params->cfg,key); cw_cfg_set(params->cfg,key,"false");
cw_dbg(DBG_INFO,"Del WLAN rid=%d, id=%d",wlan_id); cw_dbg(DBG_INFO,"Del WLAN rid=%d, id=%d",wlan_id);
return 0;*/ return 0;
} }
@ -769,15 +746,6 @@ static int cisoc_add_wlan_mkkey(const char *pkey, uint8_t*data, int len, char *d
*/ */
static int cisco_add_wlan_mkkey70(const char *pkey, uint8_t*data, int len, char *dst)
{
int wlan_id,radio_id;
radio_id = cw_get_byte(data);
wlan_id = cw_get_byte(data+4);
sprintf(dst,"radio.%d/wlan.%d",radio_id,wlan_id);
return 1;
}
static int mkkey_sig_payload(const char *pkey, uint8_t*data, int len, char *dst) static int mkkey_sig_payload(const char *pkey, uint8_t*data, int len, char *dst)
{ {
int id; int id;
@ -799,13 +767,27 @@ static int cisco_patch_add_wlan70(uint8_t * data, void * st)
*/ */
static cw_ValStruct_t cisco_add_lwwlan[]={ static cw_ValStruct_t cisco_add_lwwlan73[]={
{CW_TYPE_BSTR16, "misc", 8, 2}, {CW_TYPE_BSTR16, "misc", 8, 2},
{CW_TYPE_STR, "ssid",-1,10}, {CW_TYPE_STR, "ssid",-1,10},
{CW_TYPE_WORD, "misc2", 2, 48 }, {CW_TYPE_WORD, "misc2", 2, 48 },
{NULL,NULL,0,0} {NULL,NULL,0,0}
}; };
static int cisoc_add_lwwlan_mkkey73(const char *pkey, uint8_t*data, int len, char *dst)
{
int wlan_id,radio_id;
return 0;
stop();
radio_id = cw_get_byte(data);
wlan_id = cw_get_byte(data+1);
sprintf(dst,"radio.%d/wlan.%d/add-lw-wlan",radio_id,wlan_id);
return 1;
}
static cw_ValValRange_t oper_val_state[]={ static cw_ValValRange_t oper_val_state[]={
{1,1,"disabled"}, {1,1,"disabled"},
{2,2,"enabled"}, {2,2,"enabled"},
@ -835,16 +817,6 @@ static cw_ValStruct_t cisco_capwap_timers[] = {
static int cisoc_add_lwwlan_mkkey(const char *pkey, uint8_t*data, int len, char *dst)
{
int wlan_id,radio_id;
stop();
radio_id = cw_get_byte(data);
wlan_id = cw_get_byte(data+1);
sprintf(dst,"radio.%d/wlan.%d/add-lw-wlan",radio_id,wlan_id);
return 1;
}
static int cisco_patch_add_lwwlan(uint8_t * data, void * st) static int cisco_patch_add_lwwlan(uint8_t * data, void * st)
{ {
stop(); stop();
@ -1374,11 +1346,15 @@ static struct cw_ElemHandler handlers70[] = {
"AP Regulatory Domain", /* name */ "AP Regulatory Domain", /* name */
CISCO_ELEM_AP_REGULATORY_DOMAIN, /* Element ID */ CISCO_ELEM_AP_REGULATORY_DOMAIN, /* Element ID */
CW_VENDOR_ID_CISCO,0, /* Vendor / Proto */ CW_VENDOR_ID_CISCO,0, /* Vendor / Proto */
4,5, /* min/max length */ 4,4, /* min/max length */
cisco_ap_regulatory_domain4, /* type */ CW_TYPE_STRUCT, /* type */
"cisco/ap-regulatory-domain", /* Key */ "cisco/ap-regulatory-domain", /* Key */
cisco_in_ap_regulatory_domain, /* get */ cw_in_generic, /* get */
cisco_out_ap_regulatory_domain /* put */ cisco_out_ap_regulatory_domain, /* put */
mkkey_domain70,
NULL,
cisco_ap_regulatory_domain70
}, },
{ {
@ -1804,8 +1780,8 @@ static struct cw_ElemHandler handlers70[] = {
1,1024, /* min/max length */ 1,1024, /* min/max length */
CW_TYPE_BSTR16, /* type */ CW_TYPE_BSTR16, /* type */
"cisco/lwelem33", /* Key */ "cisco/lwelem33", /* Key */
cw_in_radio_generic, /* get */ cw_in_generic, /* get */
cw_out_radio_generic /* put */ cw_out_generic /* put */
}, },
{ {
@ -2101,21 +2077,6 @@ static struct cw_ElemHandler handlers70[] = {
} }
, ,
{
"Add Cisco WLAN (LWAPP)", /* name */
CISCO_LWELEM_ADD_WLAN, /* Element ID */
CW_VENDOR_ID_CISCO,CW_PROTO_LWAPP, /* Vendor / Proto */
7,1117, /* min/max length */
CW_TYPE_STRUCT, /* type */
"radio/wlan/add-lw-wlan", /* Key */
cw_in_generic, /* get */
cw_out_traverse, /* put */
cisoc_add_lwwlan_mkkey,
cisco_patch_add_lwwlan,
cisco_add_lwwlan,
}
,
{ {
"SSC Hash Validation", /* name */ "SSC Hash Validation", /* name */
@ -2386,6 +2347,9 @@ static struct cw_ElemDef join_response_elements[] ={
{0,0, CAPWAP_ELEM_ECN_SUPPORT, 0, CW_DELETE}, {0,0, CAPWAP_ELEM_ECN_SUPPORT, 0, CW_DELETE},
{0,0, CAPWAP_ELEM_WTP_IPV4_IP_ADDRESS, 0, 0},
{0,0, CAPWAP_ELEM_WTP_IPV6_IP_ADDRESS, 0, 0},
{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO, CISCO_LWELEM_PATH_MTU, 1, 0}, {CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO, CISCO_LWELEM_PATH_MTU, 1, 0},
{0,0,0,00} {0,0,0,00}
@ -2400,9 +2364,11 @@ static cw_State_t configuration_status_request_states[] = {
{0,0} {0,0}
}; };
static struct cw_ElemDef configuration_status_request_elements[] ={ static struct cw_ElemDef configuration_status_request_elements70[] ={
{0, CW_VENDOR_ID_CISCO, CISCO_ELEM_SPAM_VENDOR_SPECIFIC,0, CW_IGNORE}, {0, CW_VENDOR_ID_CISCO, CISCO_ELEM_SPAM_VENDOR_SPECIFIC,0, CW_IGNORE},
{0, CW_VENDOR_ID_CISCO, CISCO_ELEM_15, 0, 0}, {0, CW_VENDOR_ID_CISCO, CISCO_ELEM_15, 0, 0},
{0, CW_VENDOR_ID_CISCO, CISCO_ELEM_SUPPORTED_RATES, 0, 0}, {0, CW_VENDOR_ID_CISCO, CISCO_ELEM_SUPPORTED_RATES, 0, 0},
{0, CW_VENDOR_ID_CISCO, CISCO_ELEM_19, 0, 0}, {0, CW_VENDOR_ID_CISCO, CISCO_ELEM_19, 0, 0},
@ -2460,7 +2426,6 @@ static struct cw_ElemDef configuration_status_request_elements[] ={
{0, CW_VENDOR_ID_CISCO, CISCO_ELEM_AC_NAME_WITH_INDEX, 0, CW_IGNORE}, {0, CW_VENDOR_ID_CISCO, CISCO_ELEM_AC_NAME_WITH_INDEX, 0, CW_IGNORE},
{0, CW_VENDOR_ID_CISCO, CISCO_ELEM_AP_CORE_DUMP, 0, 0}, {0, CW_VENDOR_ID_CISCO, CISCO_ELEM_AP_CORE_DUMP, 0, 0},
{0, CW_VENDOR_ID_CISCO, CISCO_ELEM_AP_VENUE_SETTINGS, 0, 0},
{0, CW_VENDOR_ID_CISCO, CISCO_ELEM_MAC_OPERATION, 0, 0}, {0, CW_VENDOR_ID_CISCO, CISCO_ELEM_MAC_OPERATION, 0, 0},
{0, CW_VENDOR_ID_CISCO, CISCO_ELEM_TX_POWER, 0, 0}, {0, CW_VENDOR_ID_CISCO, CISCO_ELEM_TX_POWER, 0, 0},
@ -2487,7 +2452,6 @@ static struct cw_ElemDef configuration_status_request_elements[] ={
}; };
/*static uint16_t configuration_status_response_states[] = {CAPWAP_STATE_JOIN,0};*/
static struct cw_ElemDef configuration_status_response_elements[] ={ static struct cw_ElemDef configuration_status_response_elements[] ={
@ -2545,9 +2509,8 @@ static struct cw_ElemDef configuration_status_response_elements[] ={
{0, CW_VENDOR_ID_CISCO, CISCO_ELEM_SPAM_DOMAIN_SECRET, 0, 0}, {0, CW_VENDOR_ID_CISCO, CISCO_ELEM_SPAM_DOMAIN_SECRET, 0, 0},
{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO, CISCO_LWELEM_SSC_HASH_VALIDATION, 1, 0},
{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO, CISCO_LWELEM_MWAR_HASH_VALUE, 1, 0},
{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO, CISCO_LWELEM_MWAR_HASH_VALUE, 1, 0},
{0,0,0,0} {0,0,0,0}
}; };
@ -2628,7 +2591,6 @@ static struct cw_ElemDef configuration_update_request_elements[] ={
{0, CW_VENDOR_ID_CISCO, CISCO_ELEM_AP_CORE_DUMP, 0, 0}, {0, CW_VENDOR_ID_CISCO, CISCO_ELEM_AP_CORE_DUMP, 0, 0},
{0, CW_VENDOR_ID_CISCO, CISCO_ELEM_STATISTICS_TIMER, 0, 0}, {0, CW_VENDOR_ID_CISCO, CISCO_ELEM_STATISTICS_TIMER, 0, 0},
{0, CW_VENDOR_ID_CISCO, CISCO_ELEM_AC_NAME_WITH_INDEX, 0, 0}, {0, CW_VENDOR_ID_CISCO, CISCO_ELEM_AC_NAME_WITH_INDEX, 0, 0},
// {0, CW_VENDOR_ID_CISCO, CISCO_ELEM_AP_VENUE_SETTINGS, 0, 0},
{0, CW_VENDOR_ID_CISCO, CISCO_ELEM_80211_ASSOC_LIMIT, 0, 0}, {0, CW_VENDOR_ID_CISCO, CISCO_ELEM_80211_ASSOC_LIMIT, 0, 0},
{0, CW_VENDOR_ID_CISCO, CISCO_ELEM_SIG_TOGGLE, 0, 0}, {0, CW_VENDOR_ID_CISCO, CISCO_ELEM_SIG_TOGGLE, 0, 0},
{0, CW_VENDOR_ID_CISCO, CISCO_ELEM_SIG_PAYLOAD, 0, 0}, {0, CW_VENDOR_ID_CISCO, CISCO_ELEM_SIG_PAYLOAD, 0, 0},
@ -2656,7 +2618,6 @@ static struct cw_ElemDef configuration_update_request_elements[] ={
{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO, CISCO_LWELEM_SSC_HASH, 0, 0}, {CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO, CISCO_LWELEM_SSC_HASH, 0, 0},
{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO, CISCO_LWELEM_DISCOVERY_PROTOCOL, 0, 0}, {CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO, CISCO_LWELEM_DISCOVERY_PROTOCOL, 0, 0},
{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO, CISCO_LWELEM_ADD_WLAN, 0, 0},
{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO, CISCO_LWELEM_DELETE_WLAN, 0, 0}, {CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO, CISCO_LWELEM_DELETE_WLAN, 0, 0},
{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO, CISCO_LWELEM_TCP_ADJUST_MSS, 0, 0}, {CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO, CISCO_LWELEM_TCP_ADJUST_MSS, 0, 0},
@ -2667,17 +2628,15 @@ static struct cw_ElemDef configuration_update_request_elements[] ={
}; };
/*static uint16_t wtp_event_request_states[] = {CAPWAP_STATE_JOIN,0};*/
static struct cw_ElemDef wtp_event_request_elements[] ={ static struct cw_ElemDef wtp_event_request_elements[] ={
{0, CW_VENDOR_ID_CISCO, CISCO_ELEM_SPAM_VENDOR_SPECIFIC,0, CW_IGNORE}, {0, CW_VENDOR_ID_CISCO, CISCO_ELEM_SPAM_VENDOR_SPECIFIC,0, CW_IGNORE},
{0, CW_VENDOR_ID_CISCO, CISCO_ELEM_ADD_WLAN, 0, CW_IGNORE}, {0, CW_VENDOR_ID_CISCO, CISCO_ELEM_ADD_WLAN, 0, CW_IGNORE},
{0, CW_VENDOR_ID_CISCO, CISCO_ELEM_RRM_LOAD, 0, 0}, {0, CW_VENDOR_ID_CISCO, CISCO_ELEM_RRM_LOAD, 0, 0},
{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO, CISCO_LWELEM_ADD_WLAN, 0, 0}, {CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO, CISCO_LWELEM_HARDWARE_INFO, 0, 0},
{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO, CISCO_LWELEM_HARDWARE_INFO, 0, 0}, {CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO, CISCO_LWELEM_RADIO_MODULE_INFO, 0, 0},
{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO, CISCO_LWELEM_RADIO_MODULE_INFO, 0, 0}, {CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO, CISCO_LWELEM_PHY_HT_CONTROL, 0, 0},
{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO, CISCO_LWELEM_PHY_HT_CONTROL, 0, 0}, {CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO, CISCO_LWELEM_55, 0, 0},
{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO, CISCO_LWELEM_55, 0, 0},
{0,0,0,0,0} {0,0,0,0,0}
}; };
@ -2725,6 +2684,8 @@ static struct cw_ElemDef wtp_echo_response_elements[] ={
}; };
static struct cw_MsgDef messages70[] = { static struct cw_MsgDef messages70[] = {
{ {
NULL, /* name */ NULL, /* name */
@ -2787,7 +2748,7 @@ static struct cw_MsgDef messages70[] = {
CAPWAP_MSG_CONFIGURATION_STATUS_REQUEST, /* type */ CAPWAP_MSG_CONFIGURATION_STATUS_REQUEST, /* type */
CW_ROLE_AC, CW_ROLE_AC,
configuration_status_request_states, /* states */ configuration_status_request_states, /* states */
configuration_status_request_elements, configuration_status_request_elements70,
NULL /* postprocess */ NULL /* postprocess */
}, },
@ -2856,6 +2817,8 @@ static struct cw_MsgDef messages70[] = {
}; };
static struct cw_ElemHandler handlers73[] = { static struct cw_ElemHandler handlers73[] = {
{ {
"Rouge Detection (>=7.3)", /* name */ "Rouge Detection (>=7.3)", /* name */
@ -2918,14 +2881,79 @@ static struct cw_ElemHandler handlers73[] = {
} }
, ,
{
"Add Cisco WLAN (LWAPP)", /* name */
CISCO_LWELEM_ADD_WLAN, /* Element ID */
CW_VENDOR_ID_CISCO,CW_PROTO_LWAPP, /* Vendor / Proto */
7,1117, /* min/max length */
CW_TYPE_STRUCT, /* type */
"radio/wlan/", /* Key */
cw_in_generic, /* get */
cw_out_traverse, /* put */
cisoc_add_lwwlan_mkkey73,
cisco_patch_add_lwwlan,
cisco_add_lwwlan73,
}
,
{
"Add Cisco WLAN", /* name */
CISCO_ELEM_ADD_WLAN, /* Element ID */
CW_VENDOR_ID_CISCO,0, /* Vendor / Proto */
7,1117, /* min/max length */
CW_TYPE_STRUCT, /* type */
"radio/wlan/", /* Key */
cw_in_generic, /* get */
cw_out_generic_walk, /* put */
cisco_add_wlan_mkkey73,
NULL, // cisco_patch_add_wlan70
cisco_add_wlan73
}
,
{0,0,0,0,0,0,0,0} {0,0,0,0,0,0,0,0}
}; };
static struct cw_ElemDef configuration_status_request_elements73[] ={
{0, CW_VENDOR_ID_CISCO, CISCO_ELEM_AP_VENUE_SETTINGS, 0, 0},
{0,0,0,0,0}
};
static struct cw_ElemDef configuration_update_request_elements73[] ={
{CW_PROTO_LWAPP, CW_VENDOR_ID_CISCO, CISCO_LWELEM_ADD_WLAN, 0, 0},
{0,0,0,0,0}
};
static struct cw_MsgDef messages73[] = {
{
NULL, /* name */
CAPWAP_MSG_CONFIGURATION_STATUS_REQUEST, /* type */
CW_ROLE_AC,
NULL, //configuration_status_request_states, /* states * /
configuration_status_request_elements73,
NULL /* postprocess */
},
{
NULL, /* name */
CAPWAP_MSG_CONFIGURATION_UPDATE_REQUEST, /* type */
CW_ROLE_WTP,
NULL,
configuration_update_request_elements73,
NULL /* postprocess */
},
{0,0,0,0}
};
static struct cw_ElemHandler handlers75[] = { static struct cw_ElemHandler handlers75[] = {
{ {
"WTP Radio Configuration (Version >= 7.5)",/* name */ "WTP Radio Configuration (>=7.5)",/* name */
CISCO_ELEM_WTP_RADIO_CONFIGURATION, /* Element ID */ CISCO_ELEM_WTP_RADIO_CONFIGURATION, /* Element ID */
CW_VENDOR_ID_CISCO,0, /* Vendor / Proto */ CW_VENDOR_ID_CISCO,0, /* Vendor / Proto */
28,28, /* min/max length */ 28,28, /* min/max length */
@ -2939,7 +2967,7 @@ static struct cw_ElemHandler handlers75[] = {
} }
, ,
{ {
"Mac Operation (Version >= 7.5)", /* name */ "Mac Operation (Version >=7.5)", /* name */
CISCO_ELEM_MAC_OPERATION, /* Element ID */ CISCO_ELEM_MAC_OPERATION, /* Element ID */
CW_VENDOR_ID_CISCO,0, /* Vendor / Proto */ CW_VENDOR_ID_CISCO,0, /* Vendor / Proto */
17,17, /* min/max length */ 17,17, /* min/max length */
@ -2951,6 +2979,20 @@ static struct cw_ElemHandler handlers75[] = {
NULL, NULL,
cisco_mac_operation75, cisco_mac_operation75,
}, },
{
"AP Regulatory Domain (>=7.5)", /* name */
CISCO_ELEM_AP_REGULATORY_DOMAIN, /* Element ID */
CW_VENDOR_ID_CISCO,0, /* Vendor / Proto */
5,5, /* min/max length */
CW_TYPE_STRUCT, /* type */
"cisco/ap-regulatory-domain", /* Key */
cw_in_generic, /* get */
cisco_out_ap_regulatory_domain, /* put */
mkkey_domain75,
NULL,
cisco_ap_regulatory_domain75
},
{0,0,0,0,0,0,0,0} {0,0,0,0,0,0,0,0}
}; };
@ -2958,13 +3000,43 @@ static struct cw_ElemHandler handlers75[] = {
static struct cw_MsgDef messages73[] = { static struct cw_MsgDef messages75[] = {
{0,0,0,0} {0,0,0,0}
}; };
static struct cw_ElemHandler handlers80[] = {
{0,0,0,0,0,0,0,0}
};
static struct cw_ElemDef configuration_status_request_elements80[] ={
{0, CW_VENDOR_ID_CISCO, CISCO_ELEM_19, 0, CW_DELETE}, /* RRM_NEIGHBOR_CTRL_PAYLOAD */
{0, CW_VENDOR_ID_CISCO, CISCO_ELEM_22, 0, CW_DELETE}, /* RRM_INTERFERENCE_CTRL_PAYLOAD*/
{0, CW_VENDOR_ID_CISCO, CISCO_ELEM_24, 0, CW_DELETE}, /* RRM_LOAD_CTRL_PAYLOAD*/
{0, CW_VENDOR_ID_CISCO, CISCO_ELEM_39, 0, CW_DELETE}, /* DECRYPT_ERR_REPORT_PERIOD*/
{0, CW_VENDOR_ID_CISCO, CISCO_ELEM_BCAST_SSID_MODE, 0, CW_DELETE}, /* 51 */
{0, CW_VENDOR_ID_CISCO, CISCO_ELEM_CAPWAP_TIMERS, 0, CW_DELETE}, /* 68 */
{0, CW_VENDOR_ID_CISCO, CISCO_ELEM_CLIENT_AUTO_HANDOFF, 0, CW_DELETE}, /* 72 */
{0, CW_VENDOR_ID_CISCO, CISCO_ELEM_81, 0, CW_DELETE}, /* 81 */
{0, CW_VENDOR_ID_CISCO, CISCO_ELEM_AP_DOT11H, 0, CW_DELETE}, /* 132 */
{0, CW_VENDOR_ID_CISCO, CISCO_ELEM_145, 0, CW_DELETE}, /* AP_DTPC_PAYLOAD */
{0, CW_VENDOR_ID_CISCO, CISCO_ELEM_146, 0, CW_DELETE}, /* AP_CISCO_7920_VSIE_PAYLOAD */
{0, CW_VENDOR_ID_CISCO, CISCO_ELEM_153, 0, CW_DELETE}, /* AP_TSM_CONFIG_PAYLOAD */
{0, CW_VENDOR_ID_CISCO, CISCO_ELEM_156, 0, CW_DELETE}, /* AP_CAC_CONFIG_PAYLOAD */
{0,0,0,0,0}
};
static struct cw_MsgDef messages80[] = {
{
NULL, /* name */
CAPWAP_MSG_CONFIGURATION_STATUS_REQUEST, /* type */
CW_ROLE_AC,
NULL, /* states */
configuration_status_request_elements80,
NULL /* postprocess */
},
static struct cw_MsgDef messages75[] = {
{0,0,0,0} {0,0,0,0}
}; };
@ -3014,9 +3086,11 @@ static void update_msgset(struct cw_MsgSet *msgset, bstr_t version)
cw_dbg(DBG_MOD, "CISCO - Loading messages for 0x.x%08X >= 0x07056600", rv); cw_dbg(DBG_MOD, "CISCO - Loading messages for 0x.x%08X >= 0x07056600", rv);
cw_msgset_add(msgset,messages75, handlers75); cw_msgset_add(msgset,messages75, handlers75);
} }
if (rv >= 0x08000000){
cw_dbg(DBG_MOD, "CISCO - Loading messages for 0x.x%08X >= 0x08000000", rv);
cw_msgset_add(msgset,messages80, handlers80);
}
} }
} }

14
src/wtp/wtp_main.c
View File

@ -101,6 +101,20 @@ int main (int argc, char **argv)
struct cw_DiscoveryResults * results; struct cw_DiscoveryResults * results;
const char *bind_addr, *disc_addr; const char *bind_addr, *disc_addr;
/*
{
struct cw_ValBit bits[] = {
{0,"burtstag"},
{10,"windows"},
{2,NULL}
};
uint16_t x;
cw_set_word(&x,65534);
CW_TYPE_BITS->read(global_cfg,"hello",(uint8_t*)(&x),2,bits);
exit(0);
}
*/
bootcfg.nmods=0; bootcfg.nmods=0;