@@ -2,19 +2,22 @@ $Id$

 ( - todo, x - done)

-- backport tcp conn id fix to stable

 - change len_gt into and expr (e.g msg:len).

 - sipit: uri == myself doesn't match tls port = 5061

 - sipit: fix check_self & *_alias to work with tcp & tls

 - sipit: fix ipv6 references in check_self

 - regex subst on uris?

-- port receive.c pre_script_cb fix from stable

+x port receive.c pre_script_cb fix from stable

 - extend alias to include port numbers :

     something like alias= foo1.bar:5080 foo2.bar foo3.bar:*

 - extend listen and alias to include port numbers and protocol:

        tcp foo.bar:5063, udp foo.bar:5062, foo2.bar

 release:

+- backport: tcp conn id fix to stable + destroy_tcp 

+- backport: acc mem. leak fixes

+- backport: dns mem. leak fixes (resolve.[ch])

+- backport: id_builder receive_msg mem. leak (receive.c)

 - change tcp timeouts to 2 or 3 min?

 x check via ipv6 fixes and backport to stable

 x fix kill(0, SIGTERM) on startup error (will kill also the launching shell

@@ -1186,7 +1186,8 @@ char * build_req_buf_from_sip_req( struct sip_msg* msg,

 		if  ((id_buf=id_builder(msg, &id_len))==0){

 			LOG(L_ERR, "ERROR: build_req_buf_from_sip_req:"

 							" id_builder failed\n");

-			goto error01; /* free everything */

+			goto error00; /* we don't need to free anything,

+			                 nothing alloc'ed yet*/

 		}

 		DBG("build_req_from_req: id added: <%.*s>, rcv proto=%d\n",

 				(int)id_len, id_buf, msg->rcv.proto);

@@ -1315,7 +1316,7 @@ skip_clen:

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

@@ -1366,13 +1367,15 @@ skip_clen:

 #endif

 	*returned_len=new_len;

+	/* cleanup */

+#ifdef USE_TCP

+	if (id_buf) pkg_free(id_buf); /* it's not in a lump => we don't need it

+									 anymore */

+#endif

 	return new_buf;

 error01:

-	pkg_free(line_buf);

-#ifdef USE_TCP

-	if (id_buf) pkg_free(id_buf);

-#endif

+	if (line_buf) pkg_free(line_buf);

 error02:

 	if (received_buf) pkg_free(received_buf);

 error03:

@@ -1382,6 +1385,9 @@ error04:

 	if (clen_buf) pkg_free(clen_buf);

 #endif

 error00:

+#ifdef USE_TCP

+	if (id_buf) pkg_free(id_buf);

+#endif

 	*returned_len=0;

 	return 0;

 }

@@ -529,6 +529,7 @@ struct hostent* sip_resolvehost(str* name, unsigned short* port, int proto)

 					return he;

 				}

 			}

+			if (head) free_rdata_list(head); /*clean up*/

 			DBG("sip_resolvehost: not SRV record found for %.*s," 

 					" trying 'normal' lookup...\n", name->len, name->s);

 		}

@@ -1006,6 +1006,11 @@ void destroy_tcp()

 		shm_free(tcpconn_id_hash);

 		tcpconn_id_hash=0;

 	}

+	

+	if(connection_id){

+		shm_free(connection_id);

+		connection_id=0;

+	}

 }