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

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;
}