- missing "goto error" added in parse_to()

- function for parsing content-disposition added; function available for
  searching & parsing the header and alos only for parsing a string that's a
  disposition; parser supports quoted values for params (along with escaped
  chars inside quoted strings)

parser/hf.c

@@ -44,6 +44,7 @@
 #include "parse_expires.h"
 #include "parse_rr.h"
 #include "contact/parse_contact.h"
+#include "parse_disposition.h"
 #include "../ut.h"
 
 
@@ -145,6 +146,7 @@ void clean_hdr_field(struct hdr_field* hf)
 			break;
 
 		case HDR_CONTENTDISPOSITION:
+			free_disposition( ((struct disposition**)(&hf->parsed)) );
 			break;
 
 		default:

parser/parse_disposition.c

@@ -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:
+ *    [email protected]
+ *
+ * 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 "
+							"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",
+					*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:
+						LOG(L_ERR,"ERROR:parse_disposition: 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:
+						LOG(L_ERR,"ERROR:parse_disposition: 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:
+						LOG(L_ERR,"ERROR:parse_disposition: 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:
+						LOG(L_ERR,"ERROR:parse_disposition: 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:
+						LOG(L_ERR,"ERROR:parse_disposition: 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) {
+							LOG(L_ERR,"ERROR:parse_disposition: 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:
+			LOG(L_ERR,"ERROR:parse_disposition: wrong final state (%d)\n",
+				state);
+			goto error;
+	}
+	return 0;
+error:
+	return -1;
+}
+
+
+
+/* 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;
+}
+
+
+
+/* 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
+ * 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,0)==-1)
+			goto error;
+		if (msg->content_disposition==0) {
+			DBG("DEBUG:parse_content_disposition: hdr not found\n");
+			return 1;
+		}
+	}
+
+	/* now, we have the headr -> 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) {
+		LOG(L_ERR,"ERROR:parse_content_disposition: 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;
+}
+
+
+/* Prints recursiv 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);
+	}
+}
+
+

parser/parse_disposition.h

@@ -0,0 +1,80 @@
+/*
+ * $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:
+ *    [email protected]
+ *
+ * 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)
+ */
+
+#ifndef _PARSE_DISPOSITION_H_
+#define _PARSE_DISPOSITION_H_
+
+#include "../str.h"
+#include "msg_parser.h"
+
+
+#define get_content_disposition(_msg_) \
+	((struct content_disposition*)((_msg_)->content_disposition->parsed))
+
+
+struct disposition_param {
+	str name;
+	str body;
+	int is_quoted;
+	struct disposition_param *next;
+};
+
+
+struct disposition {
+	str type;
+	struct disposition_param *params;
+};
+
+
+/* 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
+ * parsed link.
+ * Returns:  -1 : error
+ *            0 : success
+ *            1 : hdr not found
+ */
+int parse_content_disposition( struct sip_msg *msg );
+
+
+/* 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);
+
+
+/* Frees the entire disposition structure (params + itself) */
+void free_disposition( struct disposition **disp);
+
+/* Prints recursiv a disposition structure */
+void print_disposition( struct disposition *disp);
+
+#endif
+

parser/parse_to.c

@@ -145,6 +145,7 @@ static /*inline*/ char* parse_to_param(char *buffer, char *end,
 						LOG( L_ERR , "ERROR: parse_to_param : "
 							"unexpected char [%c] in status %d: <<%.*s>> .\n",
 							*tmp,status, (int)(tmp-buffer), ZSW(buffer));
+						goto error;
 				}
 				break;
 			case '\r':
@@ -459,8 +460,8 @@ static /*inline*/ char* parse_to_param(char *buffer, char *end,
 						/*previous=crlf and now !=' '*/
 						goto endofheader;
 					default:
-						DBG("DEBUG: parse_to_param: "
-						"spitting out [%c] in status %d\n",*tmp,status );
+						LOG(L_ERR, "ERROR: parse_to_param: "
+							"spitting out [%c] in status %d\n",*tmp,status );
 						goto error;
 				}
 		}/*switch*/
@@ -550,6 +551,7 @@ char* parse_to(char* buffer, char *end, struct to_body *to_b)
 						LOG( L_ERR , "ERROR: parse_to : unexpected char [%c] "
 							"in status %d: <<%.*s>> .\n",
 							*tmp,status, (int)(tmp-buffer), ZSW(buffer));
+						goto error;
 				}
 				break;
 			case '\r':