Fixed some bugs, added more Cisco elements
Almost able to create a WLAN
This commit is contained in:
@ -31,8 +31,12 @@ INCL_DIRS=-I../ -I/usr/local/include -I./ -I../../include
|
||||
#FLAGS=-DWITH_IPV6 -DWITH_OPENSSL -DSYS_ARCH="$(ARCH)" -DSYS_ARCH="XXX"
|
||||
FLAGS=-DWITH_IPV6 -DUSE_OPENSSL -DSYS_ARCH='"$(KERNEL)/$(ARCH)"'
|
||||
|
||||
all: act actube
|
||||
|
||||
act: act.c
|
||||
$(CC) act.c $(INCL_DIRS) $(LIBPATH) -DSYS_ARCH='"$(KERNEL)/$(ARCH)"' -o act -l:libcw.a -lasan -lcrypto -ledit
|
||||
|
||||
|
||||
|
||||
.c.o:
|
||||
@echo " $(CC) "$<
|
||||
@ -43,8 +47,8 @@ all: $(PRG) $(ACTPRG)
|
||||
$(PRG): $(OBJS)
|
||||
$(CC) $(OBJS) -o $(PRG) $(LIBPATH) $(LDFLAGS) $(LIBS)
|
||||
|
||||
$(ACTPRG): $(ACTOBJS)
|
||||
$(CC) $(ACTOBJS) -o $(ACTPRG) $(LIBPATH) $(LIBS) -ledit
|
||||
#$(ACTPRG): $(ACTOBJS)
|
||||
# $(CC) $(ACTOBJS) -o $(ACTPRG) $(LIBPATH) $(LIBS) -ledit
|
||||
#$(CC) $(ACTOBJS) $(ACTPRG) $(LIBPATH) $(LDFLAGS) $(LIBS) -ledit
|
||||
|
||||
|
||||
|
@ -17,7 +17,8 @@ capwap/ssl-certfile: "../../ssl/intermediate-ca/int-ca.crt"
|
||||
|
||||
cisco/ssl-keyfile: "../../ssl/intermediate-ca/int-ca.key"
|
||||
cisco/ssl-certfile: "../../ssl/intermediate-ca/int-ca.crt"
|
||||
cisco/ssl-cipher: DEFAULT
|
||||
#cisco/ssl-cipher: DEFAULT
|
||||
cisco/ssl-cipher: RSA
|
||||
cisco/ssl-dhbits: 2048
|
||||
|
||||
|
||||
|
@ -445,6 +445,32 @@ static int join_cb(struct cw_ElemHandlerParams * params, uint8_t * elems_ptr, in
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int fill_update_cfg(struct cw_Conn * conn)
|
||||
{
|
||||
struct cw_Cfg_iter cfi;
|
||||
struct cw_Cfg_entry *e;
|
||||
cw_Cfg_t * u;
|
||||
u=cw_cfg_create();
|
||||
if( cw_cfg_load("status_response.ckv",u)){
|
||||
cw_log(LOG_ERR,"Cant load file");
|
||||
stop();
|
||||
};
|
||||
cw_cfg_dump(conn->remote_cfg);
|
||||
cw_cfg_iter_init(u, &cfi, NULL);
|
||||
while ((e = cw_cfg_iter_next(&cfi, NULL))!=NULL){
|
||||
const char * r;
|
||||
r = cw_cfg_get(conn->remote_cfg, e->key, "[]");
|
||||
// cw_dbg(DBG_CFG_UPDATES,"check: %s: %s",e->key,e->val);
|
||||
if (strcmp(r,e->val)==0)
|
||||
continue;
|
||||
|
||||
cw_dbg(DBG_CFG_UPDATES,"Status reps: %s: %s -> %s",e->key,r,e->val);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
static int update_cb(struct cw_ElemHandlerParams * params, uint8_t * elems_ptr, int elems_len)
|
||||
{
|
||||
struct cw_Conn * conn = (struct cw_Conn*)params->conn;
|
||||
@ -454,6 +480,7 @@ static int update_cb(struct cw_ElemHandlerParams * params, uint8_t * elems_ptr,
|
||||
|
||||
cw_dbg(DBG_X,"UPDATE Callback");
|
||||
copy(params);
|
||||
fill_update_cfg(params->conn);
|
||||
|
||||
const char * wtpname = cw_cfg_get(conn->remote_cfg,"capwap/wtp-name","default");
|
||||
sprintf(filename,"wtp-status-%s.ckv",wtpname);
|
||||
|
Reference in New Issue
Block a user