- "body_lump" changes reverted, sorry.

doc/serdev/serdev.sgml

@@ -1454,8 +1454,6 @@ struct sip_msg {
 		
     struct lump* add_rm;         /* used for all the forwarded 
                                   * requests */
-    struct lump* body_lumps;     /* Lumps that modify message body
-                                  * (update Content-Length */
     struct lump* repl_add_rm;    /* used for all the forwarded replies */
     struct lump_rpl *reply_lump; /* only for locally generated replies !!!*/
 

modules/tm/sip_msg.c

@@ -253,6 +253,7 @@ struct sip_msg*  sip_msg_cloner( struct sip_msg *org_msg )
 	struct via_param  *prm;
 	struct to_param   *to_prm,*new_to_prm;
 	struct sip_msg    *new_msg;
+	struct lump       *lump_chain, *lump_tmp, **lump_anchor, **lump_anchor2;
 	struct lump_rpl   *rpl_lump, **rpl_lump_anchor;
 	char              *p,*foo;
 
@@ -339,30 +340,24 @@ struct sip_msg*  sip_msg_cloner( struct sip_msg *org_msg )
 	}/*for all headers*/
 
 	/* length of the data lump structures */
-#define LUMP_LIST_LEN(len, list) \
-do { \
-        struct lump* lump_tmp; \
-	while ((list)) \
-	{ \
-		(len) += lump_len((list)); \
-		lump_tmp = (list)->before; \
-		while ( lump_tmp ) \
-		{ \
-			(len) += lump_len( lump_tmp ); \
-			lump_tmp = lump_tmp->before; \
-		} \
-		lump_tmp = (list)->after; \
-		while ( lump_tmp ) \
-		{ \
-			(len) += lump_len( lump_tmp ); \
-			lump_tmp = lump_tmp->after; \
-		} \
-		(list) = (list)->next; \
-	} \
-} while(0);
-
-	LUMP_LIST_LEN(len, org_msg->add_rm);
-	LUMP_LIST_LEN(len, org_msg->body_lumps);
+	lump_chain = org_msg->add_rm;
+	while (lump_chain)
+	{
+		len += lump_len( lump_chain );
+		lump_tmp = lump_chain->before;
+		while ( lump_tmp )
+		{
+			len += lump_len( lump_tmp );
+			lump_tmp = lump_tmp->before;
+		}
+		lump_tmp = lump_chain->after;
+		while ( lump_tmp )
+		{
+			len += lump_len( lump_tmp );
+			lump_tmp = lump_tmp->after;
+		}
+		lump_chain = lump_chain->next;
+	}
 
 	/*length of reply lump structures*/
 	for(rpl_lump=org_msg->reply_lump;rpl_lump;rpl_lump=rpl_lump->next)
@@ -381,7 +376,6 @@ do { \
 	memcpy( new_msg , org_msg , sizeof(struct sip_msg) );
 	p += ROUND4(sizeof(struct sip_msg));
 	new_msg->add_rm = 0;
-	new_msg->body_lumps = 0;
 	/* new_uri */
 	if (org_msg->new_uri.s && org_msg->new_uri.len)
 	{
@@ -635,42 +629,33 @@ do { \
 		new_msg->last_header = last_hdr;
 	}
 
-
-	     /* clonning data lump */
-#define CLONE_LUMP_LIST(anchor, list) \
-{ \
-        struct lump* lump_tmp, *l; \
-        struct lump** lump_anchor2, **a; \
-        a = anchor; \
-        l = list; \
-	while (l) \
-	{ \
-		lump_clone( (*a) , l , p ); \
-		/*before list*/ \
-		lump_tmp = l->before; \
-		lump_anchor2 = &((*a)->before); \
-		while ( lump_tmp ) \
-		{ \
-			lump_clone( (*lump_anchor2) , lump_tmp , p ); \
-			lump_anchor2 = &((*lump_anchor2)->before); \
-			lump_tmp = lump_tmp->before; \
-		} \
-		/*after list*/ \
-		lump_tmp = l->after; \
-		lump_anchor2 = &((*a)->after); \
-		while ( lump_tmp ) \
-		{ \
-			lump_clone( (*lump_anchor2) , lump_tmp , p ); \
-			lump_anchor2 = &((*lump_anchor2)->after); \
-			lump_tmp = lump_tmp->after; \
-		} \
-		a = &((*a)->next); \
-		l = l->next; \
-	} \
-}
-
-        CLONE_LUMP_LIST(&(new_msg->add_rm), org_msg->add_rm);
-        CLONE_LUMP_LIST(&(new_msg->body_lumps), org_msg->body_lumps);
+	/* clonning data lump */
+		lump_chain = org_msg->add_rm;
+		lump_anchor = &(new_msg->add_rm);
+	while (lump_chain)
+	{
+		lump_clone( (*lump_anchor) , lump_chain , p );
+		/*before list*/
+		lump_tmp = lump_chain->before;
+		lump_anchor2 = &((*lump_anchor)->before);
+		while ( lump_tmp )
+		{
+			lump_clone( (*lump_anchor2) , lump_tmp , p );
+			lump_anchor2 = &((*lump_anchor2)->before);
+			lump_tmp = lump_tmp->before;
+		}
+		/*after list*/
+		lump_tmp = lump_chain->after;
+		lump_anchor2 = &((*lump_anchor)->after);
+		while ( lump_tmp )
+		{
+			lump_clone( (*lump_anchor2) , lump_tmp , p );
+			lump_anchor2 = &((*lump_anchor2)->after);
+			lump_tmp = lump_tmp->after;
+		}
+		lump_anchor = &((*lump_anchor)->next);
+		lump_chain = lump_chain->next;
+	}
 
 	/*cloning reply lump structures*/
 	rpl_lump_anchor = &(new_msg->reply_lump);
@@ -688,6 +673,11 @@ do { \
 	}
 
 	clone_authorized_hooks(new_msg, org_msg);
-	
+
 	return new_msg;
 }
+
+
+
+
+

modules/tm/t_reply.c

@@ -413,7 +413,6 @@ static int faked_env(struct sip_msg *fake,
 	/* set items, which will be duped to pkg_mem, to zero, so that
 	 * "restore" called on error does not free the original items */
 	fake->add_rm=0;
-	fake->body_lumps = 0;
 	fake->new_uri.s=0; fake->new_uri.len=0; 
 
 	/* remember we are back in request processing, but process
@@ -460,21 +459,12 @@ static int faked_env(struct sip_msg *fake,
 			goto restore;
 		}
 	}
-	
-	if (shmem_msg->body_lumps) {
-		fake->body_lumps=dup_lump_list(shmem_msg->body_lumps);
-		if (!fake->body_lumps) { /* non_empty->empty ... failure */
-			LOG(L_ERR, "ERROR: on_negative_reply: body lump dup failed\n");
-			goto restore;
-		}
-	}
 	/* success */
 	return 1;
 
 restore:
 	/* restore original environment and destroy faked message */
 	free_duped_lump_list(fake->add_rm);
-	free_duped_lump_list(fake->body_lumps);
 	if (fake->new_uri.s) pkg_free(fake->new_uri.s);
 	set_t(backup_t);
 	global_msg_id=backup_msgid;

msg_translator.c

@@ -394,7 +394,7 @@ char* id_builder(struct sip_msg* msg, unsigned int *id_len)
 
 
 
-char* clen_builder(struct sip_msg* msg, unsigned int *clen_len, int body_delta)
+char* clen_builder(struct sip_msg* msg, unsigned int *clen_len)
 {
 	char* buf;
 	int len;
@@ -408,10 +408,10 @@ char* clen_builder(struct sip_msg* msg, unsigned int *clen_len, int body_delta)
 	if (body==0){
 		ser_error=E_BAD_REQ;
 		LOG(L_ERR, "ERROR: clen_builder: no message body found"
-		    " (missing crlf?)");
+					" (missing crlf?)");
 		return 0;
 	}
-	value=msg->len-(int)(body-msg->buf) + body_delta;
+	value=msg->len-(int)(body-msg->buf);
 	value_s=int2str(value, &value_len);
 	DBG("clen_builder: content-length: %d (%s)\n", value, value_s);
 		
@@ -499,7 +499,7 @@ static inline int lump_check_opt(	enum lump_conditions cond,
 
 /* computes the "unpacked" len of a lump list,
    code moved from build_req_from_req */
-static inline int lumps_len(struct sip_msg* msg, struct lump* lumps, struct socket_info* send_sock)
+static inline int lumps_len(struct sip_msg* msg, struct socket_info* send_sock)
 {
 	int s_offset;
 	int new_len;
@@ -672,7 +672,7 @@ static inline int lumps_len(struct sip_msg* msg, struct lump* lumps, struct sock
 		send_port_str=&(send_sock->port_no_str);
 	
 	
-	for(t=lumps;t;t=t->next){
+	for(t=msg->add_rm;t;t=t->next){
 		/* skip if this is an OPT lump and the condition is not satisfied */
 		if ((t->op==LUMP_ADD_OPT) && !lump_check_opt(t->u.cond, msg, send_sock))
 			continue;
@@ -764,11 +764,10 @@ skip_after:
 	code moved form build_req_from_req  */
 
 static inline void process_lumps(	struct sip_msg* msg,	
-					struct lump* lumps,
-					char* new_buf, 
-					unsigned int* new_buf_offs, 
-					unsigned int* orig_offs,
-					struct socket_info* send_sock)
+									char* new_buf, 
+									unsigned int* new_buf_offs, 
+									unsigned int* orig_offs,
+									struct socket_info* send_sock)
 {
 	struct lump *t;
 	struct lump *r;
@@ -1028,7 +1027,7 @@ static inline void process_lumps(	struct sip_msg* msg,
 	offset=*new_buf_offs;
 	s_offset=*orig_offs;
 	
-	for (t=lumps;t;t=t->next){
+	for (t=msg->add_rm;t;t=t->next){
 		switch(t->op){
 			case LUMP_ADD:
 			case LUMP_ADD_SUBST:
@@ -1185,101 +1184,12 @@ skip_nop_after:
 }
 
 
-/*
- * Adjust/insert Content-Length if necesarry
- */
-static inline int adjust_clen(struct sip_msg* msg, int body_delta, int proto)
-{
-	struct lump* anchor;
-	char* clen_buf;
-	int clen_len;
-	
-	     /* Calculate message length difference caused by 
-	      * lumps modifying message body, from this point on
-	      * the message body must not be modified. Zero value
-	      * indicates that the body hasn't been modified
-	      */
-	clen_buf = 0;
-
-	if (body_delta) {
-		     /* The body has been changed, try to find
-		      * existing Content-Length
-		      */
-		if (parse_headers(msg, HDR_CONTENTLENGTH, 0) == -1) {
-			LOG(L_ERR, "adjust_clen: Error parsing content-length\n");
-			goto error;
-		}
-
-		anchor = 0;
-		if (msg->content_length) {
-			     /* Content-Length has been found,
-			      * remove it
-			      */
-			anchor = del_lump(&msg->add_rm, msg->content_length->name.s - msg->buf, 
-					  msg->content_length->len, HDR_CONTENTLENGTH);
-			if (!anchor) {
-				LOG(L_ERR, "build_req_from_sip_req: Can't remove original Content-Length\n");
-				goto error;
-			}
-		}
-
-		if (proto == PROTO_UDP) {
-			     /* Protocol is UDP and Content-Length has
-			      * been removed, insert new value
-			      */
-			if (anchor) {
-				clen_buf = clen_builder(msg, &clen_len, body_delta);
-				if (!clen_buf) goto error;
-				if (insert_new_lump_after(anchor, clen_buf, clen_len, HDR_CONTENTLENGTH) == 0) goto error;
-			}
-		} else {
-			     /* Protocol is not UDP, insert new Content-Length,
-			      * no matter if Content-Length has been removed or not
-			      */
-			if (!anchor) {
-				     /* Create anchor */
-				     /* msg->unparsed should point just before the final crlf,
-				      * parse_headers is called from clen_builder */
-				anchor = anchor_lump(&(msg->add_rm), msg->unparsed - msg->buf, 0, HDR_CONTENTLENGTH);
-				if (!anchor) goto error;
-			}
-
-			clen_buf = clen_builder(msg, &clen_len, body_delta);
-			if (!clen_buf) goto error;
-			if (insert_new_lump_after(anchor, clen_buf, clen_len, HDR_CONTENTLENGTH) == 0) goto error;
-		}
-	} else {
-#ifdef USE_TCP
-		if (proto == PROTO_TCP
-#ifdef USE_TLS
-		    || proto == PROTO_TLS
-#endif
-		    ) {
-			anchor = anchor_lump(&(msg->add_rm), msg->unparsed - msg->buf, 0, HDR_CONTENTLENGTH);
-			if (!anchor) goto error;
-			
-			clen_buf = clen_builder(msg, &clen_len, body_delta);
-			if (!clen_buf) goto error;
-			if (insert_new_lump_after(anchor, clen_buf, clen_len, HDR_CONTENTLENGTH) == 0) goto error;
-		}
-#endif
-	}
-
-	return 0;
-
- error:
-	if (clen_buf) pkg_free(clen_buf);
-	return -1;
-}
-
-
-
 
 char * build_req_buf_from_sip_req( struct sip_msg* msg,
 								unsigned int *returned_len,
 								struct socket_info* send_sock, int proto)
-{	
-	unsigned int len, new_len, received_len, rport_len, uri_len, via_len, body_delta;
+{
+	unsigned int len, new_len, received_len, rport_len, uri_len, via_len;
 	char* line_buf;
 	char* received_buf;
 	char* rport_buf;
@@ -1291,16 +1201,18 @@ char * build_req_buf_from_sip_req( struct sip_msg* msg,
 	str branch;
 	str extra_params;
 	struct hostport hp;
-	char* clen_buf;
-	unsigned int clen_len;
 	
 #ifdef USE_TCP
 	char* id_buf;
 	unsigned int id_len;
+	char* clen_buf;
+	unsigned int clen_len;
 	
 	
 	id_buf=0;
 	id_len=0;
+	clen_buf=0;
+	clen_len=0;
 #endif
 	via_insert_param=0;
 	extra_params.len=0;
@@ -1314,8 +1226,6 @@ char * build_req_buf_from_sip_req( struct sip_msg* msg,
 	received_buf=0;
 	rport_buf=0;
 	line_buf=0;
-	clen_buf=0;
-	clen_len=0;
 
 	
 #ifdef USE_TCP
@@ -1336,16 +1246,31 @@ char * build_req_buf_from_sip_req( struct sip_msg* msg,
 		extra_params.s=id_buf;
 		extra_params.len=id_len;
 	}
+	/* if sending proto == tcp, check if Content-Length needs to be added*/
+	if (proto==PROTO_TCP
+#ifdef USE_TLS
+			|| proto==PROTO_TLS
 #endif
-	     /* Calculate messsage body difference and adjust
-	      * Content-Length
-	      */
-	body_delta = lumps_len(msg, msg->body_lumps, send_sock);
-        if (adjust_clen(msg, body_delta, proto) < 0) {
-		LOG(L_ERR, "ERROR: build_req_buf_from sip_req: Error while adjusting Contact-Length\n");
-		goto error00;
+			){
+		DBG("build_req_from_req: checking for clen; proto=%d,"
+			" rcv->proto=%d\n", proto, msg->rcv.proto);
+		/* first of all parse content-length */
+		if (parse_headers(msg, HDR_CONTENTLENGTH, 0)==-1){
+			LOG(L_ERR, "build_req_buf_from_sip_req:"
+							" error parsing content-length\n");
+			goto skip_clen;
+		}
+		if (msg->content_length==0){
+			/* we need to add it */
+			if ((clen_buf=clen_builder(msg, &clen_len))==0){
+				LOG(L_ERR, "build_req_buf_from_sip_req:" 
+								" clen_builder failed\n");
+				goto skip_clen;
+			}
+		}
 	}
-
+skip_clen:
+#endif
 	branch.s=msg->add_to_branch_s;
 	branch.len=msg->add_to_branch_len;
 	set_hostport(&hp, msg);
@@ -1435,9 +1360,22 @@ char * build_req_buf_from_sip_req( struct sip_msg* msg,
 			goto error03; /* free rport_buf */
 			
 	}
+#ifdef USE_TCP
+	/* if clen needs to be added, add it */
+	if (clen_len){
+		/* msg->unparsed should point just before the final crlf,
+		 * parse_headers is called from clen_builder */
+		anchor=anchor_lump(&(msg->add_rm), msg->unparsed-buf, 0,
+							 HDR_CONTENTLENGTH);
+		if (anchor==0) goto error04; /* free clen_buf */
+		if (insert_new_lump_after(anchor, clen_buf, clen_len,
+					HDR_CONTENTLENGTH)==0)
+			goto error04; /* free clen_buf*/
+	}
+#endif
 
 	/* compute new msg len and fix overlapping zones*/
-	new_len=len+body_delta+lumps_len(msg, msg->add_rm, send_sock);
+	new_len=len+lumps_len(msg, send_sock);
 #ifdef XL_DEBUG
 	LOG(L_ERR, "DEBUG: new_len(%d)=len(%d)+lumps_len\n", new_len, len);
 #endif
@@ -1467,8 +1405,7 @@ char * build_req_buf_from_sip_req( struct sip_msg* msg,
 	}
 	new_buf[new_len]=0;
 	/* copy msg adding/removing lumps */
-	process_lumps(msg, msg->add_rm, new_buf, &offset, &s_offset, send_sock);
-	process_lumps(msg, msg->body_lumps, new_buf, &offset, &s_offset, send_sock);
+	process_lumps(msg, new_buf, &offset, &s_offset, send_sock);
 	/* copy the rest of the message */
 	memcpy(new_buf+offset, buf+s_offset, len-s_offset);
 	new_buf[new_len]=0;
@@ -1494,6 +1431,10 @@ error02:
 	if (received_buf) pkg_free(received_buf);
 error03:
 	if (rport_buf) pkg_free(rport_buf);
+#ifdef USE_TCP
+error04:
+	if (clen_buf) pkg_free(clen_buf);
+#endif
 error00:
 #ifdef USE_TCP
 	if (id_buf) pkg_free(id_buf);
@@ -1507,16 +1448,22 @@ error00:
 char * build_res_buf_from_sip_res( struct sip_msg* msg,
 				unsigned int *returned_len)
 {
-	unsigned int new_len, via_len, body_delta;
+	unsigned int new_len, via_len;
 	char* new_buf;
 	unsigned offset, s_offset, via_offset;
 	char* buf;
 	unsigned int len;
-
+#ifdef USE_TCP
+	struct lump* anchor;
+	char* clen_buf;
+	unsigned int clen_len;
+	
+	clen_buf=0;
+	clen_len=0;
+#endif
 	buf=msg->buf;
 	len=msg->len;
 	new_buf=0;
-
 	/* we must remove the first via */
 	if (msg->via1->next) {
 		via_len=msg->via1->bsize;
@@ -1526,23 +1473,57 @@ char * build_res_buf_from_sip_res( struct sip_msg* msg,
 		via_offset=msg->h_via1->name.s-buf;
 	}
 
-	     /* Calculate messsage body difference and adjust
-	      * Content-Length
-	      */
-	body_delta = lumps_len(msg, msg->body_lumps, 0);
-        if (adjust_clen(msg, body_delta, (msg->via2 ? msg->via2->proto : PROTO_UDP)) < 0) {
-		LOG(L_ERR, "ERROR: build_req_buf_from sip_req: Error while adjusting Contact-Length\n");
-		goto error;
-	}
+#ifdef USE_TCP
 
+	/* if sending proto == tcp, check if Content-Length needs to be added*/
+	if (msg->via2 && ((msg->via2->proto==PROTO_TCP)
+#ifdef USE_TLS
+				|| (msg->via2->proto==PROTO_TLS)
+#endif
+				)){
+		DBG("build_res_from_sip_res: checking content-length for \n%.*s\n",
+				(int)msg->len, msg->buf);
+		/* first of all parse content-length */
+		if (parse_headers(msg, HDR_CONTENTLENGTH, 0)==-1){
+			LOG(L_ERR, "build_res_buf_from_sip_res:"
+							" error parsing content-length\n");
+			goto skip_clen;
+		}
+		if (msg->content_length==0){
+			DBG("build_res_from_sip_res: no content_length hdr found\n");
+			/* we need to add it */
+			if ((clen_buf=clen_builder(msg, &clen_len))==0){
+				LOG(L_ERR, "build_res_buf_from_sip_res:" 
+								" clen_builder failed\n");
+				goto skip_clen;
+			}
+		}
+	}
+skip_clen:
+#endif
+	
 	/* remove the first via*/
 	if (del_lump( &(msg->add_rm), via_offset, via_len, HDR_VIA)==0){
 		LOG(L_ERR, "build_res_buf_from_sip_res: error trying to remove first"
 					"via\n");
 		goto error;
 	}
-
-	new_len=len+body_delta+lumps_len(msg, msg->add_rm, 0); /*FIXME: we don't know the send sock */
+#ifdef USE_TCP
+	/* if clen needs to be added, add it */
+	if (clen_len){
+		/* msg->unparsed should point just before the final crlf,
+		 * parse_headers is called from clen_builder */
+		anchor=anchor_lump(&(msg->add_rm), msg->unparsed-buf, 0, 
+							HDR_CONTENTLENGTH);
+		DBG("build_res_from_sip_res: adding content-length: %.*s\n",
+				(int)clen_len, clen_buf);
+		if (anchor==0) goto error_clen; /* free clen_buf*/
+		if (insert_new_lump_after(anchor, clen_buf, clen_len,
+					HDR_CONTENTLENGTH)==0)
+			goto error_clen; /* free clen_buf*/
+	}
+#endif
+	new_len=len+lumps_len(msg, 0); /*FIXME: we don't know the send sock */
 	
 	DBG(" old size: %d, new size: %d\n", len, new_len);
 	new_buf=(char*)pkg_malloc(new_len+1); /* +1 is for debugging 
@@ -1553,8 +1534,7 @@ char * build_res_buf_from_sip_res( struct sip_msg* msg,
 	}
 	new_buf[new_len]=0; /* debug: print the message */
 	offset=s_offset=0;
-	process_lumps(msg, msg->add_rm, new_buf, &offset, &s_offset, 0); /*FIXME: no send sock*/
-	process_lumps(msg, msg->body_lumps, new_buf, &offset, &s_offset, 0); /*FIXME: no send sock*/
+	process_lumps(msg, new_buf, &offset, &s_offset, 0); /*FIXME: no send sock*/
 	/* copy the rest of the message */
 	memcpy(new_buf+offset,
 		buf+s_offset, 
@@ -1565,6 +1545,10 @@ char * build_res_buf_from_sip_res( struct sip_msg* msg,
 
 	*returned_len=new_len;
 	return new_buf;
+#ifdef USE_TCP
+error_clen:
+	if (clen_buf) pkg_free(clen_buf);
+#endif
 error:
 	*returned_len=0;
 	return 0;

parser/msg_parser.c

@@ -588,7 +588,6 @@ void free_sip_msg(struct sip_msg* msg)
 	if (msg->new_uri.s) { pkg_free(msg->new_uri.s); msg->new_uri.len=0; }
 	if (msg->headers)     free_hdr_field_lst(msg->headers);
 	if (msg->add_rm)      free_lump_list(msg->add_rm);
-	if (msg->body_lumps)  free_lump_list(msg->body_lumps);
 	if (msg->reply_lump)   free_reply_lump(msg->reply_lump);
 	/* don't free anymore -- now a pointer to a static buffer */
 #	ifdef DYN_BUF

parser/msg_parser.h

@@ -212,7 +212,6 @@ struct sip_msg {
 	struct sip_uri parsed_orig_ruri;
 	
 	struct lump* add_rm;       /* used for all the forwarded requests/replies */
-	struct lump* body_lumps;   /* Lumps that modify message body (they update Contact-Length) */
 	struct lump_rpl *reply_lump; /* only for localy generated replies !!!*/
 
 	/* str add_to_branch;