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

load and save cmds are added

This commit is contained in:
7u83 2022-08-28 13:10:36 +02:00
parent 4ef1b69f83
commit e39f4eb097
3 changed files with 62 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ac/config.ckv
View File

@ -21,6 +21,9 @@ cisco/ssl-cipher: DEFAULT
cisco/ssl-dhbits: 2048
#
# Whether or not to use IPv4/IPv6
#
@ -43,6 +46,7 @@ actube/mod.2: capwap80211
#actube/rpc/listen: unix:/tmp/actube
actube/rpc/listen: tcp:127.0.0.1:5000
actube/rpc/enable: true
actube/rpc/macros-dir: ./rpc-macros
capwap/ac-descriptor/dtls-policy: 1

58
src/ac/rpc.c
View File

@ -69,6 +69,8 @@ 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);
int load_cmd(struct rpcdata *sd, const char *cmd);
int save_cmd(struct rpcdata *sd, const char *cmd);
//void show_cfg (FILE *out, mavl_t ktv);
int show_aps (FILE *out);
@ -95,6 +97,8 @@ static struct command cmdlist[]={
{"global_cfg", global_cfg_cmd},
{"status",status_cmd},
{"clear",clear_cmd},
{"load",load_cmd},
{"save",save_cmd},
{"@prompt",prompt_cmd},
@ -319,6 +323,7 @@ int set_cmd(struct rpcdata *sd, const char *str)
{
cw_Cfg_t *cfg;
cfg = cw_cfg_create();
cw_cfg_read_from_string(str,cfg);
@ -332,6 +337,45 @@ int set_cmd(struct rpcdata *sd, const char *str)
return 0;
}
int load_cmd(struct rpcdata *sd, const char *str)
{
char fn[CW_CFG_MAX_KEY_LEN];
int rc;
const char * dir=cw_cfg_get(sd->global_cfg,"actube/rpc/macros-dir","./rpc-macros");
sprintf(fn,"%s/%s.ckv",dir,str);
rc= cw_cfg_load(fn,sd->update_cfg);
if (rc){
fprintf(sd->out,"Error loading %s: %s\n",fn,strerror(rc));
}
finish_cmd(sd->out);
return 0;
}
int save_cmd(struct rpcdata *sd, const char *str)
{
char fn[CW_CFG_MAX_KEY_LEN];
int rc;
const char * dir=cw_cfg_get(sd->global_cfg,"actube/rpc/macros-dir","./rpc-macros");
sprintf(fn,"%s/%s.ckv",dir,str);
rc= cw_cfg_save(fn,sd->update_cfg,"#\n# Managed by acTube\n#\n\n");
if (rc){
fprintf(sd->out,"Error saving %s: %s\n",fn,strerror(rc));
}
finish_cmd(sd->out);
return 0;
}
int del_cmd(struct rpcdata *sd, const char *str)
{
char *s;
@ -553,7 +597,19 @@ int execute_cmd (struct rpcdata * sd, const char *str)
searchcmd = find_cmd(cmd);
if (searchcmd!=NULL){
if (searchcmd->fun != NULL){
return searchcmd->fun(sd, str+strlen(cmd));
char *args;
int n;
args = (char*)(str+strlen(cmd));
while( isspace( *args ) )
args++;
n = strlen(args);
n--;
while (n>=0 && isspace(args[n]))
n--;
args[n+1]=0;
return searchcmd->fun(sd, args);
}
}
else{

1
src/cw/cfg.c
View File

@ -511,6 +511,7 @@ int cw_cfg_load(const char *filename, cw_Cfg_t * cfg)
FILE *f = fopen(filename, "rb");
if (!f)
return errno;
errno=0;
errs = cw_cfg_read_from_file(f, cfg);
fclose(f);