--- modules/tm/t_lookup.c.orig	Mon Oct 21 22:21:50 2002
+++ modules/tm/t_lookup.c	Tue Apr  8 19:49:53 2003
@@ -78,13 +78,13 @@
 	translate_pointer(p_msg->orig,p_msg->buf,p_msg->first_line.u.request.uri.s),\
 	p_msg->first_line.u.request.uri.len)==0)
 #define EQ_VIA_LEN(_via)\
-	( (p_msg->via1->bsize-(p_msg->_via->name.s-(p_msg->_via->hdr.s+p_msg->_via->hdr.len)))==\
-	(t_msg->via1->bsize-(t_msg->_via->name.s-(t_msg->_via->hdr.s+t_msg->_via->hdr.len))) )
+	( (p_msg->_via->port_str.s + p_msg->_via->port_str.len - p_msg->_via->name.s)==\
+	(t_msg->_via->port_str.s + t_msg->_via->port_str.len - t_msg->_via->name.s) )
 
 #define EQ_VIA_STR(_via)\
 	( memcmp( t_msg->_via->name.s,\
 	 translate_pointer(p_msg->orig,p_msg->buf,p_msg->_via->name.s),\
-	 (t_msg->via1->bsize-(t_msg->_via->name.s-(t_msg->_via->hdr.s+t_msg->_via->hdr.len)))\
+	 (t_msg->_via->port_str.s+t_msg->_via->port_str.len - t_msg->_via->name.s)\
 	)==0 )
 
 #define HF_LEN(_hf) ((_hf)->body.s+(_hf)->body.len-(_hf)->name.s)
--- parser/msg_parser.c	2003/04/08 16:11:16	1.1
+++ parser/msg_parser.c	2003/04/08 16:15:59
@@ -185,7 +185,7 @@
 			goto error;
 	}
 	/* jku: if \r covered by current length, shrink it */
-	trim_r( hdr->body );
+	trim_len( hdr->body.len, hdr->body.s, hdr->body );
 	return tmp;
 error:
 	DBG("get_hdr_field: error exit\n");