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
b66a1aed
Commit
b66a1aed
authored
Mar 27, 2014
by
Olivier Crête
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
agent: Refactor nice_agent_set_relay_info()
No behavior change is introduced
parent
f535a142
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
26 additions
and
18 deletions
+26
-18
agent/agent.c
agent/agent.c
+26
-18
No files found.
agent/agent.c
View file @
b66a1aed
...
@@ -1921,6 +1921,8 @@ nice_agent_set_relay_info(NiceAgent *agent,
...
@@ -1921,6 +1921,8 @@ nice_agent_set_relay_info(NiceAgent *agent,
{
{
Component
*
component
=
NULL
;
Component
*
component
=
NULL
;
gboolean
ret
=
TRUE
;
TurnServer
*
turn
;
g_return_val_if_fail
(
server_ip
,
FALSE
);
g_return_val_if_fail
(
server_ip
,
FALSE
);
g_return_val_if_fail
(
server_port
,
FALSE
);
g_return_val_if_fail
(
server_port
,
FALSE
);
...
@@ -1930,31 +1932,37 @@ nice_agent_set_relay_info(NiceAgent *agent,
...
@@ -1930,31 +1932,37 @@ nice_agent_set_relay_info(NiceAgent *agent,
agent_lock
();
agent_lock
();
if
(
agent_find_component
(
agent
,
stream_id
,
component_id
,
NULL
,
&
component
))
{
if
(
!
agent_find_component
(
agent
,
stream_id
,
component_id
,
NULL
,
TurnServer
*
turn
=
g_slice_new0
(
TurnServer
);
&
component
))
{
nice_address_init
(
&
turn
->
server
);
ret
=
FALSE
;
goto
done
;
}
if
(
nice_address_set_from_string
(
&
turn
->
server
,
server_ip
))
{
turn
=
g_slice_new0
(
TurnServer
);
nice_address_set_port
(
&
turn
->
server
,
server_port
);
}
else
{
g_slice_free
(
TurnServer
,
turn
);
agent_unlock_and_emit
(
agent
);
return
FALSE
;
}
nice_address_init
(
&
turn
->
server
);
turn
->
username
=
g_strdup
(
username
);
if
(
nice_address_set_from_string
(
&
turn
->
server
,
server_ip
))
{
turn
->
password
=
g_strdup
(
password
);
nice_address_set_port
(
&
turn
->
server
,
server_port
);
turn
->
type
=
type
;
}
else
{
g_slice_free
(
TurnServer
,
turn
);
ret
=
FALSE
;
goto
done
;
}
nice_debug
(
"Agent %p: added relay server [%s]:%d of type %d"
,
agent
,
turn
->
username
=
g_strdup
(
username
);
server_ip
,
server_port
,
type
);
turn
->
password
=
g_strdup
(
password
);
turn
->
type
=
type
;
component
->
turn_servers
=
g_list_append
(
component
->
turn_servers
,
turn
);
nice_debug
(
"Agent %p: added relay server [%s]:%d of type %d"
,
agent
,
}
server_ip
,
server_port
,
type
);
component
->
turn_servers
=
g_list_append
(
component
->
turn_servers
,
turn
);
done:
agent_unlock_and_emit
(
agent
);
agent_unlock_and_emit
(
agent
);
return
TRUE
;
return
ret
;
}
}
#ifdef HAVE_GUPNP
#ifdef HAVE_GUPNP
...
...
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