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

ac compiles w/o warnings

Browse Source
This commit is contained in:
7u83
2022-08-26 08:05:41 +02:00
parent c3b921292b
commit d127263d80
18 changed files with 110 additions and 292 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ac/act.c
View File

@ -97,10 +97,8 @@ prompt(EditLine *el )
rc=get_result(act_f,str2,64);
}
static char a[] = "\1\033[7m\1Edit$\1\033[0m\1 ";
static char b[] = "> ";
return (continuation ? b : str);
return (continuation ? "> " : str);
}
static void

4
src/ac/conf.c
View File

@ -289,13 +289,13 @@ int init_bcast_addrs(cw_Cfg_t *cfg)
if (ifa->ifa_broadaddr) {
char *s,*sr;
char *s; //,*sr;
sock_addrtostr(ifa->ifa_broadaddr, str, 100,1);
*strchr(str, ':') = 0;
s = cw_strdup(str);
sr = mavl_add_str(t, s);
mavl_add_str(t, s);
// printf("BCAST = %p --- %p: %s\n",str,s,str);

34
src/ac/config.ckv
View File

@ -45,31 +45,31 @@ actube/rpc/listen: tcp:127.0.0.1:5000
actube/rpc/enable: true
ac-descriptor/dtls-policy: 1
ac-descriptor/hardware/vendor: 4232704
ac-descriptor/hardware/version: .x01000001
ac-descriptor/max-wtps : 200
ac-descriptor/active-wtps: 2
ac-descriptor/r-mac-field: 1
ac-descriptor/reserved1 : 0
ac-descriptor/security : 2
ac-descriptor/software/vendor : 0
ac-descriptor/software/version: v0.0.1
ac-descriptor/station-limit: 1000
ac-descriptor/stations: 0
capwap/ac-descriptor/dtls-policy: 1
capwap/ac-descriptor/hardware/vendor: 4232704
capwap/ac-descriptor/hardware/version: .x01000001
capwap/ac-descriptor/max-wtps : 200
capwap/ac-descriptor/active-wtps: 2
capwap/ac-descriptor/r-mac-field: 1
cawpap/ac-descriptor/reserved1 : 0
capwap/ac-descriptor/security : 2
capwap/ac-descriptor/software/vendor : 0
capwap/ac-descriptor/software/version: v0.0.1
capwap/ac-descriptor/station-limit: 1000
capwap/ac-descriptor/stations: 0
capwap-control-ip-address/address.0: 192.168.0.24
capwap/control-ip-address/address.0: 192.168.0.24
#
# CAPWAP Timers
#
capwap-timers/change-state-pending-timer: Word: 3
capwap-timers/data-check-timer: Word: 10
capwap-timers/echo-interval :Byte: 30
capwap-timers/max-discovery-interval :Byte: 10
capwap/timers/change-state-pending-timer: Word: 3
capwap/timers/data-check-timer: Word: 10
capwap/timers/echo-interval :Byte: 30
capwap/timers/max-discovery-interval :Byte: 10

6
src/ac/dataman.c
View File

@ -114,8 +114,10 @@ int dataman_process_keep_alive(struct netconn *nc, uint8_t *rawmsg, int len)
((uint16_t*)sessid)[0]=sessid_len;
memcpy(bstr16_data(sessid),cw_get_elem_data(elem),sessid_len);
struct wtpman * wtpman = wtplist_get_by_session_id(sessid);
stop();
struct wtpman * wtpman =NULL;
// struct wtpman * wtpman = wtplist_get_by_session_id(sessid);
if (wtpman){
if (!dm->wtpman)
dm->wtpman=wtpman;

2
src/ac/discovery_cache.c
View File

@ -203,7 +203,7 @@ int discovery_cache_get(struct cw_DiscoveryCache * cache,struct sockaddr *addr,
{
cw_dbg(DBG_X,"DISCOVERY CACHE ---------------------------- DOUND BY ADDR");
char str[128];
sock_addrtostr(&elem->addr,str,128,1);
sock_addrtostr((struct sockaddr*)&elem->addr,str,128,1);
printf("ELEM addr: %s\n",str);
}

8
src/ac/rpc.c
View File

@ -313,9 +313,9 @@ int show_aps (FILE *out)
struct cw_Conn * conn;
conn = mavliter_get_ptr (&it);
print_mw(out,16,cw_cfg_get(conn->remote_cfg, "wtp-name", "Unknown"));
print_mw(out,16,cw_cfg_get(conn->remote_cfg, "wtp-board-data/model-no", "Unknown"));
vendor = cw_cfg_get(conn->remote_cfg, "wtp-board-data/vendor", "0");
print_mw(out,16,cw_cfg_get(conn->remote_cfg, "capwap/wtp-name", "Unknown"));
print_mw(out,16,cw_cfg_get(conn->remote_cfg, "capwap/wtp-board-data/model-no", "Unknown"));
vendor = cw_cfg_get(conn->remote_cfg, "capwap/wtp-board-data/vendor", "0");
print_mw(out,14,vendor);
sock_addr2str_p (&conn->addr, addr);
print_mw(out,16,addr);
@ -342,7 +342,7 @@ struct cw_Conn * find_ap(const char *name)
struct cw_Conn * conn;
conn = mavliter_get_ptr (&it);
wtpname = cw_cfg_get (conn->remote_cfg, "wtp-name", NULL);
wtpname = cw_cfg_get (conn->remote_cfg, "capwap/wtp-name", NULL);
if (wtpname == NULL)
continue;

2
src/ac/statemachine.c
View File

@ -131,7 +131,7 @@ struct mavl * cw_statemachine_load_states (struct mavl * statemachine_states, cw
cw_strstate(s->state));
s++;
}
return 1;
return NULL;
}

2
src/ac/wtplist.c
View File

@ -78,7 +78,7 @@ struct wtpman * wtplist_get(const struct sockaddr * addr)
}
struct wtpman * wtplist_get_by_session_id(bstr16_t *session_id)
struct wtpman * wtplist_get_by_session_id(bstr16_t session_id)
{
struct cw_Conn search;
struct cw_Conn * conn;

2
src/ac/wtplist.h
View File

@ -13,7 +13,7 @@ extern struct wtpman * wtplist_add(struct wtpman * wtpman);
extern void wtplist_remove(struct wtpman * wtpman);
extern void wtplist_lock();
extern void wtplist_unlock();
extern struct wtpman * wtplist_get_by_session_id(bstr16_t *session_id);
extern struct wtpman * wtplist_get_by_session_id(bstr16_t session_id);
struct connlist * wtplist_get_connlist(void);
#endif

216
src/ac/wtpman.c
View File

@ -166,7 +166,7 @@ static int wtpman_join(void *arg)
static void wtpman_image_data(struct wtpman *wtpman)
void wtpman_image_data(struct wtpman *wtpman)
{
/* char sock_buf[SOCK_ADDR_BUFSIZE];
struct cw_Conn *conn = wtpman->conn;
@ -300,12 +300,12 @@ int cw_run_state_machine(struct cw_Conn *conn, time_t * timer)
static void *wtpman_main(void *arg)
{
mavl_t r;
//mavl_t r;
int rc;
time_t timer;
char sock_buf[SOCK_ADDR_BUFSIZE];
//char sock_buf[SOCK_ADDR_BUFSIZE];
struct cw_Conn *conn;
int last_state;
// int last_state;
struct wtpman *wtpman = (struct wtpman *) arg;
wtpman->conn->seqnum = 0;
@ -346,8 +346,8 @@ static void *wtpman_main(void *arg)
while (1) {
int wait_join;
int wait_change_state;
//int wait_join;
//int wait_change_state;
@ -397,7 +397,7 @@ static void *wtpman_main(void *arg)
/* dtls is established, goto join state */
/*
conn->capwap_state = CAPWAP_STATE_JOIN;
if (!wtpman_join(wtpman)) {
wtpman_remove(wtpman);
@ -410,182 +410,14 @@ static void *wtpman_main(void *arg)
sock_addr2str_p(&conn->addr, sock_buf),
format_bin2hex(conn->session_id, 16));
*/
exit(0);
/*
// cw_dbg(DBG_INFO, "Creating data thread");
// pthread_t thread;
// pthread_create(&thread, NULL, (void *) wtpman_run_data, (void *) wtpman);
*/
/* here the WTP has joined, now we assume an image data request
or a configuration status request. Nothing else.
*/
rc = 0;
while (!cw_timer_timeout(timer)
&& wtpman->conn->capwap_state == CAPWAP_STATE_CONFIGURE) {
rc = cw_read_messages(wtpman->conn);
if (rc < 0) {
if (errno != EAGAIN)
break;
}
}
cw_dbg_ktv_dump(conn->remote_cfg, DBG_INFO,
"-------------dump------------", "DMP",
"---------end dump --------");
if (!cw_result_is_ok(rc)) {
cw_dbg(DBG_INFO, "WTP Problem: %s", cw_strrc(rc));
wtpman_remove(wtpman);
return NULL;
}
if (conn->capwap_state == CW_STATE_IMAGE_DATA) {
wtpman_image_data(wtpman);
return NULL;
}
conn->capwap_state = CAPWAP_STATE_RUN;
/*
// XXX testing ...
// DBGX("Cofig to sql", "");
// props_to_sql(conn,conn->incomming,0);
// radios_to_sql(conn);
*/
/*conn->msg_end=msg_end_handler; */
/* The main run loop */
reset_echointerval_timer(wtpman);
rc = 0;
while (wtpman->conn->capwap_state == CAPWAP_STATE_RUN) {
rc = cw_read_messages(wtpman->conn);
if (rc < 0) {
if (errno != EAGAIN)
break;
}
/*// cw_dbg(DBG_X, "Time left: %d",
// */
/*cw_timer_timeleft(wtpman->echointerval_timer); */
if (cw_timer_timeout(wtpman->echointerval_timer)) {
cw_dbg(DBG_INFO, "Lost connection to WTP:%s",
sock_addr2str_p(&conn->addr, sock_buf));
break;
}
/*
// mavl_del_all(conn->outgoing);
// conn_clear_upd(conn,1);
// props_to_sql(conn,conn->incomming,0);
// radios_to_sql(conn);
*/
r = db_get_update_tasks(conn,
sock_addr2str(&conn->addr, sock_buf));
if (r) {
/*
// if (!conn->outgoing->count)
// continue;
*/
cw_dbg(DBG_INFO, "Updating WTP %s",
sock_addr2str(&conn->addr, sock_buf));
rc = cw_send_request(conn,
CAPWAP_MSG_CONFIGURATION_UPDATE_REQUEST);
/*
// mavl_merge(conn->config, conn->outgoing);
// mavl_destroy(conn->outgoing);
// conn->outgoing = mbag_create();
// props_to_sql(conn,conn->incomming,0);
// radios_to_sql(conn);
// mavl_destroy(r);
*/
}
r = db_get_radio_tasks(conn,
sock_addr2str(&conn->addr, sock_buf));
if (r) {
/*
// if (!conn->radios_upd->count)
// continue;
*/
cw_dbg(DBG_INFO, "Updating Radios for %s",
sock_addr2str(&conn->addr, sock_buf));
rc = cw_send_request(conn,
CAPWAP_MSG_CONFIGURATION_UPDATE_REQUEST);
/*
// conn_clear_upd(conn,1);
// mavl_destroy(conn->radios_upd);
// conn->radios_upd=mbag_i_create();
// radios_to_sql(conn);
*/
/*
rc = cw_send_request(conn, CW_MSG_CONFIGURATION_UPDATE_REQUEST);
mavl_merge(conn->config, conn->outgoing);
mavl_destroy(conn->outgoing);
conn->outgoing = mbag_create();
config_to_sql(conn);
radios_to_sql(conn);
mavl_destroy(r);
*/
}
}
db_ping_wtp(sock_addr2str_p(&conn->addr, sock_buf), "");
wtpman_remove(wtpman);
return NULL;
}
static void wtpman_run_dtls(void *arg)
{
char sock_buf[SOCK_ADDR_BUFSIZE];
struct wtpman *wtpman = (struct wtpman *) arg;
/* reject connections to our multi- or broadcast sockets */
if (socklist[wtpman->socklistindex].type != SOCKLIST_UNICAST_SOCKET) {
cw_dbg(DBG_DTLS,
"Dropping connection from %s to non-unicast socket.",
sock_addr2str_p(&wtpman->conn->addr, sock_buf));
wtpman_remove(wtpman);
return;
}
/*// time_t timer = cw_timer_start(wtpman->conn->wait_dtls);*/
/* establish dtls session */
if (!wtpman_dtls_setup(wtpman)) {
wtpman_remove(wtpman);
return;
}
wtpman_main(arg);
}
void wtpman_destroy(struct wtpman *wtpman)
{
@ -601,10 +433,10 @@ void wtpman_destroy(struct wtpman *wtpman)
static void copy(struct cw_ElemHandlerParams * params)
{
struct wtpman * wtpman;
struct cw_Conn * conn;
wtpman = (struct wtpman*)params->conn->data;
conn = (struct cw_Conn*)params->conn;
// struct wtpman * wtpman;
//struct cw_Conn * conn;
//wtpman = (struct wtpman*)params->conn->data;
//conn = (struct cw_Conn*)params->conn;
// cw_dbg(DBG_X,"------------- Here is the config we ve got from WTP ---------------- ");
@ -632,7 +464,7 @@ static int join_cb(struct cw_ElemHandlerParams * params, uint8_t * elems_ptr, in
cw_dbg(DBG_X,"JOIN Callback");
copy(params);
const char * wtpname = cw_cfg_get(conn->local_cfg,"wtp-name","default");
const char * wtpname = cw_cfg_get(conn->local_cfg,"capwap/wtp-name","default");
sprintf(filename,"wtp-join-%s.ckv",wtpname);
cw_cfg_save(filename,params->cfg,NULL);
cw_cfg_clear(params->cfg);
@ -649,7 +481,7 @@ static int update_cb(struct cw_ElemHandlerParams * params, uint8_t * elems_ptr,
cw_dbg(DBG_X,"UPDATE Callback");
copy(params);
const char * wtpname = cw_cfg_get(conn->local_cfg,"wtp-name","default");
const char * wtpname = cw_cfg_get(conn->local_cfg,"capwap/wtp-name","default");
sprintf(filename,"wtp-status-%s.ckv",wtpname);
cw_cfg_save(filename,params->cfg,NULL);
//stop();
@ -666,8 +498,8 @@ static int event_cb(struct cw_ElemHandlerParams * params, uint8_t * elems_ptr, i
cw_dbg(DBG_X,"WTP EVENT Callback");
copy(params);
const char * wtpname = cw_cfg_get(conn->local_cfg,"wtp-name","default");
sprintf(filename,"wtp-status-%s.ckv",wtpname);
const char * wtpname = cw_cfg_get(conn->local_cfg,"capwap/wtp-name","default");
sprintf(filename,"wtp-event-%s.ckv",wtpname);
cw_cfg_save(filename,params->cfg,NULL);
//stop();
return 0;
@ -676,16 +508,6 @@ static int event_cb(struct cw_ElemHandlerParams * params, uint8_t * elems_ptr, i
static setup_complete(struct cw_Conn *conn)
{
struct wtpman * wtpman = (struct wtpman *)conn->data;
// wtpman->pjoin = cw_msgset_set_postprocess(conn->msgset,CAPWAP_MSG_JOIN_REQUEST,join_cb);
// wtpman->pupdate = cw_msgset_set_postprocess(conn->msgset,CAPWAP_MSG_CONFIGURATION_STATUS_REQUEST,update_cb);
cw_dbg(DBG_X,"SETUP COMPLETE");
}
struct wtpman *wtpman_create(int socklistindex, struct sockaddr *srcaddr,
int dtlsmode, cw_Cfg_t * global_cfg)
@ -778,7 +600,7 @@ struct wtpman *wtpman_create(int socklistindex, struct sockaddr *srcaddr,
wtpman->conn->strict_capwap = conf_strict_capwap;
wtpman->conn->strict_hdr = conf_strict_headers;
wtpman->conn->setup_complete = setup_complete;
// wtpman->conn->setup_complete = setup_complete;
/*
// wtpman->conn->radios = mbag_i_create();
// wtpman->conn->radios_upd = mbag_i_create();
@ -806,8 +628,8 @@ struct wtpman *wtpman_create(int socklistindex, struct sockaddr *srcaddr,
cw_mod_get_msg_set(wtpman->conn, cmod, bmod);
wtpman->conn->detected = 1;
cmod->setup_cfg(wtpman->conn);
if (wtpman->conn->setup_complete)
wtpman->conn->setup_complete(wtpman->conn);
// if (wtpman->conn->setup_complete)
// wtpman->conn->setup_complete(wtpman->conn);
}