[Asterisk-cvs] asterisk/res res_monitor.c,1.29,1.30

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/res
In directory mongoose.digium.com:/tmp/cvs-serv26383/res

Modified Files:
	res_monitor.c 
Log Message:
Make sure we search for url prefix only in format, not in filename (bug #3613)


Index: res_monitor.c
===================================================================
RCS file: /usr/cvsroot/asterisk/res/res_monitor.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- res_monitor.c	21 Jan 2005 21:24:26 -0000	1.29
+++ res_monitor.c	17 Feb 2005 15:05:26 -0000	1.30
@@ -323,13 +323,6 @@
 	if (data && !ast_strlen_zero((char*)data)) {
 		arg = ast_strdupa((char*)data);
 		format = arg;
-		arg = strchr(format,':');
-		if (arg)
-		{
-			*arg++ = 0;
-			urlprefix = arg;
-		}
-		else arg = format;
 		fname_base = strchr(arg, '|');
 		if (fname_base) {
 			*fname_base = 0;
@@ -343,9 +336,13 @@
 					waitforbridge = 1;
 			}
 		}
+		arg = strchr(format,':');
+		if (arg) {
+			*arg++ = 0;
+			urlprefix = arg;
+		}
 	}
-	if (urlprefix)
-	{
+	if (urlprefix) {
 		snprintf(tmp,sizeof(tmp) - 1,"%s/%s.%s",urlprefix,fname_base,
 			((strcmp(format,"gsm")) ? "wav" : "gsm"));
 		if (!chan->cdr)