Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
BC
public
liblinphone
Commits
3aed512e
Commit
3aed512e
authored
Jan 29, 2016
by
buildbot
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix gcc compilation issue
parent
58cb7a3f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
7 deletions
+9
-7
tester/eventapi_tester.c
tester/eventapi_tester.c
+1
-2
tester/presence_tester.c
tester/presence_tester.c
+8
-5
No files found.
tester/eventapi_tester.c
View file @
3aed512e
...
@@ -24,7 +24,6 @@
...
@@ -24,7 +24,6 @@
#include <event.h>
#include <event.h>
#include "liblinphone_tester.h"
#include "liblinphone_tester.h"
static
const
char
*
subscribe_content
=
"<somexml>blabla</somexml>"
;
static
const
char
*
subscribe_content
=
"<somexml>blabla</somexml>"
;
static
const
char
*
notify_content
=
"<somexml2>blabla</somexml2>"
;
static
const
char
*
notify_content
=
"<somexml2>blabla</somexml2>"
;
...
@@ -40,7 +39,7 @@ void linphone_notify_received(LinphoneCore *lc, LinphoneEvent *lev, const char *
...
@@ -40,7 +39,7 @@ void linphone_notify_received(LinphoneCore *lc, LinphoneEvent *lev, const char *
LinphoneCoreManager
*
mgr
;
LinphoneCoreManager
*
mgr
;
const
char
*
ua
=
linphone_event_get_custom_header
(
lev
,
"User-Agent"
);
const
char
*
ua
=
linphone_event_get_custom_header
(
lev
,
"User-Agent"
);
BC_ASSERT_PTR_NOT_NULL_FATAL
(
content
);
BC_ASSERT_PTR_NOT_NULL_FATAL
(
content
);
if
(
!
linphone_content_is_multipart
(
content
)
&&
(
!
ua
||
!
str
case
str
(
ua
,
"flexisip"
)))
{
/*disable check for full presence serveur support*/
if
(
!
linphone_content_is_multipart
(
content
)
&&
(
!
ua
||
!
strstr
(
ua
,
"flexisip"
)))
{
/*disable check for full presence serveur support*/
/*hack to disable content checking for list notify */
/*hack to disable content checking for list notify */
BC_ASSERT_STRING_EQUAL
(
notify_content
,(
const
char
*
)
linphone_content_get_buffer
(
content
));
BC_ASSERT_STRING_EQUAL
(
notify_content
,(
const
char
*
)
linphone_content_get_buffer
(
content
));
}
}
...
...
tester/presence_tester.c
View file @
3aed512e
...
@@ -486,12 +486,15 @@ static void test_subscribe_notify_publish(void) {
...
@@ -486,12 +486,15 @@ static void test_subscribe_notify_publish(void) {
LinphoneCoreManager
*
pauline
=
linphone_core_manager_new
(
"pauline_rc"
);
LinphoneCoreManager
*
pauline
=
linphone_core_manager_new
(
"pauline_rc"
);
LinphoneProxyConfig
*
proxy
;
LinphoneProxyConfig
*
proxy
;
LinphonePresenceModel
*
presence
;
LinphonePresenceModel
*
presence
;
LpConfig
*
pauline_lp
;
char
*
lf_identity
;
LinphoneFriend
*
lf
;
linphone_core_set_user_agent
(
marie
->
lc
,
"full-presence-support"
,
NULL
);
linphone_core_set_user_agent
(
marie
->
lc
,
"full-presence-support"
,
NULL
);
linphone_core_set_user_agent
(
pauline
->
lc
,
"full-presence-support"
,
NULL
);
linphone_core_set_user_agent
(
pauline
->
lc
,
"full-presence-support"
,
NULL
);
LpConfig
*
pauline_lp
=
linphone_core_get_config
(
pauline
->
lc
);
pauline_lp
=
linphone_core_get_config
(
pauline
->
lc
);
char
*
lf_identity
=
linphone_address_as_string_uri_only
(
marie
->
identity
);
lf_identity
=
linphone_address_as_string_uri_only
(
marie
->
identity
);
LinphoneFriend
*
lf
=
linphone_core_create_friend_with_address
(
pauline
->
lc
,
lf_identity
);
lf
=
linphone_core_create_friend_with_address
(
pauline
->
lc
,
lf_identity
);
lp_config_set_int
(
pauline_lp
,
"sip"
,
"subscribe_expires"
,
5
);
lp_config_set_int
(
pauline_lp
,
"sip"
,
"subscribe_expires"
,
5
);
...
@@ -744,7 +747,7 @@ static void test_presence_list(void) {
...
@@ -744,7 +747,7 @@ static void test_presence_list(void) {
linphone_core_manager_destroy
(
marie
);
linphone_core_manager_destroy
(
marie
);
linphone_core_manager_destroy
(
pauline
);
linphone_core_manager_destroy
(
pauline
);
}
}
#if 0
static void test_presence_list_subscribe_before_publish(void) {
static void test_presence_list_subscribe_before_publish(void) {
LinphoneCoreManager *laure = linphone_core_manager_new("laure_tcp_rc");
LinphoneCoreManager *laure = linphone_core_manager_new("laure_tcp_rc");
LinphoneCoreManager *pauline = linphone_core_manager_new("pauline_rc");
LinphoneCoreManager *pauline = linphone_core_manager_new("pauline_rc");
...
@@ -794,7 +797,7 @@ static void test_presence_list_subscribe_before_publish(void) {
...
@@ -794,7 +797,7 @@ static void test_presence_list_subscribe_before_publish(void) {
linphone_core_manager_destroy(laure);
linphone_core_manager_destroy(laure);
linphone_core_manager_destroy(pauline);
linphone_core_manager_destroy(pauline);
}
}
#endif
static
void
test_presence_list_subscription_expire_for_unknown
(
void
)
{
static
void
test_presence_list_subscription_expire_for_unknown
(
void
)
{
LinphoneCoreManager
*
laure
=
linphone_core_manager_new
(
"laure_tcp_rc"
);
LinphoneCoreManager
*
laure
=
linphone_core_manager_new
(
"laure_tcp_rc"
);
const
char
*
rls_uri
=
"sip:rls@sip.example.org"
;
const
char
*
rls_uri
=
"sip:rls@sip.example.org"
;
...
...
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