From e39f4eb097a720be57610b1596ff64db906455bd Mon Sep 17 00:00:00 2001
From: 7u83 <7u83@mail.ru>
Date: Sun, 28 Aug 2022 13:10:36 +0200
Subject: [PATCH] load and save cmds are added

---
 src/ac/config.ckv |  4 ++++
 src/ac/rpc.c      | 58 ++++++++++++++++++++++++++++++++++++++++++++++-
 src/cw/cfg.c      |  1 +
 3 files changed, 62 insertions(+), 1 deletion(-)

diff --git a/src/ac/config.ckv b/src/ac/config.ckv
index e4e822d2..9a432c17 100644
--- a/src/ac/config.ckv
+++ b/src/ac/config.ckv
@@ -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
diff --git a/src/ac/rpc.c b/src/ac/rpc.c
index d0a7f696..fefdb2f1 100644
--- a/src/ac/rpc.c
+++ b/src/ac/rpc.c
@@ -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{
diff --git a/src/cw/cfg.c b/src/cw/cfg.c
index 859ff07d..a0067ecc 100644
--- a/src/cw/cfg.c
+++ b/src/cw/cfg.c
@@ -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);