@@ -53,7 +53,7 @@ MAIN_NAME=ser

 VERSION = 0

 PATCHLEVEL = 10

 SUBLEVEL =   99

-EXTRAVERSION = -dev0

+EXTRAVERSION = -dev1

 RELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)

 OS = $(shell uname -s | sed -e s/SunOS/solaris/ | tr "[A-Z]" "[a-z]")

new file mode 100644

@@ -0,0 +1,26 @@

+# $Id$

+#

+# parse headers api changes

+#

+# 2004.02.23  created (andrei)

+

+

+Starting with the ser version 0.10.99-dev1, the parse headers api has been slighlty changed. The reason for this change was performance improvement (now gcc can optimze much better all the switches involving header types) and dramatically reducing the memory impact of switching to 64 bits flags.

+

+The header flags (HDR_xxx) have been split into header types (hdr_types_t) and header flags (hdr_flags_t). Instead of the old HDR_xxx use now HDR_xxx_T when the header type is required and HDR_xxx_F or HDR_T2F(HDR_xxx_T) when the corresponding header flag is needed (e.g. in the parse_headers() call).

+

+The hdr_field structure and the parse_headers() function have also been changed. struct hdr_field's type member is now a hdr_types_t instead of an int and the flags parameter of parse_headers is now a hdr_flags_t.

+

+The change affects also the lump types for header operations. For example instead of del_lump( msg, via_offset, via_len, HDR_VIA) use del_lump( msg, via_offset, via_len, HDR_VIA_T).

+

+WARNING: don't use a header type (HDR_xxx_T) where a header flag (HDR_xxx_F) is expected or viceversa!

+

+Examples:

+

+An old call to parse_headers(msg, HDR_FOO, 0) will become parse_header(msg, HDR_FOO_F, 0).

+

+An old loop searching for a header field:

+	while(hdr && (hdr->type!=HDR_FOO)) hdr=hdr->next;

+will become:

+	while (hdr && (hdr->type!=HDR_FOO_T)) hdr=hdr->next;

+.

@@ -463,7 +463,7 @@ int forward_reply(struct sip_msg* msg)

 	}

 	/* we have to forward the reply stateless, so we need second via -bogdan*/

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

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

 		|| (msg->via2==0) || (msg->via2->error!=PARSE_OK))

 	{

 		/* no second via => error */

@@ -313,7 +313,7 @@ static inline int get_route_set(struct sip_msg* _m, rr_t** _rs, unsigned char _o

 	ptr = _m->record_route;

 	while(ptr) {

-		if (ptr->type == HDR_RECORDROUTE) {

+		if (ptr->type == HDR_RECORDROUTE_T) {

 			if (parse_rr(ptr) < 0) {

 				LOG(L_ERR, "get_route_set(): Error while parsing Record-Route body\n");

 				goto error;

@@ -358,7 +358,7 @@ static inline int response2dlg(struct sip_msg* _m, dlg_t* _d)

 	str contact, rtag;

 	     /* Parse the whole message, we will need all Record-Route headers */

-	if (parse_headers(_m, HDR_EOH, 0) == -1) {

+	if (parse_headers(_m, HDR_EOH_F, 0) == -1) {

 		LOG(L_ERR, "response2dlg(): Error while parsing headers\n");

 		return -1;

 	}

@@ -478,7 +478,7 @@ static inline int dlg_early_resp_uac(dlg_t* _d, struct sip_msg* _m)

  */

 static inline int get_cseq_method(struct sip_msg* _m, str* _method)

 {

-	if (!_m->cseq && ((parse_headers(_m, HDR_CSEQ, 0) == -1) || !_m->cseq)) {

+	if (!_m->cseq && ((parse_headers(_m, HDR_CSEQ_F, 0) == -1) || !_m->cseq)) {

 		LOG(L_ERR, "get_cseq_method(): Error while parsing CSeq\n");

 		return -1;

 	}

@@ -526,7 +526,7 @@ static inline int dlg_confirmed_resp_uac(dlg_t* _d, struct sip_msg* _m)

 	if (get_cseq_method(_m, &method) < 0) return -1;

 	if ((method.len == 6) && !memcmp("INVITE", method.s, 6)) {

 		     /* Get contact if any and update remote target */

-		if (parse_headers(_m, HDR_CONTACT, 0) == -1) {

+		if (parse_headers(_m, HDR_CONTACT_F, 0) == -1) {

 			LOG(L_ERR, "dlg_confirmed_resp_uac(): Error while parsing headers\n");

 			return -2;

 		}

@@ -674,7 +674,7 @@ static inline int request2dlg(struct sip_msg* _m, dlg_t* _d)

 {

 	str contact, rtag, callid;

-	if (parse_headers(_m, HDR_EOH, 0) == -1) {

+	if (parse_headers(_m, HDR_EOH_F, 0) == -1) {

 		LOG(L_ERR, "request2dlg(): Error while parsing headers");

 		return -1;

 	}

@@ -789,7 +789,7 @@ int dlg_request_uas(dlg_t* _d, struct sip_msg* _m)

 	     /* We must check if the request is not out of order or retransmission

 	      * first, if so then we will not update anything

 	      */

-	if (parse_headers(_m, HDR_CSEQ, 0) == -1) {

+	if (parse_headers(_m, HDR_CSEQ_F, 0) == -1) {

 		LOG(L_ERR, "dlg_request_uas(): Error while parsing headers\n");

 		return -2;

 	}

@@ -805,7 +805,7 @@ int dlg_request_uas(dlg_t* _d, struct sip_msg* _m)

 	      */

 	if (_m->first_line.u.request.method_value == METHOD_INVITE) {

 		     /* target refresher */

-		if (parse_headers(_m, HDR_CONTACT, 0) == -1) {

+		if (parse_headers(_m, HDR_CONTACT_F, 0) == -1) {

 			LOG(L_ERR, "dlg_request_uas(): Error while parsing headers\n");

 			return -4;

 		}

@@ -66,7 +66,7 @@ inline static void free_via_clen_lump( struct lump **list )

 	prev_lump=0;

 	for(lump=*list;lump;lump=next) {

 		next=lump->next;

-		if (lump->type==HDR_VIA||lump->type==HDR_CONTENTLENGTH) {

+		if (lump->type==HDR_VIA_T||lump->type==HDR_CONTENTLENGTH_T) {

 			a=lump->before;

 			while(a) {

 				foo=a; a=a->before;

@@ -293,7 +293,7 @@ struct sip_msg*  sip_msg_cloner( struct sip_msg *org_msg, int *sip_msg_len )

 		len += ROUND4(sizeof( struct hdr_field));

 		switch (hdr->type)

 		{

-			case HDR_VIA:

+			case HDR_VIA_T:

 				for (via=(struct via_body*)hdr->parsed;via;via=via->next)

 				{

 					len+=ROUND4(sizeof(struct via_body));

@@ -303,8 +303,8 @@ struct sip_msg*  sip_msg_cloner( struct sip_msg *org_msg, int *sip_msg_len )

 				}

 				break;

-			case HDR_TO:

-			case HDR_FROM:

+			case HDR_TO_T:

+			case HDR_FROM_T:

 				/* From header might be unparsed */

 				if (hdr->parsed) {

 					len+=ROUND4(sizeof(struct to_body));

@@ -315,43 +315,42 @@ struct sip_msg*  sip_msg_cloner( struct sip_msg *org_msg, int *sip_msg_len )

 				}

 				break;

-			case HDR_CSEQ:

+			case HDR_CSEQ_T:

 				len+=ROUND4(sizeof(struct cseq_body));

 				break;

-			case HDR_AUTHORIZATION:

-			case HDR_PROXYAUTH:

+			case HDR_AUTHORIZATION_T:

+			case HDR_PROXYAUTH_T:

 				if (hdr->parsed) {

 					len += ROUND4(AUTH_BODY_SIZE);

 				}

 				break;

-			case HDR_CALLID:

-			case HDR_CONTACT:

-			case HDR_MAXFORWARDS:

-			case HDR_ROUTE:

-			case HDR_RECORDROUTE:

-			case HDR_CONTENTTYPE:

-			case HDR_CONTENTLENGTH:

-			case HDR_EXPIRES:

-			case HDR_SUPPORTED:

-			case HDR_PROXYREQUIRE:

-			case HDR_UNSUPPORTED:

-			case HDR_ALLOW:

-			case HDR_EVENT:

-			case HDR_ACCEPT:

-			case HDR_ACCEPTLANGUAGE:

-			case HDR_ORGANIZATION:

-			case HDR_PRIORITY:

-			case HDR_SUBJECT:

-			case HDR_USERAGENT:

-			case HDR_ACCEPTDISPOSITION:

-			case HDR_CONTENTDISPOSITION:

-		        case HDR_DIVERSION:

-		        case HDR_RPID:

-		        case HDR_REFER_TO:

-

+			case HDR_CALLID_T:

+			case HDR_CONTACT_T:

+			case HDR_MAXFORWARDS_T:

+			case HDR_ROUTE_T:

+			case HDR_RECORDROUTE_T:

+			case HDR_CONTENTTYPE_T:

+			case HDR_CONTENTLENGTH_T:

+			case HDR_EXPIRES_T:

+			case HDR_SUPPORTED_T:

+			case HDR_PROXYREQUIRE_T:

+			case HDR_UNSUPPORTED_T:

+			case HDR_ALLOW_T:

+			case HDR_EVENT_T:

+			case HDR_ACCEPT_T:

+			case HDR_ACCEPTLANGUAGE_T:

+			case HDR_ORGANIZATION_T:

+			case HDR_PRIORITY_T:

+			case HDR_SUBJECT_T:

+			case HDR_USERAGENT_T:

+			case HDR_ACCEPTDISPOSITION_T:

+			case HDR_CONTENTDISPOSITION_T:

+			case HDR_DIVERSION_T:

+			case HDR_RPID_T:

+			case HDR_REFER_TO_T:

 				/* we ignore them for now even if they have something parsed*/

 				break;

@@ -477,7 +476,7 @@ do { \

 		switch (hdr->type)

 		{

-			case HDR_VIA:

+			case HDR_VIA_T:

 				/*fprintf(stderr,"prepare to clone via |%.*s|\n",

 					via_len((struct via_body*)hdr->parsed),

 					via_s((struct via_body*)hdr->parsed,org_msg));*/

@@ -511,7 +510,7 @@ do { \

 						(struct via_body*)hdr->parsed , &p);

 				}

 				break;

-			case HDR_CSEQ:

+			case HDR_CSEQ_T:

 				new_hdr->parsed = p;

 				p +=ROUND4(sizeof(struct cseq_body));

 				memcpy(new_hdr->parsed, hdr->parsed, sizeof(struct cseq_body));

@@ -523,9 +522,9 @@ do { \

 					((struct cseq_body*)hdr->parsed)->method.s );

 				new_msg->cseq = new_hdr;

 				break;

-			case HDR_TO:

-			case HDR_FROM:

-				if (hdr->type == HDR_TO) {

+			case HDR_TO_T:

+			case HDR_FROM_T:

+				if (hdr->type == HDR_TO_T) {

 					new_msg->to = new_hdr;

 				} else {

 					new_msg->from = new_hdr;

@@ -570,85 +569,88 @@ do { \

 						= new_to_prm;

 				}

 				break;

-			case HDR_CALLID:

+			case HDR_CALLID_T:

 				new_msg->callid = new_hdr;

 				break;

-			case HDR_CONTACT:

+			case HDR_CONTACT_T:

 				new_msg->contact = new_hdr;

 				break;

-			case HDR_MAXFORWARDS :

+			case HDR_MAXFORWARDS_T:

 				new_msg->maxforwards = new_hdr;

 				break;

-			case HDR_ROUTE :

+			case HDR_ROUTE_T:

 				new_msg->route = new_hdr;

 				break;

-			case HDR_RECORDROUTE :

+			case HDR_RECORDROUTE_T:

 				new_msg->record_route = new_hdr;

 				break;

-			case HDR_CONTENTTYPE :

+			case HDR_CONTENTTYPE_T:

 				new_msg->content_type = new_hdr;

 				new_msg->content_type->parsed = hdr->parsed;

 				break;

-			case HDR_CONTENTLENGTH :

+			case HDR_CONTENTLENGTH_T:

 				new_msg->content_length = new_hdr;

 				new_msg->content_length->parsed = hdr->parsed;

 				break;

-			case HDR_AUTHORIZATION :

+			case HDR_AUTHORIZATION_T:

 				new_msg->authorization = new_hdr;

 				if (hdr->parsed) {

 					new_hdr->parsed = auth_body_cloner(new_msg->buf ,

 						org_msg->buf , (struct auth_body*)hdr->parsed , &p);

 				}

 				break;

-			case HDR_EXPIRES :

+			case HDR_EXPIRES_T:

 				new_msg->expires = new_hdr;

 				break;

-			case HDR_PROXYAUTH :

+			case HDR_PROXYAUTH_T:

 				new_msg->proxy_auth = new_hdr;

 				if (hdr->parsed) {

 					new_hdr->parsed = auth_body_cloner(new_msg->buf ,

 						org_msg->buf , (struct auth_body*)hdr->parsed , &p);

 				}

 				break;

-			case HDR_SUPPORTED :

+			case HDR_SUPPORTED_T:

 				new_msg->supported = new_hdr;

 				break;

-			case HDR_PROXYREQUIRE :

+			case HDR_PROXYREQUIRE_T:

 				new_msg->proxy_require = new_hdr;

 				break;

-			case HDR_UNSUPPORTED :

+			case HDR_UNSUPPORTED_T:

 				new_msg->unsupported = new_hdr;

 				break;

-			case HDR_ALLOW :

+			case HDR_ALLOW_T:

 				new_msg->allow = new_hdr;	

 				break;

-			case HDR_EVENT:

+			case HDR_EVENT_T:

 				new_msg->event = new_hdr;

 				break;

-			case HDR_ACCEPT:

+			case HDR_ACCEPT_T:

 				new_msg->accept = new_hdr;

 				break;

-			case HDR_ACCEPTLANGUAGE:

+			case HDR_ACCEPTLANGUAGE_T:

 				new_msg->accept_language = new_hdr;

 				break;

-			case HDR_ORGANIZATION:

+			case HDR_ORGANIZATION_T:

 				new_msg->organization = new_hdr;

 				break;

-			case HDR_PRIORITY:

+			case HDR_PRIORITY_T:

 				new_msg->priority = new_hdr;

 				break;

-			case HDR_SUBJECT:

+			case HDR_SUBJECT_T:

 				new_msg->subject = new_hdr;

 				break;

-			case HDR_USERAGENT:

+			case HDR_USERAGENT_T:

 				new_msg->user_agent = new_hdr;

 				break;

-			case HDR_ACCEPTDISPOSITION:

+			case HDR_ACCEPTDISPOSITION_T:

 				new_msg->accept_disposition = new_hdr;

 				break;

-			case HDR_CONTENTDISPOSITION:

+			case HDR_CONTENTDISPOSITION_T:

 				new_msg->content_disposition = new_hdr;

 				break;

+			default:

+				/* ignore the rest*/

+				;

 		}/*switch*/

 		if ( last_hdr )

@@ -354,7 +354,7 @@ int parse_tw_append( modparam_t type, void* val)

 			}

 			foo.s[foo.len] = bar;

 			ha->ival = hdr.type;

-			if (hdr.type==HDR_OTHER || ha->title.s==0) {

+			if (hdr.type==HDR_OTHER_T || ha->title.s==0) {

 				/* duplicate hdr name */

 				ha->sval.s = (char*)pkg_malloc(foo.len+1);

 				if (ha->sval.s==0) {

@@ -615,14 +615,14 @@ static inline char* append2buf( char *buf, int len, struct sip_msg *req,

 		} else if (ha->type==ELEM_IS_HDR) {

 			/* parse the HDRs */

 			if (!msg_parsed) {

-				if (parse_headers( req, HDR_EOH, 0)!=0) {

+				if (parse_headers( req, HDR_EOH_F, 0)!=0) {

 					LOG(L_ERR,"ERROR:tm:append2buf: parsing hdrs failed\n");

 					goto error;

 				}

 				msg_parsed = 1;

 			}

 			/* search the HDR */

-			if (ha->ival==HDR_OTHER) {

+			if (ha->ival==HDR_OTHER_T) {

 				for(hdr=req->headers;hdr;hdr=hdr->next)

 					if (ha->sval.len==hdr->name.len &&

 					strncasecmp( ha->sval.s, hdr->name.s, hdr->name.len)==0)

@@ -680,7 +680,7 @@ static int assemble_msg(struct sip_msg* msg, struct tw_info *twi)

 	}

 	/* parse all -- we will need every header field for a UAS */

-	if ( parse_headers(msg, HDR_EOH, 0)==-1) {

+	if ( parse_headers(msg, HDR_EOH_F, 0)==-1) {

 		LOG(L_ERR,"assemble_msg: parse_headers failed\n");

 		goto error;

 	}

@@ -770,7 +770,7 @@ static int assemble_msg(struct sip_msg* msg, struct tw_info *twi)

 		}

 		for(p_hdr = p_hdr->next;p_hdr;p_hdr = p_hdr->next) {

 			/* filter out non-RR hdr and empty hdrs */

-			if( (p_hdr->type!=HDR_RECORDROUTE) || p_hdr->body.len==0)

+			if( (p_hdr->type!=HDR_RECORDROUTE_T) || p_hdr->body.len==0)

 				continue;

 			if(p_hdr->parsed==0 && parse_rr(p_hdr)!=0 ){

@@ -63,10 +63,10 @@

 /* fr_timer AVP specs */

 static int     fr_timer_avp_type = 0;

-static int_str fr_timer_avp = (int_str)0;

+static int_str fr_timer_avp = {0};

 static str     fr_timer_str;

 static int     fr_inv_timer_avp_type = 0;

-static int_str fr_inv_timer_avp = (int_str)0;

+static int_str fr_inv_timer_avp = {0};

 static str     fr_inv_timer_str;

@@ -163,7 +163,7 @@ void init_t() {global_msg_id=0; set_t(T_UNDEFINED);}

 static inline int parse_dlg( struct sip_msg *msg )

 {

-	if (parse_headers(msg, HDR_FROM | HDR_CSEQ | HDR_TO, 0)==-1) {

+	if (parse_headers(msg, HDR_FROM_F | HDR_CSEQ_F | HDR_TO_F, 0)==-1) {

 		LOG(L_ERR, "ERROR: parse_dlg: From or Cseq or To invalid\n");

 		return 0;

 	}

@@ -800,7 +800,7 @@ int t_reply_matching( struct sip_msg *p_msg , int *p_branch )

 				has_tran_tmcbs(p_cell,TMCB_RESPONSE_OUT|TMCB_E2EACK_IN) )

 			|| (is_local(p_cell)&&has_tran_tmcbs(p_cell,TMCB_LOCAL_COMPLETED))

 		)) {

-			if (parse_headers(p_msg, HDR_TO, 0)==-1) {

+			if (parse_headers(p_msg, HDR_TO_F, 0)==-1) {

 				LOG(L_ERR, "ERROR: t_reply_matching: to parsing failed\n");

 			}

 		}

@@ -845,7 +845,7 @@ int t_check( struct sip_msg* p_msg , int *param_branch )

 		/* transaction lookup */

 		if ( p_msg->first_line.type==SIP_REQUEST ) {

 			/* force parsing all the needed headers*/

-			if (parse_headers(p_msg, HDR_EOH, 0 )==-1) {

+			if (parse_headers(p_msg, HDR_EOH_F, 0 )==-1) {

 				LOG(L_ERR, "ERROR: t_check: parsing error\n");

 				return -1;

 			}

@@ -864,7 +864,7 @@ int t_check( struct sip_msg* p_msg , int *param_branch )

 			/* we need Via for branch and Cseq method to distinguish

 			   replies with the same branch/cseqNr (CANCEL)

 			*/

-			if ( parse_headers(p_msg, HDR_VIA1|HDR_CSEQ, 0 )==-1

+			if ( parse_headers(p_msg, HDR_VIA1_F|HDR_CSEQ_F, 0 )==-1

 			|| !p_msg->via1 || !p_msg->cseq ) {

 				LOG(L_ERR, "ERROR: reply cannot be parsed\n");

 				return -1;

@@ -875,7 +875,7 @@ int t_check( struct sip_msg* p_msg , int *param_branch )

 			*/

             if ( get_cseq(p_msg)->method.len==INVITE_LEN 

 				&& memcmp( get_cseq(p_msg)->method.s, INVITE, INVITE_LEN )==0 ) {

-					if (parse_headers(p_msg, HDR_TO, 0)==-1

+					if (parse_headers(p_msg, HDR_TO_F, 0)==-1

 						|| !p_msg->to)  {

 						LOG(L_ERR, "ERROR: INVITE reply cannot be parsed\n");

 						return -1;

@@ -1038,11 +1038,11 @@ int t_newtran( struct sip_msg* p_msg )

 	   shmem with pkg_mem

 	*/

-	if (parse_headers(p_msg, HDR_EOH, 0 )) {

+	if (parse_headers(p_msg, HDR_EOH_F, 0 )) {

 		LOG(L_ERR, "ERROR: t_newtran: parse_headers failed\n");

 		return E_BAD_REQ;

 	}

-	if ((p_msg->parsed_flag & HDR_EOH)!=HDR_EOH) {

+	if ((p_msg->parsed_flag & HDR_EOH_F)!=HDR_EOH_F) {

 			LOG(L_ERR, "ERROR: t_newtran: EoH not parsed\n");

 			return E_OUT_OF_MEM;

 	}

@@ -126,7 +126,7 @@ char *build_local(struct cell *Trans,unsigned int branch,

 	/* copy'n'paste Route headers */

 	if (!is_local(Trans)) {

 		for ( hdr=Trans->uas.request->headers ; hdr ; hdr=hdr->next )

-			 if (hdr->type==HDR_ROUTE)

+			 if (hdr->type==HDR_ROUTE_T)

 				*len+=hdr->len;

 	}

@@ -165,7 +165,7 @@ char *build_local(struct cell *Trans,unsigned int branch,

 	if (!is_local(Trans))  {

 		for ( hdr=Trans->uas.request->headers ; hdr ; hdr=hdr->next )

-			if(hdr->type==HDR_ROUTE) {

+			if(hdr->type==HDR_ROUTE_T) {

 				append_mem_block(p, hdr->name.s, hdr->len );

 			}

 	}

@@ -216,7 +216,7 @@ static inline int process_routeset(struct sip_msg* msg, str* contact, struct rte

 	ptr = msg->record_route;

 	head = 0;

 	while(ptr) {

-		if (ptr->type == HDR_RECORDROUTE) {

+		if (ptr->type == HDR_RECORDROUTE_T) {

 			if (parse_rr(ptr) < 0) {

 				LOG(L_ERR, "process_routeset: Error while parsing Record-Route header\n");

 				return -1;

@@ -179,7 +179,7 @@ int unmatched_totag(struct cell *t, struct sip_msg *ack)

 	struct totag_elem *i;

 	str *tag;

-	if (parse_headers(ack, HDR_TO,0)==-1 || 

+	if (parse_headers(ack, HDR_TO_F,0)==-1 || 

 				!ack->to ) {

 		LOG(L_ERR, "ERROR: unmatched_totag: To invalid\n");

 		return 1;

@@ -273,7 +273,7 @@ static char *build_ack(struct sip_msg* rpl,struct cell *trans,int branch,

 {

 	str to;

-    if (parse_headers(rpl,HDR_TO, 0)==-1 || !rpl->to ) {

+    if (parse_headers(rpl,HDR_TO_F, 0)==-1 || !rpl->to ) {

         LOG(L_ERR, "ERROR: build_ack: "

             "cannot generate a HBH ACK if key HFs in reply missing\n");

         return NULL;

@@ -294,7 +294,7 @@ static char *build_local_ack(struct sip_msg* rpl, struct cell *trans, int branch

 			     unsigned int *ret_len, str* next_hop)

 {

 	str to;

-	if (parse_headers(rpl, HDR_EOH, 0) == -1 || !rpl->to) {

+	if (parse_headers(rpl, HDR_EOH_F, 0) == -1 || !rpl->to) {

 		LOG(L_ERR, "ERROR: build_local_ack: Error while parsing headers\n");

 		return 0;

 	}

@@ -65,10 +65,10 @@ struct str_list {

 #define skip_hf(_hf) (             \

-    ((_hf)->type == HDR_FROM)   || \

-    ((_hf)->type == HDR_TO)     || \

-    ((_hf)->type == HDR_CALLID) || \

-    ((_hf)->type == HDR_CSEQ)      \

+    ((_hf)->type == HDR_FROM_T)   || \

+    ((_hf)->type == HDR_TO_T)     || \

+    ((_hf)->type == HDR_CALLID_T) || \

+    ((_hf)->type == HDR_CSEQ_T)      \

 )

@@ -595,7 +595,7 @@ int fifo_uac(FILE *stream, char *response_file)

 	memset(&faked_msg, 0, sizeof(struct sip_msg));

 	faked_msg.len = headers.len; 

 	faked_msg.buf = faked_msg.unparsed = headers.s;

-	if (parse_headers(&faked_msg, HDR_EOH, 0) == -1 ) {

+	if (parse_headers(&faked_msg, HDR_EOH_F, 0) == -1 ) {

 		DBG("DEBUG: fifo_uac: parse_headers failed\n");

 		fifo_uac_error(response_file, 400, "HFs unparseable");

 		goto error;

@@ -52,10 +52,10 @@ struct str_list {

 #define skip_hf(_hf) (             \

-    ((_hf)->type == HDR_FROM)   || \

-    ((_hf)->type == HDR_TO)     || \

-    ((_hf)->type == HDR_CALLID) || \

-    ((_hf)->type == HDR_CSEQ)      \

+    ((_hf)->type == HDR_FROM_T)   || \

+    ((_hf)->type == HDR_TO_T)     || \

+    ((_hf)->type == HDR_CALLID_T) || \

+    ((_hf)->type == HDR_CSEQ_T)      \

 )

@@ -504,7 +504,7 @@ int unixsock_uac(str* msg)

 	memset(&faked_msg, 0, sizeof(struct sip_msg));

 	faked_msg.len = headers.len; 

 	faked_msg.buf = faked_msg.unparsed = headers.s;

-	if (parse_headers(&faked_msg, HDR_EOH, 0) == -1 ) {

+	if (parse_headers(&faked_msg, HDR_EOH_F, 0) == -1 ) {

 		unixsock_reply_asciiz("400 HFs unparsable\n");

 		unixsock_reply_send();

 		goto error;

@@ -288,7 +288,8 @@ static char * warning_builder( struct sip_msg *msg, unsigned int *returned_len)

 	str_pair_print(" in_uri=", msg->first_line.u.request.uri.s,

 								msg->first_line.u.request.uri.len);

 	str_pair_print(" out_uri=", foo->s, foo->len);

-	str_pair_print(" via_cnt", msg->parsed_flag & HDR_EOH ? "=" : ">", 1);

+	str_pair_print(" via_cnt",

+					(msg->parsed_flag & HDR_EOH_F)==HDR_EOH_F ? "=" : ">", 1);

 	str_int_print("=", via_cnt);

 	if (clen<MAX_WARNING_LEN){ buf[clen]='"'; clen++; }

 	else goto error_overflow;

@@ -1208,7 +1209,7 @@ static inline int adjust_clen(struct sip_msg* msg, int body_delta, int proto)

 	    || proto == PROTO_TLS

 #endif

 	    ) {

-		if (parse_headers(msg, HDR_CONTENTLENGTH, 0)==-1){

+		if (parse_headers(msg, HDR_CONTENTLENGTH_F, 0)==-1){

 			LOG(L_ERR, "adjust_clen: error parsing content-length\n");

 			goto error;

 		}

@@ -1218,7 +1219,7 @@ static inline int adjust_clen(struct sip_msg* msg, int body_delta, int proto)

 			 * - whole message was parsed by the above parse_headers

 			 *   which did not find content-length */

 			anchor=anchor_lump(msg, msg->unparsed-msg->buf, 0,

-												HDR_CONTENTLENGTH);

+												HDR_CONTENTLENGTH_T);

 			if (anchor==0){

 				LOG(L_ERR, "adjust_clen: cannot set clen anchor\n");

 				goto error;

@@ -1229,7 +1230,7 @@ static inline int adjust_clen(struct sip_msg* msg, int body_delta, int proto)

 	if ((anchor==0) && body_delta){

-		if (parse_headers(msg, HDR_CONTENTLENGTH, 0) == -1) {

+		if (parse_headers(msg, HDR_CONTENTLENGTH_F, 0) == -1) {

 			LOG(L_ERR, "adjust_clen: Error parsing Content-Length\n");

 			goto error;

 		}

@@ -1246,7 +1247,7 @@ static inline int adjust_clen(struct sip_msg* msg, int body_delta, int proto)

 			 *   which did not find content-length */

 			if (proto!=PROTO_UDP){

 				anchor=anchor_lump(msg, msg->unparsed-msg->buf, 0,

-													HDR_CONTENTLENGTH);

+													HDR_CONTENTLENGTH_T);

 				if (anchor==0){

 					LOG(L_ERR, "adjust_clen: cannot set clen anchor\n");

 					goto error;

@@ -1257,7 +1258,7 @@ static inline int adjust_clen(struct sip_msg* msg, int body_delta, int proto)

 		}else{

 			/* Content-Length has been found, remove it */

 			anchor = del_lump(	msg, msg->content_length->name.s - msg->buf,

-								msg->content_length->len, HDR_CONTENTLENGTH);

+								msg->content_length->len, HDR_CONTENTLENGTH_T);

 			if (anchor==0) {

 				LOG(L_ERR, "adjust_clen: Can't remove original"

 							" Content-Length\n");

@@ -1270,7 +1271,7 @@ static inline int adjust_clen(struct sip_msg* msg, int body_delta, int proto)

 		clen_buf = clen_builder(msg, &clen_len, body_delta);

 		if (!clen_buf) goto error;

 		if (insert_new_lump_after(anchor, clen_buf, clen_len,

-					HDR_CONTENTLENGTH) == 0)

+					HDR_CONTENTLENGTH_T) == 0)

 			goto error;

 	}

@@ -1384,9 +1385,9 @@ char * build_req_buf_from_sip_req( struct sip_msg* msg,

 	/* add via header to the list */

 	/* try to add it before msg. 1st via */

 	/* add first via, as an anchor for second via*/

-	anchor=anchor_lump(msg, msg->via1->hdr.s-buf, 0, HDR_VIA);

+	anchor=anchor_lump(msg, msg->via1->hdr.s-buf, 0, HDR_VIA_T);

 	if (anchor==0) goto error01;

-	if (insert_new_lump_before(anchor, line_buf, via_len, HDR_VIA)==0)

+	if (insert_new_lump_before(anchor, line_buf, via_len, HDR_VIA_T)==0)

 		goto error01;

 	/* find out where the offset of the first parameter that should be added

 	 * (after host:port), needed by add receive & maybe rport */

@@ -1412,29 +1413,29 @@ char * build_req_buf_from_sip_req( struct sip_msg* msg,

 		if (msg->via1->received){ /* received already present => overwrite it*/

 			via_insert_param=del_lump(msg,

 								msg->via1->received->start-buf-1, /*;*/

-								msg->via1->received->size+1, /*;*/ HDR_VIA);

+								msg->via1->received->size+1, /*;*/ HDR_VIA_T);

 		}else if (via_insert_param==0){ /* receive not present, ok */

-			via_insert_param=anchor_lump(msg,

-										msg->via1->hdr.s-buf+size,0, HDR_VIA);

+			via_insert_param=anchor_lump(msg, msg->via1->hdr.s-buf+size, 0,

+											HDR_VIA_T);

 		}

 		if (via_insert_param==0) goto error02; /* free received_buf */

 		if (insert_new_lump_after(via_insert_param, received_buf, received_len,

-					HDR_VIA) ==0 ) goto error02; /* free received_buf */

+					HDR_VIA_T) ==0 ) goto error02; /* free received_buf */

 	}

 	/* if rport needs to be updated, delete it if present and add it's value */

 	if (rport_len){

 		if (msg->via1->rport){ /* rport already present */

 			via_insert_param=del_lump(msg,

 								msg->via1->rport->start-buf-1, /*';'*/

-								msg->via1->rport->size+1 /* ; */, HDR_VIA);

+								msg->via1->rport->size+1 /* ; */, HDR_VIA_T);

 		}else if (via_insert_param==0){ /*force rport, no rport present */

 			/* no rport, add it */

-			via_insert_param=anchor_lump(msg,

-										msg->via1->hdr.s-buf+size,0, HDR_VIA);

+			via_insert_param=anchor_lump(msg, msg->via1->hdr.s-buf+size, 0,

+											HDR_VIA_T);

 		}

 		if (via_insert_param==0) goto error03; /* free rport_buf */

 		if (insert_new_lump_after(via_insert_param, rport_buf, rport_len,

-									HDR_VIA) ==0 )

+									HDR_VIA_T) ==0 )

 			goto error03; /* free rport_buf */

 	}

@@ -1540,7 +1541,7 @@ char * build_res_buf_from_sip_res( struct sip_msg* msg,

 	}

 	/* remove the first via*/

-	if (del_lump( msg, via_offset, via_len, HDR_VIA)==0){

+	if (del_lump( msg, via_offset, via_len, HDR_VIA_T)==0){

 		LOG(L_ERR, "build_res_buf_from_sip_res: error trying to remove first"

 					"via\n");

 		goto error;

@@ -1610,7 +1611,7 @@ char * build_res_buf_from_sip_req( unsigned int code, char *text ,str *new_tag,

 	Via's in the reply and they may be scattered down to the

 	end of header (non-block Vias are a really poor property

 	of SIP :( ) */

-	if (parse_headers( msg, HDR_EOH, 0 )==-1) {

+	if (parse_headers( msg, HDR_EOH_F, 0 )==-1) {

 		LOG(L_ERR, "ERROR: build_res_buf_from_sip_req: "

 			"alas, parse_headers failed\n");

 		goto error00;

@@ -1645,7 +1646,7 @@ char * build_res_buf_from_sip_req( unsigned int code, char *text ,str *new_tag,

 	/*headers that will be copied (TO, FROM, CSEQ,CALLID,VIA)*/

 	for ( hdr=msg->headers ; hdr ; hdr=hdr->next ) {

 		switch (hdr->type) {

-			case HDR_TO:

+			case HDR_TO_T:

 				if (new_tag && new_tag->len) {

 					to_tag=get_to(msg)->tag_value;

 					if (to_tag.len )

@@ -1655,20 +1656,24 @@ char * build_res_buf_from_sip_req( unsigned int code, char *text ,str *new_tag,

 				}

 				len += hdr->len;

 				break;

-			case HDR_VIA:

+			case HDR_VIA_T:

 				/* we always add CRLF to via*/

 				len+=(hdr->body.s+hdr->body.len)-hdr->name.s+CRLF_LEN;

 				if (hdr==msg->h_via1) len += received_len+rport_len;

 				break;

-			case HDR_RECORDROUTE:

+			case HDR_RECORDROUTE_T:

 				/* RR only for 1xx and 2xx replies */

 				if (code<180 || code>=300)

 					break;

-			case HDR_FROM:

-			case HDR_CALLID:

-			case HDR_CSEQ:

+			case HDR_FROM_T:

+			case HDR_CALLID_T:

+			case HDR_CSEQ_T:

 				/* we keep the original termination for these headers*/

 				len += hdr->len;

+				break;

+			default:

+				/* do nothing, we are interested only in the above headers */

+				;

 		}

 	}

 	/* lumps length */

@@ -1724,7 +1729,7 @@ char * build_res_buf_from_sip_req( unsigned int code, char *text ,str *new_tag,

 	for ( hdr=msg->headers ; hdr ; hdr=hdr->next ) {

 		switch (hdr->type)

 		{

-			case HDR_VIA:

+			case HDR_VIA_T:

 				if (hdr==msg->h_via1){

 					if (rport_buf){

 						if (msg->via1->rport){ /* delete the old one */

@@ -1759,12 +1764,12 @@ char * build_res_buf_from_sip_req( unsigned int code, char *text ,str *new_tag,

 				}

 				append_str( p, CRLF,CRLF_LEN);

 				break;

-			case HDR_RECORDROUTE:

+			case HDR_RECORDROUTE_T:

 				/* RR only for 1xx and 2xx replies */

 				if (code<180 || code>=300) break;

 				append_str(p, hdr->name.s, hdr->len);

 				break;

-			case HDR_TO:

+			case HDR_TO_T:

 				if (new_tag && new_tag->len){

 					if (to_tag.s ) { /* replacement */

 						/* before to-tag */

@@ -1794,10 +1799,14 @@ char * build_res_buf_from_sip_req( unsigned int code, char *text ,str *new_tag,

 					bmark->to_tag_val.len=

 							((struct to_body*)(hdr->parsed))->tag_value.len;

 				};

-			case HDR_FROM:

-			case HDR_CALLID:

-			case HDR_CSEQ:

+			case HDR_FROM_T:

+			case HDR_CALLID_T:

+			case HDR_CSEQ_T:

 					append_str(p, hdr->name.s, hdr->len);

+					break;

+			default:

+				/* do nothing, we are interested only in the above headers */

+				;

 		} /* end switch */

 	} /* end for */

 	/* lumps */

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

 #define age_CASE                                \

         switch(LOWER_DWORD(val)) {              \

         case _age1_:                            \

-	        hdr->type = HDR_ACCEPTLANGUAGE; \

+	        hdr->type = HDR_ACCEPTLANGUAGE_T; \

 	        hdr->name.len = 15;             \

 	        return (p + 4);                 \

                                                 \

         case _age2_:                            \

-                hdr->type = HDR_ACCEPTLANGUAGE; \

+                hdr->type = HDR_ACCEPTLANGUAGE_T; \

                 p += 4;                         \

 	        goto dc_end;                    \

         }

@@ -59,7 +59,7 @@

         if (LOWER_BYTE(*p) == 'o') {                       \

                 p++;                                       \

                 if (LOWER_BYTE(*p) == 'n') {               \

-                        hdr->type = HDR_ACCEPTDISPOSITION; \

+                        hdr->type = HDR_ACCEPTDISPOSITION_T; \

                         p++;                               \

                         goto dc_end;                       \

                 }                                          \

@@ -110,7 +110,7 @@

     if (LOWER_BYTE(*p) == 'p') {            \

             p++;                            \

             if (LOWER_BYTE(*p) == 't') {    \

-                    hdr->type = HDR_ACCEPT; \

+                    hdr->type = HDR_ACCEPT_T; \

                     p++;                    \

                     goto dc_end;            \

             }                               \

@@ -34,7 +34,7 @@

 #define allo_CASE                  \

     p += 4;                        \

     if (LOWER_BYTE(*p) == 'w') {   \

-            hdr->type = HDR_ALLOW; \

+            hdr->type = HDR_ALLOW_T; \

             p++;                   \

 	    goto dc_end;           \

     }                              \

@@ -36,7 +36,7 @@

 	        p += 4;                                \

 		switch(LOWER_BYTE(*p)) {               \

 		case 'n':                              \

-		        hdr->type = HDR_AUTHORIZATION; \

+		        hdr->type = HDR_AUTHORIZATION_T; \

 			p++;                           \

 			goto dc_end;                   \

                                                        \

@@ -41,12 +41,12 @@

 #define ID_CASE                      \

      switch(LOWER_DWORD(val)) {      \

      case __id1_:                    \

-	     hdr->type = HDR_CALLID; \

+	     hdr->type = HDR_CALLID_T; \

 	     hdr->name.len = 7;      \

 	     return (p + 4);         \

 	                             \

      case __id2_:                    \

-	     hdr->type = HDR_CALLID; \

+	     hdr->type = HDR_CALLID_T; \

 	     p += 4;                 \

 	     goto dc_end;            \

      }

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

 #define TH_CASE                                        \

         switch(LOWER_DWORD(val)) {                     \

         case _th12_:                                   \

-                hdr->type = HDR_CONTENTLENGTH;         \

+                hdr->type = HDR_CONTENTLENGTH_T;       \

                 hdr->name.len = 14;                    \