master/coturn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

working on double allocation

Browse Source
This commit is contained in:
mom040267 2014-07-17 08:04:52 +00:00
parent 651c5204a4
commit 74c1fd3038
2 changed files with 135 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
src/apps/uclient/startuclient.c
View File

@ -341,6 +341,13 @@ static int clnet_allocate(int verbose,
int af4 = dual_allocation || (af == STUN_ATTRIBUTE_REQUESTED_ADDRESS_FAMILY_VALUE_IPV4);
int af6 = dual_allocation || (af == STUN_ATTRIBUTE_REQUESTED_ADDRESS_FAMILY_VALUE_IPV6);
if(!no_rtcp && !in_tid) {
if (!never_allocate_rtcp && allocate_rtcp) {
af4 = 0;
af6 = 0;
}
}
if(!dos)
stun_set_allocate_request(&message, 800, af4, af6, relay_transport, mobility);
else
@ -433,22 +440,55 @@ static int clnet_allocate(int verbose,
if (verbose) {
TURN_LOG_FUNC(TURN_LOG_LEVEL_INFO, "success\n");
}
if (stun_attr_get_first_addr(&message,
STUN_ATTRIBUTE_XOR_RELAYED_ADDRESS, relay_addr,
NULL) < 0) {
TURN_LOG_FUNC(TURN_LOG_LEVEL_INFO,
"%s: !!!: relay addr cannot be received\n",
__FUNCTION__);
return -1;
} else {
if (verbose) {
ioa_addr remote_addr;
memcpy(&remote_addr, relay_addr,
sizeof(ioa_addr));
addr_debug_print(verbose, &remote_addr,
"Received relay addr");
{
int found = 0;
stun_attr_ref sar = stun_attr_get_first(&message);
while (sar) {
int attr_type = stun_attr_get_type(sar);
if(attr_type == STUN_ATTRIBUTE_XOR_RELAYED_ADDRESS) {
if (stun_attr_get_addr(&message, sar, relay_addr, NULL) < 0) {
TURN_LOG_FUNC(TURN_LOG_LEVEL_INFO,
"%s: !!!: relay addr cannot be received (1)\n",
__FUNCTION__);
return -1;
} else {
if (verbose) {
ioa_addr remote_addr;
memcpy(&remote_addr, relay_addr,sizeof(ioa_addr));
addr_debug_print(verbose, &remote_addr,"Received relay addr");
}
if(!addr_any(relay_addr)) {
if(relay_addr->ss.sa_family == AF_INET) {
if(default_address_family != STUN_ATTRIBUTE_REQUESTED_ADDRESS_FAMILY_VALUE_IPV6) {
found = 1;
break;
}
}
if(relay_addr->ss.sa_family == AF_INET6) {
if(default_address_family == STUN_ATTRIBUTE_REQUESTED_ADDRESS_FAMILY_VALUE_IPV6) {
found = 1;
break;
}
}
}
}
}
sar = stun_attr_get_next(&message,sar);
}
if(!found) {
TURN_LOG_FUNC(TURN_LOG_LEVEL_INFO,
"%s: !!!: relay addr cannot be received (2)\n",
__FUNCTION__);
return -1;
}
}
stun_attr_ref rt_sar = stun_attr_get_first_by_type(
&message, STUN_ATTRIBUTE_RESERVATION_TOKEN);
uint64_t rtv = stun_attr_get_reservation_token_value(rt_sar);

102
src/server/ns_turn_server.c
View File

@ -1097,21 +1097,16 @@ static int handle_turn_allocate(turn_turnserver *server,
*reason = (const u08bits *)"Address family attribute can not be used with reservation token request";
} else {
int af_req = stun_get_requested_address_family(sar);
if(!af4 && !af6) {
switch (af_req) {
case STUN_ATTRIBUTE_REQUESTED_ADDRESS_FAMILY_VALUE_IPV4:
af4 = 1;
break;
case STUN_ATTRIBUTE_REQUESTED_ADDRESS_FAMILY_VALUE_IPV6:
af6 = 1;
break;
default:
*err_code = 440;
*reason = (const u08bits *)"Unsupported address family requested";
}
} else {
*err_code = 400;
*reason = (const u08bits *)"Only one address family attribute can be used in a request";
switch (af_req) {
case STUN_ATTRIBUTE_REQUESTED_ADDRESS_FAMILY_VALUE_IPV4:
af4 = af_req;
break;
case STUN_ATTRIBUTE_REQUESTED_ADDRESS_FAMILY_VALUE_IPV6:
af6 = af_req;
break;
default:
*err_code = 440;
*reason = (const u08bits *)"Unsupported address family requested";
}
}
}
@ -1179,22 +1174,87 @@ static int handle_turn_allocate(turn_turnserver *server,
}
}
int af = STUN_ATTRIBUTE_REQUESTED_ADDRESS_FAMILY_VALUE_DEFAULT;
if(af4) af = STUN_ATTRIBUTE_REQUESTED_ADDRESS_FAMILY_VALUE_IPV4;
else if(af6) af = STUN_ATTRIBUTE_REQUESTED_ADDRESS_FAMILY_VALUE_IPV6;
if(af4) af4 = STUN_ATTRIBUTE_REQUESTED_ADDRESS_FAMILY_VALUE_IPV4;
if(af6) af6 = STUN_ATTRIBUTE_REQUESTED_ADDRESS_FAMILY_VALUE_IPV6;
if(af4 && af6) {
if(server->external_ip_set) {
*err_code = 440;
*reason = (const u08bits *)"Dual allocation cannot be supported in the current server configuration";
}
if(even_port >= 0) {
*err_code = 440;
*reason = (const u08bits *)"Dual allocation cannot be supported with even-port functionality";
}
}
if (*err_code || create_relay_connection(server, ss, lifetime,
af, transport,
if(!(*err_code)) {
if(!af4 && !af6) {
create_relay_connection(server, ss, lifetime,
STUN_ATTRIBUTE_REQUESTED_ADDRESS_FAMILY_VALUE_DEFAULT, transport,
even_port, in_reservation_token, &out_reservation_token,
err_code, reason,
tcp_peer_accept_connection) < 0) {
tcp_peer_accept_connection);
} else if(!af4 && af6) {
create_relay_connection(server, ss, lifetime,
af6, transport,
even_port, in_reservation_token, &out_reservation_token,
err_code, reason,
tcp_peer_accept_connection);
} else if(af4 && !af6) {
create_relay_connection(server, ss, lifetime,
af4, transport,
even_port, in_reservation_token, &out_reservation_token,
err_code, reason,
tcp_peer_accept_connection);
} else {
int err_code4 = 0;
const u08bits *reason4 = NULL;
if(af4) {
int af4res = create_relay_connection(server, ss, lifetime,
af4, transport,
even_port, in_reservation_token, &out_reservation_token,
&err_code4, &reason4,
tcp_peer_accept_connection);
if(af4res<0) {
set_relay_session_failure(a,AF_INET);
if(!err_code4) {
err_code4 = 437;
}
}
}
int err_code6 = 0;
const u08bits *reason6 = NULL;
if(af6) {
int af6res = create_relay_connection(server, ss, lifetime,
af6, transport,
even_port, in_reservation_token, &out_reservation_token,
&err_code6, &reason6,
tcp_peer_accept_connection);
if(af6res<0) {
set_relay_session_failure(a,AF_INET6);
if(!err_code6) {
err_code6 = 437;
}
}
}
if(err_code4 && err_code6) {
if(reason4) {
*err_code = err_code4;
*reason = reason4;
} else if(reason6) {
*err_code = err_code6;
*reason = reason6;
} else {
*err_code = err_code4;
}
}
}
}
if (*err_code) {
dec_quota(ss);