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
2a07eb44
Commit
2a07eb44
authored
Apr 26, 2008
by
Olivier Crete
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Port test to use NiceCandidate
darcs-hash:20080426004621-3e2dc-1866ce52eb9ba0e2fb3c5560034e289d6b024e3e.gz
parent
1baed290
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
73 additions
and
106 deletions
+73
-106
agent/agent.c
agent/agent.c
+11
-14
agent/agent.h
agent/agent.h
+0
-12
agent/test-fallback.c
agent/test-fallback.c
+11
-15
agent/test-fullmode.c
agent/test-fullmode.c
+36
-48
agent/test-restart.c
agent/test-restart.c
+15
-17
No files found.
agent/agent.c
View file @
2a07eb44
...
@@ -885,7 +885,7 @@ static gboolean priv_add_remote_candidate (
...
@@ -885,7 +885,7 @@ static gboolean priv_add_remote_candidate (
guint
component_id
,
guint
component_id
,
NiceCandidateType
type
,
NiceCandidateType
type
,
const
NiceAddress
*
addr
,
const
NiceAddress
*
addr
,
const
NiceAddress
*
related
_addr
,
const
NiceAddress
*
base
_addr
,
NiceCandidateTransport
transport
,
NiceCandidateTransport
transport
,
guint32
priority
,
guint32
priority
,
const
gchar
*
username
,
const
gchar
*
username
,
...
@@ -906,8 +906,8 @@ static gboolean priv_add_remote_candidate (
...
@@ -906,8 +906,8 @@ static gboolean priv_add_remote_candidate (
g_debug
(
"Update existing remote candidate %p."
,
candidate
);
g_debug
(
"Update existing remote candidate %p."
,
candidate
);
/* case 1: an existing candidate, update the attributes */
/* case 1: an existing candidate, update the attributes */
candidate
->
type
=
type
;
candidate
->
type
=
type
;
if
(
related
_addr
)
if
(
base
_addr
)
candidate
->
base_addr
=
*
related
_addr
;
candidate
->
base_addr
=
*
base
_addr
;
candidate
->
priority
=
priority
;
candidate
->
priority
=
priority
;
if
(
foundation
)
if
(
foundation
)
strncpy
(
candidate
->
foundation
,
foundation
,
NICE_CANDIDATE_MAX_FOUNDATION
);
strncpy
(
candidate
->
foundation
,
foundation
,
NICE_CANDIDATE_MAX_FOUNDATION
);
...
@@ -944,8 +944,8 @@ static gboolean priv_add_remote_candidate (
...
@@ -944,8 +944,8 @@ static gboolean priv_add_remote_candidate (
}
}
#endif
#endif
if
(
related
_addr
)
if
(
base
_addr
)
candidate
->
base_addr
=
*
related
_addr
;
candidate
->
base_addr
=
*
base
_addr
;
candidate
->
transport
=
transport
;
candidate
->
transport
=
transport
;
candidate
->
priority
=
priority
;
candidate
->
priority
=
priority
;
...
@@ -1119,7 +1119,7 @@ nice_agent_add_remote_candidate (
...
@@ -1119,7 +1119,7 @@ nice_agent_add_remote_candidate (
* @agent: a NiceAgent
* @agent: a NiceAgent
* @stream_id: the ID of the stream the candidate is for
* @stream_id: the ID of the stream the candidate is for
* @component_id: the ID of the component the candidate is for
* @component_id: the ID of the component the candidate is for
* @candidates: a list of NiceCandidate
Desc
items describing the candidates
* @candidates: a list of NiceCandidate items describing the candidates
*
*
* Sets the remote candidates for a component of a stream. Replaces
* Sets the remote candidates for a component of a stream. Replaces
* any existing remote candidates.
* any existing remote candidates.
...
@@ -1143,18 +1143,18 @@ nice_agent_set_remote_candidates (NiceAgent *agent, guint stream_id, guint compo
...
@@ -1143,18 +1143,18 @@ nice_agent_set_remote_candidates (NiceAgent *agent, guint stream_id, guint compo
g_mutex_lock
(
agent
->
mutex
);
g_mutex_lock
(
agent
->
mutex
);
for
(
i
=
candidates
;
i
&&
added
>=
0
;
i
=
i
->
next
)
{
for
(
i
=
candidates
;
i
&&
added
>=
0
;
i
=
i
->
next
)
{
NiceCandidate
Desc
*
d
=
(
NiceCandidateDesc
*
)
i
->
data
;
NiceCandidate
*
d
=
(
NiceCandidate
*
)
i
->
data
;
gboolean
res
=
gboolean
res
=
priv_add_remote_candidate
(
agent
,
priv_add_remote_candidate
(
agent
,
stream_id
,
stream_id
,
component_id
,
component_id
,
d
->
type
,
d
->
type
,
d
->
addr
,
&
d
->
addr
,
d
->
related
_addr
,
&
d
->
base
_addr
,
d
->
transport
,
d
->
transport
,
d
->
priority
,
d
->
priority
,
NULL
,
d
->
username
,
NULL
,
d
->
password
,
d
->
foundation
);
d
->
foundation
);
if
(
res
)
if
(
res
)
++
added
;
++
added
;
...
@@ -1591,9 +1591,6 @@ nice_agent_get_remote_candidates (
...
@@ -1591,9 +1591,6 @@ nice_agent_get_remote_candidates (
goto
done
;
goto
done
;
}
}
/* XXX: should we expose NiceCandidate to the client, or should
* we instead return a list of NiceCandidateDesc's? */
ret
=
g_slist_copy
(
component
->
remote_candidates
);
ret
=
g_slist_copy
(
component
->
remote_candidates
);
done:
done:
...
...
agent/agent.h
View file @
2a07eb44
...
@@ -104,18 +104,6 @@ typedef enum
...
@@ -104,18 +104,6 @@ typedef enum
NICE_COMPATIBILITY_LAST
=
NICE_COMPATIBILITY_MSN
NICE_COMPATIBILITY_LAST
=
NICE_COMPATIBILITY_MSN
}
NiceCompatibility
;
}
NiceCompatibility
;
typedef
struct
_NiceCandidateDesc
NiceCandidateDesc
;
struct
_NiceCandidateDesc
{
gchar
*
foundation
;
/**< 1*32ice-char (NICE_CANDIDATE_MAX_FOUNDATION-1) */
guint
component_id
;
/**< value between 1 and 256, inclusive */
NiceCandidateTransport
transport
;
guint32
priority
;
/**< value between 1 and (2**31 - 1), inclusive */
NiceAddress
*
addr
;
NiceCandidateType
type
;
NiceAddress
*
related_addr
;
/**< optional */
};
typedef
struct
_NiceAgent
NiceAgent
;
typedef
struct
_NiceAgent
NiceAgent
;
typedef
void
(
*
NiceAgentRecvFunc
)
(
typedef
void
(
*
NiceAgentRecvFunc
)
(
...
...
agent/test-fallback.c
View file @
2a07eb44
...
@@ -199,20 +199,16 @@ static void priv_get_local_addr (NiceAgent *agent, guint stream_id, guint compon
...
@@ -199,20 +199,16 @@ static void priv_get_local_addr (NiceAgent *agent, guint stream_id, guint compon
static
int
run_fallback_test
(
NiceAgent
*
lagent
,
NiceAgent
*
ragent
,
NiceAddress
*
baseaddr
)
static
int
run_fallback_test
(
NiceAgent
*
lagent
,
NiceAgent
*
ragent
,
NiceAddress
*
baseaddr
)
{
{
NiceAddress
laddr
,
raddr
,
laddr_rtcp
,
raddr_rtcp
;
NiceAddress
laddr
,
raddr
,
laddr_rtcp
,
raddr_rtcp
;
NiceCandidateDesc
cdes
=
{
/* candidate description (no ports) */
NiceCandidate
cdes
;
(
gchar
*
)
"1"
,
/* foundation */
0
,
/* component-id; filled later */
NICE_CANDIDATE_TRANSPORT_UDP
,
/* transport */
100000
,
/* priority */
NULL
,
/* address */
NICE_CANDIDATE_TYPE_HOST
,
/* type */
baseaddr
/* base-address */
};
GSList
*
cands
;
GSList
*
cands
;
guint
ls_id
,
rs_id
;
guint
ls_id
,
rs_id
;
/* XXX: dear compiler, these are for you: */
memset
(
&
cdes
,
0
,
sizeof
(
NiceCandidate
));
(
void
)
baseaddr
;
cdes
.
priority
=
100000
;
strcpy
(
cdes
.
foundation
,
"1"
);
cdes
.
type
=
NICE_CANDIDATE_TYPE_HOST
;
cdes
.
transport
=
NICE_CANDIDATE_TRANSPORT_UDP
;
cdes
.
base_addr
=
*
baseaddr
;
/* step: initialize variables modified by the callbacks */
/* step: initialize variables modified by the callbacks */
global_components_ready
=
0
;
global_components_ready
=
0
;
...
@@ -278,14 +274,14 @@ static int run_fallback_test (NiceAgent *lagent, NiceAgent *ragent, NiceAddress
...
@@ -278,14 +274,14 @@ static int run_fallback_test (NiceAgent *lagent, NiceAgent *ragent, NiceAddress
cands
=
g_slist_append
(
NULL
,
&
cdes
);
cands
=
g_slist_append
(
NULL
,
&
cdes
);
cdes
.
component_id
=
NICE_COMPONENT_TYPE_RTP
;
cdes
.
component_id
=
NICE_COMPONENT_TYPE_RTP
;
cdes
.
addr
=
&
raddr
;
cdes
.
addr
=
raddr
;
nice_agent_set_remote_candidates
(
lagent
,
ls_id
,
NICE_COMPONENT_TYPE_RTP
,
cands
);
nice_agent_set_remote_candidates
(
lagent
,
ls_id
,
NICE_COMPONENT_TYPE_RTP
,
cands
);
cdes
.
addr
=
&
laddr
;
cdes
.
addr
=
laddr
;
nice_agent_set_remote_candidates
(
ragent
,
rs_id
,
NICE_COMPONENT_TYPE_RTP
,
cands
);
nice_agent_set_remote_candidates
(
ragent
,
rs_id
,
NICE_COMPONENT_TYPE_RTP
,
cands
);
cdes
.
component_id
=
NICE_COMPONENT_TYPE_RTCP
;
cdes
.
component_id
=
NICE_COMPONENT_TYPE_RTCP
;
cdes
.
addr
=
&
raddr_rtcp
;
cdes
.
addr
=
raddr_rtcp
;
nice_agent_set_remote_candidates
(
lagent
,
ls_id
,
NICE_COMPONENT_TYPE_RTCP
,
cands
);
nice_agent_set_remote_candidates
(
lagent
,
ls_id
,
NICE_COMPONENT_TYPE_RTCP
,
cands
);
cdes
.
addr
=
&
laddr_rtcp
;
cdes
.
addr
=
laddr_rtcp
;
nice_agent_set_remote_candidates
(
ragent
,
rs_id
,
NICE_COMPONENT_TYPE_RTCP
,
cands
);
nice_agent_set_remote_candidates
(
ragent
,
rs_id
,
NICE_COMPONENT_TYPE_RTCP
,
cands
);
/* step: fall back to non-ICE mode on both sides */
/* step: fall back to non-ICE mode on both sides */
...
...
agent/test-fullmode.c
View file @
2a07eb44
...
@@ -198,21 +198,27 @@ static void priv_get_local_addr (NiceAgent *agent, guint stream_id, guint compon
...
@@ -198,21 +198,27 @@ static void priv_get_local_addr (NiceAgent *agent, guint stream_id, guint compon
g_slist_free
(
cands
);
g_slist_free
(
cands
);
}
}
static
void
init_candidate
(
NiceCandidate
*
cand
)
{
memset
(
cand
,
0
,
sizeof
(
NiceCandidate
));
cand
->
priority
=
10000
;
strcpy
(
cand
->
foundation
,
"1"
);
cand
->
type
=
NICE_CANDIDATE_TYPE_HOST
;
cand
->
transport
=
NICE_CANDIDATE_TRANSPORT_UDP
;
}
static
int
run_full_test
(
NiceAgent
*
lagent
,
NiceAgent
*
ragent
,
NiceAddress
*
baseaddr
,
guint
ready
,
guint
failed
)
static
int
run_full_test
(
NiceAgent
*
lagent
,
NiceAgent
*
ragent
,
NiceAddress
*
baseaddr
,
guint
ready
,
guint
failed
)
{
{
NiceAddress
laddr
,
raddr
,
laddr_rtcp
,
raddr_rtcp
;
NiceAddress
laddr
,
raddr
,
laddr_rtcp
,
raddr_rtcp
;
NiceCandidateDesc
cdes
=
{
/* candidate description (no ports) */
NiceCandidate
cdes
;
(
gchar
*
)
"1"
,
/* foundation */
0
,
/* component-id; filled later */
NICE_CANDIDATE_TRANSPORT_UDP
,
/* transport */
100000
,
/* priority */
NULL
,
/* address */
NICE_CANDIDATE_TYPE_HOST
,
/* type */
NULL
/* base-address */
};
GSList
*
cands
;
GSList
*
cands
;
guint
ls_id
,
rs_id
;
guint
ls_id
,
rs_id
;
init_candidate
(
&
cdes
);
/* XXX: dear compiler, this is for you */
/* XXX: dear compiler, this is for you */
(
void
)
baseaddr
;
(
void
)
baseaddr
;
...
@@ -287,14 +293,14 @@ static int run_full_test (NiceAgent *lagent, NiceAgent *ragent, NiceAddress *bas
...
@@ -287,14 +293,14 @@ static int run_full_test (NiceAgent *lagent, NiceAgent *ragent, NiceAddress *bas
ls_id
,
ufrag
,
password
);
ls_id
,
ufrag
,
password
);
}
}
cdes
.
component_id
=
NICE_COMPONENT_TYPE_RTP
;
cdes
.
component_id
=
NICE_COMPONENT_TYPE_RTP
;
cdes
.
addr
=
&
raddr
;
cdes
.
addr
=
raddr
;
nice_agent_set_remote_candidates
(
lagent
,
ls_id
,
NICE_COMPONENT_TYPE_RTP
,
cands
);
nice_agent_set_remote_candidates
(
lagent
,
ls_id
,
NICE_COMPONENT_TYPE_RTP
,
cands
);
cdes
.
addr
=
&
laddr
;
cdes
.
addr
=
laddr
;
nice_agent_set_remote_candidates
(
ragent
,
rs_id
,
NICE_COMPONENT_TYPE_RTP
,
cands
);
nice_agent_set_remote_candidates
(
ragent
,
rs_id
,
NICE_COMPONENT_TYPE_RTP
,
cands
);
cdes
.
component_id
=
NICE_COMPONENT_TYPE_RTCP
;
cdes
.
component_id
=
NICE_COMPONENT_TYPE_RTCP
;
cdes
.
addr
=
&
raddr_rtcp
;
cdes
.
addr
=
raddr_rtcp
;
nice_agent_set_remote_candidates
(
lagent
,
ls_id
,
NICE_COMPONENT_TYPE_RTCP
,
cands
);
nice_agent_set_remote_candidates
(
lagent
,
ls_id
,
NICE_COMPONENT_TYPE_RTCP
,
cands
);
cdes
.
addr
=
&
laddr_rtcp
;
cdes
.
addr
=
laddr_rtcp
;
nice_agent_set_remote_candidates
(
ragent
,
rs_id
,
NICE_COMPONENT_TYPE_RTCP
,
cands
);
nice_agent_set_remote_candidates
(
ragent
,
rs_id
,
NICE_COMPONENT_TYPE_RTCP
,
cands
);
g_slist_free
(
cands
);
g_slist_free
(
cands
);
...
@@ -333,18 +339,12 @@ static int run_full_test (NiceAgent *lagent, NiceAgent *ragent, NiceAddress *bas
...
@@ -333,18 +339,12 @@ static int run_full_test (NiceAgent *lagent, NiceAgent *ragent, NiceAddress *bas
static
int
run_full_test_delayed_answer
(
NiceAgent
*
lagent
,
NiceAgent
*
ragent
,
NiceAddress
*
baseaddr
,
guint
ready
,
guint
failed
)
static
int
run_full_test_delayed_answer
(
NiceAgent
*
lagent
,
NiceAgent
*
ragent
,
NiceAddress
*
baseaddr
,
guint
ready
,
guint
failed
)
{
{
NiceAddress
laddr
,
raddr
,
laddr_rtcp
,
raddr_rtcp
;
NiceAddress
laddr
,
raddr
,
laddr_rtcp
,
raddr_rtcp
;
NiceCandidateDesc
cdes
=
{
/* candidate description (no ports) */
NiceCandidate
cdes
;
(
gchar
*
)
"1"
,
/* foundation */
0
,
/* component-id; filled later */
NICE_CANDIDATE_TRANSPORT_UDP
,
/* transport */
100000
,
/* priority */
NULL
,
/* address */
NICE_CANDIDATE_TYPE_HOST
,
/* type */
NULL
/* base-address */
};
GSList
*
cands
;
GSList
*
cands
;
guint
ls_id
,
rs_id
;
guint
ls_id
,
rs_id
;
init_candidate
(
&
cdes
);
/* XXX: dear compiler, this is for you */
/* XXX: dear compiler, this is for you */
(
void
)
baseaddr
;
(
void
)
baseaddr
;
...
@@ -418,10 +418,10 @@ static int run_full_test_delayed_answer (NiceAgent *lagent, NiceAgent *ragent, N
...
@@ -418,10 +418,10 @@ static int run_full_test_delayed_answer (NiceAgent *lagent, NiceAgent *ragent, N
/* step: set remote candidates for agent R (answering party) */
/* step: set remote candidates for agent R (answering party) */
cands
=
g_slist_append
(
NULL
,
&
cdes
);
cands
=
g_slist_append
(
NULL
,
&
cdes
);
cdes
.
component_id
=
NICE_COMPONENT_TYPE_RTP
;
cdes
.
component_id
=
NICE_COMPONENT_TYPE_RTP
;
cdes
.
addr
=
&
laddr
;
cdes
.
addr
=
laddr
;
nice_agent_set_remote_candidates
(
ragent
,
rs_id
,
NICE_COMPONENT_TYPE_RTP
,
cands
);
nice_agent_set_remote_candidates
(
ragent
,
rs_id
,
NICE_COMPONENT_TYPE_RTP
,
cands
);
cdes
.
component_id
=
NICE_COMPONENT_TYPE_RTCP
;
cdes
.
component_id
=
NICE_COMPONENT_TYPE_RTCP
;
cdes
.
addr
=
&
laddr_rtcp
;
cdes
.
addr
=
laddr_rtcp
;
nice_agent_set_remote_candidates
(
ragent
,
rs_id
,
NICE_COMPONENT_TYPE_RTCP
,
cands
);
nice_agent_set_remote_candidates
(
ragent
,
rs_id
,
NICE_COMPONENT_TYPE_RTCP
,
cands
);
g_debug
(
"test-fullmode: Set properties, next running mainloop until first check is received..."
);
g_debug
(
"test-fullmode: Set properties, next running mainloop until first check is received..."
);
...
@@ -445,10 +445,10 @@ static int run_full_test_delayed_answer (NiceAgent *lagent, NiceAgent *ragent, N
...
@@ -445,10 +445,10 @@ static int run_full_test_delayed_answer (NiceAgent *lagent, NiceAgent *ragent, N
/* step: pass remove candidates to agent L (offering party) */
/* step: pass remove candidates to agent L (offering party) */
cdes
.
component_id
=
NICE_COMPONENT_TYPE_RTP
;
cdes
.
component_id
=
NICE_COMPONENT_TYPE_RTP
;
cdes
.
addr
=
&
raddr
;
cdes
.
addr
=
raddr
;
nice_agent_set_remote_candidates
(
lagent
,
ls_id
,
NICE_COMPONENT_TYPE_RTP
,
cands
);
nice_agent_set_remote_candidates
(
lagent
,
ls_id
,
NICE_COMPONENT_TYPE_RTP
,
cands
);
cdes
.
component_id
=
NICE_COMPONENT_TYPE_RTCP
;
cdes
.
component_id
=
NICE_COMPONENT_TYPE_RTCP
;
cdes
.
addr
=
&
raddr_rtcp
;
cdes
.
addr
=
raddr_rtcp
;
nice_agent_set_remote_candidates
(
lagent
,
ls_id
,
NICE_COMPONENT_TYPE_RTCP
,
cands
);
nice_agent_set_remote_candidates
(
lagent
,
ls_id
,
NICE_COMPONENT_TYPE_RTCP
,
cands
);
g_debug
(
"test-fullmode: Running mainloop until connectivity checks succeeed."
);
g_debug
(
"test-fullmode: Running mainloop until connectivity checks succeeed."
);
...
@@ -478,18 +478,12 @@ static int run_full_test_delayed_answer (NiceAgent *lagent, NiceAgent *ragent, N
...
@@ -478,18 +478,12 @@ static int run_full_test_delayed_answer (NiceAgent *lagent, NiceAgent *ragent, N
static
int
run_full_test_wrong_password
(
NiceAgent
*
lagent
,
NiceAgent
*
ragent
,
NiceAddress
*
baseaddr
)
static
int
run_full_test_wrong_password
(
NiceAgent
*
lagent
,
NiceAgent
*
ragent
,
NiceAddress
*
baseaddr
)
{
{
NiceAddress
laddr
,
raddr
;
NiceAddress
laddr
,
raddr
;
NiceCandidateDesc
cdes
=
{
/* candidate description (no ports) */
NiceCandidate
cdes
;
(
gchar
*
)
"1"
,
/* foundation */
NICE_COMPONENT_TYPE_RTP
,
NICE_CANDIDATE_TRANSPORT_UDP
,
/* transport */
100000
,
/* priority */
NULL
,
/* address */
NICE_CANDIDATE_TYPE_HOST
,
/* type */
NULL
/* base-address */
};
GSList
*
cands
,
*
i
;
GSList
*
cands
,
*
i
;
guint
ls_id
,
rs_id
;
guint
ls_id
,
rs_id
;
init_candidate
(
&
cdes
);
/* XXX: dear compiler, this is for you */
/* XXX: dear compiler, this is for you */
(
void
)
baseaddr
;
(
void
)
baseaddr
;
...
@@ -565,9 +559,9 @@ static int run_full_test_wrong_password (NiceAgent *lagent, NiceAgent *ragent, N
...
@@ -565,9 +559,9 @@ static int run_full_test_wrong_password (NiceAgent *lagent, NiceAgent *ragent, N
nice_agent_set_remote_credentials
(
lagent
,
nice_agent_set_remote_credentials
(
lagent
,
ls_id
,
ufrag
,
"wrong2"
);
ls_id
,
ufrag
,
"wrong2"
);
}
}
cdes
.
addr
=
&
raddr
;
cdes
.
addr
=
raddr
;
nice_agent_set_remote_candidates
(
lagent
,
ls_id
,
NICE_COMPONENT_TYPE_RTP
,
cands
);
nice_agent_set_remote_candidates
(
lagent
,
ls_id
,
NICE_COMPONENT_TYPE_RTP
,
cands
);
cdes
.
addr
=
&
laddr
;
cdes
.
addr
=
laddr
;
nice_agent_set_remote_candidates
(
ragent
,
rs_id
,
NICE_COMPONENT_TYPE_RTP
,
cands
);
nice_agent_set_remote_candidates
(
ragent
,
rs_id
,
NICE_COMPONENT_TYPE_RTP
,
cands
);
g_slist_free
(
cands
);
g_slist_free
(
cands
);
...
@@ -594,18 +588,12 @@ static int run_full_test_wrong_password (NiceAgent *lagent, NiceAgent *ragent, N
...
@@ -594,18 +588,12 @@ static int run_full_test_wrong_password (NiceAgent *lagent, NiceAgent *ragent, N
static
int
run_full_test_control_conflict
(
NiceAgent
*
lagent
,
NiceAgent
*
ragent
,
NiceAddress
*
baseaddr
,
gboolean
role
)
static
int
run_full_test_control_conflict
(
NiceAgent
*
lagent
,
NiceAgent
*
ragent
,
NiceAddress
*
baseaddr
,
gboolean
role
)
{
{
NiceAddress
laddr
,
raddr
;
NiceAddress
laddr
,
raddr
;
NiceCandidateDesc
cdes
=
{
/* candidate description (no ports) */
NiceCandidate
cdes
;
(
gchar
*
)
"1"
,
/* foundation */
NICE_COMPONENT_TYPE_RTP
,
NICE_CANDIDATE_TRANSPORT_UDP
,
/* transport */
100000
,
/* priority */
NULL
,
/* address */
NICE_CANDIDATE_TYPE_HOST
,
/* type */
NULL
/* base-address */
};
GSList
*
cands
,
*
i
;
GSList
*
cands
,
*
i
;
guint
ls_id
,
rs_id
;
guint
ls_id
,
rs_id
;
init_candidate
(
&
cdes
);
/* XXX: dear compiler, this is for you */
/* XXX: dear compiler, this is for you */
(
void
)
baseaddr
;
(
void
)
baseaddr
;
...
@@ -680,9 +668,9 @@ static int run_full_test_control_conflict (NiceAgent *lagent, NiceAgent *ragent,
...
@@ -680,9 +668,9 @@ static int run_full_test_control_conflict (NiceAgent *lagent, NiceAgent *ragent,
nice_agent_set_remote_credentials
(
lagent
,
nice_agent_set_remote_credentials
(
lagent
,
ls_id
,
ufrag
,
password
);
ls_id
,
ufrag
,
password
);
}
}
cdes
.
addr
=
&
raddr
;
cdes
.
addr
=
raddr
;
nice_agent_set_remote_candidates
(
lagent
,
ls_id
,
NICE_COMPONENT_TYPE_RTP
,
cands
);
nice_agent_set_remote_candidates
(
lagent
,
ls_id
,
NICE_COMPONENT_TYPE_RTP
,
cands
);
cdes
.
addr
=
&
laddr
;
cdes
.
addr
=
laddr
;
nice_agent_set_remote_candidates
(
ragent
,
rs_id
,
NICE_COMPONENT_TYPE_RTP
,
cands
);
nice_agent_set_remote_candidates
(
ragent
,
rs_id
,
NICE_COMPONENT_TYPE_RTP
,
cands
);
g_slist_free
(
cands
);
g_slist_free
(
cands
);
...
...
agent/test-restart.c
View file @
2a07eb44
...
@@ -195,15 +195,7 @@ static void priv_get_local_addr (NiceAgent *agent, guint stream_id, guint compon
...
@@ -195,15 +195,7 @@ static void priv_get_local_addr (NiceAgent *agent, guint stream_id, guint compon
static
int
run_restart_test
(
NiceAgent
*
lagent
,
NiceAgent
*
ragent
,
NiceAddress
*
baseaddr
)
static
int
run_restart_test
(
NiceAgent
*
lagent
,
NiceAgent
*
ragent
,
NiceAddress
*
baseaddr
)
{
{
NiceAddress
laddr
,
raddr
,
laddr_rtcp
,
raddr_rtcp
;
NiceAddress
laddr
,
raddr
,
laddr_rtcp
,
raddr_rtcp
;
NiceCandidateDesc
cdes
=
{
/* candidate description (no ports) */
NiceCandidate
cdes
;
(
gchar
*
)
"1"
,
/* foundation */
0
,
/* component-id; filled later */
NICE_CANDIDATE_TRANSPORT_UDP
,
/* transport */
100000
,
/* priority */
NULL
,
/* address */
NICE_CANDIDATE_TYPE_HOST
,
/* type */
NULL
/* base-address */
};
GSList
*
cands
;
GSList
*
cands
;
guint
ls_id
,
rs_id
;
guint
ls_id
,
rs_id
;
guint64
tie_breaker
;
guint64
tie_breaker
;
...
@@ -211,6 +203,12 @@ static int run_restart_test (NiceAgent *lagent, NiceAgent *ragent, NiceAddress *
...
@@ -211,6 +203,12 @@ static int run_restart_test (NiceAgent *lagent, NiceAgent *ragent, NiceAddress *
/* XXX: dear compiler, these are for you: */
/* XXX: dear compiler, these are for you: */
(
void
)
baseaddr
;
(
void
)
baseaddr
;
memset
(
&
cdes
,
0
,
sizeof
(
NiceCandidate
));
cdes
.
priority
=
10000
;
strcpy
(
cdes
.
foundation
,
"1"
);
cdes
.
type
=
NICE_CANDIDATE_TYPE_HOST
;
cdes
.
transport
=
NICE_CANDIDATE_TRANSPORT_UDP
;
/* step: initialize variables modified by the callbacks */
/* step: initialize variables modified by the callbacks */
global_components_ready
=
0
;
global_components_ready
=
0
;
global_components_ready_exit
=
4
;
global_components_ready_exit
=
4
;
...
@@ -284,14 +282,14 @@ static int run_restart_test (NiceAgent *lagent, NiceAgent *ragent, NiceAddress *
...
@@ -284,14 +282,14 @@ static int run_restart_test (NiceAgent *lagent, NiceAgent *ragent, NiceAddress *
ls_id
,
ufrag
,
password
);
ls_id
,
ufrag
,
password
);
}
}
cdes
.
component_id
=
NICE_COMPONENT_TYPE_RTP
;
cdes
.
component_id
=
NICE_COMPONENT_TYPE_RTP
;
cdes
.
addr
=
&
raddr
;
cdes
.
addr
=
raddr
;
nice_agent_set_remote_candidates
(
lagent
,
ls_id
,
NICE_COMPONENT_TYPE_RTP
,
cands
);
nice_agent_set_remote_candidates
(
lagent
,
ls_id
,
NICE_COMPONENT_TYPE_RTP
,
cands
);
cdes
.
addr
=
&
laddr
;
cdes
.
addr
=
laddr
;
nice_agent_set_remote_candidates
(
ragent
,
rs_id
,
NICE_COMPONENT_TYPE_RTP
,
cands
);
nice_agent_set_remote_candidates
(
ragent
,
rs_id
,
NICE_COMPONENT_TYPE_RTP
,
cands
);
cdes
.
component_id
=
NICE_COMPONENT_TYPE_RTCP
;
cdes
.
component_id
=
NICE_COMPONENT_TYPE_RTCP
;
cdes
.
addr
=
&
raddr_rtcp
;
cdes
.
addr
=
raddr_rtcp
;
nice_agent_set_remote_candidates
(
lagent
,
ls_id
,
NICE_COMPONENT_TYPE_RTCP
,
cands
);
nice_agent_set_remote_candidates
(
lagent
,
ls_id
,
NICE_COMPONENT_TYPE_RTCP
,
cands
);
cdes
.
addr
=
&
laddr_rtcp
;
cdes
.
addr
=
laddr_rtcp
;
nice_agent_set_remote_candidates
(
ragent
,
rs_id
,
NICE_COMPONENT_TYPE_RTCP
,
cands
);
nice_agent_set_remote_candidates
(
ragent
,
rs_id
,
NICE_COMPONENT_TYPE_RTCP
,
cands
);
g_debug
(
"test-restart: Set properties, next running mainloop until connectivity checks succeed..."
);
g_debug
(
"test-restart: Set properties, next running mainloop until connectivity checks succeed..."
);
...
@@ -347,14 +345,14 @@ static int run_restart_test (NiceAgent *lagent, NiceAgent *ragent, NiceAddress *
...
@@ -347,14 +345,14 @@ static int run_restart_test (NiceAgent *lagent, NiceAgent *ragent, NiceAddress *
/* step: exchange remote candidates */
/* step: exchange remote candidates */
cdes
.
component_id
=
NICE_COMPONENT_TYPE_RTP
;
cdes
.
component_id
=
NICE_COMPONENT_TYPE_RTP
;
cdes
.
addr
=
&
raddr
;
cdes
.
addr
=
raddr
;
nice_agent_set_remote_candidates
(
lagent
,
ls_id
,
NICE_COMPONENT_TYPE_RTP
,
cands
);
nice_agent_set_remote_candidates
(
lagent
,
ls_id
,
NICE_COMPONENT_TYPE_RTP
,
cands
);
cdes
.
addr
=
&
laddr
;
cdes
.
addr
=
laddr
;
nice_agent_set_remote_candidates
(
ragent
,
rs_id
,
NICE_COMPONENT_TYPE_RTP
,
cands
);
nice_agent_set_remote_candidates
(
ragent
,
rs_id
,
NICE_COMPONENT_TYPE_RTP
,
cands
);
cdes
.
component_id
=
NICE_COMPONENT_TYPE_RTCP
;
cdes
.
component_id
=
NICE_COMPONENT_TYPE_RTCP
;
cdes
.
addr
=
&
raddr_rtcp
;
cdes
.
addr
=
raddr_rtcp
;
nice_agent_set_remote_candidates
(
lagent
,
ls_id
,
NICE_COMPONENT_TYPE_RTCP
,
cands
);
nice_agent_set_remote_candidates
(
lagent
,
ls_id
,
NICE_COMPONENT_TYPE_RTCP
,
cands
);
cdes
.
addr
=
&
laddr_rtcp
;
cdes
.
addr
=
laddr_rtcp
;
nice_agent_set_remote_candidates
(
ragent
,
rs_id
,
NICE_COMPONENT_TYPE_RTCP
,
cands
);
nice_agent_set_remote_candidates
(
ragent
,
rs_id
,
NICE_COMPONENT_TYPE_RTCP
,
cands
);
g_main_loop_run
(
global_mainloop
);
g_main_loop_run
(
global_mainloop
);
...
...
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