Rename protocol_v3 as trunk to avoid confusion on protocol version to use.

1 files changed, 84 insertions, 165 deletions

diff --git a/src/ivybind.c b/src/ivybind.c
index 237ee78..c506ab3 100644
--- a/src/ivybind.c
+++ b/src/ivybind.c
@@ -31,78 +31,41 @@
 #ifdef USE_PCRE_REGEX
 #define OVECSIZE 60 /* must be multiple of 3, for regexp return */
 #include <pcre.h>
-#else
+#else  /* we don't USE_PCRE_REGEX */
 #define MAX_MSG_FIELDS 200
 #include <regex.h>
-#endif
+#endif /* USE_PCRE_REGEX */
 
 #include "list.h"
-#include "hash.h"
 #include "ivybind.h"
 
 static int err_offset;
 
 #ifdef USE_PCRE_REGEX
 	static const char *err_buf;
-#else
+#else  /* we don't USE_PCRE_REGEX */
 	static char err_buf[4096];
-#endif
+#endif /* USE_PCRE_REGEX */
 
 struct _binding {
-	IvyBindingType type;
-	const char *msgname;			/* msg tag name first word of message */
-	char **msgargs;					/* list of msg argument name */
-	IvyArgument args;				/* result */
 #ifdef USE_PCRE_REGEX
 	pcre *regexp;
 	pcre_extra *inspect;
 	int nb_match;
 	int ovector[OVECSIZE];
-#else
+#else  /* we don't USE_PCRE_REGEX */
 	regex_t regexp;						/* la regexp sous forme machine */
 	regmatch_t match[MAX_MSG_FIELDS+1];	/* resultat du match */
-#endif
+#endif /* USE_PCRE_REGEX */
 	};
 
-
 /* classes de messages emis par l'application utilise pour le filtrage */
 static int	messages_classes_count = 0;
 static const char **messages_classes = 0;
+/* regexp d'extraction du mot clef des regexp client pour le filtrage des regexp , ca va c'est clair ??? */
+static IvyBinding token_extract;
 
-
-/* stokage du message parse avant l'execution des regles de binding simple */
-static char *current_msg = NULL;
-static char *msgtag;
-static HASHTABLE msg_args_values = NULL;
-
-static IvyBinding IvyBindingCompileSimple( IvyBindingType typ, const char * expression )
-{
-	int nb_arg= 0;
-	char *argname;
-	char **argv;
-	char *expr;
-	IvyBinding bind=0;
-	
-	expr = strdup( expression ); //Allocate a new buffer of separated token
-	/* count nb args */
-	argname = expr;
-	while ( *argname ) 
-	{ 
-	if ( *argname++ == ' ' ) nb_arg++;
-	}
-
-	bind = (IvyBinding)malloc( sizeof( struct _binding ));
-	memset( bind, 0, sizeof(*bind ) );
-	bind->type = IvyBindSimple;
-	bind->msgname = strtok( expr, " ");
-	bind->msgargs = malloc ( sizeof( char* ) * ( nb_arg + 1) );
-	argv = bind->msgargs;
-	while ( (argname = strtok( NULL, " ")) )
-		*argv++ = argname;
-	*argv++ = argname; /* end with NULL */
-	return bind;
-}
-static IvyBinding IvyBindingCompileRegexp( IvyBindingType typ, const char * expression )
+IvyBinding IvyBindingCompile( const char * expression,  int *erroffset, const char **errmessage )
 {
 	IvyBinding bind=0;
 #ifdef USE_PCRE_REGEX
@@ -111,9 +74,13 @@ static IvyBinding IvyBindingCompileRegexp( IvyBindingType typ, const char * expr
 	if ( regexp != NULL )
 		{
 			bind = (IvyBinding)malloc( sizeof( struct _binding ));
+			if ( ! bind ) 
+			{
+				perror( "IvyBindingCompile malloc error: ");
+				exit(-1);
+			}
 			memset( bind, 0, sizeof(*bind ) );
 			bind->regexp = regexp;
-			bind->type = IvyBindRegexp;
 			bind->inspect = pcre_study(regexp,0,&err_buf);
 			if (err_buf!=NULL)
 				{
@@ -122,9 +89,11 @@ static IvyBinding IvyBindingCompileRegexp( IvyBindingType typ, const char * expr
 		}
 		else
 		{
+		*erroffset = err_offset;
+		*errmessage = err_buf;
 		printf("Error compiling '%s', %s\n", expression, err_buf);
 		}
-#else
+#else  /* we don't USE_PCRE_REGEX */
 	regex_t regexp;
 	int reg;
 	reg = regcomp(&regexp, expression, REGCOMP_OPT|REG_EXTENDED);
@@ -138,38 +107,26 @@ static IvyBinding IvyBindingCompileRegexp( IvyBindingType typ, const char * expr
 		else
 		{
 		regerror (reg, &regexp, err_buf, sizeof(err_buf) );
-		err_offset = 0; // TODO unkown offset error
+		*erroffset = err_offset;
+		*errmessage = err_buf;
 		printf("Error compiling '%s', %s\n", expression, err_buf);
 		}
-#endif
+#endif /* USE_PCRE_REGEX */
 	return bind;
 }
-IvyBinding IvyBindingCompile( IvyBindingType typ, const char * expression )
-{
-	if ( typ == IvyBindRegexp )
-		return IvyBindingCompileRegexp( typ, expression);
-	else
-		return IvyBindingCompileSimple( typ, expression);
-}
-void IvyBindingGetCompileError( int *offset, const char **errmessage )
-{
-	*offset = err_offset;
-	*errmessage = err_buf;
-}
+
 void IvyBindingFree( IvyBinding bind )
 {
 #ifdef USE_PCRE_REGEX
-	if (bind->inspect!=NULL) pcre_free(bind->inspect);
+	if (bind->inspect!=NULL)
+		pcre_free(bind->inspect);
 		pcre_free(bind->regexp);
-#else
-#endif
-	if (bind->msgname)
-		free ( bind->msgname );
-	if (bind->msgargs)
-		free ( bind->msgargs );
+#else  /* we don't USE_PCRE_REGEX */
+	free( bind->regexp );
+#endif /* USE_PCRE_REGEX */
 	free ( bind );
 }
-int IvyBindingExecRegexp( IvyBinding bind, const char * message )
+int IvyBindingExec( IvyBinding bind, const char * message )
 {
 	int nb_match = 0;
 #ifdef USE_PCRE_REGEX
@@ -185,9 +142,7 @@ int IvyBindingExecRegexp( IvyBinding bind, const char * message )
 					OVECSIZE);
 	if (nb_match<1) return 0; /* no match */
 	bind->nb_match = nb_match;
-	nb_match--; // firts arg wall string ???
-
-#else
+#else  /* we don't USE_PCRE_REGEX */
 	memset( bind->match, -1, sizeof(bind->match )); /* work around bug !!!*/
 	nb_match = regexec (&bind->regexp, message, MAX_MSG_FIELDS, bind->match, 0) 
 	if (nb_match == REG_NOMATCH)
@@ -197,126 +152,90 @@ int IvyBindingExecRegexp( IvyBinding bind, const char * message )
 		if ( bind->match[i].rm_so != -1 )
 			nb_match++;
 	}
-#endif
+#endif /* USE_PCRE_REGEX */
 	return nb_match;
 }
-int IvyBindingExecSimple( IvyBinding bind, const char * message )
-{
-	char **msg_args;
-	if ( strcmp( bind->msgname, msgtag ) != 0 )
-		return 0;
-	msg_args = bind->msgargs;
-	bind->args = IvyArgumentNew( 0,NULL ); 
-	while(  *msg_args )
-	{
-		char *value;
-		value = hash_lookup(msg_args_values,  (HASHKEYTYPE)*msg_args++);
-		if ( !value ) value = ""; /* TODO should we report matching ??? */
-		IvyAddChildValue( bind->args,  strlen( value ), value);
-	}
-	return 1;
-}
-int IvyBindingExec( IvyBinding bind, const char * message )
-{
-	if ( bind->type == IvyBindRegexp )
-		return IvyBindingExecRegexp( bind, message);
-	else
-		return IvyBindingExecSimple( bind, message);
-}
-static IvyArgument IvyBindingMatchSimple( IvyBinding bind, const char *message)
-{
-	return bind->args;
-}
-static IvyArgument IvyBindingMatchRegexp( IvyBinding bind, const char *message)
+
+void IvyBindingMatch( IvyBinding bind, const char *message, int argnum, int *arglen, const char **arg)
 {
-	int index=1;// firts arg wall string ???
-	int arglen;
-	const void* arg;
-	IvyArgument args;
-	args = IvyArgumentNew( 0,NULL ); 
-	
 #ifdef USE_PCRE_REGEX
-	while ( index<bind->nb_match ) {
-		arglen = bind->ovector[2*index+1]- bind->ovector[2*index];
-		arg =   message + bind->ovector[2*index];
-		index++;
+	
+		*arglen = bind->ovector[2*argnum+1]- bind->ovector[2*argnum];
+		*arg =   message + bind->ovector[2*argnum];
 #else  /* we don't USE_PCRE_REGEX */
-	for ( index = 1; index < MAX_MSG_FIELDS; index++ )
-	{
+	
 	regmatch_t* p;
 
-	p = &bind->match[index];
+	p = &bind->match[argnum];
 	if ( p->rm_so != -1 ) {
-			arglen = p->rm_eo - p->rm_so;
-			arg = message + p->rm_so;
+			*arglen = p->rm_eo - p->rm_so;
+			*arg = message + p->rm_so;
 	} else { // ARG VIDE
-			arglen = 0;
-			arg = NULL;
-	}
-#endif // USE_PCRE_REGEX
-	IvyAddChildValue( args, arglen, arg );
+			*arglen = 0;
+			*arg = NULL;
 	}
-	return args;
-}
-IvyArgument IvyBindingMatch( IvyBinding bind, const char *message)
-{
-	if ( bind->type == IvyBindRegexp )
-		return IvyBindingMatchRegexp( bind, message);
-	else 
-		return IvyBindingMatchSimple( bind, message);
+#endif /* USE_PCRE_REGEX */
+
 }
 
 //filter Expression Bind 
+int IvyBindingGetFilterCount()
+{
+return messages_classes_count;
+}
 void IvyBindingSetFilter( int argc, const char **argv)
 {
+	const char *errbuf;
+	int erroffset;
+
 	messages_classes_count = argc;
 	messages_classes = argv;
-}
-void IvyBindingParseMessage( const char *msg )
-{
-	char *arg;
-	if ( current_msg ) free( current_msg );
-	if ( msg_args_values ) hash_destroy( msg_args_values );
-	current_msg = strdup( msg );
-	msg_args_values = hash_create( 256, TRUE );
-	msgtag = strtok( current_msg, " " );
-	while( (arg = strtok( NULL, " =" )) )
+	/* compile the token extraction regexp */
+
+	token_extract = IvyBindingCompile("^\\^([a-zA-Z_0-9-]+).*", & erroffset, & errbuf);
+	if ( !token_extract )
 	{
-		char *val = strtok( NULL, " =");
-		if ( arg && val )
-			hash_addstring( msg_args_values, arg, val );
+		printf("Error compiling Token Extract regexp: %s\n", errbuf);
 	}
 }
-int IvyBindingFilter(IvyBindingType typ, int len, const char *exp)
+	
+int IvyBindingFilter(const char *expression)
 {
-	 /* TODO check args limits !!!*/
 	int i;
-	/* accepte tout par default */
-	int regexp_ok = 1;
-	// TODO simplify test 3 conditions
-	if ( typ == IvyBindRegexp )
-	{
-	if ( *exp =='^' && messages_classes_count !=0 )
+	int err;
+	int regexp_ok = 1; /* accepte tout par default */
+	int tokenlen;
+	const char *token;
+	
+	if ( *expression =='^' && messages_classes_count !=0 )
 	{
 		regexp_ok = 0;
+		
+		/* extract token */
+		err = IvyBindingExec( token_extract, expression );
+		if ( err < 1 ) return 1;
+		IvyBindingMatch( token_extract, expression , 1, &tokenlen, &token );
 		for ( i = 0 ; i < messages_classes_count; i++ )
 		{
-			if (strncmp( messages_classes[i], exp+1, strlen( messages_classes[i] )) == 0)
-				return 1;
+		  if (strncmp( messages_classes[i], token, tokenlen ) == 0) {
+		    return 1; }
+		  //		  else {
+		  //printf ("DBG> %s eliminé [%s]\n", token, expression);
+		  //}
 		}
  	}
-	}
-	else
-	{
-	if ( messages_classes_count !=0 )
+	return regexp_ok;
+}
+/* recherche si le message commence par un mot clef de la table */
+void IvyBindindFilterCheck( const char *message )
+{
+	int i;
+	for ( i = 0 ; i < messages_classes_count; i++ )
 	{
-		regexp_ok = 0;
-		for ( i = 0 ; i < messages_classes_count; i++ )
+	if (strcmp( messages_classes[i], message ) == 0)
 		{
-			if (strncmp( messages_classes[i], exp, strlen( messages_classes[i] )) == 0)
-				return 1;
-		}
- 	}
+		return; 
+	    }
 	}
-	return regexp_ok;
-}
\ No newline at end of file
+	fprintf(stderr,"*** WARNING *** message '%s' not sent due to missing keyword in filter table!!!\n", message );    
+}