deleted file mode 100644

@@ -1,423 +0,0 @@

-/*

- * 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 :: Content-Disposition header

- *

- * \ingroup parser

- */

-

-

-#include <stdio.h>

-#include <stdlib.h>

-#include <sys/types.h>

-#include <unistd.h>

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

-#include "../dprint.h"

-#include "../ut.h"

-#include "parse_disposition.h"

-

-

-

-/*! \brief parse a string that supposed to be a disposition and fills up the structure

- * Returns: -1 : error

- *           o : success */

-int parse_disposition( str *s, struct disposition *disp)

-{

-	enum { FIND_TYPE, TYPE, END_TYPE, FIND_PARAM, PARAM, END_PARAM, FIND_VAL,

-	       FIND_QUOTED_VAL, QUOTED_VAL, SKIP_QUOTED_VAL, VAL, END_VAL,

-	       F_LF, F_CR, F_CRLF};

-	struct disposition_param *disp_p;

-	struct disposition_param *new_p;

-	int  state;

-	int  saved_state;

-	char *tmp;

-	char *end;

-

-	if(s==NULL || s->s==NULL || s->len<=0) {

-		LM_ERR("invalid parameters\n");

-		return -1;

-	}

-

-	state = saved_state = FIND_TYPE;

-	end = s->s + s->len;

-	disp_p = 0;

-

-	for( tmp=s->s; tmp<end; tmp++) {

-		switch(*tmp) {

-			case ' ':

-			case '\t':

-				switch (state) {

-					case FIND_QUOTED_VAL:

-						disp_p->body.s = tmp;

-						state = QUOTED_VAL;

-						break;

-					case SKIP_QUOTED_VAL:

-						state = QUOTED_VAL;

-						break;

-					case TYPE:

-						disp->type.len = tmp - disp->type.s;

-						state = END_TYPE;

-						break;

-					case PARAM:

-						disp_p->name.len = tmp - disp_p->name.s;

-						state = END_PARAM;

-						break;

-					case VAL:

-						disp_p->body.len = tmp - disp_p->body.s;

-						state = END_VAL;

-						break;

-					case F_CRLF:

-					case F_LF:

-					case F_CR:

-						/*previous=crlf and now =' '*/

-						state=saved_state;

-						break;

-				}

-				break;

-			case '\n':

-				switch (state) {

-					case TYPE:

-						disp->type.len = tmp - disp->type.s;

-						saved_state = END_TYPE;

-						state = F_LF;

-						break;

-					case PARAM:

-						disp_p->name.len = tmp - disp_p->name.s;

-						saved_state = END_PARAM;

-						state = F_LF;

-						break;

-					case VAL:

-						disp_p->body.len = tmp - disp_p->body.s;

-						saved_state = END_VAL;

-						state = F_CR;

-						break;

-					case FIND_TYPE:

-					case FIND_PARAM:

-						saved_state=state;

-						state=F_LF;

-						break;

-					case F_CR:

-						state=F_CRLF;

-						break;

-					default:

-						LM_ERR("unexpected char [%c] in status %d: <<%.*s>>.\n",

-							*tmp,state, (int)(tmp-s->s), s->s);

-						goto error;

-				}

-				break;

-			case '\r':

-				switch (state) {

-					case TYPE:

-						disp->type.len = tmp - disp->type.s;

-						saved_state = END_TYPE;

-						state = F_CR;

-						break;

-					case PARAM:

-						disp_p->name.len = tmp - disp_p->name.s;

-						saved_state = END_PARAM;

-						state = F_CR;

-						break;

-					case VAL:

-						disp_p->body.len = tmp - disp_p->body.s;

-						saved_state = END_VAL;

-						state = F_CR;

-						break;

-					case FIND_TYPE:

-					case FIND_PARAM:

-						saved_state=state;

-						state=F_CR;

-						break;

-					default:

-						LM_ERR("unexpected char [%c] in status %d: <<%.*s>>.\n",

-							*tmp,state, (int)(tmp-s->s), ZSW(s->s));

-						goto error;

-				}

-				break;

-			case 0:

-				LM_ERR("nexpected char [%c] in status %d: <<%.*s>>.\n",

-					*tmp,state, (int)(tmp-s->s), ZSW(s->s));

-				goto error;

-				break;

-			case ';':

-				switch (state) {

-					case FIND_QUOTED_VAL:

-						disp_p->body.s = tmp;

-						state = QUOTED_VAL;

-						break;

-					case SKIP_QUOTED_VAL:

-						state = QUOTED_VAL;

-					case QUOTED_VAL:

-						break;

-					case VAL:

-						disp_p->body.len = tmp - disp_p->body.s;

-						state = FIND_PARAM;

-						break;

-					case PARAM:

-						disp_p->name.len = tmp - disp_p->name.s;

-						state = FIND_PARAM;

-						break;

-					case TYPE:

-						disp->type.len = tmp - disp->type.s;

-					case END_TYPE:

-					case END_VAL:

-						state = FIND_PARAM;

-						break;

-					default:

-						LM_ERR("unexpected char [%c] in status %d: <<%.*s>>.\n",

-							*tmp,state, (int)(tmp-s->s), ZSW(s->s));

-						goto error;

-				}

-				break;

-			case '=':

-				switch (state) {

-					case FIND_QUOTED_VAL:

-						disp_p->body.s = tmp;

-						state = QUOTED_VAL;

-						break;

-					case SKIP_QUOTED_VAL:

-						state = QUOTED_VAL;

-					case QUOTED_VAL:

-						break;

-					case PARAM:

-						disp_p->name.len = tmp - disp_p->name.s;

-					case END_PARAM:

-						state = FIND_VAL;

-						break;

-					default:

-						LM_ERR("unexpected char [%c] in status %d: <<%.*s>>.\n",

-							*tmp,state, (int)(tmp-s->s), ZSW(s->s));

-						goto error;

-				}

-				break;

-			case '\"':

-				switch (state) {

-					case SKIP_QUOTED_VAL:

-						state = QUOTED_VAL;

-						break;

-					case FIND_VAL:

-						state = FIND_QUOTED_VAL;

-						break;

-					case QUOTED_VAL:

-						disp_p->body.len = tmp - disp_p->body.s;

-						disp_p->is_quoted = 1;

-						state = END_VAL;

-						break;

-					default:

-						LM_ERR("unexpected char [%c] in status %d: <<%.*s>>.\n",

-							*tmp,state, (int)(tmp-s->s), ZSW(s->s));

-						goto error;

-				}

-				break;

-			case '\\':

-				switch (state) {

-					case FIND_QUOTED_VAL:

-						disp_p->body.s = tmp;

-						state = SKIP_QUOTED_VAL;

-						break;

-					case SKIP_QUOTED_VAL:

-						state = QUOTED_VAL;

-						break;

-					case QUOTED_VAL:

-						state = SKIP_QUOTED_VAL;

-						break;

-					default:

-						LM_ERR("unexpected char [%c] in status %d: <<%.*s>>.\n",

-							*tmp,state, (int)(tmp-s->s), ZSW(s->s));

-						goto error;

-				}

-				break;

-			case '(':

-			case ')':

-			case '<':

-			case '>':

-			case '@':

-			case ',':

-			case ':':

-			case '/':

-			case '[':

-			case ']':

-			case '?':

-			case '{':

-			case '}':

-				switch (state) {

-					case FIND_QUOTED_VAL:

-						disp_p->body.s = tmp;

-						state = QUOTED_VAL;

-						break;

-					case SKIP_QUOTED_VAL:

-						state = QUOTED_VAL;

-					case QUOTED_VAL:

-						break;

-					default:

-						LM_ERR("unexpected char [%c] in status %d: <<%.*s>>.\n",

-							*tmp,state, (int)(tmp-s->s), ZSW(s->s));

-						goto error;

-				}

-				break;

-			default:

-				switch (state) {

-					case SKIP_QUOTED_VAL:

-						state = QUOTED_VAL;

-					case QUOTED_VAL:

-						break;

-					case FIND_TYPE:

-						disp->type.s = tmp;

-						state = TYPE;

-						break;

-					case FIND_PARAM:

-						new_p=(struct disposition_param*)pkg_malloc

-							(sizeof(struct disposition_param));

-						if (new_p==0) {

-							LM_ERR("no more pkg mem\n");

-							goto error;

-						}

-						memset(new_p,0,sizeof(struct disposition_param));

-						if (disp_p==0)

-							disp->params = new_p;

-						else

-							disp_p->next = new_p;

-						disp_p = new_p;

-						disp_p->name.s = tmp;

-						state = PARAM;

-						break;

-					case FIND_VAL:

-						disp_p->body.s = tmp;

-						state = VAL;

-						break;

-					case FIND_QUOTED_VAL:

-						disp_p->body.s = tmp;

-						state = QUOTED_VAL;

-						break;

-				}

-		}/*switch*/

-	}/*for*/

-

-	/* check which was the last parser state */

-	switch (state) {

-		case END_PARAM:

-		case END_TYPE:

-		case END_VAL:

-			break;

-		case TYPE:

-			disp->type.len = tmp - disp->type.s;

-			break;

-		case PARAM:

-			disp_p->name.len = tmp - disp_p->name.s;

-			break;

-		case VAL:

-			disp_p->body.len = tmp - disp_p->body.s;

-			break;

-		default:

-			LM_ERR("wrong final state (%d)\n",

-				state);

-			goto error;

-	}

-	return 0;

-error:

-	return -1;

-}

-

-

-

-/*! \brief Frees the entire disposition structure (params + itself) */

-void free_disposition( struct disposition **disp)

-{

-	struct disposition_param *param;

-

-	/* free the params */

-	while((*disp)->params) {

-		param = (*disp)->params->next;

-		pkg_free( (*disp)->params);

-		(*disp)->params = param;

-	}

-	pkg_free( *disp );

-	*disp = 0;

-}

-

-

-

-/*! \brief looks inside the message, gets the Content-Disposition hdr, parse it, builds

- * and fills a disposition structure for it what will be attached to hdr as

- * parsed link.

- * Returns:  -1 : error

- *            0 : success

- *            1 : hdr not found

- */

-int parse_content_disposition( struct sip_msg *msg )

-{

-	struct disposition *disp;

-

-	/* look for Content-Disposition header */

-	if (msg->content_disposition==0) {

-		if (parse_headers(msg, HDR_CONTENTDISPOSITION_F, 0)==-1)

-			goto error;

-		if (msg->content_disposition==0) {

-			DBG("hdr not found\n");

-			return 1;

-		}

-	}

-

-	/* now, we have the header -> look if it isn't already parsed */

-	if (msg->content_disposition->parsed!=0) {

-		/* already parsed, nothing more to be done */

-		return 0;

-	}

-

-	/* parse the body */

-	disp = (struct disposition*)pkg_malloc(sizeof(struct disposition));

-	if (disp==0) {

-		LM_ERR("no more pkg memory\n");

-		goto error;

-	}

-	memset(disp,0,sizeof(struct disposition));

-

-	if (parse_disposition( &(msg->content_disposition->body), disp)==-1) {

-		/* error when parsing the body */

-		free_disposition( &disp );

-		goto error;

-	}

-

-	/* attach the parsed form to the header */

-	msg->content_disposition->parsed = (void*)disp;

-

-	return 0;

-error:

-	return -1;

-}

-

-

-/*! \brief Prints recursive a disposition structure */

-void print_disposition( struct disposition *disp)

-{

-	struct disposition_param *param;

-

-	DBG("*** Disposition type=<%.*s>[%d]\n",

-		disp->type.len,disp->type.s,disp->type.len);

-	for( param=disp->params; param; param=param->next) {

-		DBG("*** Disposition param: <%.*s>[%d]=<%.*s>[%d] is_quoted=%d\n",

-			param->name.len,param->name.s, param->name.len,

-			param->body.len,param->body.s, param->body.len,

-			param->is_quoted);

-	}

-}

-

-

@@ -52,6 +52,11 @@ int parse_disposition( str *s, struct disposition *disp)

 	char *tmp;

 	char *end;

+	if(s==NULL || s->s==NULL || s->len<=0) {

+		LM_ERR("invalid parameters\n");

+		return -1;

+	}

+

 	state = saved_state = FIND_TYPE;

 	end = s->s + s->len;

 	disp_p = 0;

@@ -114,8 +119,7 @@ int parse_disposition( str *s, struct disposition *disp)

 						state=F_CRLF;

 						break;

 					default:

-						LOG(L_ERR,"ERROR:parse_disposition: unexpected "

-							"char [%c] in status %d: <<%.*s>> .\n",

+						LM_ERR("unexpected char [%c] in status %d: <<%.*s>>.\n",

 							*tmp,state, (int)(tmp-s->s), s->s);

 						goto error;

 				}

@@ -143,15 +147,13 @@ int parse_disposition( str *s, struct disposition *disp)

 						state=F_CR;

 						break;

 					default:

-						LOG(L_ERR,"ERROR:parse_disposition: unexpected "

-							"char [%c] in status %d: <<%.*s>> .\n",

+						LM_ERR("unexpected char [%c] in status %d: <<%.*s>>.\n",

 							*tmp,state, (int)(tmp-s->s), ZSW(s->s));

 						goto error;

 				}

 				break;

 			case 0:

-				LOG(L_ERR,"ERROR:parse_disposition: unexpected "

-					"char [%c] in status %d: <<%.*s>> .\n",

+				LM_ERR("nexpected char [%c] in status %d: <<%.*s>>.\n",

 					*tmp,state, (int)(tmp-s->s), ZSW(s->s));

 				goto error;

 				break;

@@ -180,8 +182,7 @@ int parse_disposition( str *s, struct disposition *disp)

 						state = FIND_PARAM;

 						break;

 					default:

-						LOG(L_ERR,"ERROR:parse_disposition: unexpected "

-							"char [%c] in status %d: <<%.*s>> .\n",

+						LM_ERR("unexpected char [%c] in status %d: <<%.*s>>.\n",

 							*tmp,state, (int)(tmp-s->s), ZSW(s->s));

 						goto error;

 				}

@@ -202,8 +203,7 @@ int parse_disposition( str *s, struct disposition *disp)

 						state = FIND_VAL;

 						break;

 					default:

-						LOG(L_ERR,"ERROR:parse_disposition: unexpected "

-							"char [%c] in status %d: <<%.*s>> .\n",

+						LM_ERR("unexpected char [%c] in status %d: <<%.*s>>.\n",

 							*tmp,state, (int)(tmp-s->s), ZSW(s->s));

 						goto error;

 				}

@@ -222,8 +222,7 @@ int parse_disposition( str *s, struct disposition *disp)

 						state = END_VAL;

 						break;

 					default:

-						LOG(L_ERR,"ERROR:parse_disposition: unexpected "

-							"char [%c] in status %d: <<%.*s>> .\n",

+						LM_ERR("unexpected char [%c] in status %d: <<%.*s>>.\n",

 							*tmp,state, (int)(tmp-s->s), ZSW(s->s));

 						goto error;

 				}

@@ -241,8 +240,7 @@ int parse_disposition( str *s, struct disposition *disp)

 						state = SKIP_QUOTED_VAL;

 						break;

 					default:

-						LOG(L_ERR,"ERROR:parse_disposition: unexpected "

-							"char [%c] in status %d: <<%.*s>> .\n",

+						LM_ERR("unexpected char [%c] in status %d: <<%.*s>>.\n",

 							*tmp,state, (int)(tmp-s->s), ZSW(s->s));

 						goto error;

 				}

@@ -270,8 +268,7 @@ int parse_disposition( str *s, struct disposition *disp)

 					case QUOTED_VAL:

 						break;

 					default:

-						LOG(L_ERR,"ERROR:parse_disposition: unexpected "

-							"char [%c] in status %d: <<%.*s>> .\n",

+						LM_ERR("unexpected char [%c] in status %d: <<%.*s>>.\n",

 							*tmp,state, (int)(tmp-s->s), ZSW(s->s));

 						goto error;

 				}

@@ -290,8 +287,7 @@ int parse_disposition( str *s, struct disposition *disp)

 						new_p=(struct disposition_param*)pkg_malloc

 							(sizeof(struct disposition_param));

 						if (new_p==0) {

-							LOG(L_ERR,"ERROR:parse_disposition: no more "

-								"pkg mem\n");

+							LM_ERR("no more pkg mem\n");

 							goto error;

 						}

 						memset(new_p,0,sizeof(struct disposition_param));

@@ -331,7 +327,7 @@ int parse_disposition( str *s, struct disposition *disp)

 			disp_p->body.len = tmp - disp_p->body.s;

 			break;

 		default:

-			LOG(L_ERR,"ERROR:parse_disposition: wrong final state (%d)\n",

+			LM_ERR("wrong final state (%d)\n",

 				state);

 			goto error;

 	}

@@ -375,7 +371,7 @@ int parse_content_disposition( struct sip_msg *msg )

 		if (parse_headers(msg, HDR_CONTENTDISPOSITION_F, 0)==-1)

 			goto error;

 		if (msg->content_disposition==0) {

-			DBG("DEBUG:parse_content_disposition: hdr not found\n");

+			DBG("hdr not found\n");

 			return 1;

 		}

 	}

@@ -389,7 +385,7 @@ int parse_content_disposition( struct sip_msg *msg )

 	/* parse the body */

 	disp = (struct disposition*)pkg_malloc(sizeof(struct disposition));

 	if (disp==0) {

-		LOG(L_ERR,"ERROR:parse_content_disposition: no more pkg memory\n");

+		LM_ERR("no more pkg memory\n");

 		goto error;

 	}

 	memset(disp,0,sizeof(struct disposition));

@@ -1,14 +1,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

  *

- * 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.

@@ -17,8 +17,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-09-09 created (bogdan)

  */

 /*! \file

@@ -15,7 +15,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:

  * 2003-09-09 created (bogdan)

@@ -1,7 +1,4 @@

 /*

- * $Id$

- *

- *

  * Copyright (C) 2001-2003 FhG Fokus

  *

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

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

  * 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,

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

  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

@@ -29,6 +24,12 @@

  * 2003-09-09 created (bogdan)

  */

+/*! \file

+ * \brief Parser :: Content-Disposition header

+ *

+ * \ingroup parser

+ */

+

 #include <stdio.h>

 #include <stdlib.h>

@@ -41,7 +42,7 @@

-/* parse a string that supposed to be a disposition and fills up the structure

+/*! \brief parse a string that supposed to be a disposition and fills up the structure

  * Returns: -1 : error

  *           o : success */

 int parse_disposition( str *s, struct disposition *disp)

@@ -346,7 +347,7 @@ error:

-/* Frees the entire disposition structure (params + itself) */

+/*! \brief Frees the entire disposition structure (params + itself) */

 void free_disposition( struct disposition **disp)

 {

 	struct disposition_param *param;

@@ -363,7 +364,7 @@ void free_disposition( struct disposition **disp)

-/* looks inside the message, gets the Content-Disposition hdr, parse it, builds

+/*! \brief looks inside the message, gets the Content-Disposition hdr, parse it, builds

  * and fills a disposition structure for it what will be attached to hdr as

  * parsed link.

  * Returns:  -1 : error

@@ -413,7 +414,7 @@ error:

 }

-/* Prints recursive a disposition structure */

+/*! \brief Prints recursive a disposition structure */

 void print_disposition( struct disposition *disp)

 {

 	struct disposition_param *param;

@@ -376,7 +376,7 @@ int parse_content_disposition( struct sip_msg *msg )

 	/* look for Content-Disposition header */

 	if (msg->content_disposition==0) {

-		if (parse_headers(msg,HDR_CONTENTDISPOSITION,0)==-1)

+		if (parse_headers(msg, HDR_CONTENTDISPOSITION_F, 0)==-1)

 			goto error;

 		if (msg->content_disposition==0) {

 			DBG("DEBUG:parse_content_disposition: hdr not found\n");

@@ -2,7 +2,7 @@

  * $Id$

  *

  *

- * Copyright (C) 2001-2003 Fhg Fokus

+ * Copyright (C) 2001-2003 FhG Fokus

  *

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

  *

@@ -43,7 +43,7 @@

 /* parse a string that supposed to be a disposition and fills up the structure

  * Returns: -1 : error

- *           o : sucess */

+ *           o : success */

 int parse_disposition( str *s, struct disposition *disp)

 {

 	enum { FIND_TYPE, TYPE, END_TYPE, FIND_PARAM, PARAM, END_PARAM, FIND_VAL,

@@ -364,7 +364,7 @@ void free_disposition( struct disposition **disp)

 /* looks inside the message, gets the Content-Disposition hdr, parse it, builds

- * and fills a disposition strucure for it what will be attached to hdr as

+ * and fills a disposition structure for it what will be attached to hdr as

  * parsed link.

  * Returns:  -1 : error

  *            0 : success

@@ -384,7 +384,7 @@ int parse_content_disposition( struct sip_msg *msg )

 		}

 	}

-	/* now, we have the headr -> look if it isn't already parsed */

+	/* now, we have the header -> look if it isn't already parsed */

 	if (msg->content_disposition->parsed!=0) {

 		/* already parsed, nothing more to be done */

 		return 0;

@@ -413,7 +413,7 @@ error:

 }

-/* Prints recursiv a disposition structure */

+/* Prints recursive a disposition structure */

 void print_disposition( struct disposition *disp)

 {

 	struct disposition_param *param;

@@ -421,7 +421,7 @@ void print_disposition( struct disposition *disp)

 	DBG("*** Disposition type=<%.*s>[%d]\n",

 		disp->type.len,disp->type.s,disp->type.len);

 	for( param=disp->params; param; param=param->next) {

-		DBG("*** DIsposition param: <%.*s>[%d]=<%.*s>[%d] is_quoted=%d\n",

+		DBG("*** Disposition param: <%.*s>[%d]=<%.*s>[%d] is_quoted=%d\n",

 			param->name.len,param->name.s, param->name.len,

 			param->body.len,param->body.s, param->body.len,

 			param->is_quoted);

new file mode 100644

@@ -0,0 +1,431 @@

+/*

+ * $Id$

+ *

+ *

+ * Copyright (C) 2001-2003 Fhg Fokus

+ *

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

+ *

+ * ser 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,

+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+ *

+ * History:

+ * 2003-09-09 created (bogdan)

+ */

+

+

+#include <stdio.h>

+#include <stdlib.h>

+#include <sys/types.h>

+#include <unistd.h>

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

+#include "../dprint.h"

+#include "../ut.h"

+#include "parse_disposition.h"

+

+

+

+/* parse a string that supposed to be a disposition and fills up the structure

+ * Returns: -1 : error

+ *           o : sucess */

+int parse_disposition( str *s, struct disposition *disp)

+{

+	enum { FIND_TYPE, TYPE, END_TYPE, FIND_PARAM, PARAM, END_PARAM, FIND_VAL,

+	       FIND_QUOTED_VAL, QUOTED_VAL, SKIP_QUOTED_VAL, VAL, END_VAL,

+	       F_LF, F_CR, F_CRLF};

+	struct disposition_param *disp_p;

+	struct disposition_param *new_p;

+	int  state;

+	int  saved_state;

+	char *tmp;

+	char *end;

+

+	state = saved_state = FIND_TYPE;

+	end = s->s + s->len;

+	disp_p = 0;

+

+	for( tmp=s->s; tmp<end; tmp++) {

+		switch(*tmp) {

+			case ' ':

+			case '\t':

+				switch (state) {

+					case FIND_QUOTED_VAL:

+						disp_p->body.s = tmp;

+						state = QUOTED_VAL;

+						break;

+					case SKIP_QUOTED_VAL:

+						state = QUOTED_VAL;

+						break;

+					case TYPE:

+						disp->type.len = tmp - disp->type.s;

+						state = END_TYPE;

+						break;

+					case PARAM:

+						disp_p->name.len = tmp - disp_p->name.s;

+						state = END_PARAM;

+						break;

+					case VAL:

+						disp_p->body.len = tmp - disp_p->body.s;

+						state = END_VAL;

+						break;

+					case F_CRLF:

+					case F_LF:

+					case F_CR:

+						/*previous=crlf and now =' '*/

+						state=saved_state;

+						break;

+				}

+				break;

+			case '\n':

+				switch (state) {

+					case TYPE:

+						disp->type.len = tmp - disp->type.s;

+						saved_state = END_TYPE;

+						state = F_LF;

+						break;

+					case PARAM:

+						disp_p->name.len = tmp - disp_p->name.s;

+						saved_state = END_PARAM;

+						state = F_LF;

+						break;

+					case VAL:

+						disp_p->body.len = tmp - disp_p->body.s;

+						saved_state = END_VAL;

+						state = F_CR;

+						break;

+					case FIND_TYPE:

+					case FIND_PARAM:

+						saved_state=state;

+						state=F_LF;

+						break;

+					case F_CR:

+						state=F_CRLF;

+						break;

+					default:

+						LOG(L_ERR,"ERROR:parse_disposition: unexpected "

+							"char [%c] in status %d: <<%.*s>> .\n",

+							*tmp,state, (int)(tmp-s->s), s->s);

+						goto error;

+				}

+				break;

+			case '\r':

+				switch (state) {

+					case TYPE:

+						disp->type.len = tmp - disp->type.s;

+						saved_state = END_TYPE;

+						state = F_CR;

+						break;

+					case PARAM:

+						disp_p->name.len = tmp - disp_p->name.s;

+						saved_state = END_PARAM;

+						state = F_CR;

+						break;

+					case VAL:

+						disp_p->body.len = tmp - disp_p->body.s;

+						saved_state = END_VAL;

+						state = F_CR;

+						break;

+					case FIND_TYPE:

+					case FIND_PARAM:

+						saved_state=state;

+						state=F_CR;

+						break;

+					default:

+						LOG(L_ERR,"ERROR:parse_disposition: unexpected "