aboutsummaryrefslogtreecommitdiffstats
path: root/channels/chan_multicast_rtp.c
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2010-08-20 11:54:00 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2010-08-20 11:54:00 +0000
commit8c90971983bf3fdf5e659e8ebef767d2e6ae021e (patch)
tree8c5abec0bd3044d76e690cb4381b58e19abde9ae /channels/chan_multicast_rtp.c
parent2db4fe1ba02d36ce9b81b5207c50f29aa638a60e (diff)
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: http://svn.digium.com/svn/asterisk/trunk@282980 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_multicast_rtp.c')
-rw-r--r--channels/chan_multicast_rtp.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/channels/chan_multicast_rtp.c b/channels/chan_multicast_rtp.c
index e3414d2f3..93f46473f 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;
}