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

moved local_cfg, remote_cfg ... to cw_ElemData struct

Browse Source
This commit is contained in:
7u83
2022-07-28 01:36:16 +02:00
parent 6ac1c87b2f
commit b894c00a7e
86 changed files with 360 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/ac/Makefile
View File

@ -12,21 +12,22 @@ OBJS = \
shell.o\
PRG=actube
LIBPATH=-L../../lib/$(ARCH)/ -L/usr/local/lib -L/usr/lib
LIBPATH=-L../../lib/Linux/$(ARCH)/ -L/usr/local/lib -L/usr/lib
LIBS+=-lmavl
LIBS+=-lcw
LIBS+=-lrt
LIBS+=-lpthread
LIBS+=-lconfuse
LIBS+=-lsqlite3
LIBS+=-lc
LIBS+=-lnettle
LIBS+=$(OPENSSL_LIBS)
INCL_DIRS=-I../ -I/usr/local/include -I./
INCL_DIRS=-I../ -I/usr/local/include -I./ -I/home/tube/v/rsrch/libmavl/
#FLAGS=-DWITH_IPV6 -DWITH_OPENSSL -DSYS_ARCH="$(ARCH)" -DSYS_ARCH="XXX"
FLAGS=-DWITH_IPV6 -DWITH_OPENSSL -DSYS_ARCH='"$(ARCH)"'
FLAGS=-DWITH_IPV6 -DUSE_OPENSSL -DSYS_ARCH='"$(ARCH)"'
.c.o:
@echo " $(CC) "$<

4
src/ac/ac.conf
View File

@ -184,7 +184,7 @@ ssl_key="../../ssl/certs/ac-cisco.key"
# SSL certificate that will be sent to the client
#
# Default:
ssl_cert="../../ssl/certs/ac-cisco.pem"
ssl_cert="../../ssl/certs/ac-xcisco.pem"
# dtls_verify_peer
@ -242,4 +242,4 @@ ssl_cert="../../ssl/certs/ac-cisco.pem"
mods = { cisco, capwap, capwap80211 }
#, capwap80211 }
mods_dir = ../../lib
mods_dir = ../../lib/Linux/x86_64/

3
src/ac/ac.h
View File

@ -1,7 +1,8 @@
#ifndef __ACTUBE_AC_H
#define __ACTUBE_AC_H
#include "cw/mavl.h"
#include "mavl.h"
#include "cw/mavltypes.h"
extern mavl_t actube_global_cfg;

1
src/ac/ac_global.c
View File

@ -13,6 +13,7 @@
#include "wtpman.h"
#include "discovery_cache.h"
#include "cw/mavltypes.h"
mavl_t actube_global_cfg;

4
src/ac/ac_main.c
View File

@ -157,6 +157,7 @@ int mycmp (void *e1, void *e2)
return 0;
}
/*
void mavl_walk (struct mavlnode * node)
{
struct mykv * kv;
@ -175,6 +176,7 @@ void mavl_walk (struct mavlnode * node)
mavl_walk (node->right);
}
*/
/*
int stcmp (const void * sa1, const void *sa2)
@ -246,7 +248,7 @@ int main (int argc, char *argv[])
/* create types tree with default types */
types_tree = cw_ktv_create_types_tree();
for (ti=CW_KTV_STD_TYPES;*ti;ti++){
mavl_add_ptr(types_tree,*ti);
mavl_insert_ptr(types_tree,*ti);
}
global_cfg = cw_ktv_create();

5
src/ac/conf.c
View File

@ -37,6 +37,8 @@
#include "conf.h"
#include "ac.h"
#include "cw/mavltypes.h"
uint8_t conf_macaddress[12];
uint8_t conf_macaddress_len = 0;
@ -393,7 +395,8 @@ int init_bcast_addrs()
if (!conf_ipv4)
return 1;
t = mavl_create_str();
/*t = mavl_create_ptr(); */
t = mavl_create_ptr(mavl_cmpstr,mavl_freeptr);
if (t==NULL)
return 0;

14
src/ac/config.ktv
View File

@ -29,7 +29,7 @@ ac-descriptor/software/vendor :Dword: 4232704
ac-descriptor/software/version :Bstr16: .x07036500
ac-descriptor/station-limit :Word: 1000
ac-descriptor/stations :Word: 0
capwap-control-ip-address/address.0 :IPAddress: 192.168.0.29
capwap-control-ip-address/address.0 :IPAddress: 192.168.0.14
#capwap-control-ip-address/address.0 :IPAddress: 192.168.42.51
capwap-control-ip-address/wtps.0 :Word: 2
cisco/mwar-type :Byte: 0
@ -37,24 +37,28 @@ maximum-message-length :Word: 4096
radio/0/wtp-radio-information :Dword: 7
result-code :Dword: 0
cisco/ap-telnet-ssh/ssh :Bool: true
cisco/ap-telnet-ssh/telnet :Bool: true
ac-name:Bstr16:"X1"
#capwap-control-ip-address/address.0:IPAddress:1192.168.0.14
capwap-control-ip-address/address.0:IPAddress:192.168.0.29
capwap-control-ip-address/address.0:IPAddress:192.168.0.14
#capwap-control-ip-address/address.0:IPAddress:192.168.0.131
#capwap-control-ip-address/address.1:IPAddress:2a00:c1a0:48c6:4a00:9965:1b6e:aca3:1398
capwap-control-ip-address/wtps.0:Word:0
#capwap-control-ip-address/wtps.1:Word:11
#cisco/ssl-keyfile:Str:"../../ssl/certs/ac.key"
#cisco/ssl-certfile:Str:"../../ssl/certs/ac.crt"
#cisco/ssl-keyfile:Str:"../../ssl/certs/ac-cisco.key"
#cisco/ssl-certfile:Str:"../../ssl/certs/ac-cisco.pem"
#cisco/ssl-keyfile:Str:"../../ssl/certs/int-ca.key"
#cisco/ssl-certfile:Str:"../../ssl/certs/int-ca.crt"
cisco/ssl-keyfile:Str:"../../ssl/intermediate-ca/int-ca.key"
cisco/ssl-certfile:Str:"../../ssl/intermediate-ca/int-ca.crt"
#cisco/ssl-keyfile:Str:"../../ssl/intermediate-ca/cisco-ac-int-ca.key"
#cisco/ssl-certfile:Str:"../../ssl/intermediate-ca/cisco-ac-int-ca.crt"
cisco/ssl-cipher:Str:DEFAULT:!ECDH
#cisco/ssl-cipher:Str:+DHE-RSA:+AES-256-CBC:+AES-128-CBC:+SHA1
cisco/ssl-dhbits:Word:2048
@ -107,7 +111,7 @@ radio.1/cisco/multi-domain-capability/max-tx-power-level :Word: 20
radio.1/cisco/multi-domain-capability/number-of-channels :Word: 4
radio.1/cisco/multi-domain-capability/reserved :Byte: 1
radio.1/cisco/wtp-radio-config/beacon-period :Word: 100
radio.1/cisco/wtp-radio-config/bss-id :Bstr16: .x04fe7f499b90
radio.1/cisco/wtp-radio-config/bss-id :Bstr16: .x05fe7f499b90
radio.1/cisco/wtp-radio-config/cfg-period :Byte: 4
radio.1/cisco/wtp-radio-config/cfg-type :Byte: 1
radio.1/cisco/wtp-radio-config/cfp-maximum-duration :Word: 60

4
src/ac/dataman.c
View File

@ -1,6 +1,6 @@
#include <stdlib.h>
#include "cw/mavl.h"
#include "mavl.h"
#include "cw/sock.h"
#include "cw/timer.h"
#include "cw/cw.h"
@ -86,7 +86,7 @@ struct dataman *dataman_list_add(struct dataman *dm)
{
cw_dbg(DBG_X,"Adding dataman %p\n",dm);
return mavl_add(dataman_list, dm,NULL);
return mavl_insert(dataman_list, dm,NULL);
}

2
src/ac/db.h
View File

@ -1,7 +1,7 @@
#ifndef CW_MAVL_H
#define CW_MAVL_H
#include "cw/mavl.h"
#include "mavl.h"
extern void db_ping();
extern void db_ping_wtp(const char *wtpid,const char *acid);

6
src/ac/discovery_cache.c
View File

@ -2,7 +2,7 @@
#include "cw/sock.h"
#include "cw/mlist.h"
#include "cw/mavl.h"
#include "mavl.h"
#include "cw/mod.h"
#include "discovery_cache.h"
@ -125,8 +125,8 @@ void discovery_cache_add(struct cw_DiscoveryCache *cache,
cache->ctrhi++;
}
mavl_add_ptr(cache->byaddr,cur);
mavl_add_ptr(cache->byaddrp,cur);
mavl_insert_ptr(cache->byaddr,cur);
mavl_insert_ptr(cache->byaddrp,cur);
cache->qpos++;
if (cache->qpos>=cache->len)

1
src/ac/wtpman.c
View File

@ -148,6 +148,7 @@ static int wtpman_dtls_setup(void *arg)
cw_dbg(DBG_DTLS, "DTLS session established with %s, %s",
sock_addr2str_p(&wtpman->conn->addr,sock_buf), dtls_get_cipher(wtpman->conn,cipherstr));
return 1;
}