Skip to content
Snippets Groups Projects
Commit a12b5f67 authored by Russell Bryant's avatar Russell Bryant
Browse files

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
parent 5ef8140e
Branches
Tags
No related merge requests found
...@@ -126,11 +126,6 @@ static struct ast_channel *multicast_rtp_request(const char *type, format_t form ...@@ -126,11 +126,6 @@ static struct ast_channel *multicast_rtp_request(const char *type, format_t form
} }
*destination++ = '\0'; *destination++ = '\0';
if (!ast_sockaddr_parse(&destination_address, destination,
PARSE_PORT_REQUIRE)) {
goto failure;
}
if ((control = strchr(destination, '/'))) { if ((control = strchr(destination, '/'))) {
*control++ = '\0'; *control++ = '\0';
if (!ast_sockaddr_parse(&control_address, control, if (!ast_sockaddr_parse(&control_address, control,
...@@ -139,6 +134,11 @@ static struct ast_channel *multicast_rtp_request(const char *type, format_t form ...@@ -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))) { if (!(instance = ast_rtp_instance_new("multicast", NULL, &control_address, multicast_type))) {
goto failure; goto failure;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment