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

WTP can join w/o any memory leaks

Browse Source
This commit is contained in:
7u83
2022-08-15 16:31:26 +02:00
parent df5e2bcbb7
commit a051ba41de
17 changed files with 119 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,20 +7,19 @@
#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){
static int write_boarddata_subelem(uint8_t * dst, cw_Cfg_t ** cfg, const char * parent_key,
const char *skey, int type, void *param){
char key[256];
cw_Val_t * val;
uint8_t *d;
d=dst;
char key[CW_CFG_MAX_KEY_LEN];
int len;
sprintf(key,"%s/%s",parent_key,skey);
val = cw_ktv_get(ktv,key,CW_TYPE_BSTR16);
//val = cw_ktv_get(ktv,key,CW_TYPE_BSTR16);
len = cw_generic_write_l(cfg, CW_TYPE_BSTR16,key,
dst+4, param);
if (val == NULL) {
if (len==-1) {
cw_log(LOG_ERR,
"Creating WTP Board Data sub-element %d. Key not '%s' found",type,key);
return 0;
@ -28,11 +27,9 @@ static int write_boarddata_subelem(uint8_t * dst, mavl_t ktv, const char * paren
d += cw_put_word(d, type);
d += cw_put_word(d, val->type->len(val));
d += val->type->put(val,d);
return d-dst;
cw_set_word(dst, (uint16_t)type);
cw_set_word(dst+2,(uint16_t)len);
return len+4;
}
@ -40,35 +37,31 @@ 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;
int rc;
uint8_t * d;
char key[256];
int l;
d=dst+4;
cfg = params->cfg;
sprintf(key,"%s/%s",eh->key,CW_SKEY_VENDOR);
val = cw_ktv_get(cfg,key,CW_TYPE_DWORD);
rc = cw_generic_write_l(params->cfg_list, CW_TYPE_DWORD,key,
d, eh->param);
if (val ==NULL) {
if (rc==-1) {
cw_log(LOG_ERR,
"Creating WTP Board Data element. Key '%s' not found.", key);
return 0;
}
d += val->type->put(val,d);
/*cw_ktv_add(cfg,vendor_key,CW_TYPE_DWORD,data,len);*/
d += rc;
d+=write_boarddata_subelem(d,cfg,eh->key,"model-no",CW_BOARDDATA_MODELNO);
d+=write_boarddata_subelem(d,cfg,eh->key,"serial-no",CW_BOARDDATA_SERIALNO);
d+=write_boarddata_subelem(d,cfg,eh->key,"board-id",CW_BOARDDATA_BOARDID);
d+=write_boarddata_subelem(d,cfg,eh->key,"revision",CW_BOARDDATA_REVISION);
d+=write_boarddata_subelem(d,cfg,eh->key,"mac-address",CW_BOARDDATA_MACADDRESS);
d+=write_boarddata_subelem(d,params->cfg_list,eh->key,"model-no",CW_BOARDDATA_MODELNO,eh->param);
d+=write_boarddata_subelem(d,params->cfg_list,eh->key,"serial-no",CW_BOARDDATA_SERIALNO,eh->param);
d+=write_boarddata_subelem(d,params->cfg_list,eh->key,"board-id",CW_BOARDDATA_BOARDID,eh->param);
d+=write_boarddata_subelem(d,params->cfg_list,eh->key,"revision",CW_BOARDDATA_REVISION,eh->param);
d+=write_boarddata_subelem(d,params->cfg_list,eh->key,"mac-address",CW_BOARDDATA_MACADDRESS,eh->param);
l = d - dst-4;

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

@ -8,8 +8,6 @@
static int cw_put_encryption_subelems(uint8_t *dst,int capwap_mode)
{
stop();
int n=2;
int i;
@ -33,27 +31,21 @@ int capwap_out_wtp_descriptor(struct cw_ElemHandler * eh,
int len,l;
/* // XXX Dummy WTP Descriptor Header */
uint8_t *d;
cw_Val_t * val;
int val;
d = dst+4;
sprintf(key,"%s/%s",eh->key,CW_SKEY_MAX_RADIOS);
val = cw_ktv_get(params->cfg,key, CW_TYPE_BYTE);
if (val != NULL)
d+=val->type->put(val,d);
else{
cw_dbg(DBG_WARN,"Cannot get value for %s, setting to 0", CW_SKEY_MAX_RADIOS);
val = cw_cfg_get_byte_l(params->cfg_list,key, 0);
d+=cw_put_byte(d,val);
if (val<=0){
cw_dbg(DBG_WARN,"Cannot value for %s, setting to 0", CW_SKEY_MAX_RADIOS);
d+=cw_put_byte(d,0);
}
sprintf(key,"%s/%s",eh->key,CW_SKEY_RADIOS_IN_USE);
val = cw_ktv_get(params->cfg,key, CW_TYPE_BYTE);
if (val != NULL){
d+=val->type->put(val,d);
}
else{
d+=cw_put_byte(d,0); /*radios in use*/
}
val = cw_cfg_get_byte_l(params->cfg_list,key, 0);
d+=cw_put_byte(d,val); /*radios in use*/
/* d+=cw_put_encryption_capabilities_7(d,1); */
/* d+=cw_put_encryption_subelems(d,params->conn->capwap_mode);*/
@ -80,6 +72,6 @@ int capwap_out_wtp_descriptor(struct cw_ElemHandler * eh,
len = d-dst-4;
l = len + cw_put_elem_hdr(dst,eh->id,len);
cw_dbg_elem(DBG_ELEM_OUT,NULL,params->msgdata->type,eh,dst,l);
// cw_dbg_elem(DBG_ELEM_OUT,NULL,params->msgdata->type,eh,dst,l);
return l;
}

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

@ -866,7 +866,7 @@ static struct cw_ElemHandler handlers70[] = {
CW_TYPE_STRUCT, /* type */
"cisco/mwar-addr", /* Key */
cw_in_generic, /* get */
cw_out_generic_struct, /* put */
cw_out_generic, /* put */
NULL,
NULL,
mwar_addr
@ -2352,16 +2352,27 @@ static int postprocess_join_request(struct cw_ElemHandlerParams * params, uint8_
static int preprocess_join_request(struct cw_Conn *conn)
{
cw_Val_t * ver;
bstr16_t ver;
int use_ac_version;
char verstr[512];
if (conn->role != CW_ROLE_WTP)
return 0;
stop();
use_ac_version = cw_cfg_get_bool(conn->global_cfg,"cisco/wtp-use-ac-version",0);
if (use_ac_version){
ver = cw_cfg_get_bstr16(conn->remote_cfg,"ac-descriptor/software/version",NULL );
cw_cfg_set_bstr16(conn->local_cfg,"wtp-descriptor/software/version",ver);
cw_format_version(verstr,bstr16_data(ver),bstr16_len(ver));
cw_dbg(DBG_INFO, "Cisco WTP - Using AC's software version: %s", verstr);
free(ver);
}
// stop();
/*
use_ac_version = cw_ktv_get_bool(conn->local_cfg,"cisco/wtp-use-ac-version",0);
if (use_ac_version){
ver = cw_ktv_get(conn->remote_cfg,"ac-descriptor/software/version", CW_TYPE_BSTR16);

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

@ -8,15 +8,18 @@
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->cfg,eh->key,CW_TYPE_IPADDRESS);
if (ip==NULL){
const char * ipstr;
int rc;
cw_Val_t ip;
ipstr = cw_cfg_get_l(params->cfg_list,eh->key,NULL);
if (ipstr==NULL){
return 0;
}
return cw_put_local_ip_address(dst,eh->id,
CW_TYPE_IPADDRESS->from_str(&ip,ipstr);
rc= cw_put_local_ip_address(dst,eh->id,
CAPWAP_ELEM_WTP_IPV4_IP_ADDRESS,
CAPWAP_ELEM_WTP_IPV6_IP_ADDRESS,
ip->type->data(ip),ip->type->len(ip));
ip.type->data(&ip),ip.type->len(&ip));
ip.type->del(&ip);
return rc;
}

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

@ -8,7 +8,6 @@ int cisco_out_wtp_descriptor(struct cw_ElemHandler * eh,
struct cw_ElemHandlerParams * params, uint8_t * dst)
{
char key[CW_CFG_MAX_KEY_LEN];
int len;
/* // XXX Dummy WTP Descriptor Header */

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

@ -240,7 +240,6 @@ int static setup_cfg(struct cw_Conn * conn)
}
return 0;
}