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
1a8be3df
Commit
1a8be3df
authored
Nov 16, 2018
by
Olivier Crête
Committed by
Olivier Crête
Dec 27, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
component: Make incoming_checks into a GQueue
We check the size regularly, so add a little efficiency.
parent
94a78215
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
33 additions
and
25 deletions
+33
-25
agent/component.c
agent/component.c
+18
-16
agent/component.h
agent/component.h
+1
-1
agent/conncheck.c
agent/conncheck.c
+14
-8
No files found.
agent/component.c
View file @
1a8be3df
...
...
@@ -285,6 +285,7 @@ nice_component_close (NiceAgent *agent, NiceComponent *cmp)
{
IOCallbackData
*
data
;
GOutputVector
*
vec
;
IncomingCheck
*
c
;
/* Start closing the pseudo-TCP socket first. FIXME: There is a very big and
* reliably triggerable race here. pseudo_tcp_socket_close() does not block
...
...
@@ -319,9 +320,9 @@ nice_component_close (NiceAgent *agent, NiceComponent *cmp)
(
GDestroyNotify
)
nice_candidate_free
);
cmp
->
remote_candidates
=
NULL
;
nice_component_free_socket_sources
(
cmp
);
g_slist_free_full
(
cmp
->
incoming_checks
,
(
GDestroyNotify
)
incoming_check_free
);
cmp
->
incoming_checks
=
NULL
;
while
((
c
=
g_queue_pop_head
(
&
cmp
->
incoming_checks
)))
incoming_check_free
(
c
)
;
nice_component_clean_turn_servers
(
agent
,
cmp
);
...
...
@@ -393,6 +394,7 @@ void
nice_component_restart
(
NiceComponent
*
cmp
)
{
GSList
*
i
;
IncomingCheck
*
c
;
for
(
i
=
cmp
->
remote_candidates
;
i
;
i
=
i
->
next
)
{
NiceCandidate
*
candidate
=
i
->
data
;
...
...
@@ -411,9 +413,8 @@ nice_component_restart (NiceComponent *cmp)
g_slist_free
(
cmp
->
remote_candidates
),
cmp
->
remote_candidates
=
NULL
;
g_slist_free_full
(
cmp
->
incoming_checks
,
(
GDestroyNotify
)
incoming_check_free
);
cmp
->
incoming_checks
=
NULL
;
while
((
c
=
g_queue_pop_head
(
&
cmp
->
incoming_checks
)))
incoming_check_free
(
c
);
/* Reset the priority to 0 to make sure we get a new pair */
cmp
->
selected_pair
.
priority
=
0
;
...
...
@@ -625,19 +626,19 @@ nice_component_reattach_all_sockets (NiceComponent *component)
static
void
nice_component_detach_socket
(
NiceComponent
*
component
,
NiceSocket
*
nicesock
)
{
GSList
*
l
;
GList
*
l
;
GSList
*
s
;
SocketSource
*
socket_source
;
nice_debug
(
"Detach socket %p."
,
nicesock
);
/* Remove the socket from various lists. */
for
(
l
=
component
->
incoming_checks
;
l
!=
NULL
;)
{
for
(
l
=
component
->
incoming_checks
.
head
;
l
!=
NULL
;)
{
IncomingCheck
*
icheck
=
l
->
data
;
G
S
List
*
next
=
l
->
next
;
GList
*
next
=
l
->
next
;
if
(
icheck
->
local_socket
==
nicesock
)
{
component
->
incoming_checks
=
g_slist_delete_link
(
component
->
incoming_checks
,
l
);
g_queue_delete_link
(
&
component
->
incoming_checks
,
l
);
incoming_check_free
(
icheck
);
}
...
...
@@ -645,14 +646,14 @@ nice_component_detach_socket (NiceComponent *component, NiceSocket *nicesock)
}
/* Find the SocketSource for the socket. */
l
=
g_slist_find_custom
(
component
->
socket_sources
,
nicesock
,
s
=
g_slist_find_custom
(
component
->
socket_sources
,
nicesock
,
_find_socket_source
);
if
(
l
==
NULL
)
if
(
s
==
NULL
)
return
;
/* Detach the source. */
socket_source
=
l
->
data
;
component
->
socket_sources
=
g_slist_delete_link
(
component
->
socket_sources
,
l
);
socket_source
=
s
->
data
;
component
->
socket_sources
=
g_slist_delete_link
(
component
->
socket_sources
,
s
);
component
->
socket_sources_age
++
;
socket_source_detach
(
socket_source
);
...
...
@@ -1065,6 +1066,7 @@ nice_component_init (NiceComponent *component)
nice_component_set_io_callback
(
component
,
NULL
,
NULL
,
NULL
,
0
,
NULL
);
g_queue_init
(
&
component
->
queued_tcp_packets
);
g_queue_init
(
&
component
->
incoming_checks
);
}
static
void
...
...
@@ -1167,7 +1169,7 @@ nice_component_finalize (GObject *obj)
/* Component should have been closed already. */
g_warn_if_fail
(
cmp
->
local_candidates
==
NULL
);
g_warn_if_fail
(
cmp
->
remote_candidates
==
NULL
);
g_warn_if_fail
(
cmp
->
incoming_checks
==
NULL
);
g_warn_if_fail
(
g_queue_get_length
(
&
cmp
->
incoming_checks
)
==
0
);
g_list_free_full
(
cmp
->
valid_candidates
,
(
GDestroyNotify
)
nice_candidate_free
);
...
...
agent/component.h
View file @
1a8be3df
...
...
@@ -161,7 +161,7 @@ struct _NiceComponent {
GList
*
valid_candidates
;
/* list of owned remote NiceCandidates that are part of valid pairs */
GSList
*
socket_sources
;
/* list of SocketSource objs; must only grow monotonically */
guint
socket_sources_age
;
/* incremented when socket_sources changes */
G
SList
*
incoming_checks
;
/* list of IncomingCheck objs */
G
Queue
incoming_checks
;
/* list of IncomingCheck objs */
GList
*
turn_servers
;
/* List of TurnServer objs */
CandidatePair
selected_pair
;
/* independent from checklists,
see ICE 11.1. "Sending Media" (ID-19) */
...
...
agent/conncheck.c
View file @
1a8be3df
...
...
@@ -1640,26 +1640,33 @@ gint conn_check_compare (const CandidateCheckPair *a, const CandidateCheckPair *
*/
void
conn_check_remote_credentials_set
(
NiceAgent
*
agent
,
NiceStream
*
stream
)
{
GSList
*
j
,
*
k
,
*
l
,
*
m
;
GSList
*
j
,
*
l
,
*
m
;
GList
*
k
;
IncomingCheck
*
c
;
for
(
j
=
stream
->
components
;
j
;
j
=
j
->
next
)
{
NiceComponent
*
component
=
j
->
data
;
for
(
k
=
component
->
incoming_checks
;
k
;
k
=
k
->
next
)
{
for
(
k
=
component
->
incoming_checks
.
head
;
k
;
)
{
IncomingCheck
*
icheck
=
k
->
data
;
GList
*
k_next
=
k
->
next
;
/* sect 7.2.1.3., "Learning Peer Reflexive Candidates", has to
* be handled separately */
for
(
l
=
component
->
remote_candidates
;
l
;
l
=
l
->
next
)
{
NiceCandidate
*
rcand
=
l
->
data
;
NiceCandidate
*
lcand
=
NULL
;
if
(
nice_address_equal
(
&
rcand
->
addr
,
&
icheck
->
from
))
{
for
(
m
=
component
->
local_candidates
;
m
;
m
=
m
->
next
)
{
NiceCandidate
*
cand
=
m
->
data
;
if
(
nice_address_equal
(
&
cand
->
addr
,
&
icheck
->
local_socket
->
addr
))
{
lcand
=
cand
;
break
;
}
}
g_assert
(
lcand
!=
NULL
);
priv_schedule_triggered_check
(
agent
,
stream
,
component
,
icheck
->
local_socket
,
rcand
);
...
...
@@ -1669,13 +1676,13 @@ void conn_check_remote_credentials_set(NiceAgent *agent, NiceStream *stream)
break
;
}
}
k
=
k_next
;
}
/* Once we process the pending checks, we should free them to avoid
* reprocessing them again if a dribble-mode set_remote_candidates
* is called */
g_slist_free_full
(
component
->
incoming_checks
,
(
GDestroyNotify
)
incoming_check_free
);
component
->
incoming_checks
=
NULL
;
while
((
c
=
g_queue_pop_head
(
&
component
->
incoming_checks
)))
incoming_check_free
(
c
);
}
}
...
...
@@ -2877,15 +2884,14 @@ static int priv_store_pending_check (NiceAgent *agent, NiceComponent *component,
IncomingCheck
*
icheck
;
nice_debug
(
"Agent %p : Storing pending check."
,
agent
);
if
(
component
->
incoming_checks
&&
g_slist_length
(
component
->
incoming_checks
)
>=
if
(
g_queue_get_length
(
&
component
->
incoming_checks
)
>=
NICE_AGENT_MAX_REMOTE_CANDIDATES
)
{
nice_debug
(
"Agent %p : WARN: unable to store information for early incoming check."
,
agent
);
return
-
1
;
}
icheck
=
g_slice_new0
(
IncomingCheck
);
component
->
incoming_checks
=
g_slist_append
(
component
->
incoming_checks
,
icheck
);
g_queue_push_tail
(
&
component
->
incoming_checks
,
icheck
);
icheck
->
from
=
*
from
;
icheck
->
local_socket
=
sockptr
;
icheck
->
priority
=
priority
;
...
...
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