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
liblinphone
Commits
da9cffd5
Commit
da9cffd5
authored
Dec 15, 2014
by
Guillaume BIENKOWSKI
Browse files
Use ms_time() instead of time()
parent
42ddf0cf
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
tester/call_tester.c
tester/call_tester.c
+5
-5
tester/presence_tester.c
tester/presence_tester.c
+1
-1
No files found.
tester/call_tester.c
View file @
da9cffd5
...
...
@@ -2269,8 +2269,8 @@ static void early_media_call_with_ringing(void){
MSList
*
lcs
=
NULL
;
LinphoneCall
*
marie_call
;
LinphoneCallLog
*
marie_call_log
;
time
_t
connected_time
=
0
;
time
_t
ended_time
=
0
;
uint64
_t
connected_time
=
0
;
uint64
_t
ended_time
=
0
;
int
dummy
=
0
;
lcs
=
ms_list_append
(
lcs
,
marie
->
lc
);
...
...
@@ -2299,7 +2299,7 @@ static void early_media_call_with_ringing(void){
linphone_core_accept_call
(
pauline
->
lc
,
linphone_core_get_current_call
(
pauline
->
lc
));
CU_ASSERT_TRUE
(
wait_for_list
(
lcs
,
&
marie
->
stat
.
number_of_LinphoneCallConnected
,
1
,
1000
));
connected_time
=
time
(
NULL
);
connected_time
=
ms_get_cur_time_ms
(
);
CU_ASSERT_TRUE
(
wait_for_list
(
lcs
,
&
marie
->
stat
.
number_of_LinphoneCallStreamsRunning
,
1
,
1000
));
CU_ASSERT_EQUAL
(
marie_call
,
linphone_core_get_current_call
(
marie
->
lc
));
...
...
@@ -2312,8 +2312,8 @@ static void early_media_call_with_ringing(void){
CU_ASSERT_TRUE
(
wait_for_list
(
lcs
,
&
pauline
->
stat
.
number_of_LinphoneCallEnd
,
1
,
1000
));
CU_ASSERT_TRUE
(
wait_for_list
(
lcs
,
&
marie
->
stat
.
number_of_LinphoneCallEnd
,
1
,
1000
));
ended_time
=
time
(
NULL
);
CU_ASSERT_TRUE
(
labs
(
linphone_call_log_get_duration
(
marie_call_log
)
-
(
ended_time
-
connected_time
))
<
1
);
ended_time
=
ms_get_cur_time_ms
(
);
CU_ASSERT_TRUE
(
labs
(
(
linphone_call_log_get_duration
(
marie_call_log
)
*
1000
)
-
(
ended_time
-
connected_time
))
<
=
1000
);
ms_list_free
(
lcs
);
}
...
...
tester/presence_tester.c
View file @
da9cffd5
...
...
@@ -336,7 +336,7 @@ static void presence_information(void) {
}
/* Presence timestamp. */
current_timestamp
=
time
(
NULL
);
current_timestamp
=
ms_
time
(
NULL
);
presence
=
linphone_presence_model_new_with_activity
(
LinphonePresenceActivityShopping
,
NULL
);
linphone_core_set_presence_model
(
pauline
->
lc
,
presence
);
wait_for
(
marie
->
lc
,
pauline
->
lc
,
&
marie
->
stat
.
number_of_LinphonePresenceActivityShopping
,
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