Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
libnice
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
cpp-libs
libnice
Commits
5891c956
Commit
5891c956
authored
Apr 15, 2014
by
Olivier Crête
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
stun: Restore argument type to stun_usage_bind_process(), it's used outside libnice
parent
2246d419
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
11 deletions
+13
-11
agent/conncheck.c
agent/conncheck.c
+2
-2
stun/usages/bind.c
stun/usages/bind.c
+9
-7
stun/usages/bind.h
stun/usages/bind.h
+2
-2
No files found.
agent/conncheck.c
View file @
5891c956
...
...
@@ -2267,8 +2267,8 @@ static gboolean priv_map_reply_to_discovery_request (NiceAgent *agent, StunMessa
stun_message_id
(
&
d
->
stun_message
,
discovery_id
);
if
(
memcmp
(
discovery_id
,
response_id
,
sizeof
(
StunTransactionId
))
==
0
)
{
res
=
stun_usage_bind_process
(
resp
,
&
sockaddr
.
storage
,
&
socklen
,
&
alternate
.
storage
,
&
alternatelen
);
res
=
stun_usage_bind_process
(
resp
,
&
sockaddr
.
addr
,
&
socklen
,
&
alternate
.
addr
,
&
alternatelen
);
nice_debug
(
"Agent %p : stun_bind_process/disc for %p res %d."
,
agent
,
d
,
(
int
)
res
);
...
...
stun/usages/bind.c
View file @
5891c956
...
...
@@ -94,8 +94,8 @@ size_t stun_usage_bind_create (StunAgent *agent, StunMessage *msg,
}
StunUsageBindReturn
stun_usage_bind_process
(
StunMessage
*
msg
,
struct
sockaddr
_storage
*
addr
,
socklen_t
*
addrlen
,
struct
sockaddr
_storage
*
alternate_server
,
socklen_t
*
alternate_server_len
)
struct
sockaddr
*
addr
,
socklen_t
*
addrlen
,
struct
sockaddr
*
alternate_server
,
socklen_t
*
alternate_server_len
)
{
int
code
=
-
1
;
StunMessageReturn
val
;
...
...
@@ -126,7 +126,7 @@ StunUsageBindReturn stun_usage_bind_process (StunMessage *msg,
if
((
code
/
100
)
==
3
)
{
if
(
alternate_server
&&
alternate_server_len
)
{
if
(
stun_message_find_addr
(
msg
,
STUN_ATTRIBUTE_ALTERNATE_SERVER
,
alternate_server
,
(
struct
sockaddr_storage
*
)
alternate_server
,
alternate_server_len
)
!=
STUN_MESSAGE_RETURN_SUCCESS
)
{
stun_debug
(
" Unexpectedly missing ALTERNATE-SERVER attribute
\n
"
);
return
STUN_USAGE_BIND_RETURN_ERROR
;
...
...
@@ -152,12 +152,14 @@ StunUsageBindReturn stun_usage_bind_process (StunMessage *msg,
stun_debug
(
"Received %u-bytes STUN message
\n
"
,
stun_message_length
(
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
)
{
stun_debug
(
" No XOR-MAPPED-ADDRESS: %d
\n
"
,
val
);
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
)
{
stun_debug
(
" No MAPPED-ADDRESS: %d
\n
"
,
val
);
...
...
@@ -529,8 +531,8 @@ StunUsageBindReturn stun_usage_bind_run (const struct sockaddr *srv,
if
(
valid
!=
STUN_VALIDATION_SUCCESS
)
{
ret
=
STUN_USAGE_TRANS_RETURN_RETRY
;
}
else
{
bind_ret
=
stun_usage_bind_process
(
&
msg
,
addr
,
addrlen
,
&
alternate_server
,
&
alternate_server_len
);
bind_ret
=
stun_usage_bind_process
(
&
msg
,
(
struct
sockaddr
*
)
addr
,
addrlen
,
(
struct
sockaddr
*
)
&
alternate_server
,
&
alternate_server_len
);
if
(
bind_ret
==
STUN_USAGE_BIND_RETURN_ALTERNATE_SERVER
)
{
stun_trans_deinit
(
&
trans
);
...
...
stun/usages/bind.h
View file @
5891c956
...
...
@@ -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
*/
StunUsageBindReturn
stun_usage_bind_process
(
StunMessage
*
msg
,
struct
sockaddr
_storage
*
addr
,
socklen_t
*
addrlen
,
struct
sockaddr
_storage
*
alternate_server
,
socklen_t
*
alternate_server_len
);
struct
sockaddr
*
addr
,
socklen_t
*
addrlen
,
struct
sockaddr
*
alternate_server
,
socklen_t
*
alternate_server_len
);
/**
* stun_usage_bind_keepalive:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment