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

 #include "data_lump.h"

 #include "ut.h"

 #include "mem.h"

+#include "msg_translator.h"

 #ifdef DEBUG_DMALLOC

 #include <dmalloc.h>

@@ -35,128 +36,20 @@

 #endif

-/* faster than inet_ntoa */

-static inline char* q_inet_itoa(unsigned long ip)

-{

-	static char q_inet_itoa_buf[16]; /* 123.567.901.345\0 */

-	unsigned char* p;

-	unsigned char a,b,c;  /* abc.def.ghi.jkl */

-	int offset;

-	int r;

-	p=(unsigned char*)&ip;

-

-	offset=0;

-	/* unrolled loops (faster)*/

-	for(r=0;r<3;r++){

-		a=p[r]/100;

-		c=p[r]%10;

-		b=p[r]%100/10;

-		if (a){

-			q_inet_itoa_buf[offset]=a+'0';

-			q_inet_itoa_buf[offset+1]=b+'0';

-			q_inet_itoa_buf[offset+2]=c+'0';

-			q_inet_itoa_buf[offset+3]='.';

-			offset+=4;

-		}else if (b){

-			q_inet_itoa_buf[offset]=b+'0';

-			q_inet_itoa_buf[offset+1]=c+'0';

-			q_inet_itoa_buf[offset+2]='.';

-			offset+=3;

-		}else{

-			q_inet_itoa_buf[offset]=c+'0';

-			q_inet_itoa_buf[offset+1]='.';

-			offset+=2;

-		}

-	}

-	/* last number */

-	a=p[r]/100;

-	c=p[r]%10;

-	b=p[r]%100/10;

-	if (a){

-		q_inet_itoa_buf[offset]=a+'0';

-		q_inet_itoa_buf[offset+1]=b+'0';

-		q_inet_itoa_buf[offset+2]=c+'0';

-		q_inet_itoa_buf[offset+3]=0;

-	}else if (b){

-		q_inet_itoa_buf[offset]=b+'0';

-		q_inet_itoa_buf[offset+1]=c+'0';

-		q_inet_itoa_buf[offset+2]=0;

-	}else{

-		q_inet_itoa_buf[offset]=c+'0';

-		q_inet_itoa_buf[offset+1]=0;

-	}

-	

-	return q_inet_itoa_buf;

-}

-		

-		

-

-		

-		

-	

-

-/* checks if ip is in host(name) and ?host(ip)=name? 

- * ip must be in network byte order!

- *  resolver = DO_DNS | DO_REV_DNS; if 0 no dns check is made

- * return 0 if equal */

-int check_address(unsigned long ip, char *name, int resolver)

-{

-	struct hostent* he;

-	int i;

-	

-	/* maybe we are lucky and name it's an ip */

-	if (strcmp(name, q_inet_itoa( /* *(struct in_addr *)&*/ip ))==0)

-		return 0;

-	if (resolver&DO_DNS){ 

-		DBG("check_address: doing dns lookup\n");

-		/* try all names ips */

-		he=gethostbyname(name);

-		for(i=0;he && he->h_addr_list[i];i++){

-			if (*(unsigned long*)he->h_addr_list[i]==ip)

-				return 0;

-		}

-	}

-	if (resolver&DO_REV_DNS){

-		DBG("check_address: doing rev. dns lookup\n");

-		print_ip(ip);

-		/* try reverse dns */

-		he=gethostbyaddr((char*)&ip, sizeof(ip), AF_INET);

-		if (he && (strcmp(he->h_name, name)==0))

-			return 0;

-		for (i=0; he && he->h_aliases[i];i++){

-			if (strcmp(he->h_aliases[i],name)==0)

-				return 0;

-		}

-	}

-	return -1;

-}

-

-

 int forward_request( struct sip_msg* msg, struct proxy_l * p)

 {

-	unsigned int len, new_len, via_len, received_len, uri_len;

-	char* line_buf;

-	char* received_buf;

-	char* tmp;

-	int tmp_len;

-	char* new_buf;

-	char* orig;

+	unsigned int len;

 	char* buf;

-	unsigned int offset, s_offset, size;

 	struct sockaddr_in* to;

-	unsigned long source_ip;

-	struct lump *t,*r;

-	struct lump* anchor;

-	orig=msg->orig;

-	buf=msg->buf;

-	len=msg->len;

-	source_ip=msg->src_ip;

-	received_len=0;

-	new_buf=0;

-	line_buf=0;

-	received_buf=0;

+

+	buf = build_buf_from_sip_request( msg, &len);

+	if (!buf){

+		LOG(L_ERR, "ERROR: forward_reply: building failed\n");

+		goto error;

+	}

+

 	to=0;

 	to=(struct sockaddr_in*)malloc(sizeof(struct sockaddr));

 	if (to==0){

@@ -164,261 +57,9 @@ int forward_request( struct sip_msg* msg, struct proxy_l * p)

 		goto error;

 	}

-	line_buf=pkg_malloc(sizeof(char)*MAX_VIA_LINE_SIZE);

-	if (line_buf==0){

-		LOG(L_ERR, "ERROR: forward_request: out of memory\n");

-		goto error1;

-	}

-/*

-	via_len=snprintf(line_buf, MAX_VIA_LINE_SIZE, "Via: SIP/2.0/UDP %s:%d\r\n",

-						names[0], port_no);

-*/

-	via_len=MY_VIA_LEN+names_len[0]; /* space included in MY_VIA*/

-	if ((via_len+port_no_str_len+CRLF_LEN)<MAX_VIA_LINE_SIZE){

-		memcpy(line_buf, MY_VIA, MY_VIA_LEN);

-		memcpy(line_buf+MY_VIA_LEN, names[0], names_len[0]);

-		if (port_no!=SIP_PORT){

-			memcpy(line_buf+via_len, port_no_str, port_no_str_len);

-			via_len+=port_no_str_len;

-		}

-		memcpy(line_buf+via_len, CRLF, CRLF_LEN);

-		via_len+=CRLF_LEN;

-		line_buf[via_len]=0; /* null terminate the string*/

-	}else{

-		LOG(L_ERR, "forward_request: ERROR: via too long (%d)\n",

-				via_len);

-		goto error1;

-	}

-

-		

-	

-	/* check if received needs to be added */

-	if (check_address(source_ip, msg->via1->host.s, received_dns)!=0){

-		received_buf=pkg_malloc(sizeof(char)*MAX_RECEIVED_SIZE);

-		if (received_buf==0){

-			LOG(L_ERR, "ERROR: forward_request: out of memory\n");

-			goto error1;

-		}

-		/*

-		received_len=snprintf(received_buf, MAX_RECEIVED_SIZE,

-								";received=%s", 

-								inet_ntoa(*(struct in_addr *)&source_ip));

-		*/

-		memcpy(received_buf, RECEIVED, RECEIVED_LEN);

-		tmp=q_inet_itoa( /* *(struct in_addr *)& */source_ip);

-		tmp_len=strlen(tmp);

-		received_len=RECEIVED_LEN+tmp_len;

-		memcpy(received_buf+RECEIVED_LEN, tmp, tmp_len);

-		received_buf[received_len]=0; /*null terminate it */

-	}

-	

-	/* add via header to the list */

-	/* try to add it before msg. 1st via */

-	/*add first via, as an anchor for second via*/

-	anchor=anchor_lump(&(msg->add_rm), msg->via1->hdr.s-buf, 0, HDR_VIA);

-	if (anchor==0) goto error;

-	if (insert_new_lump_before(anchor, line_buf, via_len, HDR_VIA)==0)

-		goto error;

-	/* if received needs to be added, add anchor after host and add it */

-	if (received_len){

-		if (msg->via1->params.s){

-				size= msg->via1->params.s-msg->via1->hdr.s-1; /*compensate 

-															  for ';' */

-		}else{

-				size= msg->via1->host.s-msg->via1->hdr.s+msg->via1->host.len;

-				if (msg->via1->port!=0){

-					size+=strlen(msg->via1->hdr.s+size+1)+1; /* +1 for ':'*/

-				}

-		}

-		anchor=anchor_lump(&(msg->add_rm),msg->via1->hdr.s-buf+size,0,

-				HDR_VIA);

-		if (anchor==0) goto error;

-		if (insert_new_lump_after(anchor, received_buf, received_len, HDR_VIA) 

-				==0 ) goto error;

-	}

-	

-	

-	/* compute new msg len and fix overlapping zones*/

-	new_len=len;

-	s_offset=0;

-	for(t=msg->add_rm;t;t=t->next){

-		for(r=t->before;r;r=r->before){

-			switch(r->op){

-				case LUMP_ADD:

-					new_len+=r->len;

-					break;

-				default:

-					/* only ADD allowed for before/after */

-					LOG(L_CRIT, "BUG:forward_request: invalid op for"

-								" data lump (%x)\n", r->op);

-			}

-		}

-		switch(t->op){

-			case LUMP_ADD:

-				new_len+=t->len;

-				break;

-			case LUMP_DEL:

-				/* fix overlapping deleted zones */

-				if (t->u.offset < s_offset){

-					/* change len */

-					if (t->len>s_offset-t->u.offset) 

-							t->len-=s_offset-t->u.offset;

-					else t->len=0;

-					t->u.offset=s_offset;

-				}

-				s_offset=t->u.offset+t->len;

-				new_len-=t->len;

-				break;

-			case LUMP_NOP:

-				/* fix offset if overlapping on a deleted zone */

-				if (t->u.offset < s_offset){

-					t->u.offset=s_offset;

-				}else

-					s_offset=t->u.offset;

-				/* do nothing */

-				break;

-			debug:

-				LOG(L_CRIT,"BUG:forward_request: invalid" 

-							" op for data lump (%x)\n", r->op);

-		}

-		for (r=t->after;r;r=r->after){

-			switch(r->op){

-				case LUMP_ADD:

-					new_len+=r->len;

-					break;

-				default:

-					/* only ADD allowed for before/after */

-					LOG(L_CRIT, "BUG:forward_request: invalid"

-								" op for data lump (%x)\n", r->op);

-			}

-		}

-	}

-	

-	

-	if (msg->new_uri.s){ 

-		uri_len=msg->new_uri.len; 

-		new_len=new_len-msg->first_line.u.request.uri.len+uri_len;

-	}

-	new_buf=(char*)malloc(new_len+1);

-	if (new_buf==0){

-		LOG(L_ERR, "ERROR: forward_request: out of memory\n");

-		goto error;

-	}

-

-	offset=s_offset=0;

-	if (msg->new_uri.s){

-		/* copy message up to uri */

-		size=msg->first_line.u.request.uri.s-buf;

-		memcpy(new_buf, orig, size);

-		offset+=size;

-		s_offset+=size;

-		/* add our uri */

-		memcpy(new_buf+offset, msg->new_uri.s, uri_len);

-		offset+=uri_len;

-		s_offset+=msg->first_line.u.request.uri.len; /* skip original uri */

-	}

-/* copy msg adding/removing lumps */

-	for (t=msg->add_rm;t;t=t->next){

-		switch(t->op){

-			case LUMP_ADD:

-				/* just add it here! */

-				/* process before  */

-				for(r=t->before;r;r=r->before){

-					switch (r->op){

-						case LUMP_ADD:

-							/*just add it here*/

-							memcpy(new_buf+offset, r->u.value, r->len);

-							offset+=r->len;

-							break;

-						default:

-							/* only ADD allowed for before/after */

-							LOG(L_CRIT, "BUG:forward_request: invalid op for"

-									" data lump (%x)\n", r->op);

-								

-					}

-				}

-				/* copy "main" part */

-				memcpy(new_buf+offset, t->u.value, t->len);

-				offset+=t->len;

-				/* process after */

-				for(r=t->after;r;r=r->after){

-					switch (r->op){

-						case LUMP_ADD:

-							/*just add it here*/

-							memcpy(new_buf+offset, r->u.value, r->len);

-							offset+=r->len;

-							break;

-						default:

-							/* only ADD allowed for before/after */

-							LOG(L_CRIT, "BUG:forward_request: invalid op for"

-									" data lump (%x)\n", r->op);

-					}

-				}

-				break;

-			case LUMP_NOP:

-			case LUMP_DEL:

-				/* copy till offset */

-				if (s_offset>t->u.offset){

-					DBG("Warning: (%d) overlapped lumps offsets,"

-						" ignoring(%x, %x)\n", t->op, s_offset,t->u.offset);

-					/* this should've been fixed above (when computing len) */

-					/* just ignore it*/

-					break;

-				}

-				size=t->u.offset-s_offset;

-				if (size){

-					memcpy(new_buf+offset, orig+s_offset,size);

-					offset+=size;

-					s_offset+=size;

-				}

-				/* process before  */

-				for(r=t->before;r;r=r->before){

-					switch (r->op){

-						case LUMP_ADD:

-							/*just add it here*/

-							memcpy(new_buf+offset, r->u.value, r->len);

-							offset+=r->len;

-							break;

-						default:

-							/* only ADD allowed for before/after */

-							LOG(L_CRIT, "BUG:forward_request: invalid op for"

-									" data lump (%x)\n", r->op);

-								

-					}

-				}

-				/* process main (del only) */

-				if (t->op==LUMP_DEL){

-					/* skip len bytes from orig msg */

-					s_offset+=t->len;

-				}

-				/* process after */

-				for(r=t->after;r;r=r->after){

-					switch (r->op){

-						case LUMP_ADD:

-							/*just add it here*/

-							memcpy(new_buf+offset, r->u.value, r->len);

-							offset+=r->len;

-							break;

-						default:

-							/* only ADD allowed for before/after */

-							LOG(L_CRIT, "BUG:forward_request: invalid op for"

-									" data lump (%x)\n", r->op);

-					}

-				}

-				break;

-			default:

-					LOG(L_CRIT, "BUG: forward_request: unknown op (%x)\n",

-							t->op);

-		}

-	}

-	/* copy the rest of the message */

-	memcpy(new_buf+offset, orig+s_offset, len-s_offset);

-	new_buf[new_len]=0;

-

 	 /* send it! */

-	DBG("Sending:\n%s.\n", new_buf);

-	DBG("orig. len=%d, new_len=%d, via_len=%d, received_len=%d\n",

-			len, new_len, via_len, received_len);

+	DBG("Sending:\n%s.\n", buf);

+	DBG("orig. len=%d, new_len=%d\n", msg->len, len );

 	to->sin_family = AF_INET;

 	to->sin_port = (p->port)?htons(p->port):htons(SIP_PORT);

@@ -432,9 +73,9 @@ int forward_request( struct sip_msg* msg, struct proxy_l * p)

 	to->sin_addr.s_addr=*((long*)p->host.h_addr_list[p->addr_idx]);

 	p->tx++;

-	p->tx_bytes+=new_len;

+	p->tx_bytes+=len;

-	if (udp_send(new_buf, new_len, (struct sockaddr*) to,

+	if (udp_send( buf, len, (struct sockaddr*) to,

 				sizeof(struct sockaddr_in))==-1){

 			p->errors++;

 			p->ok=0;

@@ -442,20 +83,17 @@ int forward_request( struct sip_msg* msg, struct proxy_l * p)

 			update_fail_on_send;

 #endif

 			goto error;

-	} 

+	}

 #ifdef STATS

 	/* sent requests stats */

 	else update_sent_request( msg->first_line.u.request.method_value );

 #endif

-	free(new_buf);

+	free(buf);

 	free(to);

 	/* received_buf & line_buf will be freed in receiv_msg by free_lump_list*/

 	return 0;

-error1:

-	if (line_buf) pkg_free(line_buf);

-	if (received_buf) pkg_free(received_buf);

 error:

-	if (new_buf) free(new_buf);

+	if (buf) free(buf);

 	if (to) free(to);

 	return -1;

 }

@@ -478,7 +116,7 @@ int forward_reply(struct sip_msg* msg)

 #ifdef DNS_IP_HACK

 	int err;

 #endif

-	

+

 	orig=msg->orig;

 	buf=msg->buf;

@@ -516,9 +154,9 @@ int forward_reply(struct sip_msg* msg)

 		via_len+=msg->via1->hdr.len+1;

 	}

 	new_len=len-via_len;

-	

+

 	DBG(" old size: %d, new size: %d\n", len, new_len);

-	new_buf=(char*)malloc(new_len+1);/* +1 is for debugging 

+	new_buf=(char*)malloc(new_len+1);/* +1 is for debugging

 											(\0 to print it )*/

 	if (new_buf==0){

 		LOG(L_ERR, "ERROR: forward_reply: out of memory\n");

@@ -531,10 +169,10 @@ int forward_reply(struct sip_msg* msg)

 	memcpy(new_buf+offset,orig+s_offset, len-s_offset);

 	 /* send it! */

 	DBG(" copied size: orig:%d, new: %d, rest: %d\n",

-			s_offset, offset, 

+			s_offset, offset,

 			len-s_offset );

 	DBG("Sending: to %s:%d, \n%s.\n",

-			msg->via2->host.s, 

+			msg->via2->host.s,

 			(unsigned short)msg->via2->port,

 			new_buf);

@@ -561,8 +199,8 @@ int forward_reply(struct sip_msg* msg)

 #ifdef DNS_IP_HACK

 	}

 #endif

-	if (udp_send(new_buf,new_len, (struct sockaddr*) to, 

-					sizeof(struct sockaddr_in))==-1) 

+	if (udp_send(new_buf,new_len, (struct sockaddr*) to,

+					sizeof(struct sockaddr_in))==-1)

 	{

 #ifdef STATS

 		update_fail_on_send;

@@ -11,8 +11,6 @@

 #include "proxy.h"

-int check_address(unsigned long ip, char *name, int resolver);

-

 int forward_request( struct sip_msg* msg,  struct proxy_l* p);

 int forward_reply( struct sip_msg* msg);

@@ -16,7 +16,6 @@ int relay_lowest_reply_upstream( struct cell *Trans , struct sip_msg *p_msg );

 int push_reply_from_uac_to_uas( struct sip_msg * , unsigned int );

 int t_cancel_branch(unsigned int branch); //TO DO

-int send_udp_to( char *buf, unsigned buflen, struct sockaddr_in*  to, unsigned tolen );

 void retransmission_handler( void *);

 void final_response_handler( void *);

@@ -40,10 +39,6 @@ int tm_startup()

    hash_table->timers[WT_TIMER_LIST].timeout_handler             = wait_handler;

    hash_table->timers[DELETE_LIST].timeout_handler                 = delete_handler;

-    /* creating socket for forwarding and retransmision*/

-    if ( (sock_fd=socket(AF_INET, SOCK_DGRAM,0))<0 )

-       return -1;

-

    return 0;

 }

@@ -270,7 +265,7 @@ int t_forward( struct sip_msg* p_msg , unsigned int dest_ip_param , unsigned int

    T->outbound_request[0]->max_retrans = (T->inbound_request->first_line.u.request.method_value==METHOD_INVITE) ? MAX_INVITE_RETR : MAX_NON_INVITE_RETR;

    T->outbound_request[0]->timeout         = RETR_T1;

    /* send the request */

-   send_udp_to( T->outbound_request[0]->buffer , T->outbound_request[0]->bufflen , &(T->outbound_request[0]->to) , sizeof(struct sockaddr_in) );

+   send_udp( T->outbound_request[0]->buffer , T->outbound_request[0]->bufflen , &(T->outbound_request[0]->to) , sizeof(struct sockaddr_in) );

 }

@@ -401,7 +396,7 @@ int t_retransmit_reply( struct sip_msg* p_msg )

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

    if ( T  && T->inbound_response )

    {

-      send_udp_to( T->inbound_response->buffer , T->inbound_response->bufflen , &(T->inbound_response->to) , sizeof(struct sockaddr_in) );

+      send_udp( T->inbound_response->buffer , T->inbound_response->bufflen , &(T->inbound_response->to) , sizeof(struct sockaddr_in) );

       return 0;

    }

@@ -760,7 +755,7 @@ int t_build_and_send_ACK( struct cell *Trans, unsigned int branch)

    *(p++) = '\n';

    /* sends the ACK message to the same destination as the INVITE */

-   send_udp_to( ack_buf, p-ack_buf, &(T->outbound_request[branch]->to) , sizeof(struct sockaddr_in) );

+   send_udp( ack_buf, p-ack_buf, &(T->outbound_request[branch]->to) , sizeof(struct sockaddr_in) );

    /* free mem*/

    free( ack_buf );

@@ -771,23 +766,6 @@ int t_build_and_send_ACK( struct cell *Trans, unsigned int branch)

-/* sends a buffer as a datagram

-  */

-int send_udp_to( char *buf, unsigned buflen, struct sockaddr_in*  to, unsigned tolen )

-{

-   int res;

-

-    do

-    {

-       res = sendto(sock_fd, buf, buflen, 0, to, tolen);

-    }while( res==-1 && errno==EINTR );

-

-   return res;

-}

-

-

-

-

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

 #include <netdb.h>

 #include "../../msg_parser.h"

 #include "../../globals.h"

+#include "../../udp_server.h"

 struct s_table;

 struct timer;