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
253e2c02
Commit
253e2c02
authored
Dec 13, 2010
by
Youness Alaoui
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix lines that are > 80 chars
parent
6526c720
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
13 deletions
+21
-13
socket/turn.c
socket/turn.c
+19
-12
stun/usages/turn.c
stun/usages/turn.c
+2
-1
No files found.
socket/turn.c
View file @
253e2c02
...
@@ -364,7 +364,8 @@ priv_has_sent_permission_for_peer (TurnPriv *priv, const NiceAddress *peer)
...
@@ -364,7 +364,8 @@ priv_has_sent_permission_for_peer (TurnPriv *priv, const NiceAddress *peer)
static
void
static
void
priv_add_permission_for_peer
(
TurnPriv
*
priv
,
const
NiceAddress
*
peer
)
priv_add_permission_for_peer
(
TurnPriv
*
priv
,
const
NiceAddress
*
peer
)
{
{
priv
->
permissions
=
g_list_append
(
priv
->
permissions
,
nice_address_dup
(
peer
));
priv
->
permissions
=
g_list_append
(
priv
->
permissions
,
nice_address_dup
(
peer
));
}
}
static
void
static
void
...
@@ -434,7 +435,7 @@ socket_dequeue_all_data (TurnPriv *priv, const NiceAddress *to)
...
@@ -434,7 +435,7 @@ socket_dequeue_all_data (TurnPriv *priv, const NiceAddress *to)
SendData
*
data
=
SendData
*
data
=
(
SendData
*
)
g_queue_pop_head
(
send_queue
);
(
SendData
*
)
g_queue_pop_head
(
send_queue
);
nice_debug
(
"deque
ing data enqueued when installing permission or binding
"
);
nice_debug
(
"deque
uing data
"
);
nice_socket_send
(
priv
->
base_socket
,
to
,
data
->
data_len
,
data
->
data
);
nice_socket_send
(
priv
->
base_socket
,
to
,
data
->
data_len
,
data
->
data
);
g_free
(
data
->
data
);
g_free
(
data
->
data
);
...
@@ -564,7 +565,7 @@ socket_send (NiceSocket *sock, const NiceAddress *to,
...
@@ -564,7 +565,7 @@ socket_send (NiceSocket *sock, const NiceAddress *to,
}
}
/* enque data */
/* enque data */
nice_debug
(
"enque
ing data to be sent when aquiring permission or binding
"
);
nice_debug
(
"enque
uing data
"
);
socket_enqueue_data
(
priv
,
to
,
msg_len
,
(
gchar
*
)
buffer
);
socket_enqueue_data
(
priv
,
to
,
msg_len
,
(
gchar
*
)
buffer
);
return
TRUE
;
return
TRUE
;
}
else
{
}
else
{
...
@@ -725,8 +726,8 @@ nice_turn_socket_parse_recv (NiceSocket *sock, NiceSocket **from_sock,
...
@@ -725,8 +726,8 @@ nice_turn_socket_parse_recv (NiceSocket *sock, NiceSocket **from_sock,
priv
->
current_binding_msg
=
NULL
;
priv
->
current_binding_msg
=
NULL
;
if
(
stun_message_get_class
(
&
msg
)
==
STUN_RESPONSE
&&
if
(
stun_message_get_class
(
&
msg
)
==
STUN_RESPONSE
&&
(
priv
->
compatibility
==
NICE_TURN_SOCKET_COMPATIBILITY_
MSN
||
(
priv
->
compatibility
==
NICE_TURN_SOCKET_COMPATIBILITY_
OC2007
||
priv
->
compatibility
==
NICE_TURN_SOCKET_COMPATIBILITY_OC2007
))
{
priv
->
compatibility
==
NICE_TURN_SOCKET_COMPATIBILITY_MSN
))
{
goto
msn_google_lock
;
goto
msn_google_lock
;
}
else
{
}
else
{
g_free
(
priv
->
current_binding
);
g_free
(
priv
->
current_binding
);
...
@@ -785,7 +786,8 @@ nice_turn_socket_parse_recv (NiceSocket *sock, NiceSocket **from_sock,
...
@@ -785,7 +786,8 @@ nice_turn_socket_parse_recv (NiceSocket *sock, NiceSocket **from_sock,
socklen_t
sa_len
=
sizeof
(
sa
);
socklen_t
sa_len
=
sizeof
(
sa
);
NiceAddress
to
;
NiceAddress
to
;
stun_message_find_xor_addr
(
&
priv
->
current_binding_msg
->
message
,
stun_message_find_xor_addr
(
&
priv
->
current_binding_msg
->
message
,
STUN_ATTRIBUTE_XOR_PEER_ADDRESS
,
&
sa
,
STUN_ATTRIBUTE_XOR_PEER_ADDRESS
,
&
sa
,
&
sa_len
);
&
sa_len
);
nice_address_set_from_sockaddr
(
&
to
,
&
sa
);
nice_address_set_from_sockaddr
(
&
to
,
&
sa
);
...
@@ -842,14 +844,16 @@ nice_turn_socket_parse_recv (NiceSocket *sock, NiceSocket **from_sock,
...
@@ -842,14 +844,16 @@ nice_turn_socket_parse_recv (NiceSocket *sock, NiceSocket **from_sock,
stun_message_id
(
&
priv
->
current_create_permission_msg
->
message
,
stun_message_id
(
&
priv
->
current_create_permission_msg
->
message
,
request_id
);
request_id
);
if
(
memcmp
(
request_id
,
response_id
,
sizeof
(
StunTransactionId
))
==
0
)
{
if
(
memcmp
(
request_id
,
response_id
,
sizeof
(
StunTransactionId
))
==
0
)
{
struct
sockaddr
peer
;
struct
sockaddr
peer
;
socklen_t
peer_len
=
sizeof
(
peer
);
socklen_t
peer_len
=
sizeof
(
peer
);
int
code
=
-
1
;
int
code
=
-
1
;
NiceAddress
to
;
NiceAddress
to
;
nice_debug
(
"got response for CreatePermission"
);
nice_debug
(
"got response for CreatePermission"
);
stun_message_find_xor_addr
(
&
priv
->
current_create_permission_msg
->
message
,
stun_message_find_xor_addr
(
&
priv
->
current_create_permission_msg
->
message
,
STUN_ATTRIBUTE_XOR_PEER_ADDRESS
,
&
peer
,
STUN_ATTRIBUTE_XOR_PEER_ADDRESS
,
&
peer
,
&
peer_len
);
&
peer_len
);
nice_address_set_from_sockaddr
(
&
to
,
&
peer
);
nice_address_set_from_sockaddr
(
&
to
,
&
peer
);
...
@@ -1048,7 +1052,8 @@ priv_retransmissions_create_permission_tick_unlocked (TurnPriv *priv)
...
@@ -1048,7 +1052,8 @@ priv_retransmissions_create_permission_tick_unlocked (TurnPriv *priv)
stun_message_id
(
&
priv
->
current_create_permission_msg
->
message
,
id
);
stun_message_id
(
&
priv
->
current_create_permission_msg
->
message
,
id
);
stun_agent_forget_transaction
(
&
priv
->
agent
,
id
);
stun_agent_forget_transaction
(
&
priv
->
agent
,
id
);
stun_message_find_xor_addr
(
&
priv
->
current_create_permission_msg
->
message
,
stun_message_find_xor_addr
(
&
priv
->
current_create_permission_msg
->
message
,
STUN_ATTRIBUTE_XOR_PEER_ADDRESS
,
&
addr
,
STUN_ATTRIBUTE_XOR_PEER_ADDRESS
,
&
addr
,
&
addr_len
);
&
addr_len
);
nice_address_set_from_sockaddr
(
&
to
,
&
addr
);
nice_address_set_from_sockaddr
(
&
to
,
&
addr
);
...
@@ -1117,8 +1122,8 @@ priv_retransmissions_create_permission_tick (gpointer pointer)
...
@@ -1117,8 +1122,8 @@ priv_retransmissions_create_permission_tick (gpointer pointer)
agent_lock
();
agent_lock
();
if
(
g_source_is_destroyed
(
g_main_current_source
()))
{
if
(
g_source_is_destroyed
(
g_main_current_source
()))
{
nice_debug
(
"Source was destroyed. "
nice_debug
(
"Source was destroyed.
Avoided race condition in
"
"Avoided race condition in
turn.c:priv_retransmissions_create_permission_tick"
);
"
turn.c:priv_retransmissions_create_permission_tick"
);
agent_unlock
();
agent_unlock
();
return
FALSE
;
return
FALSE
;
}
}
...
@@ -1157,7 +1162,9 @@ priv_schedule_tick (TurnPriv *priv)
...
@@ -1157,7 +1162,9 @@ priv_schedule_tick (TurnPriv *priv)
}
}
if
(
priv
->
current_create_permission_msg
)
{
if
(
priv
->
current_create_permission_msg
)
{
guint
timeout
=
stun_timer_remainder
(
&
priv
->
current_create_permission_msg
->
timer
);
guint
timeout
=
stun_timer_remainder
(
&
priv
->
current_create_permission_msg
->
timer
);
if
(
timeout
>
0
)
{
if
(
timeout
>
0
)
{
priv
->
tick_source_create_permission
=
priv
->
tick_source_create_permission
=
agent_timeout_add_with_context
(
priv
->
nice
,
agent_timeout_add_with_context
(
priv
->
nice
,
...
...
stun/usages/turn.c
View file @
253e2c02
...
@@ -143,7 +143,8 @@ size_t stun_usage_turn_create (StunAgent *agent, StunMessage *msg,
...
@@ -143,7 +143,8 @@ size_t stun_usage_turn_create (StunAgent *agent, StunMessage *msg,
STUN_MESSAGE_RETURN_SUCCESS
)
STUN_MESSAGE_RETURN_SUCCESS
)
return
0
;
return
0
;
}
}
if
(
stun_message_find64
(
previous_response
,
STUN_ATTRIBUTE_RESERVATION_TOKEN
,
if
(
stun_message_find64
(
previous_response
,
STUN_ATTRIBUTE_RESERVATION_TOKEN
,
&
reservation
)
==
STUN_MESSAGE_RETURN_SUCCESS
)
{
&
reservation
)
==
STUN_MESSAGE_RETURN_SUCCESS
)
{
if
(
stun_message_append64
(
msg
,
STUN_ATTRIBUTE_RESERVATION_TOKEN
,
if
(
stun_message_append64
(
msg
,
STUN_ATTRIBUTE_RESERVATION_TOKEN
,
reservation
)
!=
STUN_MESSAGE_RETURN_SUCCESS
)
reservation
)
!=
STUN_MESSAGE_RETURN_SUCCESS
)
...
...
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