From: Russell Bryant <russell@russellbryant.com>
Date: Wed, 18 Aug 2010 12:30:40 +0000 (+0000)
Subject: Split _all_ arguments before parsing them.
X-Git-Tag: 1.8.0-beta4~24
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d0235ab07e26b8b8afa777cef93250bf76a55c85;p=thirdparty%2Fasterisk.git

Split _all_ arguments before parsing them.

This fixes multicast RTP paging using linksys mode.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@282638 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_multicast_rtp.c b/channels/chan_multicast_rtp.c
index e3414d2f3b..93f46473fb 100644
--- a/channels/chan_multicast_rtp.c
+++ b/channels/chan_multicast_rtp.c
@@ -126,11 +126,6 @@ static struct ast_channel *multicast_rtp_request(const char *type, format_t form
 	}
 	*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,
@@ -139,6 +134,11 @@ static struct ast_channel *multicast_rtp_request(const char *type, format_t form
 		}
 	}
 
+	if (!ast_sockaddr_parse(&destination_address, destination,
+				PARSE_PORT_REQUIRE)) {
+		goto failure;
+	}
+
 	if (!(instance = ast_rtp_instance_new("multicast", NULL, &control_address, multicast_type))) {
 		goto failure;
 	}