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
a0b48d44
Commit
a0b48d44
authored
Feb 07, 2020
by
Fabrice Bellet
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
agent: make code indentation a bit more homogeneous
parent
8a3e8c76
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
12 deletions
+12
-12
agent/agent.c
agent/agent.c
+12
-12
No files found.
agent/agent.c
View file @
a0b48d44
...
@@ -1225,17 +1225,17 @@ priv_update_controlling_mode (NiceAgent *agent, gboolean value)
...
@@ -1225,17 +1225,17 @@ priv_update_controlling_mode (NiceAgent *agent, gboolean value)
if
(
update_controlling_mode
)
{
if
(
update_controlling_mode
)
{
agent
->
controlling_mode
=
agent
->
saved_controlling_mode
;
agent
->
controlling_mode
=
agent
->
saved_controlling_mode
;
nice_debug
(
"Agent %p : Property set, changing role to
\"
%s
\"
."
,
nice_debug
(
"Agent %p : Property set, changing role to
\"
%s
\"
."
,
agent
,
agent
->
controlling_mode
?
"controlling"
:
"controlled"
);
agent
,
agent
->
controlling_mode
?
"controlling"
:
"controlled"
);
}
else
{
}
else
{
nice_debug
(
"Agent %p : Property set, role switch requested "
nice_debug
(
"Agent %p : Property set, role switch requested "
"but conncheck already started."
,
agent
);
"but conncheck already started."
,
agent
);
nice_debug
(
"Agent %p : Property set, staying with role
\"
%s
\"
"
nice_debug
(
"Agent %p : Property set, staying with role
\"
%s
\"
"
"until restart."
,
agent
,
"until restart."
,
agent
,
agent
->
controlling_mode
?
"controlling"
:
"controlled"
);
agent
->
controlling_mode
?
"controlling"
:
"controlled"
);
}
}
}
else
}
else
nice_debug
(
"Agent %p : Property set, role is already
\"
%s
\"
."
,
agent
,
nice_debug
(
"Agent %p : Property set, role is already
\"
%s
\"
."
,
agent
,
agent
->
controlling_mode
?
"controlling"
:
"controlled"
);
agent
->
controlling_mode
?
"controlling"
:
"controlled"
);
}
}
static
void
static
void
...
@@ -3169,7 +3169,7 @@ nice_agent_gather_candidates (
...
@@ -3169,7 +3169,7 @@ nice_agent_gather_candidates (
if
(
res
==
HOST_CANDIDATE_REDUNDANT
)
{
if
(
res
==
HOST_CANDIDATE_REDUNDANT
)
{
nice_debug
(
"Agent %p: Ignoring local candidate, it's redundant"
,
nice_debug
(
"Agent %p: Ignoring local candidate, it's redundant"
,
agent
);
agent
);
continue
;
continue
;
}
else
if
(
res
==
HOST_CANDIDATE_FAILED
)
{
}
else
if
(
res
==
HOST_CANDIDATE_FAILED
)
{
nice_debug
(
"Agent %p: Could ot retrieive component %d/%d"
,
agent
,
nice_debug
(
"Agent %p: Could ot retrieive component %d/%d"
,
agent
,
...
@@ -3502,8 +3502,8 @@ static void priv_update_pair_foundations (NiceAgent *agent,
...
@@ -3502,8 +3502,8 @@ static void priv_update_pair_foundations (NiceAgent *agent,
if
(
component
->
selected_pair
.
local
==
pair
->
local
&&
if
(
component
->
selected_pair
.
local
==
pair
->
local
&&
component
->
selected_pair
.
remote
==
pair
->
remote
)
{
component
->
selected_pair
.
remote
==
pair
->
remote
)
{
nice_debug
(
"Agent %p : updating SELECTED PAIR for component "
nice_debug
(
"Agent %p : updating SELECTED PAIR for component "
"%u: %s (prio:%"
G_GUINT64_FORMAT
")."
,
agent
,
"%u: %s (prio:%"
G_GUINT64_FORMAT
")."
,
agent
,
component
->
id
,
foundation
,
pair
->
priority
);
component
->
id
,
foundation
,
pair
->
priority
);
agent_signal_new_selected_pair
(
agent
,
pair
->
stream_id
,
agent_signal_new_selected_pair
(
agent
,
pair
->
stream_id
,
component
->
id
,
pair
->
local
,
pair
->
remote
);
component
->
id
,
pair
->
local
,
pair
->
remote
);
}
}
...
@@ -3545,10 +3545,10 @@ static void priv_update_selected_pair (NiceAgent *agent,
...
@@ -3545,10 +3545,10 @@ static void priv_update_selected_pair (NiceAgent *agent,
cpair
.
priority
=
pair
->
priority
;
cpair
.
priority
=
pair
->
priority
;
cpair
.
prflx_priority
=
pair
->
prflx_priority
;
cpair
.
prflx_priority
=
pair
->
prflx_priority
;
nice_debug
(
"Agent %p : Updating selected pair with higher "
nice_debug
(
"Agent %p : Updating selected pair with higher "
"priority nominated pair %p."
,
agent
,
pair
);
"priority nominated pair %p."
,
agent
,
pair
);
nice_debug
(
"Agent %p : changing SELECTED PAIR for component %u: %s:%s "
nice_debug
(
"Agent %p : changing SELECTED PAIR for component %u: %s:%s "
"(prio:%"
G_GUINT64_FORMAT
")."
,
agent
,
component
->
id
,
"(prio:%"
G_GUINT64_FORMAT
")."
,
agent
,
component
->
id
,
pair
->
local
->
foundation
,
pair
->
remote
->
foundation
,
pair
->
priority
);
pair
->
local
->
foundation
,
pair
->
remote
->
foundation
,
pair
->
priority
);
nice_component_update_selected_pair
(
agent
,
component
,
&
cpair
);
nice_component_update_selected_pair
(
agent
,
component
,
&
cpair
);
agent_signal_new_selected_pair
(
agent
,
pair
->
stream_id
,
agent_signal_new_selected_pair
(
agent
,
pair
->
stream_id
,
component
->
id
,
pair
->
local
,
pair
->
remote
);
component
->
id
,
pair
->
local
,
pair
->
remote
);
...
@@ -3690,7 +3690,7 @@ static gboolean priv_add_remote_candidate (
...
@@ -3690,7 +3690,7 @@ static gboolean priv_add_remote_candidate (
if
(
agent
->
nomination_mode
==
NICE_NOMINATION_MODE_AGGRESSIVE
&&
if
(
agent
->
nomination_mode
==
NICE_NOMINATION_MODE_AGGRESSIVE
&&
transport
!=
NICE_CANDIDATE_TRANSPORT_UDP
)
{
transport
!=
NICE_CANDIDATE_TRANSPORT_UDP
)
{
nice_debug
(
"Agent %p : we have TCP candidates, switching back "
nice_debug
(
"Agent %p : we have TCP candidates, switching back "
"to regular nomination mode"
,
agent
);
"to regular nomination mode"
,
agent
);
agent
->
nomination_mode
=
NICE_NOMINATION_MODE_REGULAR
;
agent
->
nomination_mode
=
NICE_NOMINATION_MODE_REGULAR
;
}
}
}
}
...
...
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