From a12b5f678d073df18779c85d912f9dc2201630b8 Mon Sep 17 00:00:00 2001
From: Russell Bryant <russell@russellbryant.com>
Date: Fri, 20 Aug 2010 11:54:00 +0000
Subject: [PATCH] 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.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@282980 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
channels/chan_multicast_rtp.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
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;
}
--
GitLab