*** empty log message ***

modules/tm/t_funcs.c

@@ -589,10 +589,6 @@ int t_send_reply(  struct sip_msg* p_msg , unsigned int code , char * text )
       T->outbound_response->tl[RETRASMISSIONS_LIST].payload = T->outbound_response;
       T->outbound_response->tl[FR_TIMER_LIST].payload = T->outbound_response;
       T->outbound_response->my_T = T;
-      T->status = code;
-
-
-
    }
 
    buf = build_res_buf_from_sip_req( code , text , T->inbound_request , &len );
@@ -612,6 +608,7 @@ int t_send_reply(  struct sip_msg* p_msg , unsigned int code , char * text )
    }
    memcpy( T->outbound_response->retr_buffer , buf , len );
    free( buf ) ;
+   T->status = code;
 
    /* make sure that if we send something final upstream, everything else will be cancelled */
    if ( code>=300 &&  p_msg->first_line.u.request.method_value==METHOD_INVITE )

msg_translator.c

@@ -516,92 +516,65 @@ error:
 char * build_res_buf_from_sip_req(	unsigned int code ,
 	char *text , struct sip_msg* msg, unsigned int *returned_len)
 {
-	char                    *buf=0, *p;
+	char                    *buf, *p;
 	unsigned int       len,foo;
 	struct hdr_field  *hdr;
-	int first_via;
-	int str_len_text;
-	int i;
+	int                       i;
 
-	str_len_text=strlen(text);
+	/* force parsing all headers -- we want to return all
+	Via's in the reply and they may be scattered down to the
+	end of header (non-block Vias are a really poor property
+	of SIP :( ) */
+	parse_headers( msg, HDR_EOH );
 
 	/*computes the lenght of the new response buffer*/
 	len = 0;
 	/* first line */
-	len += 3/*code*/ + 1/*space*/ + str_len_text + CRLF_LEN/*new line*/;
-
-	/* force parsing all headers -- we want to return all
-           Via's in the reply and they may be scattered down to the
- 	   end of header (non-block Vias are a really poor property
-	   of SIP :( )
-        */
-	parse_headers( msg, HDR_EOH );
-	/* check if I have those HFs identifying a transaction here */
-	if (!check_transaction_quadruple( msg ))
-		goto error;
-
-	first_via = 1;
-	for ( hdr=msg->headers ; hdr ; hdr=hdr->next ) 
-		if (  hdr->type==HDR_FROM || 
-			(hdr->type==HDR_VIA ?  (first_via ? first_via=0, 0: 1 ) : 0) ||
-			hdr->type==HDR_CALLID || hdr->type==HDR_TO ||
-			hdr->type==HDR_CSEQ )
-			len += hdr->body.len  + hdr->name.len  + MY_HF_SEP_LEN + CRLF_LEN;
+	len += 3/*code*/ + 1/*space*/ + strlen(text) + CRLF_LEN/*new line*/;
+	/*headers that will be copied (TO, FROM, CSEQ,CALLID,VIA)*/
+	for ( hdr=msg->headers ; hdr ; hdr=hdr->next )
+		if ( hdr->type==HDR_VIA || hdr->type==HDR_FROM ||
+				hdr->type==HDR_CALLID || hdr->type==HDR_TO ||
+				hdr->type==HDR_CSEQ )
+			len += ((hdr->body.s+hdr->body.len ) - hdr->name.s ) ;
 	/* end of message */
 	len += CRLF_LEN; /*new line*/
 
 	/*allocating mem*/
+	buf = 0;
 	buf = (char*) malloc( len+1 );
-	p=buf;
 	if (!buf)
 	{
 		LOG(L_ERR, "ERROR: build_res_buf_from_sip_req: out of memory\n");
 		goto error;
 	}
-	p=buf;
 
 	/* filling the buffer*/
+	p=buf;
 	/* first line */
 	for ( i=2 , foo = code  ;  i>=0  ;  i-- , foo=foo/10 )
-		*(p+i) = '0' + foo % 10;
+		*(p+i) = '0' + foo - ( foo/10 )*10;
 	p += 3;
 	*(p++) = ' ' ;
-	memcpy( p , text , str_len_text );
-	p += str_len_text;
+	memcpy( p , text , strlen(text) );
+	p += strlen(text);
 	memcpy( p, CRLF, CRLF_LEN );
 	p+=CRLF_LEN;
-	
 	/* headers*/
-	first_via=1;
 	for ( hdr=msg->headers ; hdr ; hdr=hdr->next )
-		if ( hdr->type==HDR_FROM ||
-			hdr->type==HDR_CALLID || hdr->type==HDR_TO ||
-			(hdr->type==HDR_VIA || hdr->type==HDR_CSEQ )
+		if ( hdr->type==HDR_VIA || hdr->type==HDR_FROM ||
+		hdr->type==HDR_CALLID || hdr->type==HDR_TO || hdr->type==HDR_CSEQ )
 		{
-			char *end; int plen;
-
-			end = hdr->name.s+hdr->name.len-1;
-			plen= (*end==0) ? hdr->name.len - 1 : hdr->name.len;
-			memcpy( p, hdr->name.s, plen );
-			p+=plen;
-
-			memcpy( p, MY_HF_SEP, MY_HF_SEP_LEN );
-			p+=MY_HF_SEP_LEN;
-
-			end = hdr->body.s+hdr->body.len-1;
-			plen= (*end==0) ? hdr->body.len - 1 : hdr->body.len;
-			memcpy( p, hdr->body.s, plen );
-			p+=plen;
-			memcpy( p, CRLF, CRLF_LEN );
-			p+=CRLF_LEN;
+			memcpy( p , msg->orig+(hdr->name.s-msg->buf) ,
+					((hdr->body.s+hdr->body.len ) -
+					hdr->name.s ) );
+			p += ((hdr->body.s+hdr->body.len ) - hdr->name.s );
 		}
+
 	memcpy( p, CRLF, CRLF_LEN );
 	p+=CRLF_LEN;
 	*(p++) = 0;
-
-
-	/* returned_len=len; */
-	*returned_len=p-buf;
+	*returned_len=len;
 	return buf;
 error:
 	if (buf) free(buf);