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
9d50cb1b
Commit
9d50cb1b
authored
Oct 03, 2014
by
Olivier Crête
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
agent: Only add pairs once on gathering done
Also don't try to re-add pairs that already have been added
parent
921ab719
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
4 deletions
+6
-4
agent/agent.c
agent/agent.c
+2
-1
agent/conncheck.c
agent/conncheck.c
+3
-3
agent/conncheck.h
agent/conncheck.h
+1
-0
No files found.
agent/agent.c
View file @
9d50cb1b
...
@@ -1902,7 +1902,8 @@ void agent_gathering_done (NiceAgent *agent)
...
@@ -1902,7 +1902,8 @@ void agent_gathering_done (NiceAgent *agent)
break
;
break
;
}
}
if
(
m
==
NULL
)
{
if
(
m
==
NULL
)
{
conn_check_add_for_candidate
(
agent
,
stream
->
id
,
component
,
remote_candidate
);
conn_check_add_for_candidate_pair
(
agent
,
stream
->
id
,
component
,
local_candidate
,
remote_candidate
);
}
}
}
}
}
}
...
...
agent/conncheck.c
View file @
9d50cb1b
...
@@ -1444,7 +1444,7 @@ static void priv_conn_check_add_for_candidate_pair_matched (NiceAgent *agent,
...
@@ -1444,7 +1444,7 @@ static void priv_conn_check_add_for_candidate_pair_matched (NiceAgent *agent,
}
}
}
}
static
gboolean
priv_
conn_check_add_for_candidate_pair
(
NiceAgent
*
agent
,
gboolean
conn_check_add_for_candidate_pair
(
NiceAgent
*
agent
,
guint
stream_id
,
Component
*
component
,
NiceCandidate
*
local
,
guint
stream_id
,
Component
*
component
,
NiceCandidate
*
local
,
NiceCandidate
*
remote
)
NiceCandidate
*
remote
)
{
{
...
@@ -1502,7 +1502,7 @@ int conn_check_add_for_candidate (NiceAgent *agent, guint stream_id, Component *
...
@@ -1502,7 +1502,7 @@ int conn_check_add_for_candidate (NiceAgent *agent, guint stream_id, Component *
for
(
i
=
component
->
local_candidates
;
i
;
i
=
i
->
next
)
{
for
(
i
=
component
->
local_candidates
;
i
;
i
=
i
->
next
)
{
NiceCandidate
*
local
=
i
->
data
;
NiceCandidate
*
local
=
i
->
data
;
ret
=
priv_
conn_check_add_for_candidate_pair
(
agent
,
stream_id
,
component
,
local
,
remote
);
ret
=
conn_check_add_for_candidate_pair
(
agent
,
stream_id
,
component
,
local
,
remote
);
if
(
ret
)
{
if
(
ret
)
{
++
added
;
++
added
;
...
@@ -1533,7 +1533,7 @@ int conn_check_add_for_local_candidate (NiceAgent *agent, guint stream_id, Compo
...
@@ -1533,7 +1533,7 @@ int conn_check_add_for_local_candidate (NiceAgent *agent, guint stream_id, Compo
for
(
i
=
component
->
remote_candidates
;
i
;
i
=
i
->
next
)
{
for
(
i
=
component
->
remote_candidates
;
i
;
i
=
i
->
next
)
{
NiceCandidate
*
remote
=
i
->
data
;
NiceCandidate
*
remote
=
i
->
data
;
ret
=
priv_
conn_check_add_for_candidate_pair
(
agent
,
stream_id
,
component
,
local
,
remote
);
ret
=
conn_check_add_for_candidate_pair
(
agent
,
stream_id
,
component
,
local
,
remote
);
if
(
ret
)
{
if
(
ret
)
{
++
added
;
++
added
;
...
...
agent/conncheck.h
View file @
9d50cb1b
...
@@ -96,6 +96,7 @@ struct _CandidateCheckPair
...
@@ -96,6 +96,7 @@ struct _CandidateCheckPair
int
conn_check_add_for_candidate
(
NiceAgent
*
agent
,
guint
stream_id
,
Component
*
component
,
NiceCandidate
*
remote
);
int
conn_check_add_for_candidate
(
NiceAgent
*
agent
,
guint
stream_id
,
Component
*
component
,
NiceCandidate
*
remote
);
int
conn_check_add_for_local_candidate
(
NiceAgent
*
agent
,
guint
stream_id
,
Component
*
component
,
NiceCandidate
*
local
);
int
conn_check_add_for_local_candidate
(
NiceAgent
*
agent
,
guint
stream_id
,
Component
*
component
,
NiceCandidate
*
local
);
gboolean
conn_check_add_for_candidate_pair
(
NiceAgent
*
agent
,
guint
stream_id
,
Component
*
component
,
NiceCandidate
*
local
,
NiceCandidate
*
remote
);
void
conn_check_free
(
NiceAgent
*
agent
);
void
conn_check_free
(
NiceAgent
*
agent
);
gboolean
conn_check_schedule_next
(
NiceAgent
*
agent
);
gboolean
conn_check_schedule_next
(
NiceAgent
*
agent
);
int
conn_check_send
(
NiceAgent
*
agent
,
CandidateCheckPair
*
pair
);
int
conn_check_send
(
NiceAgent
*
agent
,
CandidateCheckPair
*
pair
);
...
...
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