kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-21 12:54:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change how we set the local and remote address.

Browse Source 
The code will now only change the address and port. It will not overwrite any other values.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@187773 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2009-04-10 18:14:47 +00:00
parent 8e4b5df187
commit aaf1566222
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
main/rtp_engine.c
View File

@@ -312,7 +312,9 @@ struct ast_rtp_instance *ast_rtp_instance_new(const char *engine_name, struct sc
return NULL; return NULL;
} }
instance->engine = engine; instance->engine = engine;
memcpy(&instance->local_address, sin, sizeof(instance->local_address)); instance->local_address.sin_family = AF_INET;
instance->local_address.sin_addr = sin->sin_addr;
instance->remote_address.sin_family = AF_INET;
ast_debug(1, "Using engine '%s' for RTP instance '%p'\n", engine->name, instance); ast_debug(1, "Using engine '%s' for RTP instance '%p'\n", engine->name, instance);
@@ -350,20 +352,22 @@ struct ast_frame *ast_rtp_instance_read(struct ast_rtp_instance *instance, int r
int ast_rtp_instance_set_local_address(struct ast_rtp_instance *instance, struct sockaddr_in *address) int ast_rtp_instance_set_local_address(struct ast_rtp_instance *instance, struct sockaddr_in *address)
{ {
memcpy(&instance->local_address, address, sizeof(instance->local_address)); instance->local_address.sin_addr = address->sin_addr;
instance->local_address.sin_port = address->sin_port;
return 0; return 0;
} }
int ast_rtp_instance_set_remote_address(struct ast_rtp_instance *instance, struct sockaddr_in *address) int ast_rtp_instance_set_remote_address(struct ast_rtp_instance *instance, struct sockaddr_in *address)
{ {
if (&instance->remote_address != address) { if (&instance->remote_address != address) {
memcpy(&instance->remote_address, address, sizeof(instance->remote_address)); instance->remote_address.sin_addr = address->sin_addr;
instance->remote_address.sin_port = address->sin_port;
} }
/* moo */ /* moo */
if (instance->engine->remote_address_set) { if (instance->engine->remote_address_set) {
instance->engine->remote_address_set(instance, address); instance->engine->remote_address_set(instance, &instance->remote_address);
} }
return 0; return 0;

8
res/res_rtp_asterisk.c
View File

@@ -406,13 +406,11 @@ static int ast_rtp_new(struct ast_rtp_instance *instance, struct sched_context *
startplace = x; startplace = x;
for (;;) { for (;;) {
struct sockaddr_in local_address = { 0, }; sin->sin_port = htons(x);
local_address.sin_port = htons(x);
/* Try to bind, this will tell us whether the port is available or not */ /* Try to bind, this will tell us whether the port is available or not */
if (!bind(rtp->s, (struct sockaddr*)&local_address, sizeof(local_address))) { if (!bind(rtp->s, (struct sockaddr *)sin, sizeof(*sin))) {
ast_debug(1, "Allocated port %d for RTP instance '%p'\n", x, instance); ast_debug(1, "Allocated port %d for RTP instance '%p'\n", x, instance);
ast_rtp_instance_set_local_address(instance, &local_address); ast_rtp_instance_set_local_address(instance, sin);
break; break;
} }