Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
belle-sip
Commits
5218bcd6
Commit
5218bcd6
authored
Aug 17, 2018
by
Simon Morlat
Browse files
adapt tester to new resolver API.
parent
8482a2a0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
12 deletions
+16
-12
src/belle_sip_resolver.c
src/belle_sip_resolver.c
+1
-1
tester/belle_sip_resolver_tester.c
tester/belle_sip_resolver_tester.c
+15
-11
No files found.
src/belle_sip_resolver.c
View file @
5218bcd6
...
...
@@ -192,7 +192,7 @@ int belle_sip_resolver_results_get_ttl(const belle_sip_resolver_results_t *obj){
return
obj
->
ttl
;
}
const
char
*
belle_sip_resolver_get_name
(
const
belle_sip_resolver_results_t
*
obj
){
const
char
*
belle_sip_resolver_
results_
get_name
(
const
belle_sip_resolver_results_t
*
obj
){
return
obj
->
name
;
}
...
...
tester/belle_sip_resolver_tester.c
View file @
5218bcd6
...
...
@@ -41,8 +41,9 @@ typedef struct endpoint {
belle_sip_resolver_context_t
*
resolver_ctx
;
int
resolve_done
;
int
resolve_ko
;
struct
addrinfo
*
ai_list
;
belle_sip_list_t
*
srv_list
;
/**< List of struct dns_srv pointers */
bctbx_list_t
*
srv_list
;
belle_sip_resolver_results_t
*
results
;
const
struct
addrinfo
*
ai_list
;
}
endpoint_t
;
static
unsigned
int
wait_for
(
belle_sip_stack_t
*
stack
,
int
*
current_value
,
int
expected_value
,
int
timeout
)
{
...
...
@@ -68,12 +69,13 @@ static void reset_endpoint(endpoint_t *endpoint) {
endpoint
->
resolver_ctx
=
0
;
endpoint
->
resolve_done
=
0
;
endpoint
->
resolve_ko
=
0
;
if
(
endpoint
->
ai_list
!=
NULL
)
{
b
ctbx_freeaddrinfo
(
endpoint
->
ai_list
);
endpoint
->
ai_list
=
NULL
;
if
(
endpoint
->
results
)
{
b
elle_sip_object_unref
(
endpoint
->
results
);
endpoint
->
results
=
NULL
;
}
if
(
endpoint
->
srv_list
!=
NULL
)
{
belle_sip_list_free_with_data
(
endpoint
->
srv_list
,
belle_sip_object_unref
);
endpoint
->
ai_list
=
NULL
;
if
(
endpoint
->
srv_list
){
bctbx_list_free_with_data
(
endpoint
->
srv_list
,
belle_sip_object_unref
);
endpoint
->
srv_list
=
NULL
;
}
}
...
...
@@ -85,12 +87,14 @@ static void destroy_endpoint(endpoint_t *endpoint) {
belle_sip_uninit_sockets
();
}
static
void
a_resolve_done
(
void
*
data
,
const
char
*
name
,
struct
addrinfo
*
ai_list
,
uint32_t
ttl
)
{
static
void
a_resolve_done
(
void
*
data
,
belle_sip_resolver_results_t
*
results
)
{
endpoint_t
*
client
=
(
endpoint_t
*
)
data
;
BELLESIP_UNUSED
(
name
);
client
->
resolve_done
=
1
;
if
(
ai_list
)
{
client
->
ai_list
=
ai_list
;
belle_sip_object_ref
(
results
);
client
->
results
=
results
;
if
(
belle_sip_resolver_results_get_addrinfos
(
results
))
{
client
->
ai_list
=
belle_sip_resolver_results_get_addrinfos
(
results
);
client
->
resolve_done
=
1
;
}
else
client
->
resolve_ko
=
1
;
...
...
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