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

  *

  * History:

  * ---------

+ * 2003-02-28 scratchpad compatibility abandoned (jiri)

  * 2003-01-29 removed scratchpad (jiri)

  */

@@ -184,11 +185,7 @@ int do_action(struct action* a, struct sip_msg* msg)

 					/*udp*/

 					send_sock=get_send_socket(to, PROTO_UDP);

 					if (send_sock!=0){

-#ifdef SCRATCH

-						ret=udp_send(send_sock, msg->orig, msg->len, to);

-#else

 						ret=udp_send(send_sock, msg->buf, msg->len, to);

-#endif

 					}else{

 						ret=-1;

 					}

@@ -196,11 +193,7 @@ int do_action(struct action* a, struct sip_msg* msg)

 #ifdef USE_TCP

 					else{

 					/*tcp*/

-#ifdef SCRATCH

-					ret=tcp_send(msg->orig, msg->len, to, 0);

-#else

 					ret=tcp_send(msg->buf, msg->len, to, 0);

-#endif

 				}

 #endif

 			}

@@ -37,35 +37,5 @@

 #ifndef _COMP_DEFS_H

 #define _COMP_DEFS_H

-/* preserve "old" parser which delimited header fields by zeros,

- * and included deliminitors in body (which was the only way to

- * learn length of the whole header field 

- */

-#undef PRESERVE_ZT

-

-/* go one step further and remove ZT from first line too */

-#undef DONT_REMOVE_ZT

-

-/* make it all -- move ZT away (Via) */

-#define REMOVE_ALL_ZT

-

-/* don't use scratchpad  anymore */

-#undef SCRATCH

-

-

-/* ------------------------------------------------------ */

-/* don't touch this -- that's helper macros depending on

- * the backwards compatibility macros above */

-#ifdef PRESERVE_ZT

-#	define SET_ZT(_ch) (_ch)='\0'

-#else

-#	define SET_ZT(_ch)

-#endif

-

-#ifdef REMOVE_ALL_ZT

-#	define VIA_ZT(_ch)

-#else

-#	define VIA_ZT(ch) (_ch)='\0'

-#endif

 #endif

@@ -185,18 +185,6 @@ static void consume_request( FILE *stream )

 	while(!read_line(buffer, MAX_CONSUME_BUFFER, stream, &len));

-#ifdef _OBSOLETED

-	int eol_count;

-

-	eol_count=0;

-

-	/* each request must be terminated by two EoLs */

-	while(eol_count!=2) {

-		/* read until EoL is encountered */

-		while(!read_line(buffer, MAX_CONSUME_BUFFER, stream, &len));

-		eol_count=len==0?eol_count+1:1;

-	}

-#endif

 }

 int read_eol( FILE *stream )

@@ -112,56 +112,6 @@ void* _shm_resize( void* p , unsigned int s)

 	return sh_realloc( p, s ); 

 }

-#ifdef _OBSOLETED

-#ifdef DBG_QM_MALLOC

-void* _shm_resize( void* p, unsigned int s, char* file, char* func,

-					unsigned int line)

-#else

-void* _shm_resize( void* p , unsigned int s)

-#endif

-{

-	

-#ifdef VQ_MALLOC

-	struct vqm_frag *f;

-#else

-	#ifdef __SUNPRO_C

-		/*no warning support on Sun cc */

-	#else

-		#ifdef _NO_NO_NO

-			#warning shm_resize performs suboptimally without VQ_MALLOC!

-		#endif

-	#endif

-#endif

-

-	if (p==0) {

-		DBG("WARNING:vqm_resize: resize(0) called\n");

-		return shm_malloc( s );

-	}

-

-#	ifdef VQ_MALLOC

-	f=(struct  vqm_frag*) ((char*)p-sizeof(struct vqm_frag));

-#	ifdef DBG_QM_MALLOC

-	DBG("_shm_resize(%p, %d), called from %s: %s(%d)\n",  

-		p, s, file, func, line);

-	VQM_DEBUG_FRAG(shm_block, f);

-	if (p>(void *)shm_block->core_end || p<(void*)shm_block->init_core){

-		LOG(L_CRIT, "BUG: vqm_free: bad pointer %p (out of memory block!) - "

-				"aborting\n", p);

-		abort();

-	}

-#	endif

-	if (s <= f->size-VQM_OVERHEAD) {

-#		ifdef DBG_QM_MALLOC

-		DBG("DEBUG: happy guy -- you reused a memory fragment!\n");

-#		endif

-		return p;

-	};

-#endif

-	/* we can't make the request happy with current size */

-	return sh_realloc( p, s ); 

-}

-#endif

-

 int shm_mem_init()

@@ -32,13 +32,6 @@

 #include "defs.h"

-#ifdef _OBSOLETED

-/* moved to hash.h */

-/* always use a power of 2 for hash table size */

-#define T_TABLE_POWER    12

-#define TABLE_ENTRIES    (1 << (T_TABLE_POWER))

-#endif

-

 /* this is where table size is defined now -- sort of

    ugly, core should not be bothered by TM table size,

    but on the other, core's stateless forwarding should 

@@ -34,6 +34,5 @@

 #ifndef _TM_DEFS_H

 #define _TM_DEFS_H

-#define DEPRECATE_OLD_STUFF

 #endif

@@ -107,12 +107,6 @@ void free_cell( struct cell* dead_cell )

 		/* retransmission buffer */

 		if ( (b=dead_cell->uac[i].request.buffer) )

 			shm_free_unsafe( b );

-#ifdef OLD_CANCEL

-		if ( (b=dead_cell->uac[i].request.ack) )

-			shm_free_unsafe( b );

-		if ( (b=dead_cell->uac[i].request.cancel) )

-			shm_free_unsafe( b );

-#endif

 		b=dead_cell->uac[i].local_cancel.buffer;

 		if (b!=0 && b!=BUSY_BUFFER)

 			shm_free_unsafe( b );

@@ -120,10 +114,6 @@ void free_cell( struct cell* dead_cell )

 		if (rpl && rpl!=FAKED_REPLY) {

 			sip_msg_free_unsafe( rpl );

 		}

-#ifdef _OBSOLETED

-		if ( (b=dead_cell->uac[i].rpl_buffer.s) )

-			shm_free_unsafe( b );

-#endif

 	}

 	/* the cell's body */

@@ -296,10 +286,6 @@ struct s_table* init_hash_table()

 	return  tm_table;

-#ifdef _OBSO

-error2:

-	lock_cleanup();

-#endif

 error1:

 	free_hash_table( );

 error0:

@@ -249,10 +249,6 @@ struct s_table

 {

 	/* table of hash entries; each of them is a list of synonyms  */

 	struct entry   entrys[ TABLE_ENTRIES ];

-#ifdef _OBSOLETED

-	/* table of timer lists */

-	struct timer   timers[ NR_OF_TIMER_LISTS ];

-#endif

 };

@@ -76,12 +76,6 @@ static int

 	entry_semaphore=0, 

 	timer_semaphore=0, 

 	reply_semaphore=0;

-#ifdef _OBSOLETED

-	ack_semaphore=0;

-#endif

-#ifdef _XWAIT

-static int  wait_semaphore=0;

-#endif

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

 static int sem_nr;

 /* timer group locks */

@@ -199,14 +193,6 @@ again:

 			semctl( entry_semaphore, 0 , IPC_RMID , 0 );

 		if (reply_semaphore>0)

 			semctl(reply_semaphore, 0 , IPC_RMID , 0 );

-#ifdef _OBSOLETED

-		if (ack_semaphore>0)

-			semctl(reply_semaphore, 0 , IPC_RMID , 0 );

-#endif

-#ifdef _XWAIT

-		if (wait_semaphore>0)

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

-#endif

 		if (i==0){

@@ -263,40 +249,6 @@ again:

 			goto error;

 		}

 	}

-#ifdef _OBSOLETED	

-	if ((ack_semaphore=init_semaphore_set(sem_nr))<0){

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

-			DBG( "DEBUG:lock_initialize: ack semaphore initialization"

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

-			probe_run==1;

-			i--;

-			goto again;

-		}else{

-			LOG(L_CRIT, "ERROR:lock_initialize: ack semaphore initialization"

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

-			goto error;

-		}

-	}

-#endif

-

-#ifdef _XWAIT

-	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 */

 	LOG(L_INFO, "INFO: semaphore arrays of size %d allocated\n", sem_nr );

@@ -336,26 +288,8 @@ void lock_cleanup()

 	if (reply_semaphore > 0 &&

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

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

-#ifdef _OBSOLETED

-	if (ack_semaphore > 0 &&

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

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

-#endif

-#ifdef _XWAIT

-	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 

-#ifdef _OBSOLETED

-		= ack_semaphore 

-#endif

-		= 0;

-#ifdef _XWAIT

-	wait_semaphore = 0;

-#endif

+	entry_semaphore = timer_semaphore = reply_semaphore = 0;

 	if (timer_group_lock) shm_free(timer_group_lock);

@@ -370,24 +304,10 @@ int init_cell_lock( struct cell *cell )

 {

 #ifdef FAST_LOCK

 	init_lock(cell->reply_mutex);

-#ifdef _OBSOLETED

-	init_lock(cell->ack_mutex);

-#endif

-#ifdef _XWAIT

-	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;

-#ifdef _OBSOLETED

-	cell->ack_mutex.semaphore_set=ack_semaphore;

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

-#endif

-#ifdef _XWAIT

-	cell->wait_mutex.semaphore_set=wait_semaphore;

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

-#endif /* WAIT */

 #endif /* FAST_LOCK */

 	return 0;

 }

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

  *

  * History:

  * --------

+ * 2003-02-28 scratchpad compatibility abandoned (jiri)

  * 2003-02-25 - auth_body cloner added (janakj)

  * 2003-01-29 - scratchpad removed (jiri)

  * 2003-01-23 - msg_cloner clones msg->from->parsed too (janakj)

@@ -344,17 +345,10 @@ struct sip_msg*  sip_msg_cloner( struct sip_msg *org_msg )

 		p += ROUND4(org_msg->new_uri.len);

 	}

 	/* message buffers(org and scratch pad) */

-#ifdef SCRATCH

-	memcpy( p , org_msg->orig , org_msg->len);

-	/* ZT to be safer */

-	*(p+org_msg->len)=0;

-	new_msg->orig = new_msg->buf = p;

-#else

 	memcpy( p , org_msg->buf, org_msg->len);

 	/* ZT to be safer */

 	*(p+org_msg->len)=0;

 	new_msg->buf = p;

-#endif

 	p += ROUND4(new_msg->len+1);

 	/* unparsed and eoh pointer */

 	new_msg->unparsed = translate_pointer(new_msg->buf ,org_msg->buf,

@@ -96,11 +96,6 @@ void cancel_branch( struct cell *t, int branch )

 	crb->buffer_len=len;

 	crb->dst=irb->dst;

 	crb->branch=branch;

-#ifdef _OBSOLETED

-	crb->fr_timer.tg=TG_FR;

-	crb->retr_timer.tg=TG_RT;

-	crb->my_T=t;

-#endif

 	crb->retr_timer.payload=crb->fr_timer.payload=crb;

 	/* label it as cancel so that FR timer can better now how to

 	   deal with it */

@@ -55,17 +55,6 @@

 #include "config.h"

-#ifdef _OBSOLETED

-#define shm_free_lump( _lmp) \

-	do{\

-		if ((_lmp)) {\

-			if ((_lmp)->op==LUMP_ADD && (_lmp)->u.value )\

-				shm_free((_lmp)->u.value);\

-			shm_free((_lmp));\

-		}\

-	}while(0);

-#endif

-

 char *print_uac_request( struct cell *t, struct sip_msg *i_req,

 	int branch, str *uri, unsigned int *len, struct socket_info *send_sock )

 {

@@ -104,18 +93,6 @@ char *print_uac_request( struct cell *t, struct sip_msg *i_req,

 		other branches  and for  shmem i_req they would mix up

 	 	shmem with pkg_mem

 	*/

-#ifdef OBSOLETED

-	if (branch) for(b=i_req->add_rm,b1=0;b;b1=b,b=b->next)

-		if (b->type==HDR_VIA) {

-			for(a=b->before;a;)

-				{c=a->before;free_lump(a);pkg_free(a);a=c;}

-			for(a=b->after;a;)

-				{c=a->after;free_lump(a);pkg_free(a);a=c;}

-			if (b1) b1->next = b->next;

-			else i_req->add_rm = b->next;

-			free_lump(b);pkg_free(b);

-		}

-#endif

 	free_via_lump(&i_req->add_rm);

 	shbuf=(char *)shm_malloc(*len);

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

  *

  * History:

  * ----------

+ * 2003-02-28 scratchpad compatibility abandoned (jiri)

  * 2003-02-27  3261 ACK/200 consumption bug removed (jiri)

  * 2003-01-28  scratchpad removed (jiri)

  * 2003-01-27  next baby-step to removing ZT - PRESERVE_ZT (jiri)

@@ -90,20 +91,6 @@

 #define EQ_REQ_URI_LEN\

 	(p_msg->first_line.u.request.uri.len==t_msg->first_line.u.request.uri.len)

-#ifdef SCRATCH

-#define EQ_STR(_hf) (memcmp(t_msg->_hf->body.s,\

-	translate_pointer(p_msg->orig,p_msg->buf,p_msg->_hf->body.s), \

-	p_msg->_hf->body.len)==0)

-#define EQ_REQ_URI_STR\

-	( memcmp( t_msg->first_line.u.request.uri.s,\

-	translate_pointer(p_msg->orig,p_msg->buf,p_msg->first_line.u.request.uri.s),\

-	p_msg->first_line.u.request.uri.len)==0)

-#define EQ_VIA_STR(_via)\

-	( memcmp( t_msg->_via->name.s,\

-	 translate_pointer(p_msg->orig,p_msg->buf,p_msg->_via->name.s),\

-	 (t_msg->via1->bsize-(t_msg->_via->name.s-(t_msg->_via->hdr.s+t_msg->_via->hdr.len)))\

-	)==0 )

-#else /* SCRATCH */

 #define EQ_STR(_hf) (memcmp(t_msg->_hf->body.s,\

 	p_msg->_hf->body.s, \

 	p_msg->_hf->body.len)==0)

@@ -116,15 +103,10 @@

 	 p_msg->_via->name.s,\

 	 (t_msg->via1->bsize-(t_msg->_via->name.s-(t_msg->_via->hdr.s+t_msg->_via->hdr.len)))\

 	)==0 )

-#endif /* SCRATCH */

-#ifdef PRESERVE_ZT

-#define HF_LEN(_hf) ((_hf)->body.s+(_hf)->body.len-(_hf)->name.s)

-#else

 #define HF_LEN(_hf) ((_hf)->len)

-#endif

 /* should be request-uri matching used as a part of pre-3261 

  * transaction matching, as the standard wants us to do so

@@ -145,10 +127,6 @@ static struct cell *t_ack;

    break ref_counting

 */

-#ifdef _OBSOLETED

-struct cell      *T;

-#endif

-

 static struct cell *T;

 /* number of currently processed message; good to know

@@ -577,11 +555,6 @@ int t_reply_matching( struct sip_msg *p_msg , int *p_branch )

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

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

-#ifdef OBSOLETED

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

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

-#endif

-

 	/* hash_id */

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

@@ -45,10 +45,6 @@

 #define T_UNDEFINED  ( (struct cell*) -1 )

 #define T_NULL_CELL       ( (struct cell*) 0 )

-#ifdef _OBSOLETED

-extern struct cell      *T;

-#endif

-

 extern unsigned int     global_msg_id;

 extern int ruri_matching;

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

  *

  * History:

  * ----------

+ * 2003-02-28 scratchpad compatibility abandoned (jiri)

  * 2003-01-27  next baby-step to removing ZT - PRESERVE_ZT (jiri)

  * 2003-02-13  build_uac_request uses proto (andrei)

  */

@@ -102,28 +103,15 @@ char *build_local(struct cell *Trans,unsigned int branch,

 	}

 	*len+= via_len;

 	/*headers*/

-#ifdef PRESERVE_ZT

-	*len+=Trans->from.len+CRLF_LEN

-		+Trans->callid.len+CRLF_LEN

-		+to->len+CRLF_LEN

-		/* CSeq: 101 CANCEL */

-		+Trans->cseq_n.len+1+method_len+CRLF_LEN; 

-#else

 	*len+=Trans->from.len+Trans->callid.len+to->len+

 		+Trans->cseq_n.len+1+method_len+CRLF_LEN; 

-#endif

 	/* copy'n'paste Route headers */

 	if (!Trans->local) {

 		for ( hdr=Trans->uas.request->headers ; hdr ; hdr=hdr->next )

 			 if (hdr->type==HDR_ROUTE)

-#ifdef PRESERVE_ZT

-				*len+=((hdr->body.s+hdr->body.len ) - hdr->name.s ) + 

-					CRLF_LEN ;

-#else

 				*len+=hdr->len;

-#endif

 	}

 	/* User Agent */

@@ -150,18 +138,10 @@ char *build_local(struct cell *Trans,unsigned int branch,

 	append_mem_block(p,via,via_len);

 	/*other headers*/

-#ifdef PRESERVE_ZT

 	append_str( p, Trans->from );

-	append_mem_block( p, CRLF, CRLF_LEN );

 	append_str( p, Trans->callid );

-	append_mem_block( p, CRLF, CRLF_LEN );

 	append_str( p, *to );

-	append_mem_block( p, CRLF, CRLF_LEN );

-#else

-	append_str( p, Trans->from );

-	append_str( p, Trans->callid );

-	append_str( p, *to );

-#endif

+

 	append_str( p, Trans->cseq_n );

 	append_mem_block( p, " ", 1 );

 	append_mem_block( p, method, method_len );

@@ -170,13 +150,7 @@ char *build_local(struct cell *Trans,unsigned int branch,

 	if (!Trans->local)  {

 		for ( hdr=Trans->uas.request->headers ; hdr ; hdr=hdr->next )

 			if(hdr->type==HDR_ROUTE) {

-#ifdef PRESERVE_ZT

-				append_mem_block(p, hdr->name.s,

-					hdr->body.s+hdr->body.len-hdr->name.s );

-				append_mem_block(p, CRLF, CRLF_LEN );

-#else

 				append_mem_block(p, hdr->name.s, hdr->len );

-#endif

 			}

 	}

@@ -198,161 +172,6 @@ error:

 }

-#ifndef DEPRECATE_OLD_STUFF

-char *build_uac_request(  str msg_type, str dst, str from,

-	str fromtag, int cseq, str callid, str headers, 

-	str body, int branch, 

-	struct cell *t, unsigned int *len)

-{

-	char *via;

-	unsigned int via_len;

-	char content_len[10];

-	int content_len_len;

-	char cseq_str[10];

-	int cseq_str_len;

-	char *buf;

-	char *w;

-#ifdef _OBSOLETED

-	int dummy;

-#endif

-

-	char branch_buf[MAX_BRANCH_PARAM_LEN];

-	int branch_len;

-	str branch_str;

-

-	int from_len;

-	char *from_str;

-

-	buf=0;

-

-	/* print content length */

-	content_len_len=snprintf(

-		content_len, sizeof(content_len), 

-		"%d", body.len );

-	if (content_len_len==-1 || content_len_len>=sizeof(content_len)) {

-		LOG(L_ERR, "ERROR: uac: content_len too big\n");

-		return 0;

-	}

-	/* print cseq */

-	cseq_str_len=snprintf( 

-		cseq_str, sizeof(cseq_str),

-		"%d", cseq );

-	if (cseq_str_len==-1 || cseq_str_len>=sizeof(cseq_str)) {

-		LOG(L_ERR, "ERROR: uac: cseq too big\n");

-		return 0;

-	}

-

-	if (from.len) {

-		from_len=from.len;

-		from_str=from.s;

-	} else {

-		from_len=strlen(uac_from);

-		from_str=uac_from;

-	}

-	

-	*len=SIP_VERSION_LEN+msg_type.len+2/*spaces*/+CRLF_LEN+

-		dst.len;

-

-	if (!t_calc_branch(t, branch, branch_buf, &branch_len )) {

-		LOG(L_ERR, "ERROR: build_uac_request: branch calculation failed\n");

-		goto error;

-	}

-	branch_str.s=branch_buf;

-	branch_str.len=branch_len;

-	

-	via=via_builder(&via_len, t->uac[branch].request.send_sock,

-		&branch_str, 0, t->uac[branch].request.dst.proto);

-	

-	if (!via) {

-		LOG(L_ERR, "ERROR: build_uac_request: via building failed\n");

-		goto error;

-	}

-	*len+=via_len;

-	/* header names and separators */

-	*len+=

-		+CSEQ_LEN+CRLF_LEN

-		+TO_LEN+CRLF_LEN

-		+CALLID_LEN+CRLF_LEN

-		+CONTENT_LENGTH_LEN+CRLF_LEN

-		+ (server_signature ? USER_AGENT_LEN + CRLF_LEN : 0 )

-		+FROM_LEN+CRLF_LEN

-		+CRLF_LEN; /* EoM */

-	/* header field value and body length */

-	*len+= msg_type.len+1+cseq_str_len /* CSeq: method, delimitor, number  */

-		+ dst.len /* To */

-		+ callid.len /* call-id */

-		+ from_len+FROMTAG_LEN+fromtag.len

-		+ content_len_len

-		+ headers.len

-		+ body.len;

-	

-	buf=shm_malloc( *len+1 );

-	if (!buf) {

-		LOG(L_ERR, "ERROR: t_uac: no shmem\n");

-		goto error1;

-	}

-	w=buf;

-	memapp( w, msg_type.s, msg_type.len ); 

-	memapp( w, " ", 1); 

-	t->uac[branch].uri.s=w; t->uac[branch].uri.len=dst.len;

-	memapp( w, dst.s, dst.len ); 

-	memapp( w, " " SIP_VERSION CRLF, 1+SIP_VERSION_LEN+CRLF_LEN );

-	memapp( w, via, via_len );

-

-	/* CSeq */

-	t->cseq_n.s=w; 

-	t->cseq_n.len=CSEQ_LEN+cseq_str_len;

-	memapp(w, CSEQ, CSEQ_LEN );

-	memapp(w, cseq_str, cseq_str_len );

-	memapp(w, " ", 1 );

-

-	memapp( w, msg_type.s, msg_type.len );

-	t->to.s=w+CRLF_LEN; t->to.len=TO_LEN+dst.len;

-	memapp( w, CRLF TO, CRLF_LEN + TO_LEN  );

-	memapp( w, dst.s, dst.len );

-	t->callid.s=w+CRLF_LEN; t->callid.len=callid.len;

-	memapp( w, CRLF CALLID, CRLF_LEN + CALLID_LEN  );

-	memapp( w, callid.s, callid.len );

-	memapp( w, CRLF CONTENT_LENGTH, CRLF_LEN + CONTENT_LENGTH_LEN);

-	memapp( w, content_len, content_len_len );

-	if (server_signature) {

-		memapp( w, CRLF USER_AGENT CRLF FROM, 

-			CRLF_LEN+USER_AGENT_LEN+CRLF_LEN+FROM_LEN);

-	} else {

-		memapp( w, CRLF  FROM, 

-			CRLF_LEN+FROM_LEN);

-	}

-	t->from.s=w-FROM_LEN; 

-	t->from.len=FROM_LEN+from_len+FROMTAG_LEN+fromtag.len;

-	memapp( w, from_str, from_len );

-	memapp( w, FROMTAG, FROMTAG_LEN );

-	memapp( w, fromtag.s, fromtag.len );

-	memapp( w, CRLF, CRLF_LEN );

-

-	memapp( w, headers.s, headers.len );

-	/* EoH */

-	memapp( w, CRLF, CRLF_LEN );

-	if ( body.s ) {

-		memapp( w, body.s, body.len );

-	}

-#ifdef _OBSOLETED

-	/* ugly HACK -- debugging has shown len shorter by one */

-	dummy=*len+1;

-	*len=dummy;

-#endif

-#	ifdef EXTRA_DEBUG

-	if (w-buf != *len ) abort();

-#	endif

-	

-	

-error1:

-	pkg_free(via);	

-error:

-	return buf;

-	

-}

-#endif

-

 char *build_uac_request_dlg(str* msg,           /* Method */

 			    str* ruri,          /* Request-URI */

@@ -48,13 +48,6 @@

 #define TOTAG ";tag="

 #define TOTAG_LEN (sizeof(TOTAG)-1)

-#ifdef _OBSOLETED

-#define UAC_CSEQNR "1"

-#define UAC_CSEQNR_LEN 1

-#define CONTENT_LENGTH "Content-Length: "

-#define CONTENT_LENGTH_LEN (sizeof(CONTENT_LENGTH)-1)

-#endif

-

 /* convenience macros */

 #define memapp(_d,_s,_len) \

@@ -69,14 +62,6 @@

 		(_d) += (_len);\

 	}while(0);

-#ifdef _OBSO

-#define append_str(_p,_str) \

-	do{ \

-		memcpy((_p), (_str).s, (_str).len); \

-		(_p)+=(_str).len); \

-	} while(0);

-#endif

-

 char *build_local(struct cell *Trans, unsigned int branch,

 	unsigned int *len, char *method, int method_len, str *to);

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

  *

  * History:

  * --------

+ * 2003-02-28 scratchpad compatibility abandoned (jiri)

  * 2003-01-27  next baby-step to removing ZT - PRESERVE_ZT (jiri)

  * 2003-01-19  faked lump list created in on_reply handlers

  * 2003-02-13  updated to use rb->dst (andrei)

@@ -111,13 +112,8 @@ static char *build_ack(struct sip_msg* rpl,struct cell *trans,int branch,

             "cannot generate a HBH ACK if key HFs in reply missing\n");

         return NULL;

     }

-#ifdef PRESERVE_ZT

-	to.len=rpl->to->body.s+rpl->to->body.len-rpl->to->name.s;

-	to.s=rpl->orig+(rpl->to->name.s-rpl->buf);

-#else

 	to.s=rpl->to->name.s;

 	to.len=rpl->to->len;

-#endif

     return build_local( trans, branch, ret_len,

         ACK, ACK_LEN, &to );

 }

@@ -218,40 +214,6 @@ restore:

 	return 0;

 }

-#ifdef _OBSOLETED

-void on_negative_reply( struct cell* t, struct sip_msg* msg, 

-	int code, void *param )

-{

-	int act_ret;

-	struct sip_msg faked_msg;

-

-	/* nobody cares about a negative transaction -- ok, return */

-	if (!t->on_negative) {

-		DBG("DBG: on_negative_reply: no on_negative\n");

-		return;

-	}

-

-	DBG("DBG: on_negative_reply processed for transaction %p\n", t);

-	if (!faked_env(&faked_msg, t, t->uas.request, 0 /* create fake */ )) {

-		LOG(L_ERR, "ERROR: on_negative_reply: faked_env failed\n");

-		goto restore;

-	}

-

-	/* run */

-	act_ret=run_actions(reply_rlist[t->on_negative], &faked_msg );

-	if (act_ret<0) {

-		LOG(L_ERR, "ERROR: on_negative_reply: Error in do_action\n");

-	}

-

-

-restore:

-	faked_env(&faked_msg, 0, 0 /* don't need t and shmem_rq */ , 

-					1 /* restore fake */ );

-

-}

-#endif

-

-

 /* the main code of stateful replying */

@@ -1074,11 +1036,6 @@ int t_on_reply( struct sip_msg  *p_msg )

 	} /* provisional replies */

 done:

-#ifdef _OBSOLETED

-	/* moved to  script callback */

-	UNREF( t );

-	T=T_UNDEFINED;

-#endif

 	/* don't try to relay statelessly neither on success

        (we forwarded statefuly) nor on error; on troubles, 

 	   simply do nothing; that will make the other party to 

@@ -109,10 +109,6 @@ int t_reply( struct cell *t, struct sip_msg * , unsigned int , char * );

 */

 int t_reply_unsafe( struct cell *t, struct sip_msg * , unsigned int , char * );

-#ifdef _OBSOLETED

-void cleanup_after_final( struct s_table *h_table, struct cell *t,

-	unsigned int status );

-#endif

 enum rps relay_reply( struct cell *t, struct sip_msg *p_msg, int branch, 

 	unsigned int msg_status, branch_bm_t *cancel_bitmap );

@@ -684,14 +684,6 @@ void reset_timer( struct timer_link* tl )

 #ifdef EXTRA_DEBUG

 	DBG("DEBUG: reset_timer (group %d, tl=%p)\n", tl->tg, tl );

 #endif

-#ifdef _OBSOLETED

-	/* lock(timer_group_lock[ tl->tg ]); */

-	/* hack to work arround this timer group thing*/

-	lock(hash__XX_table->timers[timer_group[tl->tg]].mutex);

-	remove_timer_unsafe( tl );

-	unlock(hash_XX_table->timers[timer_group[tl->tg]].mutex);

-	/*unlock(timer_group_lock[ tl->tg ]);*/

-#endif

 }

@@ -90,9 +90,7 @@