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

More work on typeless

Browse Source
This commit is contained in:
7u83
2022-08-13 09:47:12 +02:00
parent add6ffa314
commit 370942ef7e
69 changed files with 1030 additions and 507 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/mod/capwap/capwap_actions.c
View File

@ -29,7 +29,7 @@
#include "cw/mavltypes.h"
static int postprocess_join_request(struct cw_Conn *conn);
static int postprocess_join_request(struct cw_ElemHandlerParams * params, uint8_t * elems_ptr, int elems_len);
static cw_ValStruct_t wtp_reboot_statistics[] = {
@ -335,10 +335,14 @@ static struct cw_ElemHandler handlers[] = {
CAPWAP_ELEM_WTP_REBOOT_STATISTICS, /* Element ID */
0,0, /* Vendor / Proto */
15,15, /* min/max length */
wtp_reboot_statistics, /* type */
CW_TYPE_STRUCT, /* type */
"wtp-reboot-statistics", /* Key */
cw_in_generic_struct, /* handler */
cw_out_generic_struct /* put */
cw_in_generic, /* handler */
cw_out_generic_struct, /* put */
NULL,
NULL,
wtp_reboot_statistics
}
,
@ -347,10 +351,14 @@ static struct cw_ElemHandler handlers[] = {
CAPWAP_ELEM_RADIO_ADMINISTRATIVE_STATE, /* Element ID */
0, 0, /* Vendor / Proto */
2, 2, /* min/max length */
radio_admin_state, /* type */
CW_TYPE_STRUCT, /* type */
"admin-state", /* Key */
cw_in_radio_generic_struct, /* get */
cw_out_radio_generic_struct /* put */
cw_in_radio_generic, /* get */
cw_out_radio_generic_struct, /* put */
NULL,
NULL,
radio_admin_state, /* type */
}
,
@ -772,14 +780,13 @@ static struct cw_MsgDef messages[] = {
};
static int postprocess_join_request(struct cw_Conn *conn)
static int postprocess_join_request(struct cw_ElemHandlerParams * params, uint8_t * elems_ptr, int elems_len)
{
cw_Val_t * result;
result = cw_ktv_get(conn->remote_cfg,"session-id",CW_TYPE_BSTR16);
bstr16_t result;
result = cw_cfg_get_bstr16(params->cfg,"session-id",NULL);
if (result != NULL){
conn->session_id = result->val.ptr;
connlist_add_by_session_id(conn->connlist,conn);
params->conn->session_id = result;
connlist_add_by_session_id(params->conn->connlist,params->conn);
}
return 1;

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

@ -9,6 +9,8 @@ int capwap_in_ac_descriptor(struct cw_ElemHandler *eh,
struct cw_ElemHandlerParams *params,
uint8_t * data, int len)
{
stop();
static struct cw_DescriptorSubelemDef allowed[] = {
{0,CAPWAP_SUBELEM_AC_HARDWARE_VERSION, "hardware", 1024,1},
{0,CAPWAP_SUBELEM_AC_SOFTWARE_VERSION, "software", 1024,1},
@ -16,6 +18,6 @@ int capwap_in_ac_descriptor(struct cw_ElemHandler *eh,
};
return cw_read_ac_descriptor(params->remote_cfg,eh,params,data,len,allowed);
return cw_read_ac_descriptor(params->cfg,eh,params,data,len,allowed);
}

16
src/mod/capwap/capwap_in_capwap_control_ip_address.c
View File

@ -23,24 +23,28 @@
#include "cw/conn.h"
#include "mod_capwap.h"
#include "cw/dbg.h"
int capwap_in_capwap_control_ip_address(struct cw_ElemHandler *eh,
struct cw_ElemHandlerParams *params,
uint8_t * data, int len)
{
char key[CW_KTV_MAX_KEY_LEN];
return 0;
stop();
char key[CW_CFG_MAX_KEY_LEN];
int idx;
sprintf(key,"%s/address",eh->key);
idx = cw_ktv_idx_get(params->remote_cfg,key);
idx = cw_cfg_get_next_index(params->cfg,key);
/* printf("SKEY is %s , idx: %d\n",key,idx);*/
sprintf(key,"%s/address.%d",eh->key,idx+1);
cw_ktv_add(params->remote_cfg,key,CW_TYPE_IPADDRESS,NULL,data,len-2);
sprintf(key,"%s/address.%d",eh->key,idx);
cw_ktv_add(params->cfg,key,CW_TYPE_IPADDRESS,NULL,data,len-2);
sprintf(key,"%s/wtps.%d",eh->key,idx+1);
cw_ktv_add(params->remote_cfg,key,CW_TYPE_WORD,NULL,data+len-2,2);
sprintf(key,"%s/wtps.%d",eh->key,idx);
cw_ktv_add(params->cfg,key,CW_TYPE_WORD,NULL,data+len-2,2);
/* if (handler-id == CW_ELEM_CAPWAP_CONTROL_IPV4_ADDRESS) {
struct sockaddr_in addr;

56
src/mod/capwap/capwap_in_wtp_board_data.c
View File

@ -56,45 +56,25 @@ static void readsubelems_wtp_board_data(mavl_t cfg, uint8_t * msgelem,
return;
}
cw_dbg(DBG_SUBELEM, "WTP board data sub-element, type=%d, len=%d",
subtype, sublen);
/* cw_dbg(DBG_SUBELEM, "WTP board data sub-element, type=%d, len=%d",
subtype, sublen);*/
switch (subtype) {
case CW_BOARDDATA_MODELNO:
/* mbag_set_bstrn(itemstore,
CW_ITEM_WTP_BOARD_MODELNO,
msgelem + i, sublen);
*/
key = "model-no";
break;
case CW_BOARDDATA_SERIALNO:
/* mbag_set_bstrn(itemstore,
CW_ITEM_WTP_BOARD_SERIALNO,
msgelem + i, sublen);
*/
key = "serial-no";
break;
case CW_BOARDDATA_MACADDRESS:
/* mbag_set_bstrn(itemstore,
CW_ITEM_WTP_BOARD_MACADDRESS,
msgelem + i, sublen);
*/
key = "mac-address";
break;
case CW_BOARDDATA_BOARDID:
/* mbag_set_bstrn(itemstore, CW_ITEM_WTP_BOARD_ID,
msgelem + i, sublen);
*/
key = "board-id";
break;
case CW_BOARDDATA_REVISION:
/* mbag_set_bstrn(itemstore,
CW_ITEM_WTP_BOARD_REVISION,
msgelem + i, sublen);
*/
key = "revision";
break;
default:
@ -102,9 +82,9 @@ static void readsubelems_wtp_board_data(mavl_t cfg, uint8_t * msgelem,
break;
}
if (key != NULL){
char add_key[256];
char add_key[CW_CFG_MAX_KEY_LEN];
sprintf(add_key,"wtp-board-data/%s",key);
cw_ktv_add(cfg,add_key,CW_TYPE_BSTR16,NULL,msgelem+i,sublen);
cw_cfg_set_val(cfg,add_key,CW_TYPE_BSTR16,NULL,msgelem+i,sublen);
}
@ -122,32 +102,12 @@ static void readsubelems_wtp_board_data(mavl_t cfg, uint8_t * msgelem,
int capwap_in_wtp_board_data(struct cw_ElemHandler *eh, struct cw_ElemHandlerParams *params,
uint8_t * data, int len)
{
char vendor_key[CW_CFG_MAX_KEY_LEN];
/*
if (len < 4) {
cw_dbg(DBG_ELEM_ERR,
"Discarding WTP_BOARD_DATA msgelem, wrong size, type=%d, len=%d",
a->elem_id, len);
return 0;
}
*/
char vendor_key[128];
mavl_t cfg = params->remote_cfg;
sprintf(vendor_key,"%s/%s",eh->key,CW_SKEY_VENDOR);
cw_ktv_add(cfg,vendor_key,CW_TYPE_DWORD,NULL,data,len);
/*
mbag_t itemstore = conn->incomming;
mbag_set_dword(itemstore, CW_ITEM_WTP_BOARD_VENDOR, cw_get_dword(data));
*/
readsubelems_wtp_board_data(cfg, data + 4, len - 4);
sprintf(vendor_key,"%s/%s",eh->key,"vendor");
cw_cfg_set_val(params->cfg,vendor_key,CW_TYPE_DWORD,NULL,data,len);
readsubelems_wtp_board_data(params->cfg, data + 4, len - 4);
return 1;
}

5
src/mod/capwap/capwap_in_wtp_descriptor.c
View File

@ -19,15 +19,18 @@
#include "cw/sock.h"
#include "cw/cw.h"
#include "cw/dbg.h"
#include "mod_capwap.h"
int capwap_in_wtp_descriptor(struct cw_ElemHandler *eh, struct cw_ElemHandlerParams *params, uint8_t * data,
int len)
{
stop();
int rc;
/*rc =cw_read_wtp_descriptor(params->remote_cfg, params->conn, eh, data, len, NULL);*/
rc =cw_read_wtp_descriptor(params->remote_cfg, NULL, eh, data, len, NULL);
rc =cw_read_wtp_descriptor(params->cfg, NULL, eh, data, len, NULL);
return rc;
}

10
src/mod/capwap/capwap_out_ac_descriptor.c
View File

@ -14,6 +14,8 @@
static int put_ac_status(mavl_t global, mavl_t local, uint8_t *dst, const char * parent_key){
stop();
uint8_t *d = dst;
char key[CW_KTV_MAX_KEY_LEN];
@ -58,16 +60,16 @@ int capwap_out_ac_descriptor(struct cw_ElemHandler * eh,
uint8_t *d = dst+4;
char key[CW_KTV_MAX_KEY_LEN];
d+=put_ac_status(params->local_cfg,
params->global_cfg,
d+=put_ac_status(params->cfg,
params->default_cfg,
d, eh->key);
sprintf(key,"%s/%s",eh->key,CW_SKEY_HARDWARE);
d+=cw_write_descriptor_subelem (d, params->local_cfg,
d+=cw_write_descriptor_subelem (d, params->cfg,
CAPWAP_SUBELEM_AC_HARDWARE_VERSION, key);
sprintf(key,"%s/%s",eh->key,CW_SKEY_SOFTWARE);
d+=cw_write_descriptor_subelem (d, params->local_cfg,
d+=cw_write_descriptor_subelem (d, params->cfg,
CAPWAP_SUBELEM_AC_SOFTWARE_VERSION, key);
len = d-dst-4;

31
src/mod/capwap/capwap_out_capwap_control_ip_address.c
View File

@ -1,6 +1,8 @@
#include "cw/cw.h"
#include "cw/dbg.h"
#include "cw/cfg.h"
#include "mod_capwap.h"
/*
@ -50,10 +52,12 @@ static int put_ip(uint8_t *dst void *priv, cw_acip_t * acip void *data)
int capwap_out_capwap_control_ip_address(struct cw_ElemHandler * eh,
struct cw_ElemHandlerParams * params, uint8_t * dst)
{
char key[CW_KTV_MAX_KEY_LEN];
char key[CW_CFG_MAX_KEY_LEN];
int i;
int wtps;
cw_Val_t * address;
cw_Val_t address;
const char *as;
uint8_t *d;
d = dst;
@ -63,17 +67,22 @@ int capwap_out_capwap_control_ip_address(struct cw_ElemHandler * eh,
int l;
sprintf(key,"%s/address.%d",eh->key,i);
address = cw_ktv_get(params->local_cfg,key,CW_TYPE_IPADDRESS);
as = cw_cfg_get(params->conn->global_cfg,key,NULL);
sprintf(key,"%s/wtps.%d",eh->key,i);
wtps = cw_ktv_get_word(params->local_cfg,key,0);
wtps = cw_cfg_get_word(params->conn->global_cfg,key,0);
i++;
if (address==NULL){
if (as==NULL){
break;
}
/* msg = d;*/
l = address->type->len(address);
address.type=CW_TYPE_IPADDRESS;
address.type->from_str(&address,as);
l = address.type->len(&address);
switch(eh->id){
case CAPWAP_ELEM_CAPWAP_CONTROL_IPV4_ADDRESS:
@ -90,13 +99,15 @@ int capwap_out_capwap_control_ip_address(struct cw_ElemHandler * eh,
continue;
}
l = address->type->put(address,d+4);
l = address.type->put(&address,d+4);
l+=cw_put_word(dst+4+l,wtps);
l+=cw_put_elem_hdr(d,eh->id,l);
cw_dbg_elem(DBG_ELEM_OUT,NULL,params->msgdata->type,eh,d+4,l-4);
// cw_dbg_elem(DBG_ELEM_OUT,NULL,params->msgdata->type,eh,d+4,l-4);
d+=l;
}while(address != NULL);
address.type->del(&address);
}while(as != NULL);
return d-dst;

21
src/mod/capwap/capwap_out_capwap_local_ip_address.c
View File

@ -1,17 +1,28 @@
#include "cw/conn.h"
#include "mod_capwap.h"
#include "cw/cw.h"
#include "cw/dbg.h"
int capwap_out_capwap_local_ip_address(struct cw_ElemHandler * eh,
struct cw_ElemHandlerParams * params, uint8_t * dst)
{
cw_Val_t * ip;
ip = cw_ktv_get(params->local_cfg,eh->key,CW_TYPE_IPADDRESS);
if (ip==NULL){
const char * ipstr;
cw_Val_t ip;
memset(&ip,0,sizeof(cw_Val_t));
ip.type=CW_TYPE_IPADDRESS;
ipstr = cw_cfg_get(params->cfg,eh->key,NULL);
if (ipstr==NULL){
return 0;
}
return cw_put_local_ip_address(dst,eh->id,
ip.type->from_str(&ip,ipstr);
int rc = cw_put_local_ip_address(dst,eh->id,
CAPWAP_ELEM_CAPWAP_LOCAL_IPV4_ADDRESS,
CAPWAP_ELEM_CAPWAP_LOCAL_IPV6_ADDRESS,
ip->type->data(ip),ip->type->len(ip));
ip.type->data(&ip),ip.type->len(&ip));
ip.type->del(&ip);
return rc;
}

6
src/mod/capwap/capwap_out_wtp_board_data.c
View File

@ -5,7 +5,7 @@
#include "cw/msgset.h"
#include "cw/keys.h"
#include "cw/cw.h"
#include "cw/dbg.h"
static int write_boarddata_subelem(uint8_t * dst, mavl_t ktv, const char * parent_key,
const char *skey, int type){
@ -40,6 +40,8 @@ static int write_boarddata_subelem(uint8_t * dst, mavl_t ktv, const char * paren
int capwap_out_wtp_board_data(struct cw_ElemHandler * eh,
struct cw_ElemHandlerParams * params, uint8_t * dst)
{
stop();
cw_Val_t * val;
mavl_t cfg;
uint8_t * d;
@ -48,7 +50,7 @@ int capwap_out_wtp_board_data(struct cw_ElemHandler * eh,
d=dst+4;
cfg = params->local_cfg;
cfg = params->cfg;
sprintf(key,"%s/%s",eh->key,CW_SKEY_VENDOR);
val = cw_ktv_get(cfg,key,CW_TYPE_DWORD);

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

@ -8,6 +8,8 @@
static int cw_put_encryption_subelems(uint8_t *dst,int capwap_mode)
{
stop();
int n=2;
int i;
@ -36,7 +38,7 @@ int capwap_out_wtp_descriptor(struct cw_ElemHandler * eh,
d = dst+4;
sprintf(key,"%s/%s",eh->key,CW_SKEY_MAX_RADIOS);
val = cw_ktv_get(params->local_cfg,key, CW_TYPE_BYTE);
val = cw_ktv_get(params->cfg,key, CW_TYPE_BYTE);
if (val != NULL)
d+=val->type->put(val,d);
else{
@ -45,7 +47,7 @@ int capwap_out_wtp_descriptor(struct cw_ElemHandler * eh,
}
sprintf(key,"%s/%s",eh->key,CW_SKEY_RADIOS_IN_USE);
val = cw_ktv_get(params->local_cfg,key, CW_TYPE_BYTE);
val = cw_ktv_get(params->cfg,key, CW_TYPE_BYTE);
if (val != NULL){
d+=val->type->put(val,d);
}
@ -62,17 +64,17 @@ int capwap_out_wtp_descriptor(struct cw_ElemHandler * eh,
/* hardware version sub element */
sprintf(key,"%s/%s",eh->key,CW_SKEY_HARDWARE);
d+=cw_write_descriptor_subelem (d, params->local_cfg,
d+=cw_write_descriptor_subelem (d, params->cfg,
CW_SUBELEM_WTP_HARDWARE_VERSION, key);
/* software version sub element */
sprintf(key,"%s/%s",eh->key,CW_SKEY_SOFTWARE);
d+=cw_write_descriptor_subelem (d, params->local_cfg,
d+=cw_write_descriptor_subelem (d, params->cfg,
CW_SUBELEM_WTP_SOFTWARE_VERSION, key);
/* bootloader version sub element */
sprintf(key,"%s/%s",eh->key,CW_SKEY_BOOTLOADER);
d+=cw_write_descriptor_subelem (d, params->local_cfg,
d+=cw_write_descriptor_subelem (d, params->cfg,
CW_SUBELEM_WTP_BOOTLOADER_VERSION, key);
len = d-dst-4;

384
src/mod/cisco/cisco_actions.c
View File

@ -77,9 +77,9 @@ static cw_ValStruct_t cisco_8021xlogin[] = {
static cw_ValEnum_t cisco_ap_username_and_password_enum[] ={
{2, "802.1x-credentials", cisco_8021xlogin, cw_in_generic_struct, cw_ktv_write_struct },
{2, "802.1x-credentials", CW_TYPE_STRUCT, cw_in_generic, cw_out_generic, cisco_8021xlogin },
{1, "login-credentials", cisco_login, cw_in_generic_struct, cw_ktv_write_struct },
{1, "login-credentials", CW_TYPE_STRUCT, cw_in_generic, cw_out_generic, cisco_login },
{0,0,0,0}
};
@ -120,6 +120,7 @@ static cw_ValIndexed_t cisco_ap_telnet_ssh = {
};
static cw_ValStruct_t cisco_multi_domain_cabability[]={
{CW_TYPE_BYTE, "radio-id", 1, -1},
{CW_TYPE_BYTE, "reserved", 1, -1},
{CW_TYPE_WORD, "first-channel", 2, -1},
{CW_TYPE_WORD, "number-of-channels", 2, -1},
@ -190,7 +191,8 @@ static cw_ValStruct_t cisco_ap_regulatory_domain5[]={
};
static cw_ValStruct_t cisco_mac_operation73[]={
static cw_ValStruct_t cisco_mac_operation70[]={
{CW_TYPE_BYTE,"radio-id",1,-1},
{CW_TYPE_BYTE,"reserved",1,-1},
{CW_TYPE_WORD,"rts-threshold",2,-1},
{CW_TYPE_BYTE,"short-retry",1,-1},
@ -225,19 +227,20 @@ int cisco_in_ap_regulatory_domain(struct cw_ElemHandler *eh,
struct cw_ElemHandlerParams *params,
uint8_t * data, int len)
{
char key[CW_KTV_MAX_KEY_LEN];
char key[CW_CFG_MAX_KEY_LEN];
int idx;
void * type;
idx = cw_ktv_idx_get(params->remote_cfg,eh->key);
idx = cw_cfg_get_next_index(params->cfg,eh->key);
sprintf(key,"%s.%d",eh->key,idx+1);
sprintf(key,"%s.%d",eh->key,idx);
if(len==4)
type = cisco_ap_regulatory_domain4;
if(len==5)
type = cisco_ap_regulatory_domain5;
cw_ktv_read_struct(params->remote_cfg,type,key,data,len);
// cw_ktv_read_struct(params->cfg,type,key,data,len);
CW_TYPE_STRUCT->read(params->cfg,key,data,len,type);
return 1;
}
@ -256,12 +259,15 @@ int cisco_out_ap_regulatory_domain(struct cw_ElemHandler * eh,
uint8_t * ob;
stop();
idx = 0;
ob = dst;
stop();
type = NULL;
result = cw_ktv_get(params->local_cfg,"ac-descriptor/software/version",CW_TYPE_BSTR16);
result = cw_ktv_get(params->cfg,"ac-descriptor/software/version",CW_TYPE_BSTR16);
if (result!=NULL){
if(result->type->len(result)==4){
uint32_t rv;
@ -280,7 +286,7 @@ int cisco_out_ap_regulatory_domain(struct cw_ElemHandler * eh,
do {
sprintf(key,"%s.%d",eh->key,idx);
search.key=key;
result = mavl_get_first(params->local_cfg,&search);
result = mavl_get_first(params->cfg,&search);
if (result==NULL)
break;
if (strncmp(result->key,key,strlen(key))!=0)
@ -288,7 +294,8 @@ int cisco_out_ap_regulatory_domain(struct cw_ElemHandler * eh,
if(type == NULL){
sprintf(testkey,"%s/%s",key,"band-id");
result = cw_ktv_get(params->local_cfg,key,CW_TYPE_BYTE);
stop();
result = cw_ktv_get(params->cfg,key,CW_TYPE_BYTE);
if (result==NULL){
type = cisco_ap_regulatory_domain4;
}
@ -298,7 +305,8 @@ int cisco_out_ap_regulatory_domain(struct cw_ElemHandler * eh,
}
start = params->msgset->header_len(eh);
len = cw_ktv_write_struct(params->local_cfg,NULL,type,key,ob+start);
stop();
len = cw_ktv_write_struct(params->cfg,NULL,type,key,ob+start);
ob += params->msgset->write_header(eh,ob,len);
idx++;
@ -328,6 +336,7 @@ static cw_ValStruct_t cisco_direct_sequence_control70[]={
};
static cw_ValStruct_t cisco_antenna_payload70[]={
{CW_TYPE_BYTE,"radio-id",1,-1},
{CW_TYPE_BYTE,"diversity-selection",1,-1},
{CW_TYPE_BYTE,"antenna-mode",1,-1},
{CW_TYPE_BYTE,"number-of-antennas",1,-1},
@ -341,6 +350,7 @@ static cw_ValStruct_t cisco_antenna_payload70[]={
static cw_ValStruct_t cisco_wtp_radio_config70[]={
{CW_TYPE_BYTE,"radio-id",1,-1},
{CW_TYPE_BYTE,"cfg-type",1,-1},
{CW_TYPE_WORD,"occupancy-limit",2,-1},
{CW_TYPE_BYTE,"cfg-period",1,-1},
@ -461,6 +471,15 @@ static cw_ValStruct_t cisco_rouge_and_mss[]={
{NULL,NULL,0,0}
};
static cw_ValStruct_t cisco_rouge_detection70[]={
{CW_TYPE_BOOL,"rouge-detection",1,-1},
{CW_TYPE_BSTR16,"rest",4,-1},
{NULL,NULL,0,0}
};
static cw_ValStruct_t cisco_rouge_detections[]={
{CW_TYPE_BOOL,"rouge-detection",1,-1},
{CW_TYPE_BSTR16,"rest",6,-1},
@ -536,23 +555,33 @@ static int cisco_in_lw_del_wlan(struct cw_ElemHandler *eh,
struct cw_ElemHandlerParams *params,
uint8_t * data, int len)
{
stop();
int wlan_id, radio_id;
char key[CW_KTV_MAX_KEY_LEN];
radio_id=cw_get_byte(data);
wlan_id=cw_get_word(data+1);
sprintf(key,"radio.%d/wlan.%d",radio_id,wlan_id);
cw_ktv_del_sub(params->local_cfg,key);
cw_ktv_del_sub(params->cfg,key);
cw_dbg(DBG_INFO,"Del WLAN rid=%d, id=%d",wlan_id);
return 0;
}
static int cw_mkradiokey(const char *pkey, uint8_t*data, int len, char *dst)
{
int radio_id;
radio_id = cw_get_byte(data);
sprintf(dst,"radio.%d/%s",radio_id,pkey);
return 1;
}
static int cisoc_add_wlan_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+3);
sprintf(dst,"radio.%d/wlan.%d/add-wlan",radio_id,wlan_id);
@ -563,7 +592,7 @@ static int cisoc_add_wlan_mkkey(const char *pkey, uint8_t*data, int len, char *d
static int cisoc_add_wlan_mkkey70(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+4);
sprintf(dst,"radio.%d/wlan.%d/add-wlan",radio_id,wlan_id);
@ -572,6 +601,7 @@ static int cisoc_add_wlan_mkkey70(const char *pkey, uint8_t*data, int len, char
static int cisco_patch_add_wlan70(uint8_t * data, void * st)
{
stop();
int * stack = st;
cw_set_byte(data,stack[1]);
cw_set_byte(data+3, stack[2]);
@ -619,7 +649,7 @@ 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);
@ -628,6 +658,7 @@ static int cisoc_add_lwwlan_mkkey(const char *pkey, uint8_t*data, int len, char
static int cisco_patch_add_lwwlan(uint8_t * data, void * st)
{
stop();
int * stack = st;
cw_set_byte(data,stack[1]);
cw_set_byte(data+1, stack[2]);
@ -705,12 +736,12 @@ static int cisco_data(struct cw_ElemHandler *eh,
static struct cw_ElemHandler handlers70[] = {
{
"AC Name -(zero-length allowed)", /* name */
"AC Name - (zero-length allowed)", /* name */
CAPWAP_ELEM_AC_NAME, /* Element ID */
0,0, /* Vendor / Proto */
0,CAPWAP_MAX_AC_NAME_LEN, /* min/max length */
CW_TYPE_BSTR16, /* type */
"ac-name", /* Key */
"capwap/ac-name", /* Key */
cw_in_generic, /* get */
cw_out_generic /* put */
}
@ -770,10 +801,14 @@ static struct cw_ElemHandler handlers70[] = {
CISCO_ELEM_AP_TIMESYNC, /* Element ID */
CW_VENDOR_ID_CISCO,0, /* Vendor / Proto */
5,5, /* min/max length */
ap_time_sync, /* type */
CW_TYPE_STRUCT, /* type */
"cisco/ap-timesync", /* Key */
cw_in_generic_struct, /* handler */
cisco_out_ap_timesync /* put */
cw_in_generic, /* handler */
cisco_out_ap_timesync, /* put */
NULL,
NULL,
ap_time_sync
}
,
@ -828,10 +863,13 @@ static struct cw_ElemHandler handlers70[] = {
CISCO_ELEM_MWAR_ADDR, /* Element ID */
CW_VENDOR_ID_CISCO,0, /* Vendor / Proto */
7,7, /* min/max length */
mwar_addr, /* type */
CW_TYPE_STRUCT, /* type */
"cisco/mwar-addr", /* Key */
cw_in_generic_struct, /* get */
cw_out_generic_struct /* put */
cw_in_generic, /* get */
cw_out_generic_struct, /* put */
NULL,
NULL,
mwar_addr
}
,
{
@ -873,10 +911,13 @@ static struct cw_ElemHandler handlers70[] = {
CISCO_LWELEM_PATH_MTU, /* Element ID */
CW_VENDOR_ID_CISCO,CW_PROTO_LWAPP, /* Vendor / Proto */
0,0, /* min/max length */
cisco_lw_path_mtu, /* type */
CW_TYPE_STRUCT, /* type */
"cisco/lw-path-mtu", /* Key */
cw_in_generic_struct, /* get */
cisco_out_lw_path_mtu /* put */
cw_in_generic, /* get */
cisco_out_lw_path_mtu, /* put */
NULL,
NULL,
cisco_lw_path_mtu,
}
,
@ -885,10 +926,14 @@ static struct cw_ElemHandler handlers70[] = {
CISCO_ELEM_AP_UPTIME, /* Element ID */
CW_VENDOR_ID_CISCO,0, /* Vendor / Proto */
8,8, /* min/max length */
cisco_ap_uptime, /* type */
CW_TYPE_STRUCT, /* type */
"cisco/ap-uptime", /* Key */
cw_in_generic_struct, /* get */
cw_out_generic_struct /* put */
cw_in_generic, /* get */
cw_out_generic_struct, /* put */
NULL,
NULL,
cisco_ap_uptime,
}
,
@ -897,10 +942,12 @@ static struct cw_ElemHandler handlers70[] = {
CISCO_LWELEM_AP_USERNAME_PASSWORD, /* Element ID */
CW_VENDOR_ID_CISCO,CW_PROTO_LWAPP, /* Vendor / Proto */
0,0, /* min/max length */
&cisco_ap_username_and_password, /* type */
&cisco_ap_username_and_password, /* type */
"cisco/ap-username-and-password", /* Key */
cw_in_generic_indexed_enum, /* get */
cw_out_generic_indexed_enum /* put */
cw_out_generic_indexed_enum, /* put */
NULL,
NULL,
}
,
{
@ -908,10 +955,14 @@ static struct cw_ElemHandler handlers70[] = {
CISCO_LWELEM_AP_LOGHOST_CONFIG, /* Element ID */
CW_VENDOR_ID_CISCO,CW_PROTO_LWAPP, /* Vendor / Proto */
36,36, /* min/max length */
cisco_loghost_config, /* type */
CW_TYPE_STRUCT, /* type */
"cisco/loghost-config", /* Key */
cw_in_generic_struct, /* get */
cw_out_generic_struct /* put */
cw_in_generic, /* get */
cw_out_generic_struct, /* put */
NULL,
NULL,
cisco_loghost_config, /* type */
}
,
{
@ -919,10 +970,14 @@ static struct cw_ElemHandler handlers70[] = {
CISCO_ELEM_AP_LED_STATE_CONFIG, /* Element ID */
CW_VENDOR_ID_CISCO,0, /* Vendor / Proto */
1,1, /* min/max length */
cisco_ap_led_state_config70, /* type */
CW_TYPE_STRUCT, /* type */
"cisco/ap-led-state-config", /* Key */
cw_in_generic_struct, /* get */
cw_out_generic_struct /* put */
cw_in_generic, /* get */
cw_out_generic_struct, /* put */
NULL,
NULL,
cisco_ap_led_state_config70
}
,
{
@ -952,10 +1007,14 @@ static struct cw_ElemHandler handlers70[] = {
CISCO_ELEM_MULTI_DOMAIN_CAPABILITY, /* Element ID */
CW_VENDOR_ID_CISCO,0, /* Vendor / Proto */
8,8, /* min/max length */
cisco_multi_domain_cabability, /* type */
CW_TYPE_STRUCT, /* type */
"cisco/multi-domain-capability", /* Key */
cw_in_radio_generic_struct, /* get */
NULL /* put */
cw_in_generic, /* get */
NULL, /* put */
cw_mkradiokey,
NULL,
cisco_multi_domain_cabability,
}
,
@ -964,20 +1023,27 @@ static struct cw_ElemHandler handlers70[] = {
CISCO_ELEM_WTP_BOARD_DATA, /* Element ID */
CW_VENDOR_ID_CISCO,0, /* Vendor / Proto */
8,48, /* min/max length */
cisco_wtp_board_data, /* type */
CW_TYPE_STRUCT, /* type */
"cisco/wtp-board-data", /* Key */
cw_in_generic_struct, /* get */
cw_in_generic, /* get */
cw_out_generic_struct, /* put */
NULL,
NULL,
cisco_wtp_board_data,
},
{
"AP LED Flash Config", /* name */
CISCO_ELEM_AP_LED_FLASH_CONFIG, /* Element ID */
CW_VENDOR_ID_CISCO,0, /* Vendor / Proto */
0,48, /* min/max length */
cisco_ap_led_flash_config, /* type */
CW_TYPE_STRUCT, /* type */
"cisco/ap-led-flash-config", /* Key */
cw_in_generic_struct, /* get */
cw_out_generic_struct /* put */
cw_in_generic, /* get */
cw_out_generic, /* put */
NULL,
NULL,
cisco_ap_led_flash_config
},
{
@ -996,10 +1062,14 @@ static struct cw_ElemHandler handlers70[] = {
CISCO_ELEM_AP_POWER_INJECTOR_CONFIG, /* Element ID */
CW_VENDOR_ID_CISCO,0, /* Vendor / Proto */
8,8, /* min/max length */
cisco_ap_power_injector_config, /* type */
CW_TYPE_STRUCT, /* type */
"cisco/ap-power-injector-config", /* Key */
cw_in_generic_struct, /* get */
cw_out_generic_struct /* put */
cw_in_generic, /* get */
cw_out_generic, /* put */
NULL,
NULL,
cisco_ap_power_injector_config
},
{
@ -1007,10 +1077,14 @@ static struct cw_ElemHandler handlers70[] = {
CISCO_ELEM_AP_MODE_AND_TYPE, /* Element ID */
CW_VENDOR_ID_CISCO,0, /* Vendor / Proto */
2,2, /* min/max length */
cisco_ap_mode_and_type, /* type */
CW_TYPE_STRUCT, /* type */
"cisco/ap-mode-and-type", /* Key */
cw_in_generic_struct, /* get */
cw_out_generic_struct /* put */
cw_in_generic, /* get */
cw_out_generic_struct, /* put */
NULL,
NULL,
cisco_ap_mode_and_type,
},
{
@ -1028,10 +1102,14 @@ static struct cw_ElemHandler handlers70[] = {
CISCO_ELEM_AP_STATIC_IP_ADDR, /* Element ID */
CW_VENDOR_ID_CISCO,0, /* Vendor / Proto */
17,17, /* min/max length */
cisco_ap_static_ip_addr, /* type */
"cisco/ap-satic-ip-addr", /* Key */
cw_in_generic_struct, /* get */
cw_out_generic_struct /* put */
CW_TYPE_STRUCT, /* type */
"cisco/ap-static-ip-addr", /* Key */
cw_in_generic, /* get */
cw_out_generic, /* put */
NULL,
NULL,
cisco_ap_static_ip_addr,
},
{
@ -1085,10 +1163,13 @@ static struct cw_ElemHandler handlers70[] = {
CISCO_ELEM_AP_MODEL, /* Element ID */
CW_VENDOR_ID_CISCO,0, /* Vendor / Proto */
60,60, /* min/max length */
cisco_ap_model, /* type */
CW_TYPE_STRUCT, /* type */
"cisco/ap-model", /* Key */
cw_in_generic_struct, /* get */
cw_in_generic, /* get */
cw_out_generic_struct, /* put */
NULL,
NULL,
cisco_ap_model,
},
{
@ -1104,14 +1185,18 @@ static struct cw_ElemHandler handlers70[] = {
{ /* WTP Radio Configuration for AC/WPT with version 7.0 */
"WTP Radio Configuration (v7.3)", /* name */
"WTP Radio Configuration (v7.0)", /* name */
CISCO_ELEM_WTP_RADIO_CONFIGURATION, /* Element ID */
CW_VENDOR_ID_CISCO,0, /* Vendor / Proto */
25,25, /* min/max length */
cisco_wtp_radio_config70, /* type */
CW_TYPE_STRUCT, /* type */
"cisco/wtp-radio-config", /* Key */
cw_in_radio_generic_struct, /* get */
cw_out_radio_generic_struct /* put */
cw_in_generic, /* get */
cw_out_generic, /* put */
cw_mkradiokey,
NULL,
cisco_wtp_radio_config70,
}
,
@ -1134,10 +1219,15 @@ static struct cw_ElemHandler handlers70[] = {
CW_CISCO_ANTENNA_PAYLOAD, /* Element ID */
CW_VENDOR_ID_CISCO,0, /* Vendor / Proto */
9,9, /* min/max length */
cisco_antenna_payload70, /* type */
CW_TYPE_STRUCT, /* type */
"cisco/antenna-payload", /* Key */
cw_in_radio_generic_struct, /* get */
cw_out_radio_generic_struct /* put */
cw_in_generic, /* get */
cw_out_radio_generic_struct, /* put */
cw_mkradiokey,
NULL,
cisco_antenna_payload70,
}
,
@ -1153,14 +1243,19 @@ static struct cw_ElemHandler handlers70[] = {
},
{
"Mac Operation", /* name */
"Mac Operation (7.0)", /* name */
CISCO_ELEM_MAC_OPERATION, /* Element ID */
CW_VENDOR_ID_CISCO,0, /* Vendor / Proto */
16,16, /* min/max length */
cisco_mac_operation73, /* type */
CW_TYPE_STRUCT, /* type */
"cisco/mac-operation", /* Key */
cw_in_radio_generic_struct, /* get */
cw_out_radio_generic_struct /* put */
cw_in_generic, /* get */
cw_out_radio_generic_struct, /* put */
cw_mkradiokey,
NULL,
cisco_mac_operation70,
},
{
@ -1168,10 +1263,14 @@ static struct cw_ElemHandler handlers70[] = {
CISCO_ELEM_TX_POWER, /* Element ID */
CW_VENDOR_ID_CISCO,0, /* Vendor / Proto */
4,4, /* min/max length */
cisco_tx_power, /* type */
CW_TYPE_STRUCT, /* type */
"cisco/tx-power", /* Key */
cw_in_radio_generic_struct, /* get */
cw_out_radio_generic_struct /* put */
cw_in_generic, /* get */
cw_out_radio_generic_struct, /* put */
cw_mkradiokey,
NULL,
cisco_tx_power,
},
{
@ -1181,8 +1280,12 @@ static struct cw_ElemHandler handlers70[] = {
5,150, /* min/max length */
CW_TYPE_BSTR16, /* type */
"cisco/tx-power-levels", /* Key */
cw_in_radio_generic, /* get */
cw_out_radio_generic /* put */
cw_in_generic, /* get */
cw_out_radio_generic, /* put */
cw_mkradiokey,
NULL,
},
{
@ -1418,27 +1521,33 @@ static struct cw_ElemHandler handlers70[] = {
{
"TCP Adjust MSS", /* name */
CISCO_LWELEM_TCP_ADJUST_MSS, /* Element ID */
"TCP Adjust MSS", /* name */
CISCO_LWELEM_TCP_ADJUST_MSS, /* Element ID */
CW_VENDOR_ID_CISCO,CW_PROTO_LWAPP, /* Vendor / Proto */
3,3, /* min/max length */
cisco_rouge_and_mss, /* type */
"cisco/rouge-and-mss", /* Key */
cw_in_generic_struct, /* get */
cw_out_generic_struct /* put */
CW_TYPE_STRUCT, /* type */
"cisco/rouge-and-mss", /* Key */
cw_in_generic, /* get */
cw_out_generic_struct, /* put */
NULL,
NULL,
cisco_rouge_and_mss,
}
,
{
"Rouge Detection", /* name */
CISCO_LWELEM_ROUGE_DETECTION, /* Element ID */
"Rouge Detection 7.0", /* name */
CISCO_LWELEM_ROUGE_DETECTION, /* Element ID */
CW_VENDOR_ID_CISCO,CW_PROTO_LWAPP, /* Vendor / Proto */
7,7, /* min/max length */
cisco_rouge_detections, /* type */
"cisco/rouge-detection", /* Key */
cw_in_generic_struct, /* get */
cw_out_generic_struct /* put */
5,5, /* min/max length */
CW_TYPE_STRUCT, /* type */
"cisco/rouge-detection", /* Key */
cw_in_generic, /* get */
cw_out_generic_struct, /* put */
NULL,
NULL,
cisco_rouge_detection70,
}
,
@ -1537,10 +1646,15 @@ static struct cw_ElemHandler handlers70[] = {
CISCO_LWELEM_DISCOVERY_PROTOCOL, /* Element ID */
CW_VENDOR_ID_CISCO,CW_PROTO_LWAPP, /* Vendor / Proto */
3,3, /* min/max length */
cisco_discovery_protocol, /* type */
CW_TYPE_STRUCT, /* type */
"cisco/cisco-discovery-protocol", /* Key */
cw_in_generic_struct, /* get */
cw_out_generic_struct /* put */
cw_in_generic, /* get */
cw_out_generic_struct, /* put */
NULL,
NULL,
cisco_discovery_protocol,
},
{
@ -1557,12 +1671,15 @@ static struct cw_ElemHandler handlers70[] = {
{
"CAPWAP Timers", /* name */
CISCO_ELEM_CAPWAP_TIMERS, /* Element ID */
0, 0, /* Vendor / Proto */
2, 2, /* min/max length */
cisco_capwap_timers, /* type */
"capwap-timers", /* Key */
cw_in_generic_struct, /* get */
cw_out_generic_struct /* put */
0, 0, /* Vendor / Proto */
2, 2, /* min/max length */
CW_TYPE_STRUCT, /* type */
"capwap-timers", /* Key */
cw_in_generic, /* get */
cw_out_generic, /* put */
NULL,
NULL,
cisco_capwap_timers, /* param */
}
,
@ -2048,6 +2165,19 @@ static struct cw_MsgDef messages70[] = {
};
static struct cw_ElemHandler handlers73[] = {
{
"Rouge Detection (>=7.3)", /* name */
CISCO_LWELEM_ROUGE_DETECTION, /* Element ID */
CW_VENDOR_ID_CISCO,CW_PROTO_LWAPP, /* Vendor / Proto */
7,7, /* min/max length */
cisco_rouge_detections, /* type */
"cisco/rouge-detection", /* Key */
cw_in_generic_struct, /* get */
cw_out_generic_struct /* put */
}
,
{
"AP LED State Config (>= v7.3)", /* name */
CISCO_ELEM_AP_LED_STATE_CONFIG, /* Element ID */
@ -2142,7 +2272,9 @@ static cw_StateMachineState_t statemachine_states[]={
};
static int (*postprocess_join_request_parent)(struct cw_Conn * conn);
//static int (*postprocess_join_request_parent)(struct cw_Conn * conn);
static int (*postprocess_join_request_parent)(struct cw_ElemHandlerParams * params, uint8_t * elems_ptr, int elems_len);
struct cw_MsgSet * cisco_register_msg_set(struct cw_MsgSet * set, int mode){
struct cw_MsgData * md;
@ -2162,48 +2294,52 @@ struct cw_MsgSet * cisco_register_msg_set(struct cw_MsgSet * set, int mode){
static void set_ac_version(struct cw_Conn * conn)
static void set_ac_version(struct cw_ElemHandlerParams * params)
{
cw_Val_t * wtpver;
bstr16_t wtpver;
char verstr[512];
wtpver = cw_ktv_get(conn->remote_cfg,"wtp-descriptor/software/version", CW_TYPE_BSTR16);
if (wtpver){
cw_format_version(verstr,wtpver->type->data(wtpver),wtpver->type->len(wtpver));
cw_dbg(DBG_INFO, "Cisco - Setting AC software version to: %s", verstr);
mavl_del(conn->local_cfg,&wtpver);
cw_ktv_add(conn->local_cfg,"ac-descriptor/software/version",CW_TYPE_BSTR16, NULL,
wtpver->type->data(wtpver),wtpver->type->len(wtpver));
wtpver = cw_cfg_get_bstr16(params->cfg,"wtp-descriptor/software/version",NULL);
if (wtpver==NULL)
return;
if(wtpver->type->len(wtpver)==4){
uint32_t rv;
rv = cw_get_dword(wtpver->type->data(wtpver));
if (rv >= 0x07030000){
cw_msgset_add(conn->msgset,messages73, handlers73);
}
if (rv >= 0x07056600){
cw_msgset_add(conn->msgset,messages75, handlers75);
}
cw_format_version(verstr,bstr16_data(wtpver),bstr16_len(wtpver));
cw_dbg(DBG_INFO, "Cisco - Setting AC software version to: %s", verstr);
cw_cfg_set_bstr16(params->conn->local_cfg,"ac-descriptor/software/version",wtpver);
cw_cfg_set_int(params->conn->local_cfg,"ac-descriptor/software/vendor",CW_VENDOR_ID_CISCO);
if(bstr16_len(wtpver)==4){
uint32_t rv;
rv = cw_get_dword(bstr16_data(wtpver));
if (rv >= 0x07030000){
cw_msgset_add(params->msgset,messages73, handlers73);
}
if (rv >= 0x07056600){
cw_msgset_add(params->msgset,messages75, handlers75);
}
}
free(wtpver);
}
static int postprocess_discovery(struct cw_Conn *conn)
static int postprocess_discovery(struct cw_ElemHandlerParams * params, uint8_t * elems_ptr, int elems_len)
//static int postprocess_discovery(struct cw_Conn *conn)
{
if (conn->role == CW_ROLE_AC ){
set_ac_version(conn);
cw_detect_nat(conn);
if (params->conn->role == CW_ROLE_AC ){
set_ac_version(params);
cw_detect_nat(params);
}
return 1;
}
static int postprocess_join_request(struct cw_Conn *conn)
static int postprocess_join_request(struct cw_ElemHandlerParams * params, uint8_t * elems_ptr, int elems_len)
//static int postprocess_join_request(struct cw_Conn *conn)
{
if (postprocess_join_request_parent!=NULL){
postprocess_join_request_parent(conn);
postprocess_join_request_parent(params,elems_ptr,elems_len);
}
postprocess_discovery(conn);
postprocess_discovery(params,elems_ptr,elems_len);
return 1;
}
@ -2215,6 +2351,8 @@ static int preprocess_join_request(struct cw_Conn *conn)
if (conn->role != CW_ROLE_WTP)
return 0;
stop();
use_ac_version = cw_ktv_get_bool(conn->local_cfg,"cisco/wtp-use-ac-version",0);

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

@ -15,7 +15,7 @@ int cisco_in_ac_descriptor(struct cw_ElemHandler *eh,
{0,0, NULL,0, 0}
};
return cw_read_ac_descriptor(params->remote_cfg,eh,params,data,len,allowed);
return cw_read_ac_descriptor(params->cfg,eh,params,data,len,allowed);
/*return cw_read_ac_descriptor(conn->config,data,len,allowed);*/

1
src/mod/cisco/cisco_in_radio_administrative_state.c
View File

@ -8,6 +8,7 @@
int cisco_in_radio_administrative_state(struct conn *conn, struct cw_action_in *a, uint8_t * data, int len,
struct sockaddr *from)
{
stop();
cw_dbg(DBG_X,"This is radio admin statie in for Cisco");

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

@ -12,20 +12,19 @@
#include "cw/cfg.h"
static int put_ac_status(cw_Cfg_t * cfg, cw_Cfg_t * default_cfg, uint8_t *dst, const char * parent_key){
static int put_ac_status(cw_Cfg_t * cfg1, cw_Cfg_t * cfg2, uint8_t *dst, const char * parent_key){
uint8_t *d = dst;
uint8_t security;
char key[CW_CFG_MAX_KEY_LEN];
d += cw_put_word(d,cw_cfg_get_word(cfg,"ac-descriptor/stations","0"));
d += cw_put_word(d,cw_cfg_get_word(cfg,"ac-descriptor/station-limit","0"));
d += cw_put_word(d,cw_cfg_get_word(cfg,"ac-descriptor/active-wtps","0"));
d += cw_put_word(d,cw_cfg_get_word(cfg,"ac-descriptor/max-wtps","0"));
d += cw_put_word(d,cw_dget(cw_cfg_get_word,cfg1,cfg2,"ac-descriptor/stations",0));
d += cw_put_word(d,cw_dget(cw_cfg_get_word,cfg1,cfg2,"ac-descriptor/station-limit",0));
d += cw_put_word(d,cw_dget(cw_cfg_get_word,cfg1,cfg2,"ac-descriptor/active-wtps",0));
d += cw_put_word(d,cw_dget(cw_cfg_get_word,cfg1,cfg2,"ac-descriptor/max-wtps",0));
d += cw_put_byte(d,cw_cfg_get_byte(cfg,"ac-descriptor/security",0));
d += cw_put_byte(d,cw_dget(cw_cfg_get_byte,cfg1,cfg2,"ac-descriptor/security",0));
/*
security = 0;
if (cw_ktv_get(local,"dtls-cert-file",CW_TYPE_BSTR16))
@ -40,14 +39,14 @@ static int put_ac_status(cw_Cfg_t * cfg, cw_Cfg_t * default_cfg, uint8_t *dst, c
d += cw_put_byte(dst,security);
*/
sprintf(key,"%s/%s",parent_key,"ac-descriptor/r-mac-field");
d += cw_put_byte(d,cw_cfg_get_byte(cfg,"ac-descriptor/r-mac-field",0));
d += cw_put_byte(d,cw_dget(cw_cfg_get_byte,cfg1,cfg2,"ac-descriptor/r-mac-field",0));
/*d += cw_put_byte(d,3);*/
d += cw_put_byte(d,0);
sprintf(key,"%s/%s",parent_key,CW_SKEY_DTLS_POLICY);
d += cw_put_byte(d,cw_cfg_get_byte(cfg,"ac-descriptor/dtls-policy",0));
d += cw_put_byte(d,cw_dget(cw_cfg_get_byte,cfg1,cfg2,"ac-descriptor/dtls-policy",0));
return d - dst;
}
@ -60,20 +59,18 @@ int cisco_out_ac_descriptor(struct cw_ElemHandler * eh,
uint8_t *d = dst+4;
char key[CW_CFG_MAX_KEY_LEN];
cw_dbg(DBG_X,"Putting AC TATUS WIITH KEY: %s",eh->key);
d+=put_ac_status(params->cfg,
params->default_cfg,
d+=put_ac_status(params->conn->local_cfg,
params->conn->global_cfg,
d, eh->key);
/* it is important to send software version first,
* because APs don't check the type */
sprintf(key,"%s/%s",eh->key,CW_SKEY_SOFTWARE);
d+=cw_write_descriptor_subelem (d, params->local_cfg,
d+=cw_write_descriptor_subelem (d, params->conn->local_cfg,
1, key);
sprintf(key,"%s/%s",eh->key,CW_SKEY_HARDWARE);
d+=cw_write_descriptor_subelem (d, params->local_cfg,
d+=cw_write_descriptor_subelem (d, params->conn->local_cfg,
0, key);

6
src/mod/cisco/cisco_out_capwap_local_ip_address.c
View File

@ -2,12 +2,16 @@
#include "mod_cisco.h"
#include "cw/cw.h"
#include "cw/dbg.h"
int cisco_out_capwap_local_ip_address(struct cw_ElemHandler * eh,
struct cw_ElemHandlerParams * params, uint8_t * dst)
{
stop();
cw_Val_t * ip;
ip = cw_ktv_get(params->local_cfg,eh->key,CW_TYPE_IPADDRESS);
ip = cw_ktv_get(params->cfg,eh->key,CW_TYPE_IPADDRESS);
if (ip==NULL){
return 0;
}

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

@ -1,5 +1,7 @@
#include "cw/lw.h"
#include "cw/cw.h"
#include "cw/dbg.h"
#include "cw/cfg.h"
#include "capwap_cisco.h"
#include "mod_cisco.h"
@ -9,15 +11,16 @@
int cisco_out_lw_path_mtu(struct cw_ElemHandler * eh,
struct cw_ElemHandlerParams * params, uint8_t * dst)
{
char key[CW_KTV_MAX_KEY_LEN];
char key[CW_CFG_MAX_KEY_LEN];
int len,max;
sprintf(key,"%s/%s",eh->key,"len");
len = cw_ktv_get_word(params->local_cfg,key,0);
len = cw_cfg_get_word(params->cfg,key,0);
if (len == 0)
return 0;
sprintf(key,"%s/%s",eh->key,"max");
max = cw_ktv_get_word(params->local_cfg,key,0);
max = cw_cfg_get_word(params->cfg,key,0);
lw_set_word(dst+16,max);
lw_set_word(dst+16+2,len);

6
src/mod/cisco/cisco_out_radio_generic.c
View File

@ -2,6 +2,7 @@
#include "cw/cw.h"
#include "cw/dbg.h"
#include "cw/cfg.h"
#include "mod_cisco.h"
@ -9,15 +10,16 @@
int cisco_out_radio_generic(struct cw_ElemHandler * handler, struct cw_ElemHandlerParams * params
, uint8_t * dst)
{
int len,i,l;
int radios;
len =0;
radios = cw_ktv_get_byte(params->local_cfg,"wtp-descriptor/max-radios",0);
radios = cw_cfg_get_byte(params->cfg,"wtp-descriptor/max-radios","0");
for(i=0;i<radios+0;i++){
l = cw_write_radio_element(handler,params,i,dst+len);
cw_dbg_elem(DBG_ELEM_OUT,NULL,params->msgdata->type,handler,dst+len,l);
// cw_dbg_elem(DBG_ELEM_OUT,NULL,params->msgdata->type,handler,dst+len,l);
len+=l;
}
return len;

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

@ -7,6 +7,9 @@
int cisco_out_wtp_descriptor(struct cw_ElemHandler * eh,
struct cw_ElemHandlerParams * params, uint8_t * dst)
{
stop();
char key[CW_KTV_MAX_KEY_LEN];
int len;
/* // XXX Dummy WTP Descriptor Header */
@ -16,7 +19,7 @@ int cisco_out_wtp_descriptor(struct cw_ElemHandler * eh,
d = dst+4;
sprintf(key,"%s/%s",eh->key,CW_SKEY_MAX_RADIOS);
val = cw_ktv_get(params->local_cfg,key, CW_TYPE_BYTE);
val = cw_ktv_get(params->cfg,key, CW_TYPE_BYTE);
if (val != NULL)
d+=val->type->put(val,d);
else{
@ -25,7 +28,7 @@ int cisco_out_wtp_descriptor(struct cw_ElemHandler * eh,
}
sprintf(key,"%s/%s",eh->key,CW_SKEY_RADIOS_IN_USE);
val = cw_ktv_get(params->local_cfg,key, CW_TYPE_BYTE);
val = cw_ktv_get(params->cfg,key, CW_TYPE_BYTE);
if (val != NULL){
d+=val->type->put(val,d);
}
@ -38,17 +41,17 @@ int cisco_out_wtp_descriptor(struct cw_ElemHandler * eh,
/* hardware version sub element */
sprintf(key,"%s/%s",eh->key,CW_SKEY_HARDWARE);
d+=cw_write_descriptor_subelem (d, params->local_cfg,
d+=cw_write_descriptor_subelem (d, params->cfg,
CW_SUBELEM_WTP_HARDWARE_VERSION, key);
/* software version sub element */
sprintf(key,"%s/%s",eh->key,CW_SKEY_SOFTWARE);
d+=cw_write_descriptor_subelem (d, params->local_cfg,
d+=cw_write_descriptor_subelem (d, params->cfg,
CW_SUBELEM_WTP_SOFTWARE_VERSION, key);
/* bootloader version sub element */
sprintf(key,"%s/%s",eh->key,CW_SKEY_BOOTLOADER);
d+=cw_write_descriptor_subelem (d, params->local_cfg,
d+=cw_write_descriptor_subelem (d, params->cfg,
CW_SUBELEM_WTP_BOOTLOADER_VERSION, key);
len = d-dst-4;

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

@ -60,10 +60,10 @@ static struct cw_MsgSet * register_messages(struct cw_MsgSet *set, int mode)
capwap_mod->register_messages(set, CW_MOD_MODE_CAPWAP);
capwap80211_mod->register_messages(set, CW_MOD_MODE_BINDINGS);
cisco_register_msg_set(set,CW_MOD_MODE_CAPWAP);
set->write_header = write_header;
set->header_len = header_len;
/* cw_dbg(DBG_MOD,"Cisco: loading cisco message set");*/
/* cw_dbg(DBG_INFO, "Initialized mod_cisco with %d messages", 7);*/
@ -228,11 +228,11 @@ int static setup_cfg(struct cw_Conn * conn)
conn->write_header=write_header;
conn->header_len=header_len;
security = cw_setup_dtls(conn,conn->local_cfg,"cisco",CAPWAP_CIPHER);
security = cw_setup_dtls(conn,conn->global_cfg,"cisco",CAPWAP_CIPHER);
cw_cfg_set_int(conn->local_cfg,"ac-descriptor/security",security);
if (conn->default_cfg==NULL){
conn->default_cfg=cw_ktv_create();
conn->default_cfg=cw_cfg_create();
}