@@ -15,27 +15,27 @@ RELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)

 ARCH = $(shell uname -s)

 # compile-time options

-# 

-# -DSTATS	

-#		allows to print out number of packets processed on CTRL-C; 

+#

+# -DSTATS

+#		allows to print out number of packets processed on CTRL-C;

 # 		implementation still nasty and reports per-process

-# -DNO_DEBUG 	

+# -DNO_DEBUG

 #		turns off some of the debug messages (DBG(...)).

-# -DNO_LOG 	

+# -DNO_LOG

 #		completely turns of all the logging (and DBG(...))

-# -DEXTRA_DEBUG	

+# -DEXTRA_DEBUG

 #		compiles in some extra debugging code

-# -DDNS_IP_HACK	

+# -DDNS_IP_HACK

 #		faster ip address resolver for ip strings (e.g "127.0.0.1")

-# -DSHM_MEM	

+# -DSHM_MEM

 #		compiles in shared mem. support, needed by some modules and

 #		by USE_SHM_MEM

 # -DSHM_MMAP

 #		use mmap instead of SYSV shared memory

-# -DPKG_MALLOC	

+# -DPKG_MALLOC

 #		uses a faster malloc (exclusive w/ USE_SHM_MEM)

-# -DUSE_SHM_MEM	

-#		all pkg_malloc => shm_malloc (most mallocs use a common sh. 

+# -DUSE_SHM_MEM

+#		all pkg_malloc => shm_malloc (most mallocs use a common sh.

 #		mem. segment); don't define PKG_MALLOC if you want this!

 # -DDBG_QM_MALLOC

 #		qm_malloc debug code, will cause pkg_malloc and shm_malloc

@@ -60,13 +60,13 @@ DEFS+= -DNAME='"$(NAME)"' -DVERSION='"$(RELEASE)"' -DARCH='"$(ARCH)"' \

 	  #-DNO_DEBUG #-DDBG_QM_MALLOC

 #-DEXTRA_DEBUG

 # -DUSE_SHM_MEM

-#-DNO_DEBUG 

+#-DNO_DEBUG

 #-DPKG_MALLOC

-#-DNO_DEBUG#-DSTATS -DNO_DEBUG 

+#-DNO_DEBUG#-DSTATS -DNO_DEBUG

 #-DNO_LOG

 #PROFILE=  -pg #set this if you want profiling

-mode = release

+mode = debug

 #mode = release

 # platform dependent settings

@@ -82,7 +82,7 @@ ifeq ($(mode), release)

 	CFLAGS=-O9 -funroll-loops  -Wcast-align $(PROFILE) -Winline\

 			-malign-double -malign-loops=4 -minline-all-stringops \

 			-march=athlon -mcpu=athlon

-	#-Wmissing-prototypes 

+	#-Wmissing-prototypes

 	LDFLAGS=-Wl,-O2 -Wl,-E $(PROFILE)\

 			 -march=athlon

 	# we need -fPIC -DPIC only for shared objects, we don't need them for

@@ -6,6 +6,7 @@

 #include "h_table.h"

 #include "../../dprint.h"

 #include "sh_malloc.h"

+ #include "../../md5utils.h"

 /*   Frees the all the containes of a cell and the cell's body itself

   */

@@ -132,6 +133,7 @@ error:

 struct cell*  build_cell( struct sip_msg* p_msg )

 {

    struct cell*  new_cell;

+   str                src[5];

    int                i;

     DBG("DEBUG: build_cell : start\n");

@@ -168,8 +170,17 @@ struct cell*  build_cell( struct sip_msg* p_msg )

 	goto error;

    new_cell->relaied_reply_branch   = -1;

    new_cell->T_canceled = T_UNDEFINED;

+#ifndef USE_SYNONIM

+   src[0]= p_msg->from->body;

+   src[1]= p_msg->to->body;

+   src[2]= p_msg->callid->body;

+   src[3]= p_msg->first_line.u.request.uri;

+   src[4]= get_cseq( p_msg )->number;

+   MDStringArray ( new_cell->md5, src, 5 );

-    init_cell_lock(  new_cell ); 

+#endif

+

+    init_cell_lock(  new_cell );

    DBG("DEBUG: build_cell : done\n");

    return new_cell;

@@ -100,6 +100,10 @@ typedef struct cell

 	   good if a need to forward ACK later on

 	*/

 	struct sockaddr_in ack_to;

+#ifndef	USE_SYNONIM

+	/* MD5checksum */

+	char md5[32];

+#endif

 #ifdef	EXTRA_DEBUG

 	/* scheduled for deletion ? */

@@ -252,6 +252,7 @@ int t_reply_matching( struct sip_msg *p_msg , unsigned int *p_branch )

 	p=p_msg->via1->branch->value.s;

 	scan_space=p_msg->via1->branch->value.len;

+#ifndef USE_SYNONIM

 	/* loop detection ... ignore */

 	n=eat_token2_end( p, p+scan_space, BRANCH_SEPARATOR );

 	loopl = n-p;

@@ -259,6 +260,7 @@ int t_reply_matching( struct sip_msg *p_msg , unsigned int *p_branch )

 	if (n==p || scan_space<2 || *n!=BRANCH_SEPARATOR) goto nomatch2;

 	loopi=p;

 	p=n+1; scan_space--;

+#endif

 	/* hash_id */

 	n=eat_token2_end( p, p+scan_space, BRANCH_SEPARATOR);

@@ -414,7 +416,10 @@ int add_branch_label( struct cell *trans, struct sip_msg *p_msg, int branch )

 	begin=p_msg->add_to_branch_s+p_msg->add_to_branch_len;

 	orig_size = size=MAX_BRANCH_PARAM_LEN - p_msg->add_to_branch_len;

+#ifndef USE_SYNONIM

+	if (memcpy(begin,trans->md5,32)) {begin+=32;size-=32;} else return -1;

 	if (size) { *begin=BRANCH_SEPARATOR; begin++; size--; } else return -1;

+#endif

 	if (int2reverse_hex( &begin, &size, trans->hash_index)==-1) return -1;

 #ifdef USE_SYNONIM

 	if (size) { *begin=BRANCH_SEPARATOR; begin++; size--; } else return -1;

@@ -31,8 +31,11 @@

 #define HDR_OTHER       65536 /*unknown header type*/

 /* maximum length of values appended to Via-branch parameter */

-#define	MAX_BRANCH_PARAM_LEN	32

-

+#ifdef USE_SYNONIM

+#define MAX_BRANCH_PARAM_LEN  22

+#else

+#define MAX_BRANCH_PARAM_LEN  48

+#endif

 /* via param types

  * WARNING: keep in sync w/ FIN_*, GEN_PARAM and PARAM_ERROR from via_parse.c*/

 enum{

@@ -149,7 +149,7 @@ char* via_builder( struct sip_msg *msg , unsigned int *len )

 		/* jku: branch parameter */

 		memcpy(line_buf+via_len, MY_BRANCH, MY_BRANCH_LEN );

 		via_len+=MY_BRANCH_LEN;

-		/* loop checks ? */

+		/* loop checks ?

 		if (loop_checks) {

 			if (check_transaction_quadruple( msg )) {

@@ -166,10 +166,10 @@ char* via_builder( struct sip_msg *msg , unsigned int *len )

 			} else DBG("DEBUG: via_builder: required HFs for "

 					"loop checking missing\n");

-		}

+		}  */

 		//DBG("DEBUG: XXX will add branch now: %s (%d)\n", msg->add_to_branch_s, msg->add_to_branch_len );

 		/* someone wants me to add something to branch here ? */

-		memcpy(line_buf+via_len, msg->add_to_branch_s,

+		memcpy(line_buf+via_len-1, msg->add_to_branch_s,

 				msg->add_to_branch_len );

 		via_len+=msg->add_to_branch_len;

@@ -5,7 +5,7 @@

 #

-debug=1          # debug level (cmd line: -dddddddddd)

+debug=9          # debug level (cmd line: -dddddddddd)

 #fork=yes          # (cmd. line: -D)

 fork=no

 log_stderror=yes # (cmd line: -E)