@@ -54,7 +54,9 @@ ARCH = $(shell uname -m |sed -e s/i.86/i386/ -e s/sun4u/sparc64/ )

 #		issues additional debugging information if lock/unlock is called

 # -DFAST_LOCK

 #		uses fast arhitecture specific locking (see the arh. specific section)

-#

+# -DNOISY_REPLIES

+#		turns on appending User-agent and Content-length:0 to ser-generated

+#		replies; 

 # -DBUSY_WAIT

 #		uses busy waiting on the lock

 # -DADAPTIVE_WAIT

@@ -66,21 +68,27 @@ ARCH = $(shell uname -m |sed -e s/i.86/i386/ -e s/sun4u/sparc64/ )

 # -DNOSMP

 #		don't use smp compliant locking (faster but won't work on SMP machines)

 #		(not yet enabled)

+# -DWAIT

+#		protection against race condiditions; turn off only for debugging;

+#       to become non-optional if stable

+# -DNEW_HNAME

+#		32-bit header name parsing; turn off for lower speed ;-) or debugging; to become non-optional if fast and stable

+# -DSRL Shortened Reply Lock -- moves more code, esp. "send" out

+#  of locks for greater speed; to become non-optional if fast and stable

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

 	 -DOS='"$(OS)"' -DCOMPILER='"$(CC_VER)"'\

 	 -DDNS_IP_HACK  -DPKG_MALLOC -DSHM_MEM  -DSHM_MMAP \

 	 -DF_MALLOC  -DUSE_SYNONIM\

 	 -DNO_DEBUG \

+	 -DWAIT -DNEW_HNAME -DNOISY_REPLIES -DSRL

 	 #-DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=0 \

 	 #-DNOSMP \

 	 #-DEXTRA_DEBUG 

 	 #-DVQ_MALLOC  -DDBG_LOCK  #-DSTATS

 	 #-DDBG_QM_MALLOC #-DNO_DEBUG

-#-DEXTRA_DEBUG

 # -DUSE_SHM_MEM

 #-DNO_DEBUG

-#-DPKG_MALLOC

 #-DNO_DEBUG#-DSTATS -DNO_DEBUG

 #-DNO_LOG

@@ -235,7 +243,7 @@ ifeq  ($(OS), SunOS)

 	YACC=yacc

 	LIBS+=-L/usr/local/lib -lxnet -lrt # or -lnsl -lsocket or -lglibc ?

-	# -lrt needed for sched_yield

+	# -lrt needed for sched_yield; some systems may require -lposix4

 endif

 ifeq ($(OS), FreeBSD)

@@ -55,7 +55,7 @@

 #define PKG_MEM_POOL_SIZE 1024*1024

 /*used if SH_MEM is defined*/

-#define SHM_MEM_SIZE 256*1024*1024

+#define SHM_MEM_SIZE 256

 #define TIMER_TICK 1

 #define LONG_SLEEP	3600

@@ -41,4 +41,6 @@ extern int *pids;

 extern int cfg_errors;

 extern unsigned int msg_no;

+extern unsigned int shm_mem_size;

+

 #endif

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

 #endif

 #include "sr_module.h"

 #include "timer.h"

+#include "msg_parser.h"

 #include <signal.h>

@@ -126,6 +127,7 @@ Options:\n\

     -h           This help message\n\

     -b nr        Maximum receive buffer size which will not be exceeded by\n\

                  auto-probing procedure even if  OS allows\n\

+	-m nr        Size of shared memory allocated in Megabytes\n\

     -w  dir      change the working directory to \"dir\" (default \"/\")\n\

     -t  dir      chroot to \"dir\"\n\

     -u uid       change uid \n\

@@ -141,9 +143,11 @@ void print_ct_constants()

 #ifdef ADAPTIVE_WAIT

 	printf("ADAPTIVE_WAIT_LOOPS=%d, ", ADAPTIVE_WAIT_LOOPS);

 #endif

+/*

 #ifdef SHM_MEM

 	printf("SHM_MEM_SIZE=%d, ", SHM_MEM_SIZE);

 #endif

+*/

 	printf("MAX_RECV_BUFFER_SIZE %d, MAX_LISTEN %d,"

 			" MAX_URI_SIZE %d, MAX_PROCESSES %d\n",

 		MAX_RECV_BUFFER_SIZE, MAX_LISTEN, MAX_URI_SIZE, MAX_PROCESSES );

@@ -204,6 +208,9 @@ process_bm_t process_bit = 0;

 /* cfg parsing */

 int cfg_errors=0;

+/* shared memory (in MB) */

+unsigned int shm_mem_size=SHM_MEM_SIZE * 1024 * 1024;

+

 #define MAX_FD 32 /* maximum number of inherited open file descriptors,

 		    (normally it shouldn't  be bigger  than 3) */

@@ -483,7 +490,7 @@ int main(int argc, char** argv)

 #ifdef STATS

 	"s:"

 #endif

-	"f:p:b:l:n:rRvcdDEVhw:t:u:g:";

+	"f:p:m:b:l:n:rRvcdDEVhw:t:u:g:";

 	while((c=getopt(argc,argv,options))!=-1){

 		switch(c){

@@ -503,6 +510,15 @@ int main(int argc, char** argv)

 					}

 					break;

+			case 'm':

+					shm_mem_size=strtol(optarg, &tmp, 10) * 1024 * 1024;

+					if (tmp &&(*tmp)){

+						fprintf(stderr, "bad shmem size number: -m %s\n", optarg);

+						goto error;

+					};

+					LOG(L_INFO, "ser: shared memory allocated: %d MByte\n", shm_mem_size );

+					break;

+

 			case 'b':

 					maxbuffer=strtol(optarg, &tmp, 10);

 					if (tmp &&(*tmp)){

@@ -619,6 +635,10 @@ int main(int argc, char** argv)

 		goto error;

 	}

+#ifdef NEW_HNAME

+    init_htable();

+#endif

+

 	/*init mallocs (before parsing cfg !)*/

 	if (init_mallocs()==-1)

 		goto error;

@@ -142,13 +142,13 @@ int shm_mem_init()

 				strerror(errno));

 		return -1;

 	}

-	shm_mempool=mmap(0, SHM_MEM_SIZE, PROT_READ|PROT_WRITE, MAP_SHARED,

+	shm_mempool=mmap(0, /* SHM_MEM_SIZE */ shm_mem_size, PROT_READ|PROT_WRITE, MAP_SHARED,

 						fd ,0);

 	/* close /dev/zero */

 	close(fd);

 #else

-	shm_shmid=shmget(IPC_PRIVATE, SHM_MEM_SIZE, 0700);

+	shm_shmid=shmget(IPC_PRIVATE, /* SHM_MEM_SIZE */ shm_mem_size , 0700);

 	if (shm_shmid==-1){

 		LOG(L_CRIT, "ERROR: shm_mem_init: could not allocate shared memory"

 				" segment: %s\n", strerror(errno));

@@ -185,11 +185,11 @@ int shm_mem_init()

 #endif

 	/* init it for malloc*/

 #	ifdef VQ_MALLOC

-		shm_block=vqm_malloc_init(shm_mempool, SHM_MEM_SIZE);

+		shm_block=vqm_malloc_init(shm_mempool, /* SHM_MEM_SIZE */ shm_mem_size );

 	#elif defined F_MALLOC

-		shm_block=fm_malloc_init(shm_mempool, SHM_MEM_SIZE);

+		shm_block=fm_malloc_init(shm_mempool, /* SHM_MEM_SIZE */ shm_mem_size );

 #	else

-		shm_block=qm_malloc_init(shm_mempool, SHM_MEM_SIZE);

+		shm_block=qm_malloc_init(shm_mempool, /* SHM_MEM_SIZE */ shm_mem_size );

 #	endif

 	if (shm_block==0){

 		LOG(L_CRIT, "ERROR: shm_mem_init: could not initialize shared"

@@ -218,7 +218,7 @@ void shm_mem_destroy()

 	DBG("shm_mem_destroy\n");

 	if (shm_mempool && (shm_mempool!=(void*)-1)) {

 #ifdef SHM_MMAP

-		munmap(shm_mempool, SHM_MEM_SIZE);

+		munmap(shm_mempool, /* SHM_MEM_SIZE */ shm_mem_size );

 #else

 		shmdt(shm_mempool);

 #endif

@@ -97,7 +97,13 @@ typedef struct cell

 	/* protection against concurrent reply processing */

 	ser_lock_t   reply_mutex;

 	/* protection against concurrent ACK processing */

-	ser_lock_t   ack_mutex;

+	ser_lock_t	ack_mutex;

+#ifdef WAIT

+	/* protection against reentering WAIT state */

+	ser_lock_t	wait_mutex;

+	/* has the transaction been put on wait status ? */

+	int on_wait;

+#endif

 	/* this is where destination is stored for picked branch;

 	good if a need to forward ACK later on */

@@ -111,6 +117,7 @@ typedef struct cell

 	/* scheduled for deletion ? */

 	short damocles;

 #endif

+

 }cell_type;

@@ -51,6 +51,9 @@ static int

 	timer_semaphore=0, 

 	reply_semaphore=0,

 	ack_semaphore=0;

+#ifdef WAIT

+static int  wait_semaphore=0;

+#endif

 /* and the maximum number of semaphores in the entry_semaphore set */

 static int sem_nr;

 /* timer group locks */

@@ -166,6 +169,11 @@ again:

 			semctl(reply_semaphore, 0 , IPC_RMID , 0 );

 		if (ack_semaphore>0)

 			semctl(reply_semaphore, 0 , IPC_RMID , 0 );

+#ifdef WAIT

+		if (wait_semaphore>0)

+			semctl(wait_semaphore, 0 , IPC_RMID , 0 );

+#endif

+

 		if (i==0){

 			LOG(L_CRIT, "lock_initialize: could not allocate semaphore"

@@ -236,6 +244,23 @@ again:

 		}

 	}

+#ifdef WAIT

+	if ((wait_semaphore=init_semaphore_set(sem_nr))<0){

+		if (errno==EINVAL || errno==ENOSPC ) {

+			DBG( "DEBUG:lock_initialize: wait semaphore initialization"

+				" failure: %s\n", strerror(errno));

+			probe_run==1;

+			i--;

+			goto again;

+		}else{

+			LOG(L_CRIT, "ERROR:lock_initialize: wait semaphore initialization"

+				" failure: %s\n", strerror(errno));

+			goto error;

+		}

+	}

+#endif

+

+

 	/* return success */

@@ -280,8 +305,18 @@ void lock_cleanup()

 	if (ack_semaphore > 0 &&

 	    semctl( ack_semaphore, 0 , IPC_RMID , 0 )==-1)

 		LOG(L_ERR, "ERROR: lock_cleanup, ack_semaphore cleanup failed\n");

+#ifdef WAIT

+	if (wait_semaphore > 0 &&

+		semctl( wait_semaphore, 0 , IPC_RMID , 0 )==-1)

+		LOG(L_ERR, "ERROR: lock_cleanup, wait_semaphore cleanup failed\n");

+#endif

+

 	entry_semaphore = timer_semaphore = reply_semaphore = ack_semaphore = 0;

+#ifdef WAIT

+	wait_semaphore = 0;

+#endif

+

 }

 #endif /*FAST_LOCK*/

@@ -329,13 +364,20 @@ int init_cell_lock( struct cell *cell )

 #ifdef FAST_LOCK

 	init_lock(cell->reply_mutex);

 	init_lock(cell->ack_mutex);

+#ifdef WAIT

+	init_lock(cell->wait_mutex);

+#endif

 	return 0;

 #else

 	cell->reply_mutex.semaphore_set=reply_semaphore;

 	cell->reply_mutex.semaphore_index = cell->hash_index % sem_nr;

 	cell->ack_mutex.semaphore_set=ack_semaphore;

 	cell->ack_mutex.semaphore_index = cell->hash_index % sem_nr;

-#endif

+#ifdef WAIT

+	cell->wait_mutex.semaphore_set=wait_semaphore;

+	cell->wait_mutex.semaphore_index = cell->hash_index % sem_nr;

+#endif /* WAIT */

+#endif /* FAST_LOCK */

 	return 0;

 }

@@ -408,107 +408,6 @@ int t_forward_uri( struct sip_msg* p_msg  )

 #endif

-/*  This function is called whenever a reply for our module is received; 

-  * we need to register  this function on module initialization;

-  *  Returns :   0 - core router stops

-  *              1 - core router relay statelessly

-  */

-int t_on_reply_received( struct sip_msg  *p_msg )

-{

-	unsigned int  branch,len, msg_status, msg_class, save_clone;

-	struct sip_msg *clone, *backup;

-	int relay;

-	int start_fr;

-	int is_invite;

-	struct retrans_buff *rb;

-

-

-	/* make sure we know the assosociated tranaction ... */

-	if (t_check( p_msg  , &branch )==-1) return 1;

-	/* ... if there is no such, tell the core router to forward statelessly */

-	if ( T<=0 ) return 1;

-

-	DBG("DEBUG: t_on_reply_received: Original status =%d\n",T->status);

-

-	/* it can take quite long -- better do it now than later 

-	   inside a reply_lock */

-	if (!(clone=sip_msg_cloner( p_msg ))) {

-		goto error;

-	}

-	msg_status=p_msg->REPLY_STATUS;

-	msg_class=REPLY_CLASS(p_msg);

-	is_invite= T->inbound_request->REQ_METHOD==METHOD_INVITE;

-

-	/* *** stop timers *** */

-	rb=T->outbound_request[branch];

-	/* stop retransmission */

-	reset_timer( hash_table, &(rb->retr_timer));

-	/* stop final response timer only if I got a final response */

-	if ( msg_class>1 )

-		reset_timer( hash_table, &(rb->fr_timer));

-

-	LOCK_REPLIES( T );

-   	/* if a got the first prov. response for an INVITE ->

-	   change FR_TIME_OUT to INV_FR_TIME_UT */

-	start_fr = !T->inbound_response[branch] && msg_class==1 && is_invite;

-

-	/* *** store and relay message as needed *** */

-	relay = t_should_relay_response( T , msg_status, branch, &save_clone );

-

-	if (save_clone) {

-		/* release previously hold message */

-		backup = T->inbound_response[branch];

-		T->inbound_response[branch] = clone;

-		T->tag=&(get_to(clone)->tag_value);

-	} else {

-		backup = NULL;

-		sip_msg_free( clone );

-	}

-

-	if (relay>=0 &&  push_reply_from_uac_to_uas( T, relay)==-1 ) {

-		/* restore original state first */

-		if (save_clone) T->inbound_response[branch] = backup;

-		/* restart FR */

-		start_fr=1;

-		goto cleanup;

-	}

-

-

-	/* *** ACK handling *** */

-	if ( is_invite )

-	{

-		if ( T->outbound_ack[branch] )

-		{   /*retransmit*/

-			SEND_BUFFER( T->outbound_ack[branch] );

-		} else if (msg_class>2 ) {   /*on a non-200 reply to INVITE*/

-           		DBG("DEBUG: t_on_reply_received: >=3xx reply to INVITE: send ACK\n");

-           		if ( t_build_and_send_ACK( T , branch , p_msg )==-1)

-           		{

-               		LOG( L_ERR , "ERROR: t_on_reply_received: unable to send ACK\n" );

-					/* restart FR */

-					start_fr=1;

-           		}

-       		}

-   	}

-cleanup:

-	UNLOCK_REPLIES( T );

-	if (backup) sip_msg_free(backup);

-	if (start_fr) set_timer( hash_table, &(rb->fr_timer), FR_INV_TIMER_LIST );

-   	/* restart retransmission if a provisional response came for 

-	   a non_INVITE -> retrasmit at RT_T2*/

-	if ( msg_class==1 && !is_invite )

-	{

-		rb->retr_list = RT_T2;

-		set_timer( hash_table, &(rb->retr_timer), RT_T2 );

-	}

-error:

-	T_UNREF( T );

-	/* don't try to relay statelessly on error; on troubles, simply do nothing;

-           that will make the other party to retransmit; hopefuly, we'll then 

-           be better off */

-	return 0;

-}

-

 #ifdef _OBSOLETED_TM

 int t_on_request_received( struct sip_msg  *p_msg , 

 	unsigned int ip , unsigned int port)

@@ -612,30 +511,6 @@ int t_release_transaction( struct sip_msg* p_msg)

-/* Retransmits the last sent inbound reply.

-

-  * input: p_msg==request for which I want to retransmit an associated

-    reply

-  * Returns  -1 -error

-  *                1 - OK

-  */

-int t_retransmit_reply( struct sip_msg* p_msg   )

-{

-/*	if (t_check( p_msg  , 0 )==-1) return 1; */

-

-   /* if no transaction exists or no reply to be resend -> out */

-/*   if ( T ) */

-   {

-	LOCK_REPLIES( T );

-	SEND_BUFFER( & T->outbound_response );

-	UNLOCK_REPLIES( T );

-	return 1;

-   }

-

-  /* no transaction found */

-/*   return -1; */

-}

-

@@ -651,170 +526,6 @@ int t_unref( /* struct sip_msg* p_msg */ )

-/* Force a new response into inbound response buffer.

-  * returns 1 if everything was OK or -1 for erro

-  */

-int t_send_reply(  struct sip_msg* p_msg , unsigned int code , char * text )

-{

-	unsigned int len, buf_len;

-	char * buf, *shbuf;

-	struct retrans_buff *rb;

-

-	DBG("DEBUG: t_send_reply: entered\n");

-	/* if (t_check( p_msg , 0 )==-1) return -1;

-

-	if (!T)

-	{

-		LOG(L_ERR, "ERROR: t_send_reply: cannot send a t_reply to a message "

-			"for which no T-state has been established\n");

-		return -1;

-	}

-	*/

-

-	buf = build_res_buf_from_sip_req(code,text,0,0,T->inbound_request,&len);

-	DBG("DEBUG: t_send_reply: buffer computed\n");

-	if (!buf)

-	{

-		DBG("DEBUG: t_send_reply: response building failed\n");

-		goto error;

-	}

-

-	LOCK_REPLIES( T );

-

-	rb = & T->outbound_response;

-	if (!rb->retr_buffer) {

-		/* initialize retransmission structure */

-		memset( rb , 0 , sizeof (struct retrans_buff) );

-		if (update_sock_struct_from_via(  &(rb->to),  p_msg->via1 )==-1)

-		{

-			LOG(L_ERR, "ERROR: t_send_reply: cannot lookup reply dst: %s\n",

-				p_msg->via1->host.s );

-			goto error2;

-		}

-

-		rb->retr_timer.tg=TG_RT;

-		rb->fr_timer.tg=TG_FR;

-		rb->retr_timer.payload = rb;

-		rb->fr_timer.payload = rb;

-		rb->to.sin_family = AF_INET;

-		rb->my_T = T;

-		rb->reply = code;

-	}

-

-

-	/* if this is a first reply (?100), longer replies will probably follow;

-	   try avoiding shm_resize by higher buffer size */

-	buf_len = rb->retr_buffer ? len : len + REPLY_OVERBUFFER_LEN;

-

-	if (! (rb->retr_buffer = (char*)shm_resize( rb->retr_buffer, buf_len )))

-	{

-		LOG(L_ERR, "ERROR: t_send_reply: cannot allocate shmem buffer\n");

-		goto error2;

-	}

-	rb->bufflen = len ;

-	memcpy( rb->retr_buffer , buf , len );

-	T->status = code;

-	SEND_BUFFER( rb );

-	/* needs to be protected too because what timers are set depends

-	   on current transactions status

-	*/

-	t_update_timers_after_sending_reply( rb );

-	UNLOCK_REPLIES( T );

-

-	free( buf ) ;

-	/* start/stops the proper timers*/

-

-	DBG("DEBUG: t_send_reply: finished\n");

-

-	return 1;

-

-error2:

-	free ( buf );

-error:

-	return -1;

-}

-

-

-

-/* Push a previously stored reply from UA Client to UA Server

-  * and send it out

-  */

-static int push_reply_from_uac_to_uas( struct cell* trans , unsigned int branch )

-{

-	char *buf;

-	unsigned int len, buf_len;

-	struct retrans_buff *rb;

-

-	DBG("DEBUG: push_reply_from_uac_to_uas: start\n");

-	rb= & trans->outbound_response;

-	/* if there is a reply, release the buffer (everything else stays same) */

-	if ( ! rb->retr_buffer ) {

-		/*init retrans buffer*/

-		memset( rb , 0 , sizeof (struct retrans_buff) );

-		if (update_sock_struct_from_via(  &(rb->to),

-			trans->inbound_response[branch]->via2 )==-1) {

-				LOG(L_ERR, "ERROR: push_reply_from_uac_to_uas: "

-					"cannot lookup reply dst: %s\n",

-				trans->inbound_response[branch]->via2->host.s );

-				goto error;

-		}

-		rb->retr_timer.tg=TG_RT;

-		rb->fr_timer.tg=TG_FR;

-		rb->retr_timer.payload = rb;

-		rb->fr_timer.payload =  rb;

-		rb->to.sin_family = AF_INET;

-		rb->my_T = trans;

-		rb->reply = trans->inbound_response[branch]->REPLY_STATUS;

-

-	} else {

-		reset_timer( hash_table, &(rb->retr_timer));

-		reset_timer( hash_table, &(rb->fr_timer));

-	}

-

-	/*  generate the retrans buffer */

-	buf = build_res_buf_from_sip_res ( trans->inbound_response[branch], &len);

-	if (!buf) {

-		LOG(L_ERR, "ERROR: push_reply_from_uac_to_uas: "

-			"no shmem for outbound reply buffer\n");

-		goto error;

-	}

-

-	/* if this is a first reply (?100), longer replies will probably follow;

-	try avoiding shm_resize by higher buffer size */

-	buf_len = rb->retr_buffer ? len : len + REPLY_OVERBUFFER_LEN;

-	if (! (rb->retr_buffer = (char*)shm_resize( rb->retr_buffer, buf_len )))

-	{

-		LOG(L_ERR, "ERROR: t_send_reply: cannot allocate shmem buffer\n");

-		goto error1;

-	}

-	rb->bufflen = len ;

-	memcpy( rb->retr_buffer , buf , len );

-	free( buf ) ;

-

-	/* update the status*/

-	trans->status = trans->inbound_response[branch]->REPLY_STATUS;

-	if ( trans->inbound_response[branch]->REPLY_STATUS>=200 &&

-		trans->relaied_reply_branch==-1 ) {

-

-		memcpy( & trans->ack_to, & trans->outbound_request[ branch ]->to,

-			sizeof( struct sockaddr_in ) );

-		trans->relaied_reply_branch = branch;

-	}

-

-	/* start/stops the proper timers*/

-	t_update_timers_after_sending_reply( rb );

-

-	/*send the reply*/

-	SEND_BUFFER( rb );

-	return 1;

-

-error1:

-	free( buf );

-error:

-	return -1;

-}

-

-

@@ -941,11 +652,30 @@ int t_put_on_wait(  struct cell  *Trans  )

 	unsigned int i;

 	struct retrans_buff* rb;

+#ifndef WAIT

 	if (is_in_timer_list2( &(Trans->wait_tl)))

   	{

 		DBG("DEBUG: t_put_on_wait: already on wait\n");

 		return 1;

 	}

+#else

+	/* have some race conditons occured and we already

+	  entered/passed the wait status previously?

+	  if so, exit now

+	*/

+

+	LOCK_WAIT(T);

+	if (Trans->on_wait)

+	{

+		DBG("DEBUG: t_put_on_wait: already on wait\n");

+		UNLOCK_WAIT(T);

+		return 1;

+	} else {

+		Trans->on_wait=1;

+		UNLOCK_WAIT(T);

+	};

+#endif

+

 	/* remove from  retranssmision  and  final response   list */

 	DBG("DEBUG: t_put_on_wait: stopping timers (FR and RETR)\n");

@@ -1402,9 +1132,13 @@ void retransmission_handler( void *attr)

 	/* retransmision */

 	DBG("DEBUG: retransmission_handler : resending (t=%p)\n", r_buf->my_T);

 	if (r_buf->reply) {

+		T=r_buf->my_T;

+/*

 		LOCK_REPLIES( r_buf->my_T );

 		SEND_BUFFER( r_buf );

 		UNLOCK_REPLIES( r_buf->my_T );

+*/

+		t_retransmit_reply();

 	}else{

 		SEND_BUFFER( r_buf );

 	}

@@ -33,16 +33,35 @@ extern struct s_table*  hash_table;

 #include "sip_msg.h"

-#define LOCK_REPLIES(_t) lock(&((_t)->reply_mutex) )

-#define UNLOCK_REPLIES(_t) unlock(&((_t)->reply_mutex) )

-#define LOCK_ACK(_t) lock(&((_t)->ack_mutex) )

-#define UNLOCK_ACK(_t) unlock(&((_t)->ack_mutex) )

+#define LOCK_REPLIES(_t) lock(&(_t)->reply_mutex )

+#define UNLOCK_REPLIES(_t) unlock(&(_t)->reply_mutex )

+#define LOCK_ACK(_t) lock(&(_t)->ack_mutex )

+#define UNLOCK_ACK(_t) unlock(&(_t)->ack_mutex )

+#define LOCK_WAIT(_t) lock(&(_t)->wait_mutex )

+#define UNLOCK_WAIT(_t) unlock(&(_t)->wait_mutex )

 /* convenience short-cut macros */

 #define REQ_METHOD first_line.u.request.method_value

 #define REPLY_STATUS first_line.u.reply.statuscode

 #define REPLY_CLASS(_reply) ((_reply)->REPLY_STATUS/100)

+

+/* send a private buffer: utilize a retransmission structure

+   but take a separate buffer not refered by it; healthy

+   for reducing time spend in REPLIES locks

+*/

+

+#define SEND_PR_BUFFER(_rb,_bf,_le ) ({ if ((_rb)->retr_buffer) \

+	{ udp_send( (_bf), (_le), (struct sockaddr*)&((_rb)->to) , \

+	   sizeof(struct sockaddr_in) ); \

+	} else { \

+	DBG("ERROR: attempt to send an empty buffer from %s (%d)", \

+	__FUNCTION__, __LINE__ ); }})

+

+#define SEND_BUFFER( _rb ) SEND_PR_BUFFER( \

+	_rb,(_rb)->retr_buffer, (_rb)->bufflen )

+

+/*

 #define SEND_BUFFER( _rb ) ({ if ((_rb)->retr_buffer) \

 	{ udp_send( (_rb)->retr_buffer, \

 	  (_rb)->bufflen, (struct sockaddr*)&((_rb)->to) , \

@@ -50,6 +69,7 @@ extern struct s_table*  hash_table;

 	} else \

 	DBG("ERROR: attempt to send an empty buffer from %s (%d)", \

 	__FUNCTION__, __LINE__ ); })

+*/

 /* 

@@ -165,7 +185,12 @@ int t_forward_uri( struct sip_msg* p_msg  );

   *  Returns :   0 - core router stops

   *                    1 - core router relay statelessly

   */

+

+#ifdef SRL

+int t_on_reply( struct sip_msg  *p_msg ) ;

+#else

 int t_on_reply_received( struct sip_msg  *p_msg ) ;

+#endif

@@ -201,7 +226,7 @@ int t_release_transaction( struct sip_msg* );

   * Returns  -1 -error

   *                1 - OK

   */

-int t_retransmit_reply( struct sip_msg *  );

+int t_retransmit_reply( /* struct sip_msg * */  );

@@ -234,7 +259,14 @@ int t_should_relay_response( struct cell *Trans, int new_code, int branch, int *

 int t_update_timers_after_sending_reply( struct retrans_buff *rb );

 int t_put_on_wait(  struct cell  *Trans  );

 int relay_lowest_reply_upstream( struct cell *Trans , struct sip_msg *p_msg );

+

+#ifdef SRL

+static int push_reply( struct cell* trans , unsigned int branch , 

+    char *buf, unsigned int len);

+#else

 static int push_reply_from_uac_to_uas( struct cell* Trans , unsigned int );

+#endif

+

 int add_branch_label( struct cell *Trans, struct sip_msg *p_msg , int branch );

 int get_ip_and_port_from_uri( struct sip_msg* p_msg , unsigned int *param_ip, unsigned int *param_port);

@@ -33,11 +33,11 @@ int t_forward_nonack( struct sip_msg* p_msg , unsigned int dest_ip_param ,

 	if ( T->outbound_request[branch]==NULL )

 	{

-		DBG("DEBUG: t_forward: first time forwarding\n");

+		DBG("DEBUG: t_forward_nonack: first time forwarding\n");

 		/* special case : CANCEL */

 		if ( p_msg->REQ_METHOD==METHOD_CANCEL  )

 		{

-			DBG("DEBUG: t_forward: it's CANCEL\n");

+			DBG("DEBUG: t_forward_nonack: it's CANCEL\n");

 			/* find original cancelled transaction; if found, use its

 			   next-hops; otherwise use those passed by script */

 			if ( T->T_canceled==T_UNDEFINED )

@@ -48,7 +48,7 @@ int t_forward_nonack( struct sip_msg* p_msg , unsigned int dest_ip_param ,

 				/* if in 1xx status, send to the same destination */

 				if ( (T->T_canceled->status/100)==1 )

 				{

-					DBG("DEBUG: t_forward: it's CANCEL and I will send "

+					DBG("DEBUG: t_forward_nonack: it's CANCEL and I will send "

 						"to the same place where INVITE went\n");

 					dest_ip=T->T_canceled->outbound_request[branch]->

 						to.sin_addr.s_addr;

@@ -59,12 +59,12 @@ int t_forward_nonack( struct sip_msg* p_msg , unsigned int dest_ip_param ,

 					T->label  = T->T_canceled->label;

 #endif

 				} else { /* transaction exists, but nothing to cancel */

-					DBG("DEBUG: t_forward: it's CANCEL but "

+					DBG("DEBUG: t_forward_nonack: it's CANCEL but "

 						"I have nothing to cancel here\n");

 					/* forward CANCEL as a stand-alone transaction */

 				}

 			} else { /* transaction doesnot exists  */

-				DBG("DEBUG: t_forward: canceled request not found! "

+				DBG("DEBUG: t_forward_nonack: canceled request not found! "

 				"nothing to CANCEL\n");

 			}

 		}/* end special case CANCEL*/

@@ -77,19 +77,19 @@ int t_forward_nonack( struct sip_msg* p_msg , unsigned int dest_ip_param ,

 			goto error;

 		/* allocates a new retrans_buff for the outbound request */

-		DBG("DEBUG: t_forward: building outbound request\n");

+		DBG("DEBUG: t_forward_nonack: building outbound request\n");

 		shm_lock();

 		rb = (struct retrans_buff*) shm_malloc_unsafe( sizeof(struct retrans_buff)  );

 		if (!rb)

 		{

-			LOG(L_ERR, "ERROR: t_forward: out of shmem\n");

+			LOG(L_ERR, "ERROR: t_forward_nonack: out of shmem\n");

 			shm_unlock();

 			goto error;

 		}

 		shbuf = (char *) shm_malloc_unsafe( len );

 		if (!shbuf)

 		{

-			LOG(L_ERR, "ERROR: t_forward: out of shmem buffer\n");

+			LOG(L_ERR, "ERROR: t_forward_nonack: out of shmem buffer\n");

 			shm_unlock();

 			goto error;

 		}

@@ -114,9 +114,11 @@ int t_forward_nonack( struct sip_msg* p_msg , unsigned int dest_ip_param ,

 		/* link the retransmission buffer to our structures when the job is done */

 		free( buf ) ; buf=NULL;

-		DBG("DEBUG: t_forward: starting timers (retrans and FR) %d\n",get_ticks() );

+		DBG("DEBUG: t_forward_nonack: starting timers (retrans and FR) %d\n",get_ticks() );

 		/*sets and starts the FINAL RESPONSE timer */

+#ifdef FR

 		set_timer( hash_table, &(rb->fr_timer), FR_TIMER_LIST );

+#endif

 		/* sets and starts the RETRANS timer */

 		rb->retr_list = RT_T1_TO_1;

@@ -132,12 +134,14 @@ int t_forward_nonack( struct sip_msg* p_msg , unsigned int dest_ip_param ,

 	if (  p_msg->REQ_METHOD==METHOD_CANCEL )

 	{

-		DBG("DEBUG: t_forward: forwarding CANCEL\n");

+		DBG("DEBUG: t_forward_nonack: forwarding CANCEL\n");

 		/* if no transaction to CANCEL */

 		/* or if the canceled transaction has a final status -> drop the CANCEL*/

 		if ( T->T_canceled!=T_NULL && T->T_canceled->status>=200)

 		{

+#ifdef FR

 			reset_timer( hash_table, &(rb->fr_timer ));

+#endif

 			reset_timer( hash_table, &(rb->retr_timer ));

 			return 1;

 		}

@@ -182,7 +186,7 @@ int t_forward_ack( struct sip_msg* p_msg , unsigned int dest_ip_param ,

 		return -1;

 	}

-	DBG("DEBUG: t_forward: forwarding ACK [%d]\n",branch);

+	DBG("DEBUG: t_forward_ack: forwarding ACK [%d]\n",branch);

 	/* not able to build branch -- then better give up */

 	if ( add_branch_label( T, p_msg , branch )==-1) {

 		LOG( L_ERR, "ERROR: t_forward_ack failed to add branch label\n" );

new file mode 100644

@@ -0,0 +1,520 @@

+/*

+ * $Id$

+ *

+ */

+

+

+#include "hash_func.h"

+#include "t_funcs.h"

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

+#include "../../config.h"

+#include "../../parser_f.h"

+#include "../../ut.h"

+#include "../../timer.h"

+

+#ifndef SRL

+/*  This function is called whenever a reply for our module is received; 

+  * we need to register  this function on module initialization;

+  *  Returns :   0 - core router stops

+  *              1 - core router relay statelessly

+  */

+int t_on_reply_received( struct sip_msg  *p_msg )

+{

+	unsigned int  branch,len, msg_status, msg_class, save_clone;

+	struct sip_msg *clone, *backup;

+	int relay;

+	int start_fr;

+	int is_invite;

+	struct retrans_buff *rb;

+

+

+	/* make sure we know the assosociated tranaction ... */

+	if (t_check( p_msg  , &branch )==-1) return 1;

+	/* ... if there is no such, tell the core router to forward statelessly */

+	if ( T<=0 ) return 1;

+

+	DBG("DEBUG: t_on_reply_received: Original status =%d\n",T->status);

+

+	/* it can take quite long -- better do it now than later 

+	   inside a reply_lock */

+	if (!(clone=sip_msg_cloner( p_msg ))) {

+		goto error;

+	}

+	msg_status=p_msg->REPLY_STATUS;

+	msg_class=REPLY_CLASS(p_msg);

+	is_invite= T->inbound_request->REQ_METHOD==METHOD_INVITE;