Browse code

- fixed compiling errors (reported by Alex Mack <amack@fhm.edu>)

Daniel-Constantin Mierla authored on 15/04/2005 13:12:56
Showing 1 changed files
... ...
@@ -354,7 +354,7 @@ int parse_tw_append( modparam_t type, void* val)
354 354
 			}
355 355
 			foo.s[foo.len] = bar;
356 356
 			ha->ival = hdr.type;
357
-			if (hdr.type==HDR_OTHER || ha->title.s==0) {
357
+			if (hdr.type==HDR_OTHER_T || ha->title.s==0) {
358 358
 				/* duplicate hdr name */
359 359
 				ha->sval.s = (char*)pkg_malloc(foo.len+1);
360 360
 				if (ha->sval.s==0) {
... ...
@@ -617,14 +617,14 @@ static inline char* append2buf( char *buf, int len, struct sip_msg *req,
617 617
 		} else if (ha->type==ELEM_IS_HDR) {
618 618
 			/* parse the HDRs */
619 619
 			if (!msg_parsed) {
620
-				if (parse_headers( req, HDR_EOH, 0)!=0) {
620
+				if (parse_headers( req, HDR_EOH_F, 0)!=0) {
621 621
 					LOG(L_ERR,"ERROR:tm:append2buf: parsing hdrs failed\n");
622 622
 					goto error;
623 623
 				}
624 624
 				msg_parsed = 1;
625 625
 			}
626 626
 			/* search the HDR */
627
-			if (ha->ival==HDR_OTHER) {
627
+			if (ha->ival==HDR_OTHER_T) {
628 628
 				for(hdr=req->headers;hdr;hdr=hdr->next)
629 629
 					if (ha->sval.len==hdr->name.len &&
630 630
 					strncasecmp( ha->sval.s, hdr->name.s, hdr->name.len)==0)
... ...
@@ -683,7 +683,7 @@ static int assemble_msg(struct sip_msg* msg, struct tw_info *twi)
683 683
 	}
684 684
 
685 685
 	/* parse all -- we will need every header field for a UAS */
686
-	if ( parse_headers(msg, HDR_EOH, 0)==-1) {
686
+	if ( parse_headers(msg, HDR_EOH_F, 0)==-1) {
687 687
 		LOG(L_ERR,"assemble_msg: parse_headers failed\n");
688 688
 		goto error;
689 689
 	}
... ...
@@ -773,7 +773,7 @@ static int assemble_msg(struct sip_msg* msg, struct tw_info *twi)
773 773
 		}
774 774
 		for(p_hdr = p_hdr->next;p_hdr;p_hdr = p_hdr->next) {
775 775
 			/* filter out non-RR hdr and empty hdrs */
776
-			if( (p_hdr->type!=HDR_RECORDROUTE) || p_hdr->body.len==0)
776
+			if( (p_hdr->type!=HDR_RECORDROUTE_T) || p_hdr->body.len==0)
777 777
 				continue;
778 778
 
779 779
 			if(p_hdr->parsed==0 && parse_rr(p_hdr)!=0 ){