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
53455086
Commit
53455086
authored
Feb 04, 2009
by
Youness Alaoui
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix bug where a discovered peer-reflexive pair does not get nominated
parent
9be637ae
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
7 deletions
+14
-7
agent/conncheck.c
agent/conncheck.c
+14
-6
agent/interfaces.c
agent/interfaces.c
+0
-1
No files found.
agent/conncheck.c
View file @
53455086
...
...
@@ -244,7 +244,8 @@ static void priv_conn_check_unfreeze_related (NiceAgent *agent, Stream *stream,
static
gboolean
priv_conn_check_tick_stream
(
Stream
*
stream
,
NiceAgent
*
agent
,
GTimeVal
*
now
)
{
gboolean
keep_timer_going
=
FALSE
;
guint
s_inprogress
=
0
,
s_succeeded
=
0
,
s_nominated
=
0
,
s_waiting_for_nomination
=
0
;
guint
s_inprogress
=
0
,
s_succeeded
=
0
,
s_discovered
=
0
,
s_nominated
=
0
,
s_waiting_for_nomination
=
0
;
guint
frozen
=
0
,
waiting
=
0
;
GSList
*
i
,
*
k
;
...
...
@@ -308,10 +309,14 @@ static gboolean priv_conn_check_tick_stream (Stream *stream, NiceAgent *agent, G
++
waiting
;
else
if
(
p
->
state
==
NICE_CHECK_SUCCEEDED
)
++
s_succeeded
;
else
if
(
p
->
state
==
NICE_CHECK_DISCOVERED
)
++
s_discovered
;
if
(
p
->
state
==
NICE_CHECK_SUCCEEDED
&&
p
->
nominated
)
if
((
p
->
state
==
NICE_CHECK_SUCCEEDED
||
p
->
state
==
NICE_CHECK_DISCOVERED
)
&&
p
->
nominated
)
++
s_nominated
;
else
if
(
p
->
state
==
NICE_CHECK_SUCCEEDED
&&
!
p
->
nominated
)
else
if
((
p
->
state
==
NICE_CHECK_SUCCEEDED
||
p
->
state
==
NICE_CHECK_DISCOVERED
)
&&
!
p
->
nominated
)
++
s_waiting_for_nomination
;
}
...
...
@@ -334,7 +339,7 @@ static gboolean priv_conn_check_tick_stream (Stream *stream, NiceAgent *agent, G
p
->
state
==
NICE_CHECK_DISCOVERED
)
{
nice_debug
(
"Agent %p : restarting check %p as the nominated pair."
,
agent
,
p
);
p
->
nominated
=
TRUE
;
priv_conn_check_initiate
(
agent
,
p
);
priv_conn_check_initiate
(
agent
,
p
);
break
;
/* move to the next component */
}
}
...
...
@@ -344,8 +349,11 @@ static gboolean priv_conn_check_tick_stream (Stream *stream, NiceAgent *agent, G
{
static
int
tick_counter
=
0
;
if
(
tick_counter
++
%
50
==
0
||
keep_timer_going
!=
TRUE
)
nice_debug
(
"Agent %p : timer(%p) tick #%u: %u frozen, %u in-progress, %u waiting, %u succeeded, %u nominated, %u waiting-for-nom."
,
agent
,
agent
,
tick_counter
,
frozen
,
s_inprogress
,
waiting
,
s_succeeded
,
s_nominated
,
s_waiting_for_nomination
);
nice_debug
(
"Agent %p : timer tick #%u: %u frozen, %u in-progress, "
"%u waiting, %u succeeded, %u discovered, %u nominated, "
"%u waiting-for-nom."
,
agent
,
tick_counter
,
frozen
,
s_inprogress
,
waiting
,
s_succeeded
,
s_discovered
,
s_nominated
,
s_waiting_for_nomination
);
}
return
keep_timer_going
;
...
...
agent/interfaces.c
View file @
53455086
/*
* interfaces.c - Source for interface discovery code
*
* Farsight Helper functions
* Copyright (C) 2006 Youness Alaoui <kakaroto@kakaroto.homelinux.net>
* Copyright (C) 2007 Collabora, Nokia
* Copyright (C) 2008 Haakon Sporsheim <haakon.sporsheim@tandberg.com>
...
...
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