Commit 5891c956 authored by Olivier Crête's avatar Olivier Crête

stun: Restore argument type to stun_usage_bind_process(), it's used outside libnice

parent 2246d419
...@@ -2267,8 +2267,8 @@ static gboolean priv_map_reply_to_discovery_request (NiceAgent *agent, StunMessa ...@@ -2267,8 +2267,8 @@ static gboolean priv_map_reply_to_discovery_request (NiceAgent *agent, StunMessa
stun_message_id (&d->stun_message, discovery_id); stun_message_id (&d->stun_message, discovery_id);
if (memcmp (discovery_id, response_id, sizeof(StunTransactionId)) == 0) { if (memcmp (discovery_id, response_id, sizeof(StunTransactionId)) == 0) {
res = stun_usage_bind_process (resp, &sockaddr.storage, res = stun_usage_bind_process (resp, &sockaddr.addr,
&socklen, &alternate.storage, &alternatelen); &socklen, &alternate.addr, &alternatelen);
nice_debug ("Agent %p : stun_bind_process/disc for %p res %d.", nice_debug ("Agent %p : stun_bind_process/disc for %p res %d.",
agent, d, (int)res); agent, d, (int)res);
......
...@@ -94,8 +94,8 @@ size_t stun_usage_bind_create (StunAgent *agent, StunMessage *msg, ...@@ -94,8 +94,8 @@ size_t stun_usage_bind_create (StunAgent *agent, StunMessage *msg,
} }
StunUsageBindReturn stun_usage_bind_process (StunMessage *msg, StunUsageBindReturn stun_usage_bind_process (StunMessage *msg,
struct sockaddr_storage *addr, socklen_t *addrlen, struct sockaddr *addr, socklen_t *addrlen,
struct sockaddr_storage *alternate_server, socklen_t *alternate_server_len) struct sockaddr *alternate_server, socklen_t *alternate_server_len)
{ {
int code = -1; int code = -1;
StunMessageReturn val; StunMessageReturn val;
...@@ -126,7 +126,7 @@ StunUsageBindReturn stun_usage_bind_process (StunMessage *msg, ...@@ -126,7 +126,7 @@ StunUsageBindReturn stun_usage_bind_process (StunMessage *msg,
if ((code / 100) == 3) { if ((code / 100) == 3) {
if (alternate_server && alternate_server_len) { if (alternate_server && alternate_server_len) {
if (stun_message_find_addr (msg, STUN_ATTRIBUTE_ALTERNATE_SERVER, if (stun_message_find_addr (msg, STUN_ATTRIBUTE_ALTERNATE_SERVER,
alternate_server, (struct sockaddr_storage *) alternate_server,
alternate_server_len) != STUN_MESSAGE_RETURN_SUCCESS) { alternate_server_len) != STUN_MESSAGE_RETURN_SUCCESS) {
stun_debug (" Unexpectedly missing ALTERNATE-SERVER attribute\n"); stun_debug (" Unexpectedly missing ALTERNATE-SERVER attribute\n");
return STUN_USAGE_BIND_RETURN_ERROR; return STUN_USAGE_BIND_RETURN_ERROR;
...@@ -152,12 +152,14 @@ StunUsageBindReturn stun_usage_bind_process (StunMessage *msg, ...@@ -152,12 +152,14 @@ StunUsageBindReturn stun_usage_bind_process (StunMessage *msg,
stun_debug ("Received %u-bytes STUN message\n", stun_message_length (msg)); stun_debug ("Received %u-bytes STUN message\n", stun_message_length (msg));
val = stun_message_find_xor_addr (msg, val = stun_message_find_xor_addr (msg,
STUN_ATTRIBUTE_XOR_MAPPED_ADDRESS, addr, addrlen); STUN_ATTRIBUTE_XOR_MAPPED_ADDRESS, (struct sockaddr_storage *)addr,
addrlen);
if (val != STUN_MESSAGE_RETURN_SUCCESS) if (val != STUN_MESSAGE_RETURN_SUCCESS)
{ {
stun_debug (" No XOR-MAPPED-ADDRESS: %d\n", val); stun_debug (" No XOR-MAPPED-ADDRESS: %d\n", val);
val = stun_message_find_addr (msg, val = stun_message_find_addr (msg,
STUN_ATTRIBUTE_MAPPED_ADDRESS, addr, addrlen); STUN_ATTRIBUTE_MAPPED_ADDRESS, (struct sockaddr_storage *)addr,
addrlen);
if (val != STUN_MESSAGE_RETURN_SUCCESS) if (val != STUN_MESSAGE_RETURN_SUCCESS)
{ {
stun_debug (" No MAPPED-ADDRESS: %d\n", val); stun_debug (" No MAPPED-ADDRESS: %d\n", val);
...@@ -529,8 +531,8 @@ StunUsageBindReturn stun_usage_bind_run (const struct sockaddr *srv, ...@@ -529,8 +531,8 @@ StunUsageBindReturn stun_usage_bind_run (const struct sockaddr *srv,
if (valid != STUN_VALIDATION_SUCCESS) { if (valid != STUN_VALIDATION_SUCCESS) {
ret = STUN_USAGE_TRANS_RETURN_RETRY; ret = STUN_USAGE_TRANS_RETURN_RETRY;
} else { } else {
bind_ret = stun_usage_bind_process (&msg, addr, addrlen, bind_ret = stun_usage_bind_process (&msg, (struct sockaddr *) addr,
&alternate_server, &alternate_server_len); addrlen, (struct sockaddr *) &alternate_server, &alternate_server_len);
if (bind_ret == STUN_USAGE_BIND_RETURN_ALTERNATE_SERVER) { if (bind_ret == STUN_USAGE_BIND_RETURN_ALTERNATE_SERVER) {
stun_trans_deinit (&trans); stun_trans_deinit (&trans);
......
...@@ -121,8 +121,8 @@ size_t stun_usage_bind_create (StunAgent *agent, StunMessage *msg, ...@@ -121,8 +121,8 @@ size_t stun_usage_bind_create (StunAgent *agent, StunMessage *msg,
* Note that #STUN_USAGE_BIND_RETURN_TIMEOUT cannot be returned by this function * Note that #STUN_USAGE_BIND_RETURN_TIMEOUT cannot be returned by this function
*/ */
StunUsageBindReturn stun_usage_bind_process (StunMessage *msg, StunUsageBindReturn stun_usage_bind_process (StunMessage *msg,
struct sockaddr_storage *addr, socklen_t *addrlen, struct sockaddr *addr, socklen_t *addrlen,
struct sockaddr_storage *alternate_server, socklen_t *alternate_server_len); struct sockaddr *alternate_server, socklen_t *alternate_server_len);
/** /**
* stun_usage_bind_keepalive: * stun_usage_bind_keepalive:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment