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

Compare commits

base: planix.org:8aa11dccbad04a8a9b1021a06b8047af08cf07b0
Branches Tags
planix.org:master
planix.org:cisco
planix.org:shell
planix.org:typeless
planix.org:bsdmakefiles
planix.org:v0.0.0
..
compare: planix.org:1598abee34dcb662e72f878d13661149178532df
Branches Tags
planix.org:cisco
planix.org:master
planix.org:shell
planix.org:typeless
planix.org:bsdmakefiles
planix.org:v0.0.0

No commits in common. "8aa11dccbad04a8a9b1021a06b8047af08cf07b0" and "1598abee34dcb662e72f878d13661149178532df" have entirely different histories.
8aa11dccba ... 1598abee34

10 changed files with 437 additions and 532 deletions
Show Stats Expand all files Collapse all files

1
src/ac/Makefile
View File

@ -17,6 +17,7 @@ LIBS+=-lmavl
LIBS+=-lcw LIBS+=-lcw
LIBS+=-lrt LIBS+=-lrt
LIBS+=-lpthread LIBS+=-lpthread
LIBS+=-lconfuse
LIBS+=-lc LIBS+=-lc
LIBS+=-lnettle LIBS+=-lnettle
LIBS+=-lssl LIBS+=-lssl

51
src/ac/ac_main.c
View File

@ -223,7 +223,7 @@ int main (int argc, char *argv[])
cw_cfg_dump(global_cfg); cw_cfg_dump(global_cfg);
cw_log (LOG_INFO, "Starting AC-Tube, Name=%s, ID=%s", cw_cfg_get(global_cfg,"capwap/ac-name",NULL), conf_acid); cw_log (LOG_INFO, "Starting AC-Tube, Name=%s, ID=%s", conf_acname, conf_acid);
rc = ac_run(global_cfg); rc = ac_run(global_cfg);
errX: errX:
@ -246,52 +246,42 @@ void process_ctrl_packet (int index, struct sockaddr *addr, uint8_t * buffer, in
void process_cw_data_packet (int index, struct sockaddr *addr, uint8_t * buffer, int len); void process_cw_data_packet (int index, struct sockaddr *addr, uint8_t * buffer, int len);
static void pcb(char *dst, struct mavlnode *node)
{
struct cw_Cfg_entry *e = mavlnode_dataptr(node);
sprintf(dst, "%s", e->key);
}
int ac_run(cw_Cfg_t * cfg) int ac_run(cw_Cfg_t * cfg)
{ {
struct cw_Cfg_iter cfi;
const char *s;
int i;
if (1 /*!conf_listen_addrs_len*/) {
cw_log (LOG_ERR, "Fatal error: No listen addresses found.");
// return 1;
}
extern void cw_cfg_iterate(cw_Cfg_t *);
cw_cfg_iterate(cfg);
return 1;
/* it is important to create the unicast sockets first, /* it is important to create the unicast sockets first,
* because when we create the mcast an bcast sockets next * because when we create the mcast an bcast sockets next
* we will look for already created sockets to find a * we will look for already created sockets to find a
* good unicast reply socket */ * good unicast reply socket */
cw_cfg_iter_init(cfg, &cfi, "actube/listen"); int i;
for (i=0; (s = cw_cfg_iter_next(&cfi, NULL)) != NULL; i++) {
/* for (i = 0; i < conf_listen_addrs_len; i++) {
char addr[100]; char addr[100];
char port[50]; char port[50];
int proto; int proto;
conf_parse_listen_addr (s, addr, port, &proto); conf_parse_listen_addr (conf_listen_addrs[i], addr, port, &proto);
socklist_add_unicast (addr, port, proto,
cw_cfg_get_bool(cfg,"actube/ipv4","true"), socklist_add_unicast (addr, port, proto);
cw_cfg_get_bool(cfg,"actube/ipv6","true")
);
}
if (!i) {
cw_log (LOG_ERR, "Fatal error: No listen addresses found.");
return 1;
} }
*/
if (socklist_len == 0) { if (socklist_len == 0) {
cw_log (LOG_ERR, "Fatal error: Could not setup any listen socket"); cw_log (LOG_ERR, "Fatal error: Could not setup any listen socket");
return 1; return 1;
} }
/* create multicast sockets */ /* create multicast sockets */
for (i = 0; i < conf_mcast_groups_len; i++) { for (i = 0; i < conf_mcast_groups_len; i++) {
@ -308,20 +298,13 @@ int ac_run(cw_Cfg_t * cfg)
} }
/* broadcast socket ipv4 only */ /* broadcast socket ipv4 only */
for (i = 0; i < conf_bcast_addrs_len; i++) {
//mavl_print(cfg,pcb,180);
cw_cfg_iter_init(cfg, &cfi, "actube/bcast");
for (i=0; (s = cw_cfg_iter_next(&cfi, NULL)) != NULL; i++) {
// for (i = 0; i < conf_bcast_addrs_len; i++) {
char addr[50], port[50]; char addr[50], port[50];
int proto; int proto;
conf_parse_listen_addr (s, addr, port, &proto); conf_parse_listen_addr (conf_bcast_addrs[i], addr, port, &proto);
socklist_add_broadcast (addr, port, proto); socklist_add_broadcast (addr, port, proto);
#ifdef WITH_LWAPP #ifdef WITH_LWAPP
// printf("Adding %d\n",socklist_len); // printf("Adding %d\n",socklist_len);

315
src/ac/conf.c
View File

@ -19,6 +19,7 @@
#include <string.h> #include <string.h>
#include <sys/utsname.h> #include <sys/utsname.h>
#include <confuse.h>
#include "cw/capwap.h" #include "cw/capwap.h"
#include "cw/sock.h" #include "cw/sock.h"
@ -39,9 +40,9 @@
#include "cw/mavltypes.h" #include "cw/mavltypes.h"
/*uint8_t conf_macaddress[12]; uint8_t conf_macaddress[12];
uint8_t conf_macaddress_len = 0; uint8_t conf_macaddress_len = 0;
*/
long conf_strict_capwap = 1; long conf_strict_capwap = 1;
long conf_strict_headers = 0; long conf_strict_headers = 0;
@ -49,6 +50,9 @@ long conf_strict_headers = 0;
const char *conf_acname = NULL;
int conf_acname_len = 0;
char *conf_acid = NULL; char *conf_acid = NULL;
char *conf_primary_if = NULL; char *conf_primary_if = NULL;
@ -62,6 +66,9 @@ struct sockaddr_storage *conf_salist = NULL;
char **conf_mcast_groups = 0; char **conf_mcast_groups = 0;
int conf_mcast_groups_len = 0; int conf_mcast_groups_len = 0;
char **conf_bcast_addrs = 0;
int conf_bcast_addrs_len;
struct sockaddr_storage *conf_bsalist = NULL; struct sockaddr_storage *conf_bsalist = NULL;
@ -112,44 +119,14 @@ char *conf_control_port = 0;
int conf_dtls_verify_peer = 1; int conf_dtls_verify_peer = 1;
static int init_ac_name(cw_Cfg_t * cfg) static int init_acname()
{ {
char *s; if (conf_acname == NULL) {
char *primary_if=NULL; char *s = malloc(strlen(CONF_DEFAULT_ACNAME) + strlen(conf_acid) + 1);
char ac_name[CAPWAP_MAX_AC_NAME_LEN+1]; sprintf(s, "%s%s", CONF_DEFAULT_ACNAME, conf_acid);
uint8_t macaddress[128]; conf_acname = s;
uint8_t macaddress_len;
char acid[128];
int i;
s= cw_cfg_get(cfg,"capwap/ac-name",NULL);
if (s!=NULL)
return 1;
// primary_if = sock_get_primary_if(AF_INET6);
if (!primary_if)
primary_if = sock_get_primary_if(AF_INET);
acid[0]=0;
if (primary_if) {
macaddress_len=8;
if (!sock_getifhwaddr(primary_if, macaddress, &macaddress_len)) {
cw_dbg(DBG_INFO, "Fatal: Unable to detect link layer address for %s\n",
primary_if);
} }
else{ conf_acname_len = strlen(conf_acname);
s=acid;
for (i = 0; i < macaddress_len; i++) {
s += sprintf(s, "%02X", macaddress[i]);
}
}
}
sprintf(ac_name,"actube%s",acid);
cw_cfg_set(cfg,"capwap/ac-name",ac_name);
return 1; return 1;
} }
@ -158,6 +135,49 @@ static int init_ac_name(cw_Cfg_t * cfg)
static int init_acid()
{
int i;
char *s;
if (conf_acid != NULL)
return 1;
#ifdef WITH_IPV6
conf_primary_if = sock_get_primary_if(AF_INET6);
if (!conf_primary_if)
conf_primary_if = sock_get_primary_if(AF_INET);
#else
conf_primary_if = get_primary_if(AF_INET);
#endif
if (!conf_primary_if) {
cw_log(LOG_ERR,
"Fatal: Unable to detect primary interface, needed to set ac_id. Pleas use confiPleas u to set ac_id");
return 0;
}
if (!sock_getifhwaddr(conf_primary_if, conf_macaddress, &conf_macaddress_len)) {
cw_log(LOG_ERR, "Fatal: Unable to detect link layer address for %s\n",
conf_primary_if);
return 0;
};
conf_acid = malloc(2 * conf_macaddress_len + 1);
s = conf_acid;
for (i = 0; i < conf_macaddress_len; i++) {
s += sprintf(s, "%02X", conf_macaddress[i]);
}
return 1;
}
static int init_dtls() static int init_dtls()
{ {
if (conf_dtls_psk != NULL) { if (conf_dtls_psk != NULL) {
@ -201,13 +221,11 @@ static int init_listen_addrs(cw_Cfg_t * cfg)
struct ifaddrs *ifap, *ifa; struct ifaddrs *ifap, *ifa;
int rc; int rc;
int ctr; int ctr;
struct cw_Cfg_iter cfi; const char * a0;
a0 = cw_cfg_get(cfg,"actube/listen.0",NULL);
if (a0)
cw_cfg_iter_init(cfg, &cfi, "actube/listen"); return 1;
if (cw_cfg_iter_next(&cfi,NULL) != NULL)
return 0;
rc = getifaddrs(&ifap); rc = getifaddrs(&ifap);
if (rc == -1) if (rc == -1)
@ -292,24 +310,18 @@ static int add_bcast_addr(void *priv, void *addr)
/* /*
* Initialize broadcast addresses (ipv4 only) * Initialize broadcast addresses (ipv4 only)
*/ */
int init_bcast_addrs(cw_Cfg_t *cfg) int init_bcast_addrs()
{ {
int rc; int rc;
char str[100]; char str[100];
char key[100];
struct ifaddrs *ifa0, *ifa; struct ifaddrs *ifa0, *ifa;
mavl_t t; mavl_t t;
mavliter_t it; mavliter_t it;
struct cw_Cfg_iter cfi;
int i;
//printf("BCAST INIT\n"); if (conf_bcast_addrs)
cw_cfg_iter_init(cfg, &cfi, "actube/bcast"); return 1;
if (cw_cfg_iter_next(&cfi,NULL) != NULL)
return 0;
if (!conf_ipv4)
if (!cw_cfg_get_bool(cfg,"actube/ipv4", "true"))
return 1; return 1;
/*t = mavl_create_ptr(); */ /*t = mavl_create_ptr(); */
@ -347,34 +359,22 @@ int init_bcast_addrs(cw_Cfg_t *cfg)
if (ifa->ifa_broadaddr) { if (ifa->ifa_broadaddr) {
char *s,*sr;
sock_addrtostr(ifa->ifa_broadaddr, str, 100,1); sock_addrtostr(ifa->ifa_broadaddr, str, 100,1);
*strchr(str, ':') = 0; *strchr(str, ':') = 0;
mavl_add_str(t, cw_strdup(str));
s = cw_strdup(str);
sr = mavl_add_str(t, s);
printf("BCAST = %p --- %p: %s\n",str,s,str);
} }
} }
// conf_bcast_addrs = malloc(t->count * sizeof(char *)); conf_bcast_addrs = malloc(t->count * sizeof(char *));
i=0;
mavliter_init(&it,t); mavliter_init(&it,t);
mavliter_foreach(&it){ mavliter_foreach(&it){
char * d; char * d;
d = mavliter_get_str(&it); d = mavliter_get_str(&it);
// conf_bcast_addrs[conf_bcast_addrs_len] = cw_strdup(d); conf_bcast_addrs[conf_bcast_addrs_len] = cw_strdup(d);
// if (conf_bcast_addrs[conf_bcast_addrs_len] != 0) if (conf_bcast_addrs[conf_bcast_addrs_len] != 0)
// conf_bcast_addrs_len++; conf_bcast_addrs_len++;
sprintf(key,"actube/bcast.%d",i++);
cw_cfg_set(cfg,key,d);
} }
@ -386,7 +386,7 @@ int init_bcast_addrs(cw_Cfg_t *cfg)
return 1; return 1;
} }
int init_mcast_groups(cw_Cfg_t * cfg) int init_mcast_groups()
{ {
int ctr; int ctr;
int i; int i;
@ -440,7 +440,6 @@ int init_mcast_groups(cw_Cfg_t * cfg)
} }
/*
static int conf_read_strings(cfg_t * cfg, char *name, char ***dst, int *len) static int conf_read_strings(cfg_t * cfg, char *name, char ***dst, int *len)
{ {
@ -466,9 +465,8 @@ static int conf_read_strings(cfg_t * cfg, char *name, char ***dst, int *len)
return 1; return 1;
} }
*/
/*
static int conf_read_dbg_level(cfg_t * cfg) static int conf_read_dbg_level(cfg_t * cfg)
{ {
const char *name = "dbg"; const char *name = "dbg";
@ -486,7 +484,6 @@ static int conf_read_dbg_level(cfg_t * cfg)
} }
return 1; return 1;
} }
*/
struct cw_Mod ** conf_mods; struct cw_Mod ** conf_mods;
char *conf_mods_dir = NULL; char *conf_mods_dir = NULL;
@ -494,28 +491,19 @@ char *conf_mods_dir = NULL;
/* /*
* Read the module names from config file * Read the module names from config file
*/ */
static int init_mods(cw_Cfg_t *cfg){ static int conf_read_mods(cfg_t *cfg){
int n, i; int n, i;
const char * modname; n = cfg_size(cfg,CFG_ENTRY_MODS);
struct cw_Cfg_iter cfi; conf_mods = malloc(sizeof(struct cw_Mod *)*(n+1));
cw_cfg_iter_init(cfg, &cfi, "actube/mod");
if (cw_cfg_iter_next(&cfi,NULL) == NULL){
cw_cfg_set(cfg,"actube/mod.0","capwap");
cw_cfg_set(cfg,"actube/mod.1","capwap80211");
}
// cw_dbg(DBG_INFO,"Mods directory: %s",conf_mods_dir); cw_dbg(DBG_INFO,"Mods directory: %s",conf_mods_dir);
// cw_mod_set_path(conf_mods_dir); cw_mod_set_path(conf_mods_dir);
cw_cfg_iter_init(cfg, &cfi, "actube/mod"); for (i=0; i < n; i++){
printf("iter mods\n"); char *modname = cfg_getnstr(cfg, CFG_ENTRY_MODS, i);
for (i=0; (modname = cw_cfg_iter_next(&cfi, NULL)) != NULL; i++) { struct cw_Mod * mod = cw_mod_load(modname, actube_global_cfg, CW_ROLE_AC);
printf("init mod name: %s\n",modname);
struct cw_Mod * mod = cw_mod_load(modname, cfg, CW_ROLE_AC);
if (!mod) if (!mod)
return 0; return 0;
@ -616,6 +604,143 @@ static void errfunc(cfg_t *cfg, const char *fmt, va_list ap){
fprintf(stderr,"\n"); fprintf(stderr,"\n");
} }
int read_config(const char *filename)
{
int i, n;
cfg_opt_t opts[] = {
CFG_STR_LIST("mods", "{}", CFGF_NONE),
CFG_SIMPLE_STR("mods_dir", &conf_mods_dir),
CFG_STR_LIST("dbg", "{}", CFGF_NONE),
CFG_STR_LIST("listen", "{}", CFGF_NONE),
CFG_STR_LIST("mcast_groups", "{}", CFGF_NONE),
CFG_STR_LIST("broadcast_listen", "{}", CFGF_NONE),
CFG_STR_LIST("ac_ips", "{}", CFGF_NONE),
CFG_SIMPLE_STR("control_port", &conf_control_port),
CFG_SIMPLE_BOOL("strict_capwap", &conf_strict_capwap),
CFG_SIMPLE_BOOL("strict_headers", &conf_strict_headers),
CFG_SIMPLE_BOOL("use_loopback", &conf_use_loopback),
/*// CFG_SIMPLE_STR("capwap_mode", &conf_capwap_mode_str),*/
#ifdef WITH_LWAPP
CFG_SIMPLE_STR("lw_control_port", &conf_lw_control_port),
CFG_SIMPLE_BOOL("lwapp", &conf_lwapp),
#endif
CFG_SIMPLE_INT("max_wtps", &conf_max_wtps),
CFG_SIMPLE_INT("debug_level", &conf_debug_level),
CFG_SIMPLE_INT("vendor_id", &conf_vendor_id),
CFG_SIMPLE_STR("ac_id", &conf_acid),
CFG_SIMPLE_STR("ac_name", &conf_acname),
CFG_SIMPLE_STR("hardware_version", &conf_hardware_version),
CFG_SIMPLE_STR("software_version", &conf_software_version),
CFG_SIMPLE_STR("cisco_hardware_version", &conf_cisco_hardware_version),
CFG_SIMPLE_STR("cisco_software_version", &conf_cisco_software_version),
CFG_SIMPLE_STR("ssl_cert", &conf_sslcertfilename),
CFG_SIMPLE_STR("ssl_key", &conf_sslkeyfilename),
CFG_SIMPLE_STR("ssl_key_pass", &conf_sslkeypass),
CFG_SIMPLE_STR("dtls_psk", &conf_dtls_psk),
CFG_SIMPLE_BOOL("dtls_verify_peer", &conf_dtls_verify_peer),
CFG_SIMPLE_BOOL("ipv4", &conf_ipv4),
CFG_SIMPLE_BOOL("ipv6", &conf_ipv6),
CFG_SIMPLE_STR("db_file", &conf_db_file),
CFG_SIMPLE_STR("image_dir", &conf_image_dir),
CFG_END()
};
cfg_t *cfg;
conf_mods_dir=cw_strdup("");
if (!init_control_port())
return 0;
cfg = cfg_init(opts, CFGF_NONE);
cfg_set_error_function(cfg, errfunc);
if (cfg_parse(cfg, filename))
return 0;
/* read debug options */
conf_read_dbg_level(cfg);
/* read multi cast groups */
conf_read_strings(cfg, "mcast_groups", &conf_mcast_groups,
&conf_mcast_groups_len);
/* read ipv4 broadcast addresses */
conf_read_strings(cfg, "broadcast_listen", &conf_bcast_addrs, &conf_bcast_addrs_len);
/* read ac_ips */
n = cfg_size(cfg, "ac_ips");
if (!(conf_ac_ips = malloc(sizeof(struct sockaddr) * n)))
return 0;
conf_ac_ips_len = n;
for (i = 0; i < n; i++) {
struct sockaddr sa;
char *str = cfg_getnstr(cfg, "ac_ips", i);
if (sock_strtoaddr(cfg_getnstr(cfg, "ac_ips", i), &sa))
conf_ac_ips[i] = sa;
else {
perror(str);
}
}
if (!conf_read_mods(cfg)){
cfg_free(cfg);
return 0;
}
cfg_free(cfg);
if (!init_acid())
return 0;
if (!init_acname())
return 0;
/* if (!init_version())
return 0;
*/
if (!init_vendor_id())
return 0;
if (!init_dtls())
return 0;
/* if (!conf_sslcipher)
conf_sslcipher = CAPWAP_CIPHER;
*/ if (!conf_image_dir)
conf_image_dir = CONF_DEFAULT_IMAGE_DIR;
init_mcast_groups();
init_bcast_addrs();
return 1;
}
void free_config() void free_config()
{ {
@ -628,7 +753,5 @@ void ac_conf_init(cw_Cfg_t *cfg)
{ {
printf("ac conf\n"); printf("ac conf\n");
init_listen_addrs(cfg); init_listen_addrs(cfg);
init_bcast_addrs(cfg);
init_ac_name(cfg);
init_mods(cfg);
} }

29
src/ac/config.ckv
View File

@ -1,12 +1,4 @@
#Cfg #Cfg
#
# AC Name
# Deafults to actube + mac address of primary interface
#
#capwap/ac-name
#
capwap/ssl-cipher: DHE-RSA:RSA:AES-256-CBC:AES-128-CBC:SHA1:PSK capwap/ssl-cipher: DHE-RSA:RSA:AES-256-CBC:AES-128-CBC:SHA1:PSK
capwap/ssl-psk-enable: false capwap/ssl-psk-enable: false
capwap/ssl-psk: 123456 capwap/ssl-psk: 123456
@ -17,23 +9,6 @@ cisco/ssl-certfile: "../../ssl/intermediate-ca/int-ca.crt"
cisco/ssl-cipher: DEFAULT cisco/ssl-cipher: DEFAULT
cisco/ssl-dhbits: 2048 cisco/ssl-dhbits: 2048
#actube/listen.hitler : 123456789
# actube/listen.17 : 123456789
# Whether or not to use IPv4/IPv6
#
#actube/ipv4: true
#actube/ipv6: true
#
actube/ipv6: false
#
# List of Mods
#
#actube/mod.1: capwap
#actube/mod.2: capwap80211
#
actube/mod.0: cisco
actube/mod.1: capwap
actube/mod.2: capwap80211

11
src/ac/socklist.c
View File

@ -335,7 +335,7 @@ static int socklist_check_size()
} }
int socklist_add_unicast(const char *addr, const char *port, int ac_proto, int ipv4, int ipv6) int socklist_add_unicast(const char *addr, const char *port, int ac_proto)
{ {
char sock_buf[SOCK_ADDR_BUFSIZE]; char sock_buf[SOCK_ADDR_BUFSIZE];
struct addrinfo hints; struct addrinfo hints;
@ -365,14 +365,6 @@ int socklist_add_unicast(const char *addr, const char *port, int ac_proto, int i
struct sockaddr *sa; struct sockaddr *sa;
int sockfd; int sockfd;
if (res->ai_addr->sa_family == AF_INET && !ipv4){
continue;
}
if (res->ai_addr->sa_family == AF_INET6 && !ipv6){
continue;
}
ifname[0] = 0; ifname[0] = 0;
rc = sock_getifinfo(res->ai_addr, ifname, &broadcast, &netmask); rc = sock_getifinfo(res->ai_addr, ifname, &broadcast, &netmask);
if (!rc) { if (!rc) {
@ -380,7 +372,6 @@ int socklist_add_unicast(const char *addr, const char *port, int ac_proto, int i
continue; continue;
} }
/* Bind the control port */ /* Bind the control port */
sa = res->ai_addr; sa = res->ai_addr;
sockfd = socket(res->ai_addr->sa_family, SOCK_DGRAM, 0); sockfd = socket(res->ai_addr->sa_family, SOCK_DGRAM, 0);

2
src/ac/socklist.h
View File

@ -40,7 +40,7 @@ struct socklistelem{
extern int socklist_add_multicast(const char * addr, const char * port, int ac_proto); extern int socklist_add_multicast(const char * addr, const char * port, int ac_proto);
extern int socklist_add_unicast(const char *addr, const char * port, int ac_proto, int ipv4, int ipv6); extern int socklist_add_unicast(const char *addr, const char * port, int ac_proto);
extern int socklist_add_broadcast(const char *addr, const char * port,int ac_proto); extern int socklist_add_broadcast(const char *addr, const char * port,int ac_proto);
extern int socklist_init(); extern int socklist_init();
extern void socklist_destroy(); extern void socklist_destroy();

2
src/cw/Doxyfile
View File

@ -1743,7 +1743,7 @@ RTF_EXTENSIONS_FILE =
# classes and files. # classes and files.
# The default value is: NO. # The default value is: NO.
GENERATE_MAN = YES GENERATE_MAN = NO
# The MAN_OUTPUT tag is used to specify where the man pages will be put. If a # The MAN_OUTPUT tag is used to specify where the man pages will be put. If a
# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of # relative path is entered the value of OUTPUT_DIRECTORY will be put in front of

202
src/cw/cfg.c
View File

@ -7,73 +7,19 @@
#include "cfg.h" #include "cfg.h"
#include "val.h" #include "val.h"
static const char *nextc(const char *s) static int cmp(const void *k1,const void*k2){
{
while (isdigit(*s))
s++;
return s;
}
static int cmp0(const char *s1, const char *s2)
{
const char *d1, *d2;
int i1, i2, i;
d1 = strchr(s1, '.');
if (d1 == NULL)
return strcmp(s1, s2);
d2 = strchr(s2, '.');
if (d2 == NULL)
return strcmp(s1, s2);
if ((d1 - s1) != (d2 - s2))
return strcmp(s1, s2);
if (strncmp(s1, s2, (d1 - s1)) != 0)
return strcmp(s1, s2);
if (isdigit(d1[1])) {
i1 = atoi(d1 + 1);
} else {
return cmp0(d1 + 1, d2 + 1);
}
if (isdigit(d2[1])) {
i2 = atoi(d2 + 1);
} else {
return cmp0(d1 + 1, d2 + 1);
}
i = i1 - i2;
if (i == 0) {
return cmp0(nextc(d1 + 1), nextc(d2 + 1));
}
return i;
}
static int cmp(const void *k1, const void *k2)
{
struct cw_Cfg_entry * e1,*e2; struct cw_Cfg_entry * e1,*e2;
e1=(struct cw_Cfg_entry *)k1; e1=(struct cw_Cfg_entry *)k1;
e2=(struct cw_Cfg_entry *)k2; e2=(struct cw_Cfg_entry *)k2;
return strcmp(e1->key,e2->key);
return cmp0(e1->key, e2->key);
/* return strcmp(e1->key,e2->key);*/
} }
static void del(void *ptr) static void del(void *ptr)
{ {
struct cw_Cfg_entry * e; struct cw_Cfg_entry * e;
e=(struct cw_Cfg_entry *)ptr; e=(struct cw_Cfg_entry *)ptr;
free((void *) e->key); free(e->key);
free((void *) e->val); free(e->val);
} }
@ -92,7 +38,7 @@ int cw_cfg_set(cw_Cfg_t * cfg, const char *key, const char *val)
return 0; return 0;
e.val = cw_strdup(val); e.val = cw_strdup(val);
if (!e.val){ if (!e.val){
free((void *) e.key); free(e.key);
return 0; return 0;
} }
void * rc = mavl_replace(cfg,&e,&replaced); void * rc = mavl_replace(cfg,&e,&replaced);
@ -106,7 +52,7 @@ int cw_cfg_set(cw_Cfg_t * cfg, const char *key, const char *val)
return -1; return -1;
} }
const char *cw_cfg_get(cw_Cfg_t * cfg, const char *key, const char *def) const char * cw_cfg_get(cw_Cfg_t * cfg, char *key, const char *def)
{ {
struct cw_Cfg_entry e,*r; struct cw_Cfg_entry e,*r;
e.key = key; e.key = key;
@ -117,6 +63,11 @@ const char *cw_cfg_get(cw_Cfg_t * cfg, const char *key, const char *def)
} }
uint16_t cw_cfg_get_word(cw_Cfg_t * cfg, char *key)
{
}
void cw_cfg_dump(cw_Cfg_t *cfg) void cw_cfg_dump(cw_Cfg_t *cfg)
{ {
@ -156,13 +107,13 @@ static int get_char(struct parser *p)
return c; return c;
} }
static void unget_char(struct parser *p, int c) static void unget_char(struct parser *p,int c){
{
ungetc(c,p->f); ungetc(c,p->f);
if (c=='\n'){ if (c=='\n'){
p->line--; p->line--;
p->pos=p->prevpos; p->pos=p->prevpos;
} else }
else
p->pos--; p->pos--;
} }
@ -259,8 +210,7 @@ static int read_key(struct parser *p, char *key, int max_len)
n=0; n=0;
while(c!=EOF && n<max_len){ while(c!=EOF && n<max_len){
if (!p->quote && !isalnum(c) if (!p->quote && !isalnum(c) && !strchr("._/-()@#|{}[]\\",c)/*strchr(": \t\n\a",c)*/){
&& !strchr("._/-()@#|{}[]\\", c) /*strchr(": \t\n\a",c) */ ) {
unget_char(p,c); unget_char(p,c);
break; break;
} }
@ -283,13 +233,10 @@ static int skip_to_colon(FILE * f, struct parser *p)
if (c!=':'){ if (c!=':'){
if (c=='\n'){ if (c=='\n'){
unget_char(p,c); unget_char(p,c);
sprintf(p->error, sprintf(p->error,"Error at line %d, pos %d: Unexpected EOL, collon expected.", p->line, p->pos);
"Error at line %d, pos %d: Unexpected EOL, collon expected.",
p->line, p->pos);
return 0; return 0;
} }
sprintf(p->error, "Error at line %d, pos %d: Collon expected.", sprintf(p->error,"Error at line %d, pos %d: Collon expected.", p->line, p->pos);
p->line, p->pos);
return 0; return 0;
} }
return 1; return 1;
@ -297,8 +244,7 @@ static int skip_to_colon(FILE * f, struct parser *p)
static int read_val(struct parser *p, char *val, int max_len) static int read_val(struct parser *p, char *val, int max_len){
{
int c,n,quote; int c,n,quote;
if (!skip_to_colon(p->f,p)) if (!skip_to_colon(p->f,p))
return -1; return -1;
@ -306,7 +252,8 @@ static int read_val(struct parser *p, char *val, int max_len)
if (c=='"'){ if (c=='"'){
quote=1; quote=1;
c=get_char(p); c=get_char(p);
} else { }
else{
quote=0; quote=0;
} }
n=0; n=0;
@ -432,7 +379,7 @@ static int cw_cfg_get_next_idx(cw_Cfg_t * cfg, const char *key, int n)
{ {
char ikey[CW_CFG_MAX_KEY_LEN]; char ikey[CW_CFG_MAX_KEY_LEN];
struct cw_Cfg_entry search, * result; struct cw_Cfg_entry search, * result;
const char *d; char *d;
int i; int i;
sprintf(ikey,"%s.%d",key,n); sprintf(ikey,"%s.%d",key,n);
@ -472,96 +419,12 @@ static int cw_cfg_get_next_idx(cw_Cfg_t * cfg, const char *key, int n)
} }
void cw_cfg_iterate(cw_Cfg_t * cfg)
static void pcb(char *dst, struct mavlnode *node)
{
struct cw_Cfg_entry *e = mavlnode_dataptr(node);
sprintf(dst, "%s", e->key);
}
void cw_cfg_iter_init(cw_Cfg_t * cfg, struct cw_Cfg_iter *cfi, const char *base)
{
struct cw_Cfg_entry search;
search.key = base;
mavliter_init(&(cfi->it), cfg);
mavliter_seek(&(cfi->it), &search, 0);
cfi->base = base;
}
const char *cw_cfg_iter_next(struct cw_Cfg_iter *cfi, const char *key)
{
struct cw_Cfg_entry *e;
int bl, kl;
const char *d;
e = mavliter_get(&(cfi->it));
if (e == NULL)
return NULL;
bl = strlen(cfi->base);
kl = strlen(e->key);
if (bl > kl)
return NULL;
if (bl == kl) {
if (strcmp(cfi->base, e->key) != 0)
return NULL;
else {
mavliter_next(&(cfi->it));
return e->val;
}
}
d = strchr(e->key, '.');
if (d == NULL)
return NULL;
if (d - e->key != bl)
return NULL;
if (strncmp(cfi->base, e->key, bl) != 0)
return NULL;
mavliter_next(&(cfi->it));
return e->val;
}
void cw_cfg_iterate(cw_Cfg_t * cfg, const char *key)
{ {
printf("Iterate\n"); printf("Iterate\n");
struct cw_Cfg_entry *e; struct cw_Cfg_entry *e;
struct cw_Cfg_entry search; struct cw_Cfg_entry search;
search.key = key; search.key="actube/listen";
struct mavliter it;
struct mavlnode *first;
mavl_print(cfg,pcb,180);
printf("SEEK TO %s\n", search.key);
struct cw_Cfg_iter cfi;
cw_cfg_iter_init(cfg, &cfi, key);
const char *kee;
while ((kee = cw_cfg_iter_next(&cfi, NULL)) != NULL) {
printf("KEY===%s\n", kee);
}
return;
mavliter_init(&it, cfg);
mavliter_seek(&it, &search, 0);
struct cw_Cfg_entry *en;
return;
int i=0; int i=0;
i = cw_cfg_get_next_idx(cfg,"actube/listen",i); i = cw_cfg_get_next_idx(cfg,"actube/listen",i);
@ -588,22 +451,3 @@ void cw_cfg_iterate(cw_Cfg_t * cfg, const char *key)
printf("%s : %s\n",e->key,e->val); printf("%s : %s\n",e->key,e->val);
} }
int cw_cfg_get_bool(cw_Cfg_t * cfg, const char * key, const char *def)
{
struct cw_Val v;
const char *s = cw_cfg_get(cfg,key,def);
CW_TYPE_BOOL->from_str(&v,s);
return v.val.boolean;
}
uint16_t cw_cfg_get_word(cw_Cfg_t * cfg, char *key, const char * def)
{
struct cw_Val v;
const char *s = cw_cfg_get(cfg,key,def);
CW_TYPE_WORD->from_str(&v,s);
return v.val.word;
}

18
src/cw/cfg.h
View File

@ -14,23 +14,11 @@ int cw_cfg_read_from_file(FILE * file, cw_Cfg_t * cfg);
int cw_cfg_load(const char *filename,cw_Cfg_t * cfg); int cw_cfg_load(const char *filename,cw_Cfg_t * cfg);
struct cw_Cfg_entry{ struct cw_Cfg_entry{
const char *key; char *key;
const char *val; char *val;
}; };
const char * cw_cfg_get(cw_Cfg_t * cfg, char *key, const char *def);
struct cw_Cfg_iter{
struct mavliter it;
const char *base;
};
const char * cw_cfg_get(cw_Cfg_t * cfg, const char *key, const char *def);
const char *cw_cfg_iter_next(struct cw_Cfg_iter *cfi, const char *key);
void cw_cfg_iter_init(cw_Cfg_t * cfg, struct cw_Cfg_iter *cfi, const char *base);
int cw_cfg_get_bool(cw_Cfg_t * cfg, const char * key, const char *def);
uint16_t cw_cfg_get_word(cw_Cfg_t * cfg, char *key, const char * def);
#endif #endif

18
src/mod/capwap/mod_capwap_ac.c
View File

@ -5,7 +5,6 @@
#include "cw/val.h" #include "cw/val.h"
#include "cw/keys.h" #include "cw/keys.h"
#include "cw/dtls.h" #include "cw/dtls.h"
#include "cw/cfg.h"
#include "mod_capwap.h" #include "mod_capwap.h"
@ -16,15 +15,16 @@ static int init(struct cw_Mod * mod, mavl_t global_cfg, int role)
switch (role){ switch (role){
case CW_ROLE_AC:{ case CW_ROLE_AC:{
cw_dbg(DBG_MOD, "CAPWAP: Initialiazing mod_capwap in AC mode"); cw_dbg(DBG_MOD, "CAPWAP: Initialiazing mod_capwap in AC mode");
cw_cfg_set(global_cfg, cw_ktv_add_from_str(global_cfg,
"capwap/ac-descriptor/hardware/version", "capwap/ac-descriptor/hardware/version",
"0.0.0.1"); CW_TYPE_BSTR16,NULL,"0.0.0.1");
cw_cfg_set(global_cfg, cw_ktv_add_from_str(global_cfg,
"capwap/ac-descriptor/hardware/vendor","0"); "capwap/ac-descriptor/hardware/vendor",CW_TYPE_DWORD,NULL,"0");
cw_cfg_set(global_cfg, cw_ktv_add_from_str(global_cfg,
"capwap/ac-descriptor/software/version","0.0.0.1"); "capwap/ac-descriptor/software/version",
cw_cfg_set(global_cfg, CW_TYPE_BSTR16, NULL, "0.0.0.1");
"capwap/ac-descriptor/software/vendor", "0"); cw_ktv_add_from_str(global_cfg,
"capwap/ac-descriptor/software/vendor",CW_TYPE_DWORD, NULL, "0");
} }
break; break;
} }