Browse code

bug_fix: ambiguous use of TOTAG* defines fixed (report courtesy of Bogdan)

Jiri Kuthan authored on 03/12/2002 20:24:27
Showing 5 changed files
... ...
@@ -82,8 +82,8 @@
82 82
 #define RECEIVED   ";received="
83 83
 #define RECEIVED_LEN 10
84 84
 
85
-#define TOTAG ";tag="
86
-#define TOTAG_LEN (sizeof(TOTAG)-1)
85
+#define TOTAG_TOKEN ";tag="
86
+#define TOTAG_TOKEN_LEN (sizeof(TOTAG_TOKEN)-1)
87 87
 
88 88
 #define SRV_PREFIX "_sip._udp."
89 89
 #define SRV_PREFIX_LEN 10
... ...
@@ -90,7 +90,7 @@ void free_cell( struct cell* dead_cell )
90 90
 		sip_msg_free_unsafe( dead_cell->uas.request );
91 91
 	if ( dead_cell->uas.response.buffer )
92 92
 		shm_free_unsafe( dead_cell->uas.response.buffer );
93
-#ifdef TOTAG
93
+#ifdef _TOTAG
94 94
 	if (dead_cell->uas.to_tag.s)
95 95
 		shm_free_unsafe(dead_cell->uas.to_tag.s);
96 96
 #endif
... ...
@@ -105,7 +105,7 @@ typedef struct ua_server
105 105
 	struct sip_msg   *request;
106 106
 	struct retr_buf  response;
107 107
 	unsigned int     status;
108
-#ifdef TOTAG
108
+#ifdef _TOTAG
109 109
 	str              to_tag;
110 110
 #endif
111 111
 	unsigned int     isACKed;
... ...
@@ -508,7 +508,7 @@ enum rps relay_reply( struct cell *t, struct sip_msg *p_msg, int branch,
508 508
 	unsigned int res_len;
509 509
 	int relayed_code;
510 510
 	struct sip_msg *relayed_msg;
511
-#ifdef TOTAG
511
+#ifdef _TOTAG
512 512
 	str	to_tag;
513 513
 #endif
514 514
 	enum rps reply_status;
... ...
@@ -606,7 +606,7 @@ enum rps relay_reply( struct cell *t, struct sip_msg *p_msg, int branch,
606 606
 		}
607 607
 		uas_rb->buffer_len = res_len;
608 608
 		memcpy( uas_rb->buffer, buf, res_len );
609
-#ifdef TOTAG
609
+#ifdef _TOTAG
610 610
 		/* to tag now */
611 611
 		if (relayed_code>=300 && t->is_invite) {
612 612
 			if (relayed_msg!=FAKED_REPLY) {
... ...
@@ -646,7 +646,7 @@ enum rps relay_reply( struct cell *t, struct sip_msg *p_msg, int branch,
646 646
 	/* success */
647 647
 	return reply_status;
648 648
 
649
-#ifdef TOTAG
649
+#ifdef _TOTAG
650 650
 error04:
651 651
 	shm_free( uas_rb->buffer );
652 652
 	uas_rb->buffer=0;
... ...
@@ -636,7 +636,7 @@ char * build_res_buf_from_sip_req( unsigned int code, char *text,
636 636
 				if (to_tag.s )
637 637
 					len+=new_tag_len-to_tag.len;
638 638
 				else
639
-					len+=new_tag_len+TOTAG_LEN/*";tag="*/;
639
+					len+=new_tag_len+TOTAG_TOKEN_LEN/*";tag="*/;
640 640
 			}
641 641
 		} else if (hdr->type==HDR_VIA) {
642 642
 				if (hdr==msg->h_via1) len += received_len;
... ...
@@ -711,7 +711,7 @@ char * build_res_buf_from_sip_req( unsigned int code, char *text,
711 711
 						append_str_trans( p, hdr->name.s ,
712 712
 							((hdr->body.s+hdr->body.len )-hdr->name.s ),
713 713
 							msg);
714
-						append_str( p, TOTAG,TOTAG_LEN,msg);
714
+						append_str( p, TOTAG_TOKEN,TOTAG_TOKEN_LEN,msg);
715 715
 						append_str( p, new_tag,new_tag_len,msg);
716 716
 						append_str( p, CRLF,CRLF_LEN,msg);
717 717
 					}