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

  *

  * History:

  * --------

+ * 2003-03-01 VOICE_MAIL defs removed (jiri)

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

  * 2003-01-20 bug_fix: use of return value of snprintf aligned to C99 (jiri)

  * 2003-01-23 added rport patches, contributed by 

@@ -829,7 +830,6 @@ error:

 char * build_res_buf_from_sip_req( unsigned int code, char *text,

 					char *new_tag, unsigned int new_tag_len,

 					struct sip_msg* msg, unsigned int *returned_len)

-#ifdef VOICE_MAIL

 {

     return build_res_buf_with_body_from_sip_req(code,text,new_tag,new_tag_len,

 						0,0, /* no body */

@@ -842,7 +842,6 @@ char * build_res_buf_with_body_from_sip_req( unsigned int code, char *text ,

 					     char *body, unsigned int body_len,

 					     char *content_type, unsigned int content_type_len,

 					     struct sip_msg* msg, unsigned int *returned_len)

-#endif

 {

 	char              *buf, *p;

 	unsigned int      len,foo;

@@ -859,10 +858,8 @@ char * build_res_buf_with_body_from_sip_req( unsigned int code, char *text ,

 	unsigned int      warning_len;

 	unsigned int	  text_len;

 	int r;

-#ifdef VOICE_MAIL

-	char content_len[27];

 	int content_len_len;

-#endif

+	char *content_len;

 	char *after_body;

 	str to_tag;

@@ -874,6 +871,7 @@ char * build_res_buf_with_body_from_sip_req( unsigned int code, char *text ,

 	buf=0;

 	/* make -Wall happy */

 	warning=0;

+	content_len=0;

 	text_len=strlen(text);

@@ -949,17 +947,19 @@ char * build_res_buf_with_body_from_sip_req( unsigned int code, char *text ,

 	if (server_signature) {

 		/*server header*/

 		len += SERVER_HDR_LEN + CRLF_LEN;

-#ifndef VOICE_MAIL

-		/*content length header*/

+	}

+

+	if (body_len) {

+		content_len=int2str(body_len, &content_len_len);

+		len += CONTENT_LENGTH_LEN + content_len_len + CRLF_LEN;

+	    len += body_len;

+	} else {

 		len +=CONTENT_LENGTH_LEN+1 + CRLF_LEN;

-#endif

 	}

-#ifdef VOICE_MAIL

-	content_len_len=snprintf(content_len, sizeof(content_len), "Content-Length: %d", body_len);

-	len += content_len_len + CRLF_LEN;

-	if(content_type_len)

+	if(content_type_len) {

 	    len += content_type_len + CRLF_LEN;

-#endif

+	}

+

 	if (sip_warning) {

 		warning = warning_builder(msg,&warning_len);

 		if (warning) len += warning_len + CRLF_LEN;

@@ -968,10 +968,6 @@ char * build_res_buf_with_body_from_sip_req( unsigned int code, char *text ,

 	/* end of message */

 	len += CRLF_LEN; /*new line*/

-#ifdef VOICE_MAIL

-	if(body_len)

-	    len += body_len;

-#endif

 	/*allocating mem*/

 	buf = (char*) pkg_malloc( len+1 );

 	if (!buf)

@@ -1068,27 +1064,27 @@ char * build_res_buf_with_body_from_sip_req( unsigned int code, char *text ,

 		p+=SERVER_HDR_LEN;

 		memcpy( p, CRLF, CRLF_LEN );

 		p+=CRLF_LEN;

-#ifndef VOICE_MAIL

-		/* content length header*/

-		memcpy( p, CONTENT_LENGTH "0" , CONTENT_LENGTH_LEN+1 );

-		p+=CONTENT_LENGTH_LEN+1;

+	}

+

+	

+	if (body_len) {

+		memcpy(p, CONTENT_LENGTH, CONTENT_LENGTH_LEN );

+		p+=CONTENT_LENGTH_LEN;

+		memcpy( p, content_len, content_len_len );

+		p+=content_len_len;

 		memcpy( p, CRLF, CRLF_LEN );

 		p+=CRLF_LEN;

-#endif

+	} else {

+		/* content length header*/

+		memcpy( p, CONTENT_LENGTH "0" CRLF, CONTENT_LENGTH_LEN+1+CRLF_LEN );

+		p+=CONTENT_LENGTH_LEN+1+CRLF_LEN;

 	}

-

-#ifdef VOICE_MAIL

-	memcpy( p, content_len, content_len_len );

-	p+=content_len_len;

-	memcpy( p, CRLF, CRLF_LEN );

-	p+=CRLF_LEN;

 	if(content_type_len){

 	    memcpy( p, content_type, content_type_len );

 	    p+=content_type_len;

 	    memcpy( p, CRLF, CRLF_LEN );

 	    p+=CRLF_LEN;

 	}

-#endif

 	if (sip_warning && warning) {

 		memcpy( p, warning, warning_len);

 		p+=warning_len;

@@ -1098,12 +1094,10 @@ char * build_res_buf_with_body_from_sip_req( unsigned int code, char *text ,

 	/*end of message*/

 	memcpy( p, CRLF, CRLF_LEN );

 	p+=CRLF_LEN;

-#ifdef VOICE_MAIL

 	if(body_len){

 	    memcpy ( p, body, body_len );

 	    p+=body_len;

 	}

-#endif

 	*(p) = 0;

 	*returned_len = len;

 	/* in req2reply, received_buf is not introduced to lumps and

@@ -23,6 +23,10 @@

  * You should have received a copy of the GNU General Public License 

  * along with this program; if not, write to the Free Software 

  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+ *

+ * History:

+ * --------

+ * 2003-03-01 VOICE_MAIL defs removed (jiri)

  */

@@ -54,7 +58,6 @@ char * build_res_buf_from_sip_req(	unsigned int code ,

 				unsigned int new_tag_len ,

 				struct sip_msg* msg,

 				unsigned int *returned_len);

-#ifdef VOICE_MAIL

 char * build_res_buf_with_body_from_sip_req(	unsigned int code ,

 				char *text ,

 				char *new_tag ,

@@ -65,7 +68,6 @@ char * build_res_buf_with_body_from_sip_req(	unsigned int code ,

 				unsigned int content_type_len,

 				struct sip_msg* msg,

 				unsigned int *returned_len);

-#endif

 char* via_builder( unsigned int *len,

 	struct socket_info* send_sock,