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;