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

Added lots of RPC cmds added. send is possible.

Browse Source
This commit is contained in:
7u83
2022-08-28 09:06:15 +02:00
parent 62616b5e7b
commit a77023165b
22 changed files with 452 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

154
src/ac/rpc.c
View File

@ -2,6 +2,7 @@
#include <stdio.h>
#include <errno.h>
#include <string.h>
#include <ctype.h>
#include <sys/types.h>
#include <sys/socket.h>
@ -16,6 +17,7 @@
#include "cw/log.h"
#include "cw/dbg.h"
#include "wtpman.h"
#include "cw/connlist.h"
@ -64,6 +66,9 @@ int wlan0_cmd(struct rpcdata *sd, const char * cmd);
int exit_cmd(struct rpcdata *sd, const char * cmd);
int prompt_cmd(struct rpcdata *sd, const char * cmd);
int global_cfg_cmd(struct rpcdata *sd, const char * cmd);
int status_cmd(struct rpcdata *sd, const char * cmd);
void print_mw(FILE *f, int w, const char * str);
int clear_cmd(struct rpcdata *sd, const char *cmd);
//void show_cfg (FILE *out, mavl_t ktv);
int show_aps (FILE *out);
@ -88,6 +93,9 @@ static struct command cmdlist[]={
{"set", set_cmd },
{"wlan0",wlan0_cmd},
{"global_cfg", global_cfg_cmd},
{"status",status_cmd},
{"clear",clear_cmd},
{"@prompt",prompt_cmd},
@ -112,9 +120,18 @@ int prompt_cmd(struct rpcdata *sd, const char *cmd)
}
int global_cfg_cmd(struct rpcdata *sd, const char *cmd)
int global_cfg_cmd(struct rpcdata *sd, const char *str)
{
cw_cfg_fdump(sd->out,sd->global_cfg);
char *s;
while( isspace( *str ) )
str++;
s=(char*)str;
while (!isspace(*s) && *s!=0)
s++;
*s=0;
cw_cfg_fdump(sd->out,sd->global_cfg,str);
finish_cmd(sd->out);
return 0;
}
@ -149,8 +166,18 @@ int exit_cmd(struct rpcdata *sd, const char *cmd)
int cfg_cmd(struct rpcdata *sd, const char *cmd)
int cfg_cmd(struct rpcdata *sd, const char *str)
{
char *s;
while( isspace( *str ) )
str++;
s=(char*)str;
while (!isspace(*s) && *s!=0)
s++;
*s=0;
struct cw_Conn * conn;
wtplist_lock();
conn = find_ap(sd->prompt);
@ -158,37 +185,112 @@ int cfg_cmd(struct rpcdata *sd, const char *cmd)
fprintf(sd->out,"WTP '%s' not found\n",sd->prompt);
}
else {
cw_cfg_fdump(sd->out,conn->remote_cfg);
cw_cfg_fdump(sd->out,conn->remote_cfg,str);
}
finish_cmd(sd->out);
wtplist_unlock();
return 0;
}
int ucfg_cmd(struct rpcdata *sd, const char *cmd)
int status_cmd(struct rpcdata *sd, const char *cmd)
{
// struct cw_Conn * conn;
stop();
// show_cfg(sd->out,sd->update_cfg);
struct cw_Conn * conn;
int i;
char key[CW_CFG_MAX_KEY_LEN];
wtplist_lock();
print_mw(sd->out,8,"Radio");
print_mw(sd->out,15,"Admin State");
print_mw(sd->out,15,"Oper State");
print_mw(sd->out,13,"Cause");
fprintf(sd->out,"\n");
conn = find_ap(sd->prompt);
if (conn==NULL){
fprintf(sd->out,"WTP '%s' not found\n",sd->prompt);
goto errX;
}
i=0;
do {
char tmp[128];
sprintf(key,"radio.%d",i);
if (!cw_cfg_base_exists(conn->remote_cfg,key))
break;
sprintf(tmp,"%d",i);
print_mw(sd->out,8,tmp);
sprintf(key,"radio.%d/capwap/admin-state",i);
print_mw(sd->out,15, cw_cfg_get(conn->remote_cfg,key,"?"));
sprintf(key,"radio.%d/capwap/operational-state/state",i);
print_mw(sd->out,15, cw_cfg_get(conn->remote_cfg,key,"?"));
sprintf(key,"radio.%d/capwap/operational-state/cause",i);
print_mw(sd->out,13, cw_cfg_get(conn->remote_cfg,key,"?"));
fprintf(sd->out,"\n");
i++;
}while(1);
errX:
finish_cmd(sd->out);
wtplist_unlock();
return 0;
}
int ucfg_cmd(struct rpcdata *sd, const char *str)
{
char *s;
while( isspace( *str ) )
str++;
s=(char*)str;
while (!isspace(*s) && *s!=0)
s++;
*s=0;
cw_cfg_fdump(sd->out,sd->update_cfg,str);
finish_cmd(sd->out);
return 0;
}
int clear_cmd(struct rpcdata *sd, const char *cmd)
{
cw_cfg_clear(sd->update_cfg);
fprintf(sd->out,"ucfg cleard\n");
finish_cmd(sd->out);
return 0;
}
#include "wtpman.h"
int
send_cmd(struct rpcdata * sd, const char *cmd)
{
struct wtpman * wtpman;
struct cw_Conn * conn;
wtplist_lock();
conn = find_ap(sd->prompt);
if (conn==NULL){
fprintf(sd->out,"WTP '%s' not found\n",sd->prompt);
goto errX;
}
else {
conn->update_cfg=sd->update_cfg;
wtpman=conn->data;
cw_cfg_copy(sd->update_cfg,conn->update_cfg,0,NULL);
wtpman->update=1;
fprintf(sd->out, "Sending update cmd\n");
// conn->update_cfg=sd->update_cfg;
}
errX:
wtplist_unlock();
finish_cmd(sd->out);
return 0;
}
@ -221,29 +323,30 @@ int set_cmd(struct rpcdata *sd, const char *str)
cw_cfg_read_from_string(str,cfg);
cw_cfg_fdump(sd->out,cfg);
cw_cfg_fdump(sd->out,cfg,NULL);
cw_cfg_copy(cfg,sd->update_cfg,DBG_CFG_UPDATES,"rpc ucfg");
cw_cfg_destroy(cfg);
finish_cmd(sd->out);
// cw_ktv_init_str_reader(&r,str,strlen(str));
// cw_ktv_parse_string(&r,key,type,val);
/*cw_ktv_parse_string(key,type,val, 2048);*/
// fprintf(sd->out,"%s %s\n",key,val);
// cw_ktv_add(sd->update_cfg,key,CW_TYPE_STR,NULL,val,strlen(val));
return 0;
}
int del_cmd(struct rpcdata *sd, const char *str)
{
char key[CW_CFG_MAX_KEY_LEN];
sscanf(str,"%s",key);
stop();
// cw_ktv_del_sub(sd->update_cfg,key);
//
char *s;
while( isspace( *str ) )
str++;
s=(char*)str;
while (!isspace(*s) && *s!=0)
s++;
*s=0;
fprintf(sd->out,"DEL: '%s'\n",str);
cw_cfg_del(sd->update_cfg,str);
finish_cmd(sd->out);
return 0;
}
@ -540,6 +643,7 @@ void rpc_loop (FILE *file, cw_Cfg_t *global_cfg)
sd.in = file;
sd.out = file;
sd.global_cfg=global_cfg;
sd.update_cfg=cw_cfg_create();
sprintf(sd.prompt,"%s","*");

43
src/ac/wtpman.c
View File

@ -298,6 +298,18 @@ int cw_run_state_machine(struct cw_Conn *conn, time_t * timer)
/*#define CW_TRANSITION(prestate,state) (prestate<<16|state)*/
int run_update(struct wtpman *wtpman)
{
int rc;
if (!wtpman->update)
return EAGAIN;
rc = cw_send_request(wtpman->conn, CAPWAP_MSG_CONFIGURATION_UPDATE_REQUEST);
cw_cfg_clear(wtpman->conn->update_cfg);
wtpman->update=0;
return rc;
}
static void *wtpman_main(void *arg)
{
//mavl_t r;
@ -343,6 +355,7 @@ static void *wtpman_main(void *arg)
conn->capwap_prevstate = CAPWAP_STATE_DTLS_SETUP;
conn->capwap_state = CAPWAP_STATE_JOIN;
rc = 0;
wtpman->update=0;
while (1) {
@ -359,15 +372,19 @@ static void *wtpman_main(void *arg)
while (!cw_timer_timeout(timer)) {
rc = run_update(wtpman);
if (rc !=EAGAIN)
break;
rc = cw_read_messages(wtpman->conn);
if (rc < 0) {
if (errno == EAGAIN)
if (errno == EAGAIN){
continue;
}
}
break;
}
if (rc < 0) {
conn->capwap_prevstate = conn->capwap_state;
conn->capwap_state = CAPWAP_STATE_TIMEOUT;
@ -463,6 +480,24 @@ static int event_cb(struct cw_ElemHandlerParams * params, uint8_t * elems_ptr, i
return 0;
}
static int change_state_event_cb(struct cw_ElemHandlerParams * params, uint8_t * elems_ptr, int elems_len)
{
struct cw_Conn * conn = (struct cw_Conn*)params->conn;
struct wtpman * wtpman = (struct wtpman *)conn->data;
char filename[200];
cw_dbg(DBG_X,"WTP EVENT Callback");
copy(params);
const char * wtpname = cw_cfg_get(conn->remote_cfg,"capwap/wtp-name","default");
sprintf(filename,"wtp-change-event-%d-%s.ckv",wtpman->ctr++,wtpname);
cw_cfg_save(filename,params->cfg,NULL);
return 0;
}
@ -552,6 +587,10 @@ struct wtpman *wtpman_create(int socklistindex, struct sockaddr *srcaddr,
CAPWAP_MSG_WTP_EVENT_REQUEST,
event_cb);
cw_conn_set_msg_cb(wtpman->conn,
CAPWAP_MSG_CHANGE_STATE_EVENT_REQUEST,
change_state_event_cb);

2
src/ac/wtpman.h
View File

@ -40,7 +40,7 @@ struct wtpman {
cw_Cfg_t * wtp_cfg;
int update;
int ctr;
};