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
c8ef8403
Commit
c8ef8403
authored
Jan 30, 2009
by
Youness Alaoui
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Port libnice agent to the StunMessageReturn API
parent
f46eba9f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
29 additions
and
21 deletions
+29
-21
agent/conncheck.c
agent/conncheck.c
+4
-2
socket/turn.c
socket/turn.c
+25
-19
No files found.
agent/conncheck.c
View file @
c8ef8403
...
...
@@ -1991,7 +1991,8 @@ static gboolean priv_map_reply_to_relay_request (NiceAgent *agent, StunMessage *
/* check for unauthorized error response */
if
(
agent
->
compatibility
==
NICE_COMPATIBILITY_DRAFT19
&&
stun_message_get_class
(
resp
)
==
STUN_ERROR
&&
stun_message_find_error
(
resp
,
&
code
)
==
0
&&
stun_message_find_error
(
resp
,
&
code
)
==
STUN_MESSAGE_RETURN_SUCCESS
&&
recv_realm
!=
NULL
&&
recv_realm_len
>
0
)
{
if
(
code
==
438
||
...
...
@@ -2078,7 +2079,8 @@ static gboolean priv_map_reply_to_relay_refresh (NiceAgent *agent, StunMessage *
/* check for unauthorized error response */
if
(
cand
->
agent
->
compatibility
==
NICE_COMPATIBILITY_DRAFT19
&&
stun_message_get_class
(
resp
)
==
STUN_ERROR
&&
stun_message_find_error
(
resp
,
&
code
)
==
0
&&
stun_message_find_error
(
resp
,
&
code
)
==
STUN_MESSAGE_RETURN_SUCCESS
&&
recv_realm
!=
NULL
&&
recv_realm_len
>
0
)
{
if
(
code
==
438
||
...
...
socket/turn.c
View file @
c8ef8403
...
...
@@ -248,7 +248,8 @@ socket_send (NiceSocket *sock, const NiceAddress *to,
buffer
,
sizeof
(
buffer
),
STUN_IND_SEND
))
goto
send
;
if
(
stun_message_append_xor_addr
(
&
msg
,
STUN_ATTRIBUTE_PEER_ADDRESS
,
(
struct
sockaddr
*
)
&
sa
,
sizeof
(
sa
))
!=
0
)
(
struct
sockaddr
*
)
&
sa
,
sizeof
(
sa
))
!=
STUN_MESSAGE_RETURN_SUCCESS
)
goto
send
;
}
else
{
if
(
!
stun_agent_init_request
(
&
priv
->
agent
,
&
msg
,
...
...
@@ -256,15 +257,16 @@ socket_send (NiceSocket *sock, const NiceAddress *to,
goto
send
;
if
(
stun_message_append32
(
&
msg
,
STUN_ATTRIBUTE_MAGIC_COOKIE
,
TURN_MAGIC_COOKIE
)
!=
0
)
TURN_MAGIC_COOKIE
)
!=
STUN_MESSAGE_RETURN_SUCCESS
)
goto
send
;
if
(
priv
->
username
!=
NULL
&&
priv
->
username_len
>
0
)
{
if
(
stun_message_append_bytes
(
&
msg
,
STUN_ATTRIBUTE_USERNAME
,
priv
->
username
,
priv
->
username_len
)
!=
0
)
priv
->
username
,
priv
->
username_len
)
!=
STUN_MESSAGE_RETURN_SUCCESS
)
goto
send
;
}
if
(
stun_message_append_addr
(
&
msg
,
STUN_ATTRIBUTE_DESTINATION_ADDRESS
,
(
struct
sockaddr
*
)
&
sa
,
sizeof
(
sa
))
!=
0
)
(
struct
sockaddr
*
)
&
sa
,
sizeof
(
sa
))
!=
STUN_MESSAGE_RETURN_SUCCESS
)
goto
send
;
if
(
priv
->
compatibility
==
NICE_TURN_SOCKET_COMPATIBILITY_GOOGLE
&&
...
...
@@ -274,7 +276,8 @@ socket_send (NiceSocket *sock, const NiceAddress *to,
}
}
if
(
stun_message_append_bytes
(
&
msg
,
STUN_ATTRIBUTE_DATA
,
buf
,
len
)
!=
0
)
if
(
stun_message_append_bytes
(
&
msg
,
STUN_ATTRIBUTE_DATA
,
buf
,
len
)
!=
STUN_MESSAGE_RETURN_SUCCESS
)
goto
send
;
msg_len
=
stun_agent_finish_message
(
&
priv
->
agent
,
&
msg
,
...
...
@@ -320,7 +323,7 @@ nice_turn_socket_parse_recv (NiceSocket *sock, NiceSocket **from_sock,
if
(
priv
->
compatibility
!=
NICE_TURN_SOCKET_COMPATIBILITY_DRAFT9
)
{
uint32_t
cookie
;
if
(
stun_message_find32
(
&
msg
,
STUN_ATTRIBUTE_MAGIC_COOKIE
,
&
cookie
)
!=
0
)
&
cookie
)
!=
STUN_MESSAGE_RETURN_SUCCESS
)
goto
recv
;
if
(
cookie
!=
TURN_MAGIC_COOKIE
)
goto
recv
;
...
...
@@ -330,8 +333,8 @@ nice_turn_socket_parse_recv (NiceSocket *sock, NiceSocket **from_sock,
if
(
stun_message_get_class
(
&
msg
)
==
STUN_RESPONSE
&&
priv
->
compatibility
==
NICE_TURN_SOCKET_COMPATIBILITY_GOOGLE
)
{
uint32_t
opts
=
0
;
if
(
stun_message_find32
(
&
msg
,
STUN_ATTRIBUTE_OPTIONS
,
&
opts
)
==
0
&&
opts
&
0x1
)
if
(
stun_message_find32
(
&
msg
,
STUN_ATTRIBUTE_OPTIONS
,
&
opts
)
==
STUN_MESSAGE_RETURN_SUCCESS
&&
opts
&
0x1
)
goto
msn_google_lock
;
}
return
0
;
...
...
@@ -377,7 +380,8 @@ nice_turn_socket_parse_recv (NiceSocket *sock, NiceSocket **from_sock,
STUN_ATTRIBUTE_REALM
,
&
recv_realm_len
);
/* check for unauthorized error response */
if
(
stun_message_find_error
(
&
msg
,
&
code
)
==
0
&&
if
(
stun_message_find_error
(
&
msg
,
&
code
)
==
STUN_MESSAGE_RETURN_SUCCESS
&&
(
code
==
438
||
(
code
==
401
&&
!
(
recv_realm
!=
NULL
&&
recv_realm_len
>
0
&&
...
...
@@ -418,11 +422,13 @@ nice_turn_socket_parse_recv (NiceSocket *sock, NiceSocket **from_sock,
if
(
priv
->
compatibility
==
NICE_TURN_SOCKET_COMPATIBILITY_DRAFT9
)
{
if
(
stun_message_find_xor_addr
(
&
msg
,
STUN_ATTRIBUTE_REMOTE_ADDRESS
,
(
struct
sockaddr
*
)
&
sa
,
&
from_len
)
!=
0
)
(
struct
sockaddr
*
)
&
sa
,
&
from_len
)
!=
STUN_MESSAGE_RETURN_SUCCESS
)
goto
recv
;
}
else
{
if
(
stun_message_find_addr
(
&
msg
,
STUN_ATTRIBUTE_REMOTE_ADDRESS
,
(
struct
sockaddr
*
)
&
sa
,
&
from_len
)
!=
0
)
(
struct
sockaddr
*
)
&
sa
,
&
from_len
)
!=
STUN_MESSAGE_RETURN_SUCCESS
)
goto
recv
;
}
...
...
@@ -608,20 +614,20 @@ priv_send_channel_bind (TurnPriv *priv, StunMessage *resp,
}
if
(
stun_message_append32
(
&
msg
->
message
,
STUN_ATTRIBUTE_CHANNEL_NUMBER
,
channel_attr
)
!=
0
)
{
channel_attr
)
!=
STUN_MESSAGE_RETURN_SUCCESS
)
{
g_free
(
msg
);
return
FALSE
;
}
if
(
stun_message_append_xor_addr
(
&
msg
->
message
,
STUN_ATTRIBUTE_PEER_ADDRESS
,
(
struct
sockaddr
*
)
&
sa
,
sizeof
(
sa
))
!=
0
)
{
(
struct
sockaddr
*
)
&
sa
,
sizeof
(
sa
))
!=
STUN_MESSAGE_RETURN_SUCCESS
)
{
g_free
(
msg
);
return
FALSE
;
}
if
(
priv
->
username
!=
NULL
&&
priv
->
username_len
>
0
)
{
if
(
stun_message_append_bytes
(
&
msg
->
message
,
STUN_ATTRIBUTE_USERNAME
,
priv
->
username
,
priv
->
username_len
)
!=
0
)
{
priv
->
username
,
priv
->
username_len
)
!=
STUN_MESSAGE_RETURN_SUCCESS
)
{
g_free
(
msg
);
return
FALSE
;
}
...
...
@@ -635,7 +641,7 @@ priv_send_channel_bind (TurnPriv *priv, StunMessage *resp,
realm
=
(
uint8_t
*
)
stun_message_find
(
resp
,
STUN_ATTRIBUTE_REALM
,
&
len
);
if
(
realm
!=
NULL
)
{
if
(
stun_message_append_bytes
(
&
msg
->
message
,
STUN_ATTRIBUTE_REALM
,
realm
,
len
)
!=
0
)
{
realm
,
len
)
!=
STUN_MESSAGE_RETURN_SUCCESS
)
{
g_free
(
msg
);
return
0
;
}
...
...
@@ -643,7 +649,7 @@ priv_send_channel_bind (TurnPriv *priv, StunMessage *resp,
nonce
=
(
uint8_t
*
)
stun_message_find
(
resp
,
STUN_ATTRIBUTE_NONCE
,
&
len
);
if
(
nonce
!=
NULL
)
{
if
(
stun_message_append_bytes
(
&
msg
->
message
,
STUN_ATTRIBUTE_NONCE
,
nonce
,
len
)
!=
0
)
{
nonce
,
len
)
!=
STUN_MESSAGE_RETURN_SUCCESS
)
{
g_free
(
msg
);
return
0
;
}
...
...
@@ -708,14 +714,14 @@ priv_add_channel_binding (TurnPriv *priv, NiceAddress *peer)
}
if
(
stun_message_append32
(
&
msg
->
message
,
STUN_ATTRIBUTE_MAGIC_COOKIE
,
TURN_MAGIC_COOKIE
)
!=
0
)
{
TURN_MAGIC_COOKIE
)
!=
STUN_MESSAGE_RETURN_SUCCESS
)
{
g_free
(
msg
);
return
FALSE
;
}
if
(
priv
->
username
!=
NULL
&&
priv
->
username_len
>
0
)
{
if
(
stun_message_append_bytes
(
&
msg
->
message
,
STUN_ATTRIBUTE_USERNAME
,
priv
->
username
,
priv
->
username_len
)
!=
0
)
{
priv
->
username
,
priv
->
username_len
)
!=
STUN_MESSAGE_RETURN_SUCCESS
)
{
g_free
(
msg
);
return
FALSE
;
}
...
...
@@ -723,7 +729,7 @@ priv_add_channel_binding (TurnPriv *priv, NiceAddress *peer)
if
(
stun_message_append_addr
(
&
msg
->
message
,
STUN_ATTRIBUTE_DESTINATION_ADDRESS
,
(
struct
sockaddr
*
)
&
sa
,
sizeof
(
sa
))
!=
0
)
{
(
struct
sockaddr
*
)
&
sa
,
sizeof
(
sa
))
!=
STUN_MESSAGE_RETURN_SUCCESS
)
{
g_free
(
msg
);
return
FALSE
;
}
...
...
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