Merge branch 'master' into websocket

Conflicts:
	pkg/kamailio/fedora/16/kamailio.spec

parser/case_acce.h

@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Accept, Accept-Language, Accept-Contact, Accept-Disposition Header Field Name Parsing Macros
  *
  * Copyright (C) 2001-2003 FhG Fokus

parser/case_allo.h

@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Allow, Allow-Events Header Field Name Parsing Macros
  *
  * Copyright (C) 2001-2003 FhG Fokus

parser/case_auth.h

@@ -1,6 +1,4 @@
 /* 
- * $Id$ 
- *
  * Authorization Header Field Name Parsing Macros
  *
  * Copyright (C) 2001-2003 FhG Fokus

parser/case_call.h

@@ -1,6 +1,4 @@
 /* 
- * $Id$ 
- *
  * Call-ID Header Name Parsing Macros
  *
  * Copyright (C) 2001-2003 FhG Fokus

parser/case_cont.h

@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Contact, Content-Type, Content-Length, Content-Disposition, Content-Encoding
  * Header Field Name Parsing Macros
  *

parser/case_cseq.h

@@ -1,6 +1,4 @@
 /* 
- * $Id$ 
- *
  * CSeq Header Field Name Parsing Macros
  *
  * Copyright (C) 2001-2003 FhG Fokus

parser/case_date.h

@@ -1,6 +1,4 @@
 /* 
- * $Id$ 
- *
  * Date Header Field Name Parsing Macros
  *
  * Copyright (c) 2007 iptelorg GmbH

parser/case_dive.h

@@ -1,6 +1,4 @@
 /* 
- * $Id$ 
- *
  * Diversion Header Field Parsing Macros
  *
  * Copyright (C) 2001-2003 FhG Fokus

parser/case_even.h

@@ -1,6 +1,4 @@
 /* 
- * $Id$ 
- *
  * Event Header Field Name Parsing Macros
  *
  * Copyright (C) 2001-2003 FhG Fokus

parser/case_expi.h

@@ -1,6 +1,4 @@
 /* 
- * $Id$ 
- *
  * Expires Header Field Name Parsing Macros
  *
  * Copyright (C) 2001-2003 FhG Fokus

parser/case_from.h

@@ -1,6 +1,4 @@
 /* 
- * $Id$ 
- *
  * From Header Field Name Parsing Macros
  *
  * Copyright (C) 2001-2003 FhG Fokus

parser/case_iden.h

@@ -1,6 +1,4 @@
 /* 
- * $Id$ 
- *
  * Identity, Identity-info Header Field Name Parsing Macros
  *
  * Copyright (c) 2007 iptelorg GmbH

parser/case_max.h

@@ -1,6 +1,4 @@
 /* 
- * $Id$ 
- *
  * Max-Forwards Header Field Name Parsing Macros
  *
  * Copyright (C) 2001-2003 FhG Fokus

parser/case_min.h

@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Min-SE Header Field Name Parsing Macros
  *
  * Copyright (C) 2001-2003 FhG Fokus

parser/case_orga.h

@@ -1,6 +1,4 @@
 /* 
- * $Id$ 
- *
  * Organization Header Field Name Parsing Macros
  *
  * Copyright (C) 2001-2003 FhG Fokus

parser/case_p_as.h

@@ -1,6 +1,4 @@
 /* 
- * $Id$
- * 
  * Copyright (C) 2010 iptelorg GmbH
  *
  * Permission to use, copy, modify, and distribute this software for any

parser/case_p_pr.h

@@ -1,6 +1,4 @@
 /* 
- * $Id$
- * 
  * Copyright (C) 2010 iptelorg GmbH
  *
  * Permission to use, copy, modify, and distribute this software for any

parser/case_path.h

@@ -1,6 +1,4 @@
 /* 
- * $Id$ 
- *
  * Path Header Field Name Parsing Macros
  *
  * Copyright (C) 2009 iptelorg GmbH

parser/case_prio.h

@@ -1,6 +1,4 @@
 /* 
- * $Id$ 
- *
  * Priority Header Field Name Parsing Macros
  *
  * Copyright (C) 2001-2003 FhG Fokus

parser/case_priv.h

@@ -1,6 +1,4 @@
 /* 
- * $Id$ 
- *
  * Call-ID Header Name Parsing Macros
  *
  * Copyright (C) 2001-2003 FhG FOKUS

parser/case_prox.h

@@ -1,6 +1,4 @@
 /* 
- * $Id$ 
- *
  * Proxy-Require, Proxy-Authorization Header Field Name Parsing Macros
  *
  * Copyright (C) 2001-2003 FhG Fokus

parser/case_reas.h

@@ -1,6 +1,4 @@
 /* 
- * $Id$
- * 
  * Copyright (C) 2010 iptelorg GmbH
  *
  * Permission to use, copy, modify, and distribute this software for any

parser/case_reco.h

@@ -1,6 +1,4 @@
 /* 
- * $Id$ 
- *
  * Record-Route Header Field Name Parsing Macros
  *
  * Copyright (C) 2001-2003 FhG Fokus

parser/case_reje.h

@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Reject-Contact Header Field Name Parsing Macros
  *
  * Copyright (C) 2001-2003 FhG Fokus

parser/case_remo.h

@@ -1,6 +1,4 @@
 /* 
- * $Id$ 
- *
  * Remote-Party-ID Header Field Name Parsing Macros
  *
  * Copyright (C) 2001-2003 FhG Fokus

parser/case_requ.h

@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Require, Request-Disposition Header Field Name Parsing Macros
  *
  * Copyright (C) 2001-2003 FhG Fokus

parser/case_retr.h

@@ -1,6 +1,4 @@
 /* 
- * $Id$ 
- *
  * Expires Header Field Name Parsing Macros
  *
  * Copyright (C) 2007 iptelorg GmbH

parser/case_rout.h

@@ -1,6 +1,4 @@
 /* 
- * $Id$ 
- *
  * Route Header Field Name Parsing Macros
  *
  * Copyright (C) 2001-2003 FhG Fokus

parser/case_serv.h

@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Subject Header Field Name Parsing Macros
  *
  * Copyright (C) 2001-2003 Fhg Fokus

parser/case_sess.h

@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Session-Expires Header Field Name Parsing Macros
  *
  * Copyright (C) 2001-2003 FhG Fokus

parser/case_sip.h

@@ -1,3 +1,23 @@
+/*
+ * Copyright (C) 2004 Jamey Hicks, jamey dot hicks at hp dot com
+ *
+ * This file is part of SIP-router, a free SIP server.
+ *
+ * SIP-router 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
+ *
+ * SIP-router 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
+ */
+
 /*! \file 
  * \brief Parser :: Handle case for headers
  *

parser/case_subj.h

@@ -1,6 +1,4 @@
 /* 
- * $Id$ 
- *
  * Subject Header Field Name Parsing Macros
  *
  * Copyright (C) 2001-2003 FhG Fokus

parser/case_subs.h

@@ -1,6 +1,4 @@
 /* 
- * $Id$ 
- *
  * Subject Header Field Name Parsing Macros
  *
  * Copyright (C) 2001-2003 FhG Fokus

parser/case_supp.h

@@ -1,6 +1,4 @@
 /* 
- * $Id$ 
- *
  * Supported Header Field Name Parsing Macros
  *
  * Copyright (C) 2001-2003 FhG Fokus

parser/case_to.h

@@ -1,6 +1,4 @@
 /* 
- * $Id$ 
- *
  * To Header Field Name Parsing Macros
  *
  * Copyright (C) 2001-2003 FhG Fokus

parser/case_unsu.h

@@ -1,6 +1,4 @@
 /* 
- * $Id$ 
- *
  * Unsupported Header Field Name Parsing Macros
  *
  * Copyright (C) 2001-2003 FhG Fokus

parser/case_user.h

@@ -1,6 +1,4 @@
 /* 
- * $Id$ 
- *
  * User-Agent Header Field Name Parsing Macros
  *
  * Copyright (C) 2001-2003 FhG Fokus

parser/case_via.h

@@ -1,6 +1,4 @@
 /* 
- * $Id$ 
- *
  * Via Header Field Name Parsing Macros
  *
  * Copyright (C) 2001-2003 FhG Fokus

parser/case_www.h

@@ -1,6 +1,4 @@
 /* 
- * $Id$ 
- *
  * WWW-Authenticate Header Field Name Parsing Macros
  *
  * Copyright (C) 2001-2003 FhG Fokus

parser/contact/contact.c

@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Parses one Contact in Contact HF body
  *
  * Copyright (C) 2001-2003 FhG Fokus

parser/contact/contact.h

@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Contact data type
  *
  * Copyright (C) 2001-2003 FhG Fokus

parser/contact/parse_contact.c

@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Contact header field body parser
  *
  * Copyright (C) 2001-2003 FhG Fokus

parser/contact/parse_contact.h

@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Contact header field body parser
  *
  * Copyright (C) 2001-2003 FhG Fokus

parser/digest/digest.c

@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Digest credentials parser interface
  *
  * Copyright (C) 2001-2003 FhG Fokus

parser/digest/digest.h

@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Digest credentials parser interface
  *
  * Copyright (C) 2001-2003 FhG Fokus

parser/digest/digest_keys.h

@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * This file is automatically generated, do not edit
  *
  * Copyright (C) 2001-2003 FhG Fokus

parser/digest/digest_parser.c

@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Digest credentials parser
  *
  * Copyright (C) 2001-2003 FhG Fokus

parser/digest/digest_parser.h

@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Digest credentials parser
  *
  * Copyright (C) 2001-2003 FhG Fokus

parser/digest/param_parser.c

@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * 32-bit Digest parameter name parser
  *
  * Copyright (C) 2001-2003 FhG Fokus

parser/digest/param_parser.h

@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * 32-bit Digest parameter name parser
  *
  * Copyright (C) 2001-2003 FhG Fokus

parser/hf.c

@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright (C) 2001-2003 FhG Fokus
  *
  * This file is part of ser, a free SIP server.
@@ -63,7 +61,7 @@
 /** Frees a hdr_field structure.
  * WARNING: it frees only parsed (and not name.s, body.s)
  */
-void clean_hdr_field(struct hdr_field* hf)
+void clean_hdr_field(struct hdr_field* const hf)
 {
 	void** h_parsed;
 
@@ -228,7 +226,7 @@ void free_hdr_field_lst(struct hdr_field* hf)
 }
 
 /* print the content of hdr_field */
-void dump_hdr_field( struct hdr_field* hf )
+void dump_hdr_field(struct hdr_field const* const hf )
 {
 	LOG(L_ERR, "DEBUG: dump_hdr_field: type=%d, name=%.*s, "
 		"body=%.*s, parsed=%p, next=%p\n",

parser/hf.h

@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright (C) 2001-2003 FhG Fokus
  *
  * This file is part of ser, a free SIP server.
@@ -258,7 +256,7 @@ static inline int hdr_allocs_parse(struct hdr_field* hdr)
 /** frees a hdr_field structure.
  * WARNING: it frees only parsed (and not name.s, body.s)
  */
-void clean_hdr_field(struct hdr_field* hf);
+void clean_hdr_field(struct hdr_field* const hf);
 
 
 /** frees a hdr_field list.
@@ -267,7 +265,7 @@ void clean_hdr_field(struct hdr_field* hf);
 void free_hdr_field_lst(struct hdr_field* hf);
 
 /* print content of hdr_field */
-void dump_hdr_field( struct hdr_field* hf );
+void dump_hdr_field( struct hdr_field const* const hf);
 
 /**
  * free hdr parsed structure using inner free function

parser/keys.h

@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Fast 32-bit Header Field Name Parser -- keys
  *
  * Copyright (C) 2001-2003 FhG Fokus

parser/msg_parser.c

@@ -1,9 +1,6 @@
 /*
- * $Id$
- *
  * sip msg. header proxy parser
  *
- *
  * Copyright (C) 2001-2003 FhG Fokus
  *
  * This file is part of ser, a free SIP server.
@@ -88,7 +85,7 @@ unsigned int global_req_flags = 0;
 
 /* returns pointer to next header line, and fill hdr_f ;
  * if at end of header returns pointer to the last crlf  (always buf)*/
-char* get_hdr_field(char* buf, char* end, struct hdr_field* hdr)
+char* get_hdr_field(char* const buf, char* const end, struct hdr_field* const hdr)
 {
 
 	char* tmp;
@@ -316,7 +313,7 @@ error:
    give you the first occurrence of a header you are interested in,
    look at check_transaction_quadruple
 */
-int parse_headers(struct sip_msg* msg, hdr_flags_t flags, int next)
+int parse_headers(struct sip_msg* const msg, const hdr_flags_t flags, const int next)
 {
 	struct hdr_field* hf;
 	char* tmp;
@@ -595,7 +592,7 @@ error:
 
 
 /* returns 0 if ok, -1 for errors */
-int parse_msg(char* buf, unsigned int len, struct sip_msg* msg)
+int parse_msg(char* const buf, const unsigned int len, struct sip_msg* const msg)
 {
 
 	char *tmp;
@@ -610,9 +607,6 @@ int parse_msg(char* buf, unsigned int len, struct sip_msg* msg)
 	offset=tmp-buf;
 	fl=&(msg->first_line);
 	rest=parse_first_line(tmp, len-offset, fl);
-#if 0
-	rest=parse_fline(tmp, buf+len, fl);
-#endif
 	offset+=rest-tmp;
 	tmp=rest;
 	switch(fl->type){
@@ -722,7 +716,7 @@ void free_reply_lump( struct lump_rpl *lump)
 
 
 /*only the content*/
-void free_sip_msg(struct sip_msg* msg)
+void free_sip_msg(struct sip_msg* const msg)
 {
 	if (msg->new_uri.s) { pkg_free(msg->new_uri.s); msg->new_uri.len=0; }
 	if (msg->dst_uri.s) { pkg_free(msg->dst_uri.s); msg->dst_uri.len=0; }
@@ -742,7 +736,7 @@ void free_sip_msg(struct sip_msg* msg)
 /*
  * Make a private copy of the string and assign it to dst_uri
  */
-int set_dst_uri(struct sip_msg* msg, str* uri)
+int set_dst_uri(struct sip_msg* const msg, const str* const uri)
 {
 	char* ptr;
 
@@ -772,7 +766,7 @@ int set_dst_uri(struct sip_msg* msg, str* uri)
 }
 
 
-void reset_dst_uri(struct sip_msg* msg)
+void reset_dst_uri(struct sip_msg* const msg)
 {
 	if(msg->dst_uri.s != 0) {
 		pkg_free(msg->dst_uri.s);
@@ -811,7 +805,7 @@ int set_path_vector(struct sip_msg* msg, str* path)
 }
 
 
-void reset_path_vector(struct sip_msg* msg)
+void reset_path_vector(struct sip_msg* const msg)
 {
 	if(msg->path_vec.s != 0) {
 		pkg_free(msg->path_vec.s);
@@ -821,7 +815,7 @@ void reset_path_vector(struct sip_msg* msg)
 }
 
 
-hdr_field_t* get_hdr(sip_msg_t *msg, enum _hdr_types_t ht)
+hdr_field_t* get_hdr(const sip_msg_t* const msg, const enum _hdr_types_t ht)
 {
 	hdr_field_t *hdr;
 
@@ -833,7 +827,7 @@ hdr_field_t* get_hdr(sip_msg_t *msg, enum _hdr_types_t ht)
 }
 
 
-hdr_field_t* next_sibling_hdr(hdr_field_t *hf)
+hdr_field_t* next_sibling_hdr(const hdr_field_t* const hf)
 {
 	hdr_field_t *hdr;
 
@@ -843,7 +837,7 @@ hdr_field_t* next_sibling_hdr(hdr_field_t *hf)
 	return NULL;
 }
 
-hdr_field_t* get_hdr_by_name(sip_msg_t *msg, char *name, int name_len)
+hdr_field_t* get_hdr_by_name(const sip_msg_t* const msg, const char* const name, const int name_len)
 {
 	hdr_field_t *hdr;
 
@@ -855,8 +849,8 @@ hdr_field_t* get_hdr_by_name(sip_msg_t *msg, char *name, int name_len)
 	return NULL;
 }
 
-
-hdr_field_t* next_sibling_hdr_by_name(hdr_field_t *hf)
+/** not used yet */
+hdr_field_t* next_sibling_hdr_by_name(const hdr_field_t* const hf)
 {
 	hdr_field_t *hdr;
 
@@ -872,7 +866,7 @@ hdr_field_t* next_sibling_hdr_by_name(hdr_field_t *hf)
  * set msg context id
  * - return: -1 on error; 0 - on set
  */
-int msg_ctx_id_set(sip_msg_t *msg, msg_ctx_id_t *mid)
+int msg_ctx_id_set(const sip_msg_t* const msg, msg_ctx_id_t* const mid)
 {
 	if(msg==NULL || mid==NULL)
 		return -1;
@@ -885,7 +879,7 @@ int msg_ctx_id_set(sip_msg_t *msg, msg_ctx_id_t *mid)
  * check msg context id
  * - return: -1 on error; 0 - on no match; 1 - on match
  */
-int msg_ctx_id_match(sip_msg_t *msg, msg_ctx_id_t *mid)
+int msg_ctx_id_match(const sip_msg_t* const msg, const msg_ctx_id_t* const mid)
 {
 	if(msg==NULL || mid==NULL)
 		return -1;
@@ -897,7 +891,7 @@ int msg_ctx_id_match(sip_msg_t *msg, msg_ctx_id_t *mid)
 /**
  * set msg time value
  */
-int msg_set_time(sip_msg_t *msg)
+int msg_set_time(sip_msg_t* const msg)
 {
 	if(unlikely(msg==NULL))
 		return -2;

parser/msg_parser.h

@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright (C) 2001-2003 FhG Fokus
  *
  * This file is part of ser, a free SIP server.
@@ -382,18 +380,18 @@ extern int via_cnt;
 extern unsigned int global_req_flags;
 
 
-int parse_msg(char* buf, unsigned int len, struct sip_msg* msg);
+int parse_msg(char* const buf, const unsigned int len, struct sip_msg* const msg);
 
-int parse_headers(struct sip_msg* msg, hdr_flags_t flags, int next);
+int parse_headers(struct sip_msg* const msg, const hdr_flags_t flags, const int next);
 
-char* get_hdr_field(char* buf, char* end, struct hdr_field* hdr);
+char* get_hdr_field(char* const buf, char* const end, struct hdr_field* const hdr);
 
-void free_sip_msg(struct sip_msg* msg);
+void free_sip_msg(struct sip_msg* const msg);
 
 /*! \brief make sure all HFs needed for transaction identification have been
    parsed; return 0 if those HFs can't be found
 */
-inline static int check_transaction_quadruple( struct sip_msg* msg )
+inline static int check_transaction_quadruple(struct sip_msg* const msg)
 {
 	if ( parse_headers(msg, HDR_FROM_F|HDR_TO_F|HDR_CALLID_F|HDR_CSEQ_F,0)!=-1
 		&& msg->from && msg->to && msg->callid && msg->cseq ) {
@@ -408,7 +406,7 @@ inline static int check_transaction_quadruple( struct sip_msg* msg )
 
 /*! \brief returns a pointer to the begining of the msg's body
  */
-inline static char* get_body(struct sip_msg *msg)
+inline static char* get_body(struct sip_msg* const msg)
 {
 	int offset;
 	unsigned int len;
@@ -434,19 +432,20 @@ inline static char* get_body(struct sip_msg *msg)
 /*! \brief
  * Make a private copy of the string and assign it to dst_uri
  */
-int set_dst_uri(struct sip_msg* msg, str* uri);
+int set_dst_uri(struct sip_msg* const msg, const str* const uri);
 
 /*! \brief If the dst_uri is set to an URI then reset it */
-void reset_dst_uri(struct sip_msg* msg);
+void reset_dst_uri(struct sip_msg* const msg);
 
-hdr_field_t* get_hdr(sip_msg_t *msg, enum _hdr_types_t ht);
-hdr_field_t* next_sibling_hdr(hdr_field_t *hf);
-hdr_field_t* get_hdr_by_name(sip_msg_t *msg, char *name, int name_len);
-hdr_field_t* next_sibling_hdr_by_name(hdr_field_t *hf);
+hdr_field_t* get_hdr(const sip_msg_t* const msg, const enum _hdr_types_t ht);
+hdr_field_t* next_sibling_hdr(const hdr_field_t* const hf);
+/** not used yet */
+hdr_field_t* get_hdr_by_name(const sip_msg_t* const msg, const char* const name, const int name_len);
+hdr_field_t* next_sibling_hdr_by_name(const hdr_field_t* const hf);
 
 int set_path_vector(struct sip_msg* msg, str* path);
 
-void reset_path_vector(struct sip_msg* msg);
+void reset_path_vector(struct sip_msg* const msg);
 
 
 /** force a specific send socket for forwarding a request.
@@ -479,17 +478,17 @@ typedef struct msg_ctx_id {
  * set msg context id
  * - return: -1 on error; 0 - on set 
  */
-int msg_ctx_id_set(sip_msg_t *msg, msg_ctx_id_t *mid);
+int msg_ctx_id_set(const sip_msg_t* const msg, msg_ctx_id_t* const mid);
 
 /**
  * check msg context id
  * - return: -1 on error; 0 - on no match; 1 - on match
  */
-int msg_ctx_id_match(sip_msg_t *msg, msg_ctx_id_t *mid);
+int msg_ctx_id_match(const sip_msg_t* const msg, const msg_ctx_id_t* const mid);
 
 /**
  * set msg time value
  */
-int msg_set_time(sip_msg_t *msg);
+int msg_set_time(sip_msg_t* const msg);
 
 #endif

parser/parse_body.c

@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright (C) 2008 iptelorg GmbH
  *
  * This file is part of ser, a free SIP server.

parser/parse_body.h

@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright (C) 2008 iptelorg GmbH
  *
  * This file is part of ser, a free SIP server.

parser/parse_content.c

@@ -1,7 +1,4 @@
 /*
- * $Id$
- *
- *
  * Copyright (C) 2001-2003 FhG Fokus
  *
  * This file is part of ser, a free SIP server.
@@ -216,7 +213,7 @@ static type_node_t subtype_tree[] = {
 
 
 
-char* parse_content_length( char* buffer, char* end, int* length)
+char* parse_content_length(char* const buffer, const char* const end, int* const length)
 {
 	int number;
 	char *p;
@@ -259,7 +256,7 @@ error:
 
 
 
-char* decode_mime_type(char *start, char *end, unsigned int *mime_type)
+char* decode_mime_type(char* const start, const char* const end, unsigned int* const mime_type)
 {
 	int node;
 	char *mark;
@@ -385,10 +382,10 @@ error:
  *  	-   > 0 mime found
  *      -   = 0 hdr not found
  *      -   =-1 error */
-int parse_content_type_hdr( struct sip_msg *msg )
+int parse_content_type_hdr(struct sip_msg* const msg)
 {
 	char *end;
-	char *ret;
+	const char *ret;
 	unsigned int  mime;
 
 	/* is the header already found? */
@@ -430,7 +427,7 @@ error:
 	return -1;
 }
 
-int parse_accept_body(struct hdr_field *hdr)
+int parse_accept_body(struct hdr_field* const hdr)
 {
 	static unsigned int mimes[MAX_MIMES_NR];
 	int nr_mimes;
@@ -492,7 +489,7 @@ error:
  * returns: > 0 ok
  *          = 0 hdr not found
  *          = -1 error */
-int parse_accept_hdr( struct sip_msg *msg )
+int parse_accept_hdr(struct sip_msg* const msg)
 {
 	static unsigned int mimes[MAX_MIMES_NR];
 	int nr_mimes;

parser/parse_content.h

@@ -1,7 +1,4 @@
 /*
- * $Id$
- *
- *
  * Copyright (C) 2001-2003 FhG Fokus
  *
  * This file is part of ser, a free SIP server.
@@ -105,9 +102,9 @@ struct mime_type {
  *            0        : hdr not found
  *           -1        : error (parse error )
  */
-int parse_content_type_hdr( struct sip_msg *msg);
+int parse_content_type_hdr(struct sip_msg* const msg);
 
-int parse_accept_body(struct hdr_field *hdr);
+int parse_accept_body(struct hdr_field* const hdr);
 
 /*! \brief
  * parse the body of the Accept header. It's values are also converted
@@ -116,7 +113,7 @@ int parse_accept_body(struct hdr_field *hdr);
  *            0 : hdr not found
  *           -1 : error (parse error)
  */
-int parse_accept_hdr( struct sip_msg *msg );
+int parse_accept_hdr(struct sip_msg* const msg);
 
 
 /*! \brief
@@ -124,11 +121,11 @@ int parse_accept_hdr( struct sip_msg *msg );
  *  type specified by this header (see th above defines).
  *  Returns the first chr after the end of the header.
  */
-char* parse_content_length( char* buffer, char* end, int* len);
+char* parse_content_length(char* const buffer, const char* const end, int* const length);
 
 /*! \brief
  * Sets the mime type from the body of a Content-Type header
  */
-char* decode_mime_type(char *start, char *end, unsigned int *mime_type);
+char* decode_mime_type(char* const start, const char* const end, unsigned int* const mime_type);
 
 #endif

parser/parse_cseq.c

@@ -1,6 +1,4 @@
 /* 
- * $Id$ 
- *
  * Copyright (C) 2001-2003 FhG Fokus
  *
  * This file is part of ser, a free SIP server.
@@ -42,7 +40,7 @@
 #include "../mem/mem.h"
 
 /*BUGGY*/
-char* parse_cseq(char *buf, char* end, struct cseq_body* cb)
+char* parse_cseq(char* const buf, const char* const end, struct cseq_body* const cb)
 {
 	char *t, *m, *m_end;
 	
@@ -102,7 +100,7 @@ error:
 }
 
 
-void free_cseq(struct cseq_body* cb)
+void free_cseq(struct cseq_body* const cb)
 {
 	pkg_free(cb);
 }

parser/parse_cseq.h

@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright (C) 2001-2003 FhG Fokus
  *
  * This file is part of ser, a free SIP server.
@@ -54,13 +52,13 @@ struct cseq_body{
 /*! \brief
  * Parse CSeq header field
  */
-char* parse_cseq(char *buf, char* end, struct cseq_body* cb);
+char* parse_cseq(char* const buf, const char* const end, struct cseq_body* const cb);
 
 
 /*! \brief
  * Free all associated memory
  */
-void free_cseq(struct cseq_body* cb);
+void free_cseq(struct cseq_body* const cb);
 
 
 #endif

parser/parse_date.c

@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright (c) 2007 iptelorg GmbH
  *
  * This file is part of ser, a free SIP server.

parser/parse_date.h

@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright (c) 2007 iptelorg GmbH
  *
  * This file is part of ser, a free SIP server.

parser/parse_def.h

@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright (C) 2001-2003 FhG Fokus
  *
  * This file is part of ser, a free SIP server.

parser/parse_disposition.c

@@ -1,7 +1,4 @@
 /*
- * $Id$
- *
- *
  * Copyright (C) 2001-2003 FhG Fokus
  *
  * This file is part of ser, a free SIP server.

parser/parse_disposition.h

@@ -1,7 +1,4 @@
 /*
- * $Id$
- *
- *
  * Copyright (C) 2001-2003 FhG Fokus
  *
  * This file is part of ser, a free SIP server.

parser/parse_diversion.c

@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright (C) 2001-2003 FhG Fokus
  *
  * This file is part of ser, a free SIP server.

parser/parse_diversion.h

@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright (C) 2001-2003 FhG Fokus
  *
  * This file is part of ser, a free SIP server.

parser/parse_event.c

@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Event header field body parser.
  *
  * Copyright (C) 2001-2003 FhG Fokus

parser/parse_event.h

@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright (C) 2001-2003 FhG Fokus
  *
  * This file is part of ser, a free SIP server.

parser/parse_expires.c

@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Expires header field body parser
  *
  * Copyright (C) 2001-2003 FhG Fokus

parser/parse_expires.h

@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Expires header field body parser
  *
  * Copyright (C) 2001-2003 FhG Fokus

parser/parse_fline.c

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

parser/parse_fline.h

@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright (C) 2001-2003 FhG Fokus
  *
  * This file is part of ser, a free SIP server.

parser/parse_from.c

@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright (C) 2001-2003 FhG Fokus
  *
  * This file is part of ser, a free SIP server.

parser/parse_from.h

@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright (C) 2001-2003 FhG Fokus
  *
  * This file is part of ser, a free SIP server.

parser/parse_hname2.c

@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Fast 32-bit Header Field Name Parser
  *
  * Copyright (C) 2001-2003 FhG Fokus
@@ -172,27 +170,7 @@ static inline char* skip_ws(char* p, unsigned int size)
 	        return (p + 2);    \
         }
 
-#if 0
-int hdr_update_type(struct hdr_field* hdr)
-{
-	if(hdr==0 || hdr->name.s==0)
-		return -1;
-	switch(hdr->name.len) {
-		case 19:
-			if(strncasecmp(hdr->name.s, "P-Asserted-Identity", 19)==0)
-				hdr->type = HDR_PAI_T;
-		break;
-		case 20:
-			if(strncasecmp(hdr->name.s, "P-Preferred-Identity", 20)==0)
-				hdr->type = HDR_PPI_T;
-		break;
-	}
-
-	return 0;
-}
-#endif
-
-char* parse_hname2(char* begin, char* end, struct hdr_field* hdr)
+char* parse_hname2(char* const begin, const char* const end, struct hdr_field* const hdr)
 {
 	register char* p;
 	register unsigned int val;

parser/parse_hname2.h

@@ -1,6 +1,4 @@
 /* 
- * $Id$ 
- *
  * Fast 32-bit Header Field Name Parser
  *
  * Copyright (C) 2001-2003 FhG Fokus
@@ -37,6 +35,6 @@
 /** Fast 32-bit header field name parser.
  * @file
  */
-char* parse_hname2(char* begin, char* end, struct hdr_field* hdr);
+char* parse_hname2(char* const begin, const char* const end, struct hdr_field* const hdr);
 
 #endif /* PARSE_HNAME2_H */

parser/parse_hostport.c

@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright (C) 2001-2003 FhG Fokus
  *
  * This file is part of ser, a free SIP server.

parser/parse_hostport.h

@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright (C) 2001-2003 FhG Fokus
  *
  * This file is part of ser, a free SIP server.

parser/parse_identity.c

@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright (c) 2007 iptelorg GmbH
  *
  * This file is part of ser, a free SIP server.

parser/parse_identity.h

@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright (c) 2007 iptelorg GmbH
  *
  * This file is part of ser, a free SIP server.

parser/parse_identityinfo.c

@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright (c) 2007 iptelorg GmbH
  *
  * This file is part of ser, a free SIP server.

parser/parse_identityinfo.h

@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright (c) 2007 iptelorg GmbH
  *
  * This file is part of ser, a free SIP server.

parser/parse_methods.c

@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright (c) 2004 Juha Heinanen
  *
  * This file is part of ser, a free SIP server.
@@ -53,7 +51,7 @@ static int token_char(char _c)
  * _must_ contain _only_ the method (without trailing or heading whitespace).
  * \return 0 on success, -1 on error
  */
-int parse_method_name(str* s, enum request_method* method)
+int parse_method_name(const str* const s, enum request_method* const method)
  {
 	if (unlikely(!s || !method)) {
 		LOG(L_ERR, "Invalid parameter value\n");
@@ -172,7 +170,7 @@ int parse_method_name(str* s, enum request_method* method)
   * Parse a method pointed by _next, assign its enum bit to _method, and update
   * _next past the method. Returns 1 if parse succeeded and 0 otherwise.
   */
-static int parse_method_advance(str* _next, enum request_method* _method)
+static int parse_method_advance(str* const _next, enum request_method* const _method)
  {
 	char* end;
 	
@@ -358,7 +356,7 @@ found:
   * Parse comma separated list of methods pointed by _body and assign their
   * enum bits to _methods.  Returns 0 on success and -1 on failure.
   */
- int parse_methods(str* _body, unsigned int* _methods)
+int parse_methods(const str* const _body, unsigned int* const _methods)
  {
  	str next;
  	unsigned int method;

parser/parse_methods.h

@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright (c) 2004 Juha Heinanen
  *
  * This file is part of ser, a free SIP server.
@@ -44,9 +42,9 @@
  * Parse comma separated list of methods pointed by _body and assign their
  * enum bits to _methods.  Returns 1 on success and 0 on failure.
  */
-int parse_methods(str* _body, unsigned int* _methods);
+int parse_methods(const str* const _body, unsigned int* const _methods);
 
-int parse_method_name(str* s, enum request_method* _method);
+int parse_method_name(const str* const s, enum request_method* const method);
 
 
 #endif /* PARSE_METHODS_H */

parser/parse_nameaddr.c

@@ -1,6 +1,4 @@
 /* 
- * $Id$
- *
  * Copyright (C) 2001-2003 FhG Fokus
  *
  * This file is part of ser, a free SIP server.

parser/parse_nameaddr.h

@@ -1,6 +1,4 @@
 /* 
- * $Id$
- *
  * Copyright (C) 2001-2003 FhG Fokus
  *
  * This file is part of ser, a free SIP server.

parser/parse_retry_after.c

@@ -1,6 +1,4 @@
 /* 
- * $Id$ 
- *
  * Copyright (C) 2007 iptelorg GmbH
  *
  * This file is part of ser, a free SIP server.
@@ -39,7 +37,7 @@
 #include "../mem/mem.h"
 
 /*! \brief Parse the Retry-after header field */
-char* parse_retry_after(char *buf, char* end, unsigned* after, int* err)
+char* parse_retry_after(char* const buf, const char* const end, unsigned* const after, int* const err)
 {
 	char *t;
 	int i;

parser/parse_retry_after.h

@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright (C) 2007 iptelorg GmbH
  *
  * This file is part of ser, a free SIP server.
@@ -33,7 +31,7 @@
 
 
 /* Parse Retry-After header field */
-char* parse_retry_after(char *buf, char* end, unsigned* after, int* err);
+char* parse_retry_after(char* const buf, const char* const end, unsigned* const after, int* const err);
 
 
 

parser/parse_rr.c

@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Route & Record-Route header field parser
  *
  * Copyright (C) 2001-2003 FhG Fokus

parser/parse_rr.h

@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Route & Record-Route Parser
  *
  * Copyright (C) 2001-2003 FhG Fokus

parser/parse_sipifmatch.c

@@ -1,3 +1,23 @@
+/*
+ * Copyright (C) 2004 Jamey Hicks, jamey dot hicks at hp dot com
+ *
+ * This file is part of SIP-router, a free SIP server.
+ *
+ * SIP-router 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
+ *
+ * SIP-router 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
+ */
+
 /*! \file
  * \brief Parser :: Parse if-match header
  *

parser/parse_sipifmatch.h

@@ -1,3 +1,23 @@
+/*
+ * Copyright (C) 2004 Jamey Hicks, jamey dot hicks at hp dot com
+ *
+ * This file is part of SIP-router, a free SIP server.
+ *
+ * SIP-router 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
+ *
+ * SIP-router 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
+ */
+
 /*! \file
  * \brief Parser :: Parse if-match header
  *

parser/parse_subscription_state.c

@@ -1,3 +1,23 @@
+/*
+ * Copyright (C) 2006 Vaclav Kubart, vaclav dot kubart at iptel dot org
+ *
+ * This file is part of SIP-router, a free SIP server.
+ *
+ * SIP-router 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
+ *
+ * SIP-router 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
+ */
+
 /*! \file
  * \brief Parser :: Parse subscription-state in NOTIFY
  *

parser/parse_subscription_state.h

@@ -1,3 +1,23 @@
+/*
+ * Copyright (C) 2006 Vaclav Kubart, vaclav dot kubart at iptel dot org
+ *
+ * This file is part of SIP-router, a free SIP server.
+ *
+ * SIP-router 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
+ *
+ * SIP-router 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
+ */
+
 /*! \file
  * \brief Parser :: Parse subscription-state in NOTIFY
  *

parser/parse_to.c

@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright (C) 2001-2003 Fhg Fokus
  *
  * This file is part of ser, a free SIP server.
@@ -70,9 +68,9 @@ enum {
 
 
 
-static /*inline*/ char* parse_to_param(char *buffer, char *end,
-					struct to_body *to_b,
-					int *returned_status)
+static char* parse_to_param(char* const buffer, const char* const end,
+					struct to_body* const to_b,
+					int* const returned_status)
 {
 	struct to_param *param;
 	struct to_param *newparam;
@@ -524,8 +522,7 @@ error:
 
 
 
-
-char* parse_to(char* buffer, char *end, struct to_body *to_b)
+char* parse_to(char* const buffer, const char* const end, struct to_body* const to_b)
 {
 	int status;
 	int saved_status;
@@ -822,7 +819,7 @@ error:
 }
 
 
-void free_to_params(struct to_body* tb)
+void free_to_params(struct to_body* const tb)
 {
 	struct to_param *tp=tb->param_lst;
 	struct to_param *foo;
@@ -834,14 +831,14 @@ void free_to_params(struct to_body* tb)
 }
 
 
-void free_to(struct to_body* tb)
+void free_to(struct to_body* const tb)
 {
 	free_to_params(tb);
 	pkg_free(tb);
 }
 
 
-int parse_to_header(struct sip_msg *msg)
+int parse_to_header(struct sip_msg* const msg)
 {
 	if ( !msg->to && ( parse_headers(msg,HDR_TO_F,0)==-1 || !msg->to)) {
 		ERR("bad msg or missing TO header\n");
@@ -856,7 +853,7 @@ int parse_to_header(struct sip_msg *msg)
 		return -1;
 }
 
-sip_uri_t *parse_to_uri(sip_msg_t *msg)
+sip_uri_t *parse_to_uri(sip_msg_t* const msg)
 {
 	to_body_t *tb = NULL;
 	

parser/parse_to.h

@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright (C) 2001-2003 Fhg Fokus
  *
  * This file is part of ser, a free SIP server.
@@ -65,14 +63,14 @@ typedef struct to_body{
 /*! \brief
  * To header field parser
  */
-char* parse_to(char* buffer, char *end, struct to_body *to_b);
+char* parse_to(char* const buffer, const char* const end, struct to_body* const to_b);
 
-void free_to_params(struct to_body* tb);
+void free_to_params(struct to_body* const tb);
 
-void free_to(struct to_body* tb);
+void free_to(struct to_body* const tb);
 
-int parse_to_header(struct sip_msg *msg);
+int parse_to_header(struct sip_msg* const msg);
 
-sip_uri_t *parse_to_uri(struct sip_msg* msg);
+sip_uri_t *parse_to_uri(struct sip_msg* const msg);
 
 #endif

parser/parse_uri.c

@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright (C) 2001-2003 FhG Fokus
  *
  * This file is part of ser, a free SIP server.

parser/parse_uri.h

@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright (C) 2001-2003 FhG Fokus
  *
  * This file is part of ser, a free SIP server.