[asterisk-commits] russell: trunk r282980 - in /trunk: ./ channels/chan_multicast_rtp.c

[SVN commits to the Asterisk project]

Author: russell
Date: Fri Aug 20 06:54:00 2010
New Revision: 282980

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=282980
Log:
Merged revisions 282638 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r282638 | russell | 2010-08-18 07:30:40 -0500 (Wed, 18 Aug 2010) | 4 lines
  
  Split _all_ arguments before parsing them.
  
  This fixes multicast RTP paging using linksys mode.
........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_multicast_rtp.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/channels/chan_multicast_rtp.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_multicast_rtp.c?view=diff&rev=282980&r1=282979&r2=282980
==============================================================================
--- trunk/channels/chan_multicast_rtp.c (original)
+++ trunk/channels/chan_multicast_rtp.c Fri Aug 20 06:54:00 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))) {