Index: channels/chan_sip.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_sip.c,v
retrieving revision 1.688
diff -u -r1.688 chan_sip.c
--- channels/chan_sip.c	22 Mar 2005 19:09:47 -0000	1.688
+++ channels/chan_sip.c	23 Mar 2005 19:28:40 -0000
@@ -2573,7 +2573,7 @@
 			strncpy(tmp, get_header(req, "To"), sizeof(tmp) - 1);
 		else
 			strncpy(tmp, get_header(req, "From"), sizeof(tmp) - 1);
-		tag = strcasestr(tmp, "tag=");
+		tag = ast_strcasestr(tmp, "tag=");
 		if (tag) {
 			tag += 4;
 			c = strchr(tag, ';');
@@ -3335,7 +3335,7 @@
 		copy_all_header(resp, req, "Record-Route");
 	copy_header(resp, req, "From");
 	ot = get_header(req, "To");
-	if (!strcasestr(ot, "tag=") && strncmp(msg, "100", 3)) {
+	if (!ast_strcasestr(ot, "tag=") && strncmp(msg, "100", 3)) {
 		/* Add the proper tag if we don't have it already.  If they have specified
 		   their tag, use it.  Otherwise, use our own tag */
 		if (!ast_strlen_zero(p->theirtag) && ast_test_flag(p, SIP_OUTGOING))
@@ -3444,7 +3444,7 @@
 
 	/* Add tag *unless* this is a CANCEL, in which case we need to send it exactly
 	   as our original request, including tag (or presumably lack thereof) */
-	if (!strcasestr(ot, "tag=") && sipmethod != SIP_CANCEL) {
+	if (!ast_strcasestr(ot, "tag=") && sipmethod != SIP_CANCEL) {
 		/* Add the proper tag if we don't have it already.  If they have specified
 		   their tag, use it.  Otherwise, use our own tag */
 		if (ast_test_flag(p, SIP_OUTGOING) && !ast_strlen_zero(p->theirtag))
@@ -7699,7 +7699,7 @@
 
 	/* Get their tag if we haven't already */
 	to = get_header(req, "To");
-	to = strcasestr(to, "tag=");
+	to = ast_strcasestr(to, "tag=");
 	if (to) {
 		to += 4;
 		strncpy(p->theirtag, to, sizeof(p->theirtag) - 1);
@@ -8869,7 +8869,7 @@
 	/* Find their tag if we haven't got it */
 	if (ast_strlen_zero(p->theirtag)) {
 		from = get_header(req, "From");
-		from = strcasestr(from, "tag=");
+		from = ast_strcasestr(from, "tag=");
 		if (from) {
 			from += 4;
 			strncpy(p->theirtag, from, sizeof(p->theirtag) - 1);