[asterisk-commits] russell: branch 1.8 r282638 - /branches/1.8/channels/chan_multicast_rtp.c

[SVN commits to the Asterisk project]

Author: russell
Date: Wed Aug 18 07:30:40 2010
New Revision: 282638

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=282638
Log:
Split _all_ arguments before parsing them.

This fixes multicast RTP paging using linksys mode.

Modified:
    branches/1.8/channels/chan_multicast_rtp.c

Modified: branches/1.8/channels/chan_multicast_rtp.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/channels/chan_multicast_rtp.c?view=diff&rev=282638&r1=282637&r2=282638
==============================================================================
--- branches/1.8/channels/chan_multicast_rtp.c (original)
+++ branches/1.8/channels/chan_multicast_rtp.c Wed Aug 18 07:30:40 2010
@@ -126,17 +126,17 @@
 	}
 	*destination++ = '\0';
 
-	if (!ast_sockaddr_parse(&destination_address, destination,
-				PARSE_PORT_REQUIRE)) {
-		goto failure;
-	}
-
 	if ((control = strchr(destination, '/'))) {
 		*control++ = '\0';
 		if (!ast_sockaddr_parse(&control_address, control,
 					PARSE_PORT_REQUIRE)) {
 			goto failure;
 		}
+	}
+
+	if (!ast_sockaddr_parse(&destination_address, destination,
+				PARSE_PORT_REQUIRE)) {
+		goto failure;
 	}
 
 	if (!(instance = ast_rtp_instance_new("multicast", NULL, &control_address, multicast_type))) {