[sr-dev] git:master: evapi: option to retrive data from clients encapsulated in netstring format

[Daniel-Constantin Mierla]

Module: sip-router
Branch: master
Commit: 58559544b7bb94421feb51db415910db6de2359d
URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=58559544b7bb94421feb51db415910db6de2359d

Author: Daniel-Constantin Mierla <miconda at gmail.com>
Committer: Daniel-Constantin Mierla <miconda at gmail.com>
Date:   Tue Apr  8 16:40:24 2014 +0200

evapi: option to retrive data from clients encapsulated in netstring format

---

 modules/evapi/evapi_dispatch.c |   54 +++++++++++++++++++++++++++++++++++----
 modules/evapi/evapi_dispatch.h |    2 +-
 modules/evapi/evapi_mod.c      |    8 +++--
 3 files changed, 54 insertions(+), 10 deletions(-)

diff --git a/modules/evapi/evapi_dispatch.c b/modules/evapi/evapi_dispatch.c
index a13742d..7b42320 100644
--- a/modules/evapi/evapi_dispatch.c
+++ b/modules/evapi/evapi_dispatch.c
@@ -38,7 +38,10 @@
 #include "../../ut.h"
 #include "../../lib/kcore/faked_msg.h"
 
+#include "evapi_dispatch.h"
+
 static int _evapi_notify_sockets[2];
+static int _evapi_netstring_format = 1;
 
 #define EVAPI_IPADDR_SIZE	64
 typedef struct _evapi_client {
@@ -80,7 +83,7 @@ void evapi_env_reset(evapi_env_t *evenv)
 /**
  *
  */
-void evapi_init_event_routes(void)
+void evapi_init_environment(int dformat)
 {
 	memset(&_evapi_rts, 0, sizeof(evapi_evroutes_t));
 
@@ -93,6 +96,7 @@ void evapi_init_event_routes(void)
 	_evapi_rts.msg_received = route_get(&event_rt, "evapi:message-received");
 	if (_evapi_rts.msg_received < 0 || event_rt.rlist[_evapi_rts.msg_received] == NULL)
 		_evapi_rts.msg_received = -1;
+	_evapi_netstring_format = dformat;
 }
 
 /**
@@ -220,11 +224,12 @@ int evapi_dispatch_notify(char *obuf, int olen)
  */
 void evapi_recv_client(struct ev_loop *loop, struct ev_io *watcher, int revents)
 {
-#define CLIENT_BUFFER_SIZE	1024
+#define CLIENT_BUFFER_SIZE	4096
 	char rbuffer[CLIENT_BUFFER_SIZE];
 	ssize_t rlen;
-	int i;
+	int i, k;
 	evapi_env_t evenv;
+	str frame;
 
 	if(EV_ERROR & revents) {
 		perror("received invalid event\n");
@@ -270,10 +275,47 @@ void evapi_recv_client(struct ev_loop *loop, struct ev_io *watcher, int revents)
 			i, _evapi_clients[i].src_addr, _evapi_clients[i].src_port,
 			(int)rlen, rbuffer);
 	evenv.conidx = i;
-	evenv.msg.s = rbuffer;
-	evenv.msg.len = rlen;
 	evenv.eset = 1;
-	evapi_run_cfg_route(&evenv, _evapi_rts.msg_received);
+	if(_evapi_netstring_format) {
+		/* netstring decapsulation */
+		k = 0;
+		while(k<rlen) {
+			frame.len = 0;
+			while(k<rlen) {
+				if(rbuffer[k]==' ' || rbuffer[k]=='\t'
+						|| rbuffer[k]=='\r' || rbuffer[k]=='\n')
+					k++;
+				else break;
+			}
+			if(k==rlen) return;
+			while(k<rlen) {
+				if(rbuffer[k]>='0' && rbuffer[k]<='9') {
+					frame.len = frame.len*10 + rbuffer[k] - '0';
+				} else {
+					if(rbuffer[k]==':')
+						break;
+					/* invalid character - discard the rest */
+					return;
+				}
+				k++;
+			}
+			if(k==rlen || frame.len<=0) return;
+			if(frame.len + k>=rlen) return;
+			k++;
+			frame.s = rbuffer + k;
+			if(frame.s[frame.len]!=',') return;
+			frame.s[frame.len] = '\0';
+			k += frame.len ;
+			evenv.msg.s = frame.s;
+			evenv.msg.len = frame.len;
+			evapi_run_cfg_route(&evenv, _evapi_rts.msg_received);
+			k++;
+		}
+	} else {
+		evenv.msg.s = rbuffer;
+		evenv.msg.len = rlen;
+		evapi_run_cfg_route(&evenv, _evapi_rts.msg_received);
+	}
 }
 
 /**
diff --git a/modules/evapi/evapi_dispatch.h b/modules/evapi/evapi_dispatch.h
index 568576f..b1662ca 100644
--- a/modules/evapi/evapi_dispatch.h
+++ b/modules/evapi/evapi_dispatch.h
@@ -37,7 +37,7 @@ int evapi_run_worker(int prank);
 
 int evapi_relay(str *evdata);
 
-void evapi_init_event_routes(void);
+void evapi_init_environment(int dformat);
 
 int pv_parse_evapi_name(pv_spec_t *sp, str *in);
 int pv_get_evapi(sip_msg_t *msg,  pv_param_t *param, pv_value_t *res);
diff --git a/modules/evapi/evapi_mod.c b/modules/evapi/evapi_mod.c
index 94c1fff..d8e730c 100644
--- a/modules/evapi/evapi_mod.c
+++ b/modules/evapi/evapi_mod.c
@@ -48,6 +48,7 @@ static int   _evapi_workers = 1;
 static char *_evapi_bind_addr = "127.0.0.1";
 static int   _evapi_bind_port = 8448;
 static char *_evapi_bind_param = NULL;
+static int   _evapi_netstring_format_param = 1;
 
 static tm_api_t tmb;
 
@@ -71,8 +72,9 @@ static cmd_export_t cmds[]={
 };
 
 static param_export_t params[]={
-	{"workers",     INT_PARAM,   &_evapi_workers},
-	{"bind_addr",   STR_PARAM,   &_evapi_bind_param},
+	{"workers",           INT_PARAM,   &_evapi_workers},
+	{"bind_addr",         STR_PARAM,   &_evapi_bind_param},
+	{"netstring_format",  INT_PARAM,   &_evapi_netstring_format_param},
 	{0, 0, 0}
 };
 
@@ -138,7 +140,7 @@ static int mod_init(void)
 	/* add child to update local config framework structures */
 	cfg_register_child(1 + _evapi_workers);
 
-	evapi_init_event_routes();
+	evapi_init_environment(_evapi_netstring_format_param);
 
 	return 0;
 }