Some kind of shell is now there in act

src/ac/Makefile

@@ -5,13 +5,15 @@ include ../Defs.mak
 OBJS = \
 	wtplist.o wtpman.o conf.o ac_main.o \
 	dataman.o \
-	ac_interface.o \
 	socklist.o \
 	discovery_cache.o\
-	shell.o\
+	rpc.o\
 	statemachine.o\
 
+ACTOBJS = \
+	act.o 
 
+ACTPRG=act
 PRG=actube
 LIBPATH=-L../../lib/$(KERNEL)/$(ARCH)/ -L/usr/local/lib -L/usr/lib 
 
@@ -23,22 +25,33 @@ LIBS+=-lc
 LIBS+=-lnettle
 LIBS+=-lssl
 LIBS+=-lcrypto
+LIBS+=-ledit
 
 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='"$(ARCH)"'
+FLAGS=-DWITH_IPV6 -DUSE_OPENSSL -DSYS_ARCH='"$(KERNEL)/$(ARCH)"'
+
+
+
 
 .c.o:
 	@echo "  $(CC) "$<
 	$(CC) $(FLAGS) $(INCL_DIRS) -c $(CFLAGS) $< -o $@
 
+all: $(PRG) $(ACTPRG)
 
 $(PRG): $(OBJS) 
-#	$(CC) $(AC_OBJS) ../mod/modload_ac.o -o $(AC_NAME) $(LDFLAGS) $(LIBS)
 	$(CC) $(OBJS) -o $(PRG) $(LIBPATH) $(LDFLAGS) $(LIBS) 
 
+$(ACTPRG): $(ACTOBJS)
+	$(CC) $(ACTOBJS) -o $(ACTPRG) $(LIBPATH) $(LDFLAGS) -ledit -lcw -lcrypto -lssl -lmavl -lnettle
+
+
+
+
 
 clean: 
-	rm  -f $(PRG) $(OBJS)
+	rm -f $(PRG) $(OBJS)
+	rm -f $(ACTPRG) $(ACTOBJS)
 
 

src/ac/ac.h

@@ -17,7 +17,8 @@ enum {
 	AC_PROTO_UNKNOWN
 };
 
-int start_shell(cw_Cfg_t *global_cfg);
+int start_rpc(cw_Cfg_t *global_cfg);
+int test_shell();
 
 
 #endif

src/ac/ac_interface.c

@@ -1,103 +0,0 @@
-#include <stdlib.h>
-#include <string.h>
-
-#include <sys/types.h>
-#include <sys/socket.h>
-
-#include "cw/sock.h"
-
-#include "socklist.h"
-#include "conf.h"
-
-#include "cw/capwap.h"
-/*//#include "cw/capwap_80211.h"*/
-/*#include "cw/aciplist.h"*/
-
-
-/*
-int pr(void *x,void *y){
-}
-*/
-
-/*
-struct radioinfo * get_radioinfo()
-{
-	
-}
-*/
-
-
-/*
-struct ac_info * get_acinfo()
-{
-	
-	struct ac_info * acinfo;
-	acinfo = malloc(sizeof(struct ac_info));
-	if(!acinfo)
-		return 0;
-
-	memset(acinfo,0,sizeof(struct ac_info));
-	acinfo->ac_name=conf_acname;
-
-	acinfo->stations=10;
-	acinfo->limit=10000;
-	acinfo->active_wtps=10;
-	acinfo->max_wtps=conf_max_wtps;
-	acinfo->rmac=1; 	
-
-	acinfo->vendor_id=conf_vendor_id;
-
-	acinfo->hardware_version=(uint8_t*)conf_hardware_version;
-	acinfo->software_version=(uint8_t*)conf_software_version;
-	acinfo->cisco_hardware_version=(uint8_t*)conf_cisco_hardware_version;
-	acinfo->cisco_software_version=(uint8_t*)conf_cisco_software_version;
-
-
-	if (conf_dtls_psk)
-		acinfo->security|=AC_SECURITY_S;
-	if (conf_sslkeyfilename && conf_sslcertfilename)
-		acinfo->security|=AC_SECURITY_X;
-
-
-//	acinfo->dtls_policy = AC_DTLS_POLICY_C | AC_DTLS_POLICY_D ;
-//	acinfo->ac_ips = conf_ac_ips;
-//	acinfo->ac_ips_len=conf_ac_ips_len;
-
-//	acinfo->salist=conf_salist;
-//	acinfo->salist_len=conf_salist_len;
-
-//	acinfo->salist = conf_ac_ips;
-//	acinfo->salist_len = conf_ac_ips_len;
-
-	//acinfo->aciplist=get_aciplist();
-
-
-	aciplist_foreach(acinfo->aciplist,pr,NULL);
-*/
-
-/*
-	int i;
-	for (i=1; i<=4; i++){
-		acinfo->radioinfos[i].type= 
-			CW_80211_RADIO_TYPE_B |
-			CW_80211_RADIO_TYPE_A | 
-			CW_80211_RADIO_TYPE_G | 
-			CW_80211_RADIO_TYPE_N;
-//		acinfo->radioinfos[i].type=0xffffffff; 
-		acinfo->radioinfos[i].rid=i;
-	}
-
-
-	return acinfo;
-
-}
-
-*/
-
-/*
-get_join_result()
-{
-	return 0;
-}
-*/
-

src/ac/ac_main.c

@@ -92,7 +92,7 @@ static int parse_args (int argc, char *argv[], struct bootcfg * bootcfg)
 	
 	bootcfg->cfgfilename = "config.ckv";
 	
-	while ( (c = getopt (argc, argv, "vc:d:p:")) != -1) {
+	while ( (c = getopt (argc, argv, "hvc:d:p:")) != -1) {
 		
 		switch (c) {
 			case 'c':
@@ -211,7 +211,6 @@ int main (int argc, char *argv[])
 	parse_args (argc, argv, &bootcfg);
 
 
-
 	global_cfg=cw_cfg_create();
 	if (!global_cfg){
 		fprintf(stderr,"Can't create global_cfg: %s\n",strerror(errno));
@@ -226,7 +225,6 @@ int main (int argc, char *argv[])
 		goto errX;
 	};
 
-
 	cw_log_name = "AC-Tube";
 
 /*
@@ -279,7 +277,7 @@ int main (int argc, char *argv[])
 
 	ac_conf_init(global_cfg);
 
-	if (!start_shell(global_cfg))
+	if (!start_rpc(global_cfg))
 		goto errX;
 
 

src/ac/act.c

@@ -0,0 +1,396 @@
+/*	$NetBSD: tc1.c,v 1.7 2016/02/17 19:47:49 christos Exp $	*/
+
+/*-
+ * Copyright (c) 1992, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Christos Zoulas of Cornell University.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/*
+ * test.c: A little test program
+ */
+#include <sys/wait.h>
+#include <ctype.h>
+#include <dirent.h>
+#include <locale.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <errno.h>
+
+
+#include "histedit.h"
+
+#include "cw/cfg.h"
+#include "cw/sock.h"
+
+
+static int continuation = 0;
+volatile sig_atomic_t gotsig = 0;
+
+static	unsigned char	complete(EditLine *, int);
+static	char   *prompt(EditLine *);
+static	void	sig(int);
+
+
+FILE * act_f;
+
+static int 
+get_result(FILE *f, char *str,int len)
+{
+	int n = len;
+	char *rc;
+	rc = fgets (str, len, f);
+	if (rc==NULL)
+		return 0;
+
+	n = strlen(str);
+	if (n==1 && str[0]=='\n')
+		return 0;
+
+	return  1;
+}
+
+
+
+static char *
+prompt(EditLine *el )
+{
+	static char str[64];
+	char str2[64];
+	int rc;
+
+	fprintf(act_f,"@prompt\n");
+	rc = get_result(act_f,str,64);
+	while(rc){
+		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);
+}
+
+static void
+sig(int i)
+{
+	gotsig = i;
+}
+
+static unsigned char
+complete(EditLine *el, int ch __attribute__((__unused__)))
+{
+	DIR *dd = opendir(".");
+	struct dirent *dp;
+	const char* ptr;
+	const LineInfo *lf = el_line(el);
+	size_t len;
+	int res = CC_ERROR;
+
+	/*
+	 * Find the last word
+	 */
+	for (ptr = lf->cursor - 1;
+	    !isspace((unsigned char)*ptr) && ptr > lf->buffer; ptr--)
+		continue;
+	len = lf->cursor - ++ptr;
+
+	for (dp = readdir(dd); dp != NULL; dp = readdir(dd)) {
+		if (len > strlen(dp->d_name))
+			continue;
+		if (strncmp(dp->d_name, ptr, len) == 0) {
+			if (el_insertstr(el, &dp->d_name[len]) == -1)
+				res = CC_ERROR;
+			else
+				res = CC_REFRESH;
+			break;
+		}
+	}
+
+	closedir(dd);
+	return res;
+}
+
+const char *cfgfilename = "config.ckv";
+const char *srvaddr;
+const char *prgname;
+
+static int 
+parse_args (int argc, char *argv[])
+{
+	int c;
+	opterr = 1;
+	
+	
+	while ( (c = getopt (argc, argv, "hvc:s:")) != -1) {
+		
+		switch (c) {
+			case 'c':
+				cfgfilename = optarg;
+				break;
+			case 'v':
+				printf("ACT shell for ACTube version 0.0.1, %s\n", SYS_ARCH);
+				exit(EXIT_SUCCESS);
+				break;
+			case 's':
+				srvaddr = optarg;
+				break;
+
+/*			case 'd':{
+                                if (!cw_dbg_set_level_from_str(optarg)){
+                                        fprintf(stderr,"Invalid debug option: %s\n",optarg);
+                                        exit(EXIT_FAILURE);
+                                }
+
+				break;
+			} */
+
+			case '?':
+				exit(EXIT_FAILURE);
+			default:
+			case 'h':
+				printf("Usage:\n");
+				printf("%s [-v | -h | -s <dst> | -c <cfg> ]\n",argv[0]);
+				printf(" -c: specify config file\n");
+				printf(" -s: specify adress to connect to \n");
+				printf(" -v: print version info\n");
+
+				exit(EXIT_SUCCESS);
+				break;
+		}
+	}
+	return 0;
+}
+
+int create_tcp_fd(const char *addr)
+{
+	struct sockaddr server;
+	
+	int rc;
+	int sockfd;
+
+	memset(&server,0,sizeof(server));
+	rc = sock_strtoaddr (addr, (struct sockaddr*) &server);
+	
+	if (! rc) {
+		fprintf(stderr, "Can't parse address '%s', %s\n", addr, strerror (errno));
+		return -1;
+	}
+	
+	sockfd = socket ( ( (struct sockaddr*) &server)->sa_family, SOCK_STREAM, 0);
+
+	rc = connect(sockfd, (struct sockaddr*)&server, sizeof(server));
+
+	if (rc ) {
+		fprintf(stderr,"%s: Error, can't connt to %s %s\n",prgname,addr,strerror(errno));
+		return -1;
+	}
+
+	return sockfd;	
+}
+
+static FILE *act_connect(const char *srvaddr)
+{
+	int fd;
+	if (srvaddr==NULL){
+		fprintf(stderr,"%s: Error, no address given.\n",prgname);
+		return NULL;
+	}
+	
+	fd=create_tcp_fd(srvaddr);
+	if (fd==-1)
+		return NULL;
+	return fdopen(fd,"a+");
+
+//	return NULL;
+}
+
+
+
+
+int
+main(int argc , char *argv[])
+{
+	prgname = argv[0];	
+	parse_args(argc,argv);
+
+	act_f = act_connect(srvaddr);
+	if (act_f==NULL){
+		return (EXIT_FAILURE);
+	}
+
+
+	EditLine *el = NULL;
+	int num;
+	const char *buf;
+	Tokenizer *tok;
+#if 0
+	int lastevent = 0;
+#endif
+	int ncontinuation;
+	History *hist;
+	HistEvent ev;
+
+	(void) setlocale(LC_CTYPE, "");
+	(void) signal(SIGINT, sig);
+	(void) signal(SIGQUIT, sig);
+	(void) signal(SIGHUP, sig);
+	(void) signal(SIGTERM, sig);
+
+	hist = history_init();		/* Init the builtin history	*/
+					/* Remember 100 events		*/
+	history(hist, &ev, H_SETSIZE, 100);
+
+	tok  = tok_init(NULL);		/* Initialize the tokenizer	*/
+
+					/* Initialize editline		*/
+	el = el_init(*argv, stdin, stdout, stderr);
+
+	el_set(el, EL_EDITOR, "emacs");	/* Default editor is vi		*/
+	el_set(el, EL_SIGNAL, 0);	/* Handle signals gracefully	*/
+
+	el_set(el, EL_PROMPT_ESC, prompt, '\1');/* Set the prompt function */
+
+			/* Tell editline to use this history interface	*/
+	el_set(el, EL_HIST, history, hist);
+
+					/* Add a user-defined function	*/
+	el_set(el, EL_ADDFN, "ed-complete", "Complete argument", complete);
+
+					/* Bind tab to it		*/
+	el_set(el, EL_BIND, "^I", "ed-complete", NULL);
+
+	/*
+	 * Bind j, k in vi command mode to previous and next line, instead
+	 * of previous and next history.
+	 */
+	el_set(el, EL_BIND, "-a", "k", "ed-prev-line", NULL);
+	el_set(el, EL_BIND, "-a", "j", "ed-next-line", NULL);
+
+	/*
+	 * Source the user's defaults file.
+	 */
+	el_source(el, NULL);
+
+	while ((buf = el_gets(el, &num)) != NULL && num != 0)  {
+		int ac, cc, co;
+		const char **av;
+		const LineInfo *li;
+		li = el_line(el);
+		if (gotsig) {
+			(void) fprintf(stderr, "Got signal %d.\n", (int)gotsig);
+			gotsig = 0;
+			el_reset(el);
+		}
+
+		if (!continuation && num == 1)
+			continue;
+
+		ac = cc = co = 0;
+		ncontinuation = tok_line(tok, li, &ac, &av, &cc, &co);
+		if (ncontinuation < 0) {
+			(void) fprintf(stderr, "Internal error\n");
+			continuation = 0;
+			continue;
+		}
+
+		/* Simpler */
+		history(hist, &ev, continuation ? H_APPEND : H_ENTER, buf);
+
+		continuation = ncontinuation;
+		ncontinuation = 0;
+		if (continuation)
+			continue;
+
+		if (strcmp(av[0], "history") == 0) {
+			int rv;
+
+			switch (ac) {
+			case 1:
+				for (rv = history(hist, &ev, H_LAST); rv != -1;
+				    rv = history(hist, &ev, H_PREV))
+					(void) fprintf(stdout, "%4d %s",
+					    ev.num, ev.str);
+				break;
+
+			case 2:
+				if (strcmp(av[1], "clear") == 0)
+					 history(hist, &ev, H_CLEAR);
+				else
+					 goto badhist;
+				break;
+
+			case 3:
+				if (strcmp(av[1], "load") == 0)
+					 history(hist, &ev, H_LOAD, av[2]);
+				else if (strcmp(av[1], "save") == 0)
+					 history(hist, &ev, H_SAVE, av[2]);
+				break;
+
+			badhist:
+			default:
+				(void) fprintf(stderr,
+				    "Bad history arguments\n");
+				break;
+			}
+		} else if (el_parse(el, ac, av) == -1) {
+			char str[2000];
+
+			str[0]=0;
+			fprintf(act_f,"%s\n",av[0]);
+			fflush(act_f);
+			do {
+				int n;
+				fgets (str, 2000, act_f);
+				n = strlen(str);
+//				printf("LEN: %d\n",n);
+				if (n==1 && str[0]=='\n')
+					break;
+				fprintf(stdout,"%s",str);
+			}while(!feof(act_f));
+
+			fflush(stdout);
+
+		}
+
+		tok_reset(tok);
+	}
+
+	el_end(el);
+	tok_end(tok);
+	history_end(hist);
+
+	return (0);
+}

src/ac/config.ckv

@@ -40,10 +40,9 @@ actube/ipv6: false
 actube/mod.1: capwap
 actube/mod.2: capwap80211
 
-#actube/shell/listen: unix:/tmp/actube
+#actube/rpc/listen: unix:/tmp/actube
-actube/shell/listen: tcp:127.0.0.1:5000
+actube/rpc/listen: tcp:127.0.0.1:5000
-actube/shell/enable: true
+actube/rpc/enable: true
-actube/shell/term: ansi
 
 
 ac-descriptor/dtls-policy:  1

src/ac/rpc.c

@@ -6,8 +6,10 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/un.h>
-#include <arpa/telnet.h>
+#include <sys/wait.h>
 
+#include <arpa/telnet.h>
+#include <histedit.h>
 
 
 #include "cw/sock.h"
@@ -23,16 +25,26 @@
 #include "ac.h"
 
 
-struct shelldata{
+struct rpcdata{
+
+	FILE *in;
 	FILE *out;
+
 	char prompt[1024];
-	mavl_t update_cfg;
+	cw_Cfg_t * update_cfg;
+	cw_Cfg_t * global_cfg;
 	char *history[2000];
 	char line[4096];
 	int pos;
 	char esc[8];
 	int escpos;
 	int quit;
+
+	History *hist;
+	HistEvent ev;
+	Tokenizer *tok;
+	EditLine *el;
+
 };
 
 struct sockdata{
@@ -41,27 +53,32 @@ struct sockdata{
 	cw_Cfg_t * global_cfg;
 };
 
-void select_cmd(struct shelldata *sd, const char *cmd);
+int select_cmd(struct rpcdata *sd, const char *cmd);
-void list_cmd(struct shelldata *sd, const char * cmd);
+int list_cmd(struct rpcdata *sd, const char * cmd);
-void cfg_cmd(struct shelldata *sd, const char * cmd);
+int cfg_cmd(struct rpcdata *sd, const char * cmd);
-void ucfg_cmd(struct shelldata *sd, const char * cmd);
+int ucfg_cmd(struct rpcdata *sd, const char * cmd);
-void set_cmd(struct shelldata *sd, const char * cmd);
+int set_cmd(struct rpcdata *sd, const char * cmd);
-void del_cmd(struct shelldata *sd, const char * cmd);
+int del_cmd(struct rpcdata *sd, const char * cmd);
-void send_cmd(struct shelldata *sd, const char * cmd);
+int send_cmd(struct rpcdata *sd, const char * cmd);
-void wlan0_cmd(struct shelldata *sd, const char * cmd);
+int wlan0_cmd(struct rpcdata *sd, const char * cmd);
-void exit_cmd(struct shelldata *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);
+
 //void show_cfg (FILE *out, mavl_t ktv);
-void show_aps (FILE *out);
+int show_aps (FILE *out);
 
 struct cw_Conn * find_ap(const char *name);
 
 struct command{
 	char * cmd;
-	void (*fun)();
+	int (*fun)(struct rpcdata *sd, const char *cmd);
+	
 };
 
 static struct command cmdlist[]={
 	{"exit",exit_cmd},
+	{"bumm",exit_cmd},
 	{"cfg", cfg_cmd },
 	{"del", del_cmd },
 	{"ucfg", ucfg_cmd},
@@ -70,32 +87,63 @@ static struct command cmdlist[]={
 	{"send", send_cmd},
 	{"set", set_cmd },
 	{"wlan0",wlan0_cmd},
+	{"global_cfg", global_cfg_cmd},
+
+	{"@prompt",prompt_cmd},
 
 	
 	{NULL,NULL}
 };
 
 
-void select_cmd(struct shelldata *sd, const char *cmd)
+static void finish_cmd(FILE *f)
+{
+	fprintf(f,"\n");
+	fflush(f);
+}
+
+int prompt_cmd(struct rpcdata *sd, const char *cmd)
+{
+	fprintf(sd->out,"actube[%s]:>\n","*");
+	finish_cmd(sd->out);
+	return 0;
+}
+
+
+int global_cfg_cmd(struct rpcdata *sd, const char *cmd)
+{
+	cw_cfg_fdump(sd->out,sd->global_cfg);
+	finish_cmd(sd->out);
+	return 0;
+}
+
+
+int select_cmd(struct rpcdata *sd, const char *cmd)
 {
 	char ap [CAPWAP_MAX_WTP_NAME_LEN];
 	sscanf(cmd,"%s",ap);
 	strcpy(sd->prompt,ap);
 }
 
-void list_cmd(struct shelldata *sd, const char *cmd)
+int list_cmd(struct rpcdata *sd, const char *cmd)
 {
 	show_aps(sd->out);
+	return 0;
 }
 
-void exit_cmd(struct shelldata *sd, const char *cmd)
+int exit_cmd(struct rpcdata *sd, const char *cmd)
 {
-	sd->quit=1;
+		//fprintf(sd->out,"Unknown command: '%s'\n\r\n\r",cmd);
+
+	printf("Exitcmd %s\n",cmd);
+	fprintf(sd->out,"END: %s\n\r",cmd);
+	fflush(sd->out);
+	return 1;
 }
 
 
 
-void cfg_cmd(struct shelldata *sd, const char *cmd)
+int cfg_cmd(struct rpcdata *sd, const char *cmd)
 {
 	struct cw_Conn * conn;
 	wtplist_lock();
@@ -108,21 +156,23 @@ void cfg_cmd(struct shelldata *sd, const char *cmd)
 //		show_cfg(sd->out,conn->remote_cfg);
 	}
 	wtplist_unlock();
+	return 0;
 }
 
-void ucfg_cmd(struct shelldata *sd, const char *cmd)
+int ucfg_cmd(struct rpcdata *sd, const char *cmd)
 {
-	struct cw_Conn * conn;
+//	struct cw_Conn * conn;
 	stop();
 //	show_cfg(sd->out,sd->update_cfg);
-
+	return 0;
 }
 
 #include "wtpman.h"
 
-void 
+int
-send_cmd(struct shelldata * sd, const char *cmd)
+send_cmd(struct rpcdata * sd, const char *cmd)
 {
+
 	struct cw_Conn * conn;
 	wtplist_lock();
 	conn = find_ap(sd->prompt);
@@ -133,10 +183,11 @@ send_cmd(struct shelldata * sd, const char *cmd)
 		conn->update_cfg=sd->update_cfg;
 	}
 	wtplist_unlock();
+	return 0;
 }
 
-void 
+int
-wlan0_cmd(struct shelldata * sd, const char *cmd)
+wlan0_cmd(struct rpcdata * sd, const char *cmd)
 {
 	stop();
 
@@ -153,34 +204,37 @@ wlan0_cmd(struct shelldata * sd, const char *cmd)
 		fclose(f);
 	}
 	wtplist_unlock();
-
+	return 0;
 }
 
-void set_cmd(struct shelldata *sd, const char *str)
+int set_cmd(struct rpcdata *sd, const char *str)
 {
-	struct cw_Conn * conn;
+/*	struct cw_Conn * conn;
 	struct cw_Val_Reader r;
 	char key[CW_CFG_MAX_KEY_LEN];
 	char type[CW_CFG_MAX_KEY_LEN];
 	char val[2048];
-
+*/
 	stop();
 
 //	cw_ktv_init_str_reader(&r,str,strlen(str));
 	
-	cw_ktv_parse_string(&r,key,type,val);
+//	cw_ktv_parse_string(&r,key,type,val);
 	/*cw_ktv_parse_string(key,type,val, 2048);*/
 	
-	fprintf(sd->out,"%s :%s: %s\n",key,type,val);
+//	fprintf(sd->out,"%s :%s: %s\n",key,type,val);
-	cw_ktv_add(sd->update_cfg,key,CW_TYPE_STR,NULL,val,strlen(val));
+//	cw_ktv_add(sd->update_cfg,key,CW_TYPE_STR,NULL,val,strlen(val));
+	return 0;
 }
 
-void del_cmd(struct shelldata *sd, const char *str)
+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);
+//
+	return 0;
 }
 
 
@@ -208,7 +262,7 @@ void show_cfg (FILE *out, mavl_t ktv)
 }
 */
 
-void show_aps (FILE *out)
+int  show_aps (FILE *out)
 {
 	stop();
 /*	struct connlist * cl;
@@ -244,6 +298,7 @@ void show_aps (FILE *out)
 	}
 	wtplist_unlock();
 	*/
+	return 0;
 }
 
 
@@ -358,7 +413,7 @@ struct command * find_cmd(const char *cmd)
 }
 
 
-void execute_cmd (struct shelldata * sd, const char *str)
+int execute_cmd (struct rpcdata * sd, const char *str)
 {
 	char cmd[1024];
 	char args[1024];
@@ -370,21 +425,21 @@ void execute_cmd (struct shelldata * sd, const char *str)
 	
 	n = sscanf (str, "%s", cmd);
 	if (n<=0)
-		return;
+		return 0;
 	
 	searchcmd = find_cmd(cmd);
-	
 	if (searchcmd!=NULL){
 		if (searchcmd->fun != NULL){
-			fprintf(sd->out,"%s %s\n", searchcmd->cmd,str+strlen(cmd));
+			return searchcmd->fun(sd, str+strlen(cmd));
-			searchcmd->fun(sd, str+strlen(cmd));
 		}
 	}
 	else{
-		fprintf(sd->out,"Unknown command: '%s'\n\r",cmd);
+		printf("unknow command\n");
+		fprintf(sd->out,"Unknown command: '%s'\n",cmd);
+		finish_cmd(sd->out);
 	}
 
-	return;
+	return 0;
 	
 	
 	char key[CW_CFG_MAX_KEY_LEN];
@@ -412,25 +467,26 @@ void execute_cmd (struct shelldata * sd, const char *str)
 	else{
 		fprintf(sd->out,"%s :%s: %s\n", key,type,val);
 	}
-	return;
+	return 0;
 	
 	
 	n = sscanf (str, "%s%s", cmd, args);
 
 	if (n<=0)
-		return;
+		return 0;
 	/*printf("CMD: %s, ARGS:\n",cmd);*/
 	
 	if (strcmp (cmd, "s") == 0) {
 		show_aps (sd->out);
-		return;
+		return 0;
 	}
 	
 	if (strcmp (cmd, "con")==0){
 		con(sd->out);
-		return;
+		return 0;
 	}
 	
+	return 0;
 }
 
 struct esc_strings {
@@ -472,7 +528,10 @@ static int cmpansi(char * str,char * ansistr)
 }
 
 
-static void get_line_char_mode(FILE * file, struct shelldata *sd)
+
+
+
+static void get_line_char_mode(FILE * file, struct rpcdata *sd)
 {
 	int c;
 	struct esc_strings * es;
@@ -570,13 +629,13 @@ static void get_line_char_mode(FILE * file, struct shelldata *sd)
 		if (strcmp(es->result,"left")==0){
 			if (sd->pos>0){
 				sd->pos--;
-				fprintf(file,es->str);
+				fprintf(file,"%s",es->str);
 			}
 		}
 		if (strcmp(es->result,"right")==0){
 			if (sd->line[sd->pos]!=0){
 				sd->pos++;
-				fprintf(file,es->str);
+				fprintf(file,"%s",es->str);
 			}
 		}
 
@@ -590,48 +649,40 @@ static void get_line_char_mode(FILE * file, struct shelldata *sd)
 }
 
 
-
+void rpc_loop (FILE *file, cw_Cfg_t *global_cfg)
-void shell_loop (FILE *file)
 {
-	struct shelldata sd;
+	struct rpcdata sd;
 	int c;
 	c=0;
-	/*	setvbuf(file,NULL,_IONBF,0);
-		fflush(file);
-	*/
 
 	char str[2048];
-//	sd.update_cfg = cw_ktv_create();
-	
 	
+	sd.in = file;
 	sd.out = file;	
+	sd.global_cfg=global_cfg;
+
+
 	sprintf(sd.prompt,"%s","*");
 	sd.quit=0;
 
 	do {
 		int c;
-		get_line_char_mode(file,&sd);
-		printf("THE CMD FROM LINE '%s'\n",sd.line);
 
 		str[0]=0;
-//		c=fgetc(file);
 		
-		//printf("%c\n",c);
 
-	//	fgets (str, sizeof (str), file);
+		fgets (str, sizeof (str), file);
 
-	//	printf("My String: %s\n",str);
+		if (execute_cmd (&sd, str)) {
-
-		execute_cmd (&sd, sd.line);
-		if (sd.quit)
 			break;
+		}
 
 	} while (c != EOF);
 	
 }
 
 
-void * run_shell (void * arg)
+void * run_rpc_server (void * arg)
 {
 	char sockstr[SOCK_ADDR_BUFSIZE];
 	struct sockdata * sockdata;
@@ -644,7 +695,7 @@ void * run_shell (void * arg)
 	memset(&client,0,sizeof(client));
 	client_size=sizeof(client);
 
-	cw_dbg(DBG_INFO,"Starting shell, listening on: %s (sock fd: %d)",sockdata->name, sockdata->fd);
+	cw_dbg(DBG_INFO,"Starting RPC Service, listening on: %s (sock fd: %d)",sockdata->name, sockdata->fd);
 
 	while(1){
 		clientsock = accept (sockdata->fd, (struct sockaddr*) &client, &client_size);
@@ -656,10 +707,8 @@ void * run_shell (void * arg)
 		
 		if (clientsock > 0) {
 			sock_addr2str_p (&client, sockstr);
-			cw_dbg (DBG_INFO, "Acceptiong session from %s", sockstr);
+			cw_dbg (DBG_INFO, "Accepting RPC session from %s", sockstr);
-			cw_dbg (DBG_INFO, "Start shell");
+			rpc_loop (fdopen (clientsock, "a+"),sockdata->global_cfg);
-			shell_loop (fdopen (clientsock, "a+"));
-			cw_dbg (DBG_INFO, "Stop shell");
 			close (clientsock);
 		}
 		
@@ -690,14 +739,13 @@ int create_tcp_fd(const char *name)
 	}
 	
 	sockfd = socket ( ( (struct sockaddr*) &server)->sa_family, SOCK_STREAM, 0);
-	
 	yes = 1;
 	/* reuse address */
 	setsockopt (sockfd, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof (yes));
 	
 	
 	/* bind address */
-	rc =  bind (sockfd, (struct sockaddr*) &server, sizeof (server));
+	rc =  bind (sockfd, (struct sockaddr*) &server, sizeof (struct sockaddr));
 	
 	if (rc) {
 		cw_log (LOG_ERR, "Can't bind socket address '%s', %s", addr, strerror (errno));
@@ -716,8 +764,7 @@ static int create_unix_fd(const char *name)
 	unlink(name);
 	fd = socket(PF_UNIX, SOCK_STREAM, 0);
 
-	memset(&addr, 0, sizeof(addr));
+	sock_addrinit((struct sockaddr_storage*)&addr,AF_UNIX);
-	addr.sun_family = AF_UNIX;
 	strncpy(addr.sun_path, name, sizeof(addr.sun_path)-1);
 	rc = bind(fd, (struct sockaddr*)&addr, sizeof(addr));
 	if (rc) {
@@ -729,15 +776,14 @@ static int create_unix_fd(const char *name)
 	return fd;
 }
 
-
+int start_rpc(cw_Cfg_t *global_cfg)
-int start_shell(cw_Cfg_t *global_cfg)
 {
 	struct sockdata * sockdata;
 	const char *sockname;
 	int rc, type;
 	int fd;
 
-	rc = cw_cfg_get_bool(global_cfg,"actube/shell/enable",1);
+	rc = cw_cfg_get_bool(global_cfg,"actube/rpc/enable",1);
 	if (!rc)
 		return 1;
 
@@ -750,10 +796,10 @@ int start_shell(cw_Cfg_t *global_cfg)
 	sockdata->global_cfg = global_cfg;
 	sockdata->fd=-1;
 
-	sockname = cw_cfg_get(global_cfg,"actube/shell/listen",NULL);
+	sockname = cw_cfg_get(global_cfg,"actube/rpc/listen",NULL);
 	
 	if (sockname==NULL) {
-		cw_log (LOG_ERR, "Can't get shell listen address from global_cfg 'actube/shell/listen");
+		cw_log (LOG_ERR, "Can't get RPC listen address from global_cfg 'actube/rpc/listen");
 		goto errX;
 	}
 
@@ -785,14 +831,14 @@ int start_shell(cw_Cfg_t *global_cfg)
 	}
 	
 	pthread_t thread;
-	pthread_create (&thread, NULL, run_shell,
+	pthread_create (&thread, NULL, run_rpc_server,
 	                sockdata);
 	return 1;
 errX:
 	if (sockdata->fd!=-1)
 		close(sockdata->fd);
 	if (sockdata->name)
-		free(sockdata->name);
+		free((void*)sockdata->name);
 
 	free(sockdata);
 	return 0;

src/cw/cfg.c

@@ -186,6 +186,20 @@ void cw_cfg_dump(cw_Cfg_t * cfg)
 	}
 }
 
+void cw_cfg_fdump(FILE *f, cw_Cfg_t * cfg)
+{
+	mavliter_t it;
+	struct cw_Cfg_entry *e;
+	mavliter_init(&it, cfg->cfg);
+	mavliter_foreach(&it) {
+
+		e = mavliter_get(&it);
+		fprintf(f,"%s: '%s'\n", e->key, e->val);
+	}
+}
+
+
+
 
 struct parser {
 	int line;

src/cw/cfg.h

@@ -56,6 +56,7 @@ int cw_cfg_base_exists_l(cw_Cfg_t ** cfgs, const char *key);
 int cw_cfg_save(const char *filename, cw_Cfg_t *cfg, const char *format, ...);
 
 uint16_t cw_cfg_get_word_l(cw_Cfg_t ** cfg, char *key, uint16_t def);
+void cw_cfg_fdump(FILE *f, cw_Cfg_t * cfg);
 
 
 

src/cw/sock.h

@@ -35,8 +35,9 @@
 
 
 #ifdef __FreeBSD__
-#define HAVE_SIN_LEN
+#define HAVE_SIN_LEN 1
-#define HAVE_SIN6_LEN
+#define HAVE_SIN6_LEN 1
+#define HAVE_SS_LEN 1
 #endif
 
 
@@ -68,7 +69,7 @@ extern int sock_getport(struct sockaddr *addr);
 extern int sock_setport(struct sockaddr *addr, int port);
 extern int sock_getbroadcastaddr(const struct sockaddr *addr,
 				 struct sockaddr *broadcastaddr);
-extern void sock_addrinit(struct sockaddr *addr, int type);
+extern void sock_addrinit(struct sockaddr_storage *addr, int type);
 extern int sock_set_dontfrag(int sock, int val);
 
 

src/cw/sock_addrinit.c

@@ -4,19 +4,31 @@
 #include <sys/socket.h>
 #include <arpa/inet.h>
 #include <netinet/in.h>
+#include <sys/un.h>
 
-void sock_addrinit(struct sockaddr *addr,int type)
+#include "sock.h"
+
+void sock_addrinit(struct sockaddr_storage *addr,int type)
 {
+	int len;
 	switch (type){
 		case AF_INET:
-			memset(addr,0,sizeof(struct sockaddr_in));
+			len=sizeof(struct sockaddr_in);
-			addr->sa_family=type;
+			break;
-#ifdef HAVE_SIN_LEN
+		case AF_INET6:
-			addr_sa_len=sizeof(struct sockaddr_in);
+			len=sizeof(struct sockaddr_in6);
-#endif
+			break;
-			return;
+		case AF_UNIX:
-
+			len = sizeof(struct sockaddr_un);
+			break;
+		default:
+			len=0;
 	}
 	
+	memset(addr,0,len);
+	addr->ss_family=type;
+#ifdef HAVE_SS_LEN
+	addr->ss_len=len;
+#endif	
 
 }