deleted file mode 100644

@@ -1,270 +0,0 @@

-/*

- * sip first line parsing automaton

- * 

- * Copyright (C) 2001-2003 FhG Fokus

- *

- * This file is part of Kamailio, a free SIP server.

- *

- * Kamailio is free software; you can redistribute it and/or modify

- * it under the terms of the GNU General Public License as published by

- * the Free Software Foundation; either version 2 of the License, or

- * (at your option) any later version

- *

- * Kamailio is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU General Public License for more details.

- *

- * 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

- *

- */

-

-/*! \file

- * \brief Parser :: SIP first line parsing automaton

- *

- * \ingroup parser

- */

-

-

-#include "../comp_defs.h"

-#include "../dprint.h"

-#include "msg_parser.h"

-#include "parser_f.h"

-#include "../mem/mem.h"

-#include "../ut.h"

-

-/* flags for first line

- * - stored on a short field (16 flags) */

-#define FLINE_FLAG_PROTO_SIP	(1<<0)

-#define FLINE_FLAG_PROTO_HTTP	(1<<1)

-

-int http_reply_parse = 0;

-

-/* grammar:

-	request  =  method SP uri SP version CRLF

-	response =  version SP status  SP reason  CRLF

-	(version = "SIP/2.0")

-*/

-

-

-/* parses the first line, returns pointer to  next line  & fills fl;

-   also  modifies buffer (to avoid extra copy ops) */

-char* parse_first_line(char* buffer, unsigned int len, struct msg_start* fl)

-{

-	

-	char *tmp;

-	char* second;

-	char* third;

-	char* nl;

-	int offset;

-	/* int l; */

-	char* end;

-	char s1,s2,s3;

-	char *prn;

-	unsigned int t;

-

-	/* grammar:

-		request  =  method SP uri SP version CRLF

-		response =  version SP status  SP reason  CRLF

-		(version = "SIP/2.0")

-	*/

-	

-

-	memset(fl, 0, sizeof(struct msg_start));

-	offset = 0;

-	end=buffer+len;

-	/* see if it's a reply (status) */

-

-	/* jku  -- parse well-known methods */

-

-	/* drop messages which are so short they are for sure useless;

-           utilize knowledge of minimum size in parsing the first

-	   token 

-        */

-	if (len <=16 ) {

-		LOG(L_INFO, "ERROR: parse_first_line: message too short: %d\n", len);

-		goto error1;

-	}

-	tmp=buffer;

-  	/* is it perhaps a reply, ie does it start with "SIP...." ? */

-	if ( 	(*tmp=='S' || *tmp=='s') && 

-		strncasecmp( tmp+1, SIP_VERSION+1, SIP_VERSION_LEN-1)==0 &&

-		(*(tmp+SIP_VERSION_LEN)==' ')) {

-			fl->type=SIP_REPLY;

-			fl->flags|=FLINE_FLAG_PROTO_SIP;

-			fl->u.reply.version.len=SIP_VERSION_LEN;

-			tmp=buffer+SIP_VERSION_LEN;

-	} else if (http_reply_parse != 0 &&

-		 	(*tmp=='H' || *tmp=='h') &&

-			/* 'HTTP/1.' */

-			strncasecmp( tmp+1, HTTP_VERSION+1, HTTP_VERSION_LEN-1)==0 &&

-			/* [0|1] */

-			((*(tmp+HTTP_VERSION_LEN)=='0') || (*(tmp+HTTP_VERSION_LEN)=='1')) &&

-			(*(tmp+HTTP_VERSION_LEN+1)==' ')  ){ 

-			/* ugly hack to be able to route http replies

-			 * Note: - the http reply must have a via

-			 *       - the message is marked as SIP_REPLY (ugly)

-			 */

-				fl->type=SIP_REPLY;

-				fl->flags|=FLINE_FLAG_PROTO_HTTP;

-				fl->u.reply.version.len=HTTP_VERSION_LEN+1 /*include last digit*/;

-				tmp=buffer+HTTP_VERSION_LEN+1 /* last digit */;

-	} else IFISMETHOD( INVITE, 'I' )

-	else IFISMETHOD( CANCEL, 'C')

-	else IFISMETHOD( ACK, 'A' )

-	else IFISMETHOD( BYE, 'B' ) 

-	else IFISMETHOD( INFO, 'I' )

-	else IFISMETHOD( REGISTER, 'R')

-	else IFISMETHOD( SUBSCRIBE, 'S')

-	else IFISMETHOD( NOTIFY, 'N')

-	else IFISMETHOD( MESSAGE, 'M')

-	else IFISMETHOD( OPTIONS, 'O')

-	else IFISMETHOD( PRACK, 'P')

-	else IFISMETHOD( UPDATE, 'U')

-	else IFISMETHOD( REFER, 'R')

-	else IFISMETHOD( PUBLISH, 'P')

-	/* if you want to add another method XXX, include METHOD_XXX in

-           H-file (this is the value which you will take later in

-           processing and define XXX_LEN as length of method name;

-	   then just call IFISMETHOD( XXX, 'X' ) ... 'X' is the first

-	   latter; everything must be capitals

-	*/

-	else {

-		/* neither reply, nor any of known method requests, 

-		   let's believe it is an unknown method request

-        	*/

-		tmp=eat_token_end(buffer,buffer+len);

-		if ((tmp==buffer)||(tmp>=end)){

-			LOG(L_INFO, "ERROR:parse_first_line: empty  or bad first line\n");

-			goto error1;

-		}

-		if (*tmp!=' ') {

-			LOG(L_INFO, "ERROR:parse_first_line: method not followed by SP\n");

-			goto error1;

-		}

-		fl->type=SIP_REQUEST;

-		fl->u.request.method_value=METHOD_OTHER;

-		fl->u.request.method.len=tmp-buffer;

-	}

-

-

-	/* identifying type of message over now; 

-	   tmp points at space after; go ahead */

-

-	fl->u.request.method.s=buffer;  /* store ptr to first token */

-	second=tmp+1;			/* jump to second token */

-	offset=second-buffer;

-

-/* EoJku */

-	

-	/* next element */

-	tmp=eat_token_end(second, second+len-offset);

-	if (tmp>=end){

-		goto error;

-	}

-	offset+=tmp-second;

-	third=eat_space_end(tmp, tmp+len-offset);

-	offset+=third-tmp;

-	if ((third==tmp)||(tmp>=end)){

-		goto error;

-	}

-	fl->u.request.uri.s=second;

-	fl->u.request.uri.len=tmp-second;

-

-	/* jku: parse status code */

-	if (fl->type==SIP_REPLY) {

-		if (fl->u.request.uri.len!=3) {

-			LOG(L_INFO, "ERROR:parse_first_line: len(status code)!=3: %.*s\n",

-				fl->u.request.uri.len, ZSW(second) );

-			goto error;

-		}

-		s1=*second; s2=*(second+1);s3=*(second+2);

-		if (s1>='0' && s1<='9' && 

-		    s2>='0' && s2<='9' &&

-		    s3>='0' && s3<='9' ) {

-			fl->u.reply.statuscode=(s1-'0')*100+10*(s2-'0')+(s3-'0');

-		} else {

-			LOG(L_INFO, "ERROR:parse_first_line: status_code non-numerical: %.*s\n",

-				fl->u.request.uri.len, ZSW(second) );

-			goto error;

-		}

-	}

-	/* EoJku */

-

-	/*  last part: for a request it must be the version, for a reply

-	 *  it can contain almost anything, including spaces, so we don't care

-	 *  about it*/

-	if (fl->type==SIP_REQUEST){

-		tmp=eat_token_end(third,third+len-offset);

-		offset+=tmp-third;

-		if ((tmp==third)||(tmp>=end)){

-			goto error;

-		}

-		if (! is_empty_end(tmp, tmp+len-offset)){

-			goto error;

-		}

-	}else{

-		tmp=eat_token2_end(third,third+len-offset,'\r'); /* find end of line 

-												  ('\n' or '\r') */

-		if (tmp>=end){ /* no crlf in packet => invalid */

-			goto error;

-		}

-		offset+=tmp-third;

-	}

-	nl=eat_line(tmp,len-offset);

-	if (nl>=end){ /* no crlf in packet or only 1 line > invalid */

-		goto error;

-	}

-	fl->u.request.version.s=third;

-	fl->u.request.version.len=tmp-third;

-	fl->len=nl-buffer;

-

-	if (fl->type==SIP_REQUEST) {

-		if(fl->u.request.version.len >= SIP_VERSION_LEN

-				&& (fl->u.request.version.s[0]=='S'

-					|| fl->u.request.version.s[0]=='s')

-				&& !strncasecmp(fl->u.request.version.s+1,

-					SIP_VERSION+1, SIP_VERSION_LEN-1)) {

-			fl->flags|=FLINE_FLAG_PROTO_SIP;

-		} else if(fl->u.request.version.len >= HTTP_VERSION_LEN

-				&& (fl->u.request.version.s[0]=='H'

-					|| fl->u.request.version.s[0]=='h')

-				&& !strncasecmp(fl->u.request.version.s+1,

-					HTTP_VERSION+1, HTTP_VERSION_LEN-1)) {

-			fl->flags|=FLINE_FLAG_PROTO_HTTP;

-		}

-	}

-

-	return nl;

-

-error:

-	LOG(L_DBG, "parse_first_line: bad %s first line\n",

-		(fl->type==SIP_REPLY)?"reply(status)":"request");

-

-	LOG(L_DBG, "at line 0 char %d: \n", offset );

-	prn=pkg_malloc( offset );

-	if (prn) {

-		for (t=0; t<offset; t++)

-			if (*(buffer+t)) *(prn+t)=*(buffer+t);

-			else *(prn+t)=176; /* '�' */

-		LOG(L_DBG, "parsed so far: %.*s\n", offset, ZSW(prn) );

-		pkg_free( prn );

-	};

-error1:

-	fl->type=SIP_INVALID;

-	LOG(cfg_get(core, core_cfg, corelog), "parse_first_line: bad message (offset: %d)\n", offset);

-	/* skip  line */

-	nl=eat_line(buffer,len);

-	return nl;

-}

-

-char* parse_fline(char* buffer, char* end, struct msg_start* fl)

-{

-	if(end<=buffer) {

-		/* make it throw error via parse_first_line() for consistency */

-		return parse_first_line(buffer, 0, fl);

-	}

-	return parse_first_line(buffer, (unsigned int)(end-buffer), fl);

-}

@@ -254,7 +254,7 @@ error:

 	};

 error1:

 	fl->type=SIP_INVALID;

-	LOG(L_ERR, "parse_first_line: bad message (offset: %d)\n", offset);

+	LOG(cfg_get(core, core_cfg, corelog), "parse_first_line: bad message (offset: %d)\n", offset);

 	/* skip  line */

 	nl=eat_line(buffer,len);

 	return nl;

@@ -3,19 +3,14 @@

  * 

  * Copyright (C) 2001-2003 FhG Fokus

  *

- * This file is part of ser, a free SIP server.

+ * This file is part of Kamailio, a free SIP server.

  *

- * ser is free software; you can redistribute it and/or modify

+ * Kamailio is free software; you can redistribute it and/or modify

  * it under the terms of the GNU General Public License as published by

  * the Free Software Foundation; either version 2 of the License, or

  * (at your option) any later version

  *

- * For a license to use the ser software under conditions

- * other than those described here, or to purchase support for this

- * software, please contact iptel.org by e-mail at the following addresses:

- *    info@iptel.org

- *

- * ser is distributed in the hope that it will be useful,

+ * Kamailio is distributed in the hope that it will be useful,

  * but WITHOUT ANY WARRANTY; without even the implied warranty of

  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

  * GNU General Public License for more details.

@@ -24,11 +19,6 @@

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

  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

  *

- * History:

- * ---------

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

- * 2003-01-28: removed 0-terminators from first line (jiri)

- * 2003-04-26 ZSW (jiri)

  */

 /*! \file

@@ -45,6 +45,11 @@

 #include "../mem/mem.h"

 #include "../ut.h"

+/* flags for first line

+ * - stored on a short field (16 flags) */

+#define FLINE_FLAG_PROTO_SIP	(1<<0)

+#define FLINE_FLAG_PROTO_HTTP	(1<<1)

+

 int http_reply_parse = 0;

 /* grammar:

@@ -56,7 +61,7 @@ int http_reply_parse = 0;

 /* parses the first line, returns pointer to  next line  & fills fl;

    also  modifies buffer (to avoid extra copy ops) */

-char* parse_first_line(char* buffer, unsigned int len, struct msg_start * fl)

+char* parse_first_line(char* buffer, unsigned int len, struct msg_start* fl)

 {

 	char *tmp;

@@ -77,6 +82,7 @@ char* parse_first_line(char* buffer, unsigned int len, struct msg_start * fl)

 	*/

+	memset(fl, 0, sizeof(struct msg_start));

 	offset = 0;

 	end=buffer+len;

 	/* see if it's a reply (status) */

@@ -97,6 +103,7 @@ char* parse_first_line(char* buffer, unsigned int len, struct msg_start * fl)

 		strncasecmp( tmp+1, SIP_VERSION+1, SIP_VERSION_LEN-1)==0 &&

 		(*(tmp+SIP_VERSION_LEN)==' ')) {

 			fl->type=SIP_REPLY;

+			fl->flags|=FLINE_FLAG_PROTO_SIP;

 			fl->u.reply.version.len=SIP_VERSION_LEN;

 			tmp=buffer+SIP_VERSION_LEN;

 	} else if (http_reply_parse != 0 &&

@@ -111,6 +118,7 @@ char* parse_first_line(char* buffer, unsigned int len, struct msg_start * fl)

 			 *       - the message is marked as SIP_REPLY (ugly)

 			 */

 				fl->type=SIP_REPLY;

+				fl->flags|=FLINE_FLAG_PROTO_HTTP;

 				fl->u.reply.version.len=HTTP_VERSION_LEN+1 /*include last digit*/;

 				tmp=buffer+HTTP_VERSION_LEN+1 /* last digit */;

 	} else IFISMETHOD( INVITE, 'I' )

@@ -223,6 +231,22 @@ char* parse_first_line(char* buffer, unsigned int len, struct msg_start * fl)

 	fl->u.request.version.len=tmp-third;

 	fl->len=nl-buffer;

+	if (fl->type==SIP_REQUEST) {

+		if(fl->u.request.version.len >= SIP_VERSION_LEN

+				&& (fl->u.request.version.s[0]=='S'

+					|| fl->u.request.version.s[0]=='s')

+				&& !strncasecmp(fl->u.request.version.s+1,

+					SIP_VERSION+1, SIP_VERSION_LEN-1)) {

+			fl->flags|=FLINE_FLAG_PROTO_SIP;

+		} else if(fl->u.request.version.len >= HTTP_VERSION_LEN

+				&& (fl->u.request.version.s[0]=='H'

+					|| fl->u.request.version.s[0]=='h')

+				&& !strncasecmp(fl->u.request.version.s+1,

+					HTTP_VERSION+1, HTTP_VERSION_LEN-1)) {

+			fl->flags|=FLINE_FLAG_PROTO_HTTP;

+		}

+	}

+

 	return nl;

 error:

@@ -245,3 +269,12 @@ error1:

 	nl=eat_line(buffer,len);

 	return nl;

 }

+

+char* parse_fline(char* buffer, char* end, struct msg_start* fl)

+{

+	if(end<=buffer) {

+		/* make it throw error via parse_first_line() for consistency */

+		return parse_first_line(buffer, 0, fl);

+	}

+	return parse_first_line(buffer, (unsigned int)(end-buffer), fl);

+}

@@ -22,7 +22,7 @@

  *

  * 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

+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

  *

  * History:

  * ---------

@@ -77,6 +77,7 @@ char* parse_first_line(char* buffer, unsigned int len, struct msg_start * fl)

 	*/

+	offset = 0;

 	end=buffer+len;

 	/* see if it's a reply (status) */

@@ -239,7 +240,7 @@ error:

 	};

 error1:

 	fl->type=SIP_INVALID;

-	LOG(L_ERR, "parse_first_line: bad message\n");

+	LOG(L_ERR, "parse_first_line: bad message (offset: %d)\n", offset);

 	/* skip  line */

 	nl=eat_line(buffer,len);

 	return nl;

@@ -233,7 +233,7 @@ error:

 	if (prn) {

 		for (t=0; t<offset; t++)

 			if (*(buffer+t)) *(prn+t)=*(buffer+t);

-			else *(prn+t)='�';

+			else *(prn+t)=176; /* '�' */

 		LOG(L_DBG, "parsed so far: %.*s\n", offset, ZSW(prn) );

 		pkg_free( prn );

 	};

@@ -45,7 +45,7 @@

 #include "../mem/mem.h"

 #include "../ut.h"

-int http_reply_hack = 0;

+int http_reply_parse = 0;

 /* grammar:

 	request  =  method SP uri SP version CRLF

@@ -98,7 +98,7 @@ char* parse_first_line(char* buffer, unsigned int len, struct msg_start * fl)

 			fl->type=SIP_REPLY;

 			fl->u.reply.version.len=SIP_VERSION_LEN;

 			tmp=buffer+SIP_VERSION_LEN;

-	} else if (http_reply_hack != 0 && 

+	} else if (http_reply_parse != 0 &&

 		 	(*tmp=='H' || *tmp=='h') &&

 			/* 'HTTP/1.' */

 			strncasecmp( tmp+1, HTTP_VERSION+1, HTTP_VERSION_LEN-1)==0 &&

@@ -225,21 +225,21 @@ char* parse_first_line(char* buffer, unsigned int len, struct msg_start * fl)

 	return nl;

 error:

-	LOG(L_INFO, "ERROR:parse_first_line: bad %s first line\n",

+	LOG(L_DBG, "parse_first_line: bad %s first line\n",

 		(fl->type==SIP_REPLY)?"reply(status)":"request");

-	LOG(L_INFO, "ERROR: at line 0 char %d: \n", offset );

+	LOG(L_DBG, "at line 0 char %d: \n", offset );

 	prn=pkg_malloc( offset );

 	if (prn) {

 		for (t=0; t<offset; t++)

 			if (*(buffer+t)) *(prn+t)=*(buffer+t);

 			else *(prn+t)='�';

-		LOG(L_INFO, "ERROR: parsed so far: %.*s\n", offset, ZSW(prn) );

+		LOG(L_DBG, "parsed so far: %.*s\n", offset, ZSW(prn) );

 		pkg_free( prn );

 	};

 error1:

 	fl->type=SIP_INVALID;

-	LOG(L_INFO, "ERROR:parse_first_line: bad message\n");

+	LOG(L_ERR, "parse_first_line: bad message\n");

 	/* skip  line */

 	nl=eat_line(buffer,len);

 	return nl;

@@ -1,9 +1,6 @@

 /*

- * $Id$

- * 

  * sip first line parsing automaton

  * 

- *

  * Copyright (C) 2001-2003 FhG Fokus

  *

  * This file is part of ser, a free SIP server.

@@ -48,12 +48,7 @@

 #include "../mem/mem.h"

 #include "../ut.h"

-

-#ifdef NO_HTTP_REPLY_HACK

-#undef HTTP_REPLY_HACK

-#else

-/* #define HTTP_REPLY_HACK */ /* allow HTTP replies */

-#endif

+int http_reply_hack = 0;

 /* grammar:

 	request  =  method SP uri SP version CRLF

@@ -106,21 +101,20 @@ char* parse_first_line(char* buffer, unsigned int len, struct msg_start * fl)

 			fl->type=SIP_REPLY;

 			fl->u.reply.version.len=SIP_VERSION_LEN;

 			tmp=buffer+SIP_VERSION_LEN;

-#ifdef HTTP_REPLY_HACK

-	}else if ( 	(*tmp=='H' || *tmp=='h') &&

-		/* 'HTTP/1.' */

-		strncasecmp( tmp+1, HTTP_VERSION+1, HTTP_VERSION_LEN-1)==0 &&

-		/* [0|1] */

-		((*(tmp+HTTP_VERSION_LEN)=='0') || (*(tmp+HTTP_VERSION_LEN)=='1')) &&

-		(*(tmp+HTTP_VERSION_LEN+1)==' ')  ){ 

-		/* ugly hack to be able to route http replies

-		 * Note: - the http reply must have a via

-		 *       - the message is marked as SIP_REPLY (ugly)

-		 */

-			fl->type=SIP_REPLY;

-			fl->u.reply.version.len=HTTP_VERSION_LEN+1 /*include last digit*/;

-			tmp=buffer+HTTP_VERSION_LEN+1 /* last digit */;

-#endif

+	} else if (http_reply_hack != 0 && 

+		 	(*tmp=='H' || *tmp=='h') &&

+			/* 'HTTP/1.' */

+			strncasecmp( tmp+1, HTTP_VERSION+1, HTTP_VERSION_LEN-1)==0 &&

+			/* [0|1] */

+			((*(tmp+HTTP_VERSION_LEN)=='0') || (*(tmp+HTTP_VERSION_LEN)=='1')) &&

+			(*(tmp+HTTP_VERSION_LEN+1)==' ')  ){ 

+			/* ugly hack to be able to route http replies

+			 * Note: - the http reply must have a via

+			 *       - the message is marked as SIP_REPLY (ugly)

+			 */

+				fl->type=SIP_REPLY;

+				fl->u.reply.version.len=HTTP_VERSION_LEN+1 /*include last digit*/;

+				tmp=buffer+HTTP_VERSION_LEN+1 /* last digit */;

 	} else IFISMETHOD( INVITE, 'I' )

 	else IFISMETHOD( CANCEL, 'C')

 	else IFISMETHOD( ACK, 'A' )

@@ -34,6 +34,12 @@

  * 2003-04-26 ZSW (jiri)

  */

+/*! \file

+ * \brief Parser :: SIP first line parsing automaton

+ *

+ * \ingroup parser

+ */

+

 #include "../comp_defs.h"

 #include "../dprint.h"

@@ -127,6 +127,8 @@ char* parse_first_line(char* buffer, unsigned int len, struct msg_start * fl)

 	else IFISMETHOD( OPTIONS, 'O')

 	else IFISMETHOD( PRACK, 'P')

 	else IFISMETHOD( UPDATE, 'U')

+	else IFISMETHOD( REFER, 'R')

+	else IFISMETHOD( PUBLISH, 'P')

 	/* if you want to add another method XXX, include METHOD_XXX in

            H-file (this is the value which you will take later in

            processing and define XXX_LEN as length of method name;

@@ -125,6 +125,8 @@ char* parse_first_line(char* buffer, unsigned int len, struct msg_start * fl)

 	else IFISMETHOD( NOTIFY, 'N')

 	else IFISMETHOD( MESSAGE, 'M')

 	else IFISMETHOD( OPTIONS, 'O')

+	else IFISMETHOD( PRACK, 'P')

+	else IFISMETHOD( UPDATE, 'U')

 	/* if you want to add another method XXX, include METHOD_XXX in

            H-file (this is the value which you will take later in

            processing and define XXX_LEN as length of method name;

@@ -123,6 +123,8 @@ char* parse_first_line(char* buffer, unsigned int len, struct msg_start * fl)

 	else IFISMETHOD( REGISTER, 'R')

 	else IFISMETHOD( SUBSCRIBE, 'S')

 	else IFISMETHOD( NOTIFY, 'N')

+	else IFISMETHOD( MESSAGE, 'M')

+	else IFISMETHOD( OPTIONS, 'O')

 	/* if you want to add another method XXX, include METHOD_XXX in

            H-file (this is the value which you will take later in

            processing and define XXX_LEN as length of method name;

@@ -92,7 +92,6 @@ char* parse_first_line(char* buffer, unsigned int len, struct msg_start * fl)

 		LOG(L_INFO, "ERROR: parse_first_line: message too short: %d\n", len);

 		goto error1;

 	}

-	fl->line.s = buffer;

 	tmp=buffer;

   	/* is it perhaps a reply, ie does it start with "SIP...." ? */

 	if ( 	(*tmp=='S' || *tmp=='s') && 

@@ -212,7 +211,6 @@ char* parse_first_line(char* buffer, unsigned int len, struct msg_start * fl)

 		}

 		offset+=tmp-third;

 	}

-	fl->line.len = tmp-fl->line.s;

 	nl=eat_line(tmp,len-offset);

 	if (nl>=end){ /* no crlf in packet or only 1 line > invalid */

 		goto error;

@@ -92,7 +92,7 @@ char* parse_first_line(char* buffer, unsigned int len, struct msg_start * fl)

 		LOG(L_INFO, "ERROR: parse_first_line: message too short: %d\n", len);

 		goto error1;

 	}

-

+	fl->line.s = buffer;

 	tmp=buffer;

   	/* is it perhaps a reply, ie does it start with "SIP...." ? */

 	if ( 	(*tmp=='S' || *tmp=='s') && 

@@ -212,6 +212,7 @@ char* parse_first_line(char* buffer, unsigned int len, struct msg_start * fl)

 		}

 		offset+=tmp-third;

 	}

+	fl->line.len = tmp-fl->line.s;

 	nl=eat_line(tmp,len-offset);

 	if (nl>=end){ /* no crlf in packet or only 1 line > invalid */

 		goto error;

@@ -42,7 +42,12 @@

 #include "../mem/mem.h"

 #include "../ut.h"

-#define HTTP_REPLY_HACK /* allow HTTP replies */

+

+#ifdef NO_HTTP_REPLY_HACK

+#undef HTTP_REPLY_HACK

+#else

+/* #define HTTP_REPLY_HACK */ /* allow HTTP replies */

+#endif

 /* grammar:

 	request  =  method SP uri SP version CRLF

@@ -96,6 +101,21 @@ char* parse_first_line(char* buffer, unsigned int len, struct msg_start * fl)

 			fl->type=SIP_REPLY;

 			fl->u.reply.version.len=SIP_VERSION_LEN;

 			tmp=buffer+SIP_VERSION_LEN;

+#ifdef HTTP_REPLY_HACK

+	}else if ( 	(*tmp=='H' || *tmp=='h') &&

+		/* 'HTTP/1.' */

+		strncasecmp( tmp+1, HTTP_VERSION+1, HTTP_VERSION_LEN-1)==0 &&

+		/* [0|1] */

+		((*(tmp+HTTP_VERSION_LEN)=='0') || (*(tmp+HTTP_VERSION_LEN)=='1')) &&

+		(*(tmp+HTTP_VERSION_LEN+1)==' ')  ){ 

+		/* ugly hack to be able to route http replies

+		 * Note: - the http reply must have a via

+		 *       - the message is marked as SIP_REPLY (ugly)

+		 */

+			fl->type=SIP_REPLY;

+			fl->u.reply.version.len=HTTP_VERSION_LEN+1 /*include last digit*/;

+			tmp=buffer+HTTP_VERSION_LEN+1 /* last digit */;

+#endif

 	} else IFISMETHOD( INVITE, 'I' )

 	else IFISMETHOD( CANCEL, 'C')

 	else IFISMETHOD( ACK, 'A' )

@@ -42,6 +42,8 @@

 #include "../mem/mem.h"

 #include "../ut.h"

+#define HTTP_REPLY_HACK /* allow HTTP replies */

+

 /* grammar:

 	request  =  method SP uri SP version CRLF

 	response =  version SP status  SP reason  CRLF

@@ -48,1100 +48,6 @@

 	(version = "SIP/2.0")

 */

-/*known methods: INVITE, ACK, CANCEL, BYE*/

-

-enum { START,

-       INVITE1, INVITE2, INVITE3, INVITE4, INVITE5,

-       ACK1, ACK2,

-       CANCEL1, CANCEL2, CANCEL3, CANCEL4, CANCEL5,

-       BYE1, BYE2,

-       SIP1, SIP2, SIP3, SIP4, SIP5, SIP6,

-       FIN_INVITE = 100, FIN_ACK, FIN_CANCEL, FIN_BYE, FIN_SIP,

-       P_METHOD = 200, L_URI, P_URI, L_VER, 

-       VER1, VER2, VER3, VER4, VER5, VER6, FIN_VER,

-       L_STATUS, P_STATUS, L_REASON, P_REASON,

-       L_LF, F_CR, F_LF

-};

-

-

-#ifdef _CURRENTLY_UNUSED

-char* parse_fline(char* buffer, char* end, struct msg_start* fl)

-{

-	char* tmp;

-	register int state;

-	unsigned short stat;

-

-	stat=0;

-	fl->type=SIP_REQUEST;

-	state=START;

-	for(tmp=buffer;tmp<end;tmp++){

-		switch(*tmp){

-			case ' ':

-			case '\t':

-				switch(state){

-					case START: /*allow space at the begining, although not

-								  legal*/

-						break;

-					case L_URI:

-					case L_VER:

-					case L_STATUS:

-					case L_REASON:

-					case L_LF:

-						 /*eat  space*/

-						break;

-					case FIN_INVITE:

-						*tmp=0;

-						fl->u.request.method.len=tmp-fl->u.request.method.s;

-						fl->u.request.method_value=METHOD_INVITE;

-						state=L_URI;

-						break;

-					case FIN_ACK:

-						*tmp=0;

-						fl->u.request.method.len=tmp-fl->u.request.method.s;

-						fl->u.request.method_value=METHOD_ACK;

-						state=L_URI;

-						break;

-					case FIN_CANCEL:

-						*tmp=0;

-						fl->u.request.method.len=tmp-fl->u.request.method.s;

-						fl->u.request.method_value=METHOD_CANCEL;

-						state=L_URI;

-						break;

-					case FIN_BYE:

-						*tmp=0;

-						fl->u.request.method.len=tmp-fl->u.request.method.s;

-						fl->u.request.method_value=METHOD_BYE;

-						state=L_URI;

-						break;

-					case FIN_SIP:

-						*tmp=0;

-						fl->u.reply.version.len=tmp-fl->u.reply.version.s;

-						state=L_STATUS;

-						fl->type=SIP_REPLY;

-						break;

-					case P_URI:

-						*tmp=0;

-						fl->u.request.uri.len=tmp-fl->u.request.uri.s;

-						state=L_VER;

-						break;

-					case FIN_VER:

-						*tmp=0;

-						fl->u.request.version.len=tmp-fl->u.request.version.s;

-						state=L_LF;

-						break;

-					case P_STATUS:

-						*tmp=0;

-						fl->u.reply.status.len=tmp-fl->u.reply.status.s;

-						state=L_REASON;

-						break;

-					case P_REASON:

-					 /*	*tmp=0;

-						fl->u.reply.reason.len=tmp-fl->u.reply.reason.s;

-						*/

-						break;

-					case VER1:

-					case VER2:

-					case VER3:

-					case VER4:

-					case VER5:

-					case VER6:

-						LOG(L_ERR, "ERROR: parse_first_line: invalid version "

-								" in request\n");

-						goto error;

-					case P_METHOD:

-					default:

-						*tmp=0;

-						fl->u.request.method.len=tmp-fl->u.request.method.s;

-						fl->u.request.method_value=METHOD_OTHER;

-						state=L_URI;

-				}

-				break;

-			case 's':

-			case 'S':

-				switch(state){

-					case START:

-						state=SIP1;

-						fl->u.reply.version.s=tmp;

-						break;

-					case P_URI:

-					case P_REASON:

-					case P_METHOD:

-						break;

-					case L_REASON:

-						fl->u.reply.reason.s=tmp;

-						state=P_REASON;

-						break;

-					case P_STATUS:

-					case L_STATUS:

-						LOG(L_ERR, "ERROR: parse_first_line: non-number "

-								"character <%c> in request status\n", *tmp);

-						goto error;

-					case L_LF:

-						LOG(L_ERR, "ERROR: parse_first_line: invalid "

-								"character <%c> in request\n", *tmp);

-						goto error;

-					case L_URI:

-						fl->u.request.uri.s=tmp;

-						state=P_URI;

-						break;

-					case L_VER:

-						fl->u.request.version.s=tmp;

-						state=VER1;

-						break;

-					case VER1:

-					case VER2:

-					case VER3:

-					case VER4:

-					case VER5:

-					case VER6:

-					case FIN_VER:

-						LOG(L_ERR, "ERROR: parse_first_line: invalid version "

-								" in request\n");

-						goto error;

-					default:

-						state=P_METHOD;

-				}

-				break;

-					

-			case 'i':

-			case 'I':

-				switch(state){

-					case START:

-						state=INVITE1;

-						fl->u.request.method.s=tmp;

-						break;

-					case INVITE3:

-						state=INVITE4;

-						break;

-					case SIP1:

-						state=SIP2;

-						break;

-					case P_URI:

-					case P_REASON:

-					case P_METHOD:

-						break;

-					case L_REASON:

-						fl->u.reply.reason.s=tmp;

-						state=P_REASON;

-						break;

-					case P_STATUS:

-					case L_STATUS:

-						LOG(L_ERR, "ERROR: parse_first_line: non-number "

-								"character <%c> in request status\n", *tmp);

-						goto error;

-					case L_LF: