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
83f861b3
Commit
83f861b3
authored
Apr 12, 2016
by
johan
Browse files
Merge branch 'master' into zrtphash
parents
70a429cd
47e36935
Changes
2
Hide whitespace changes
Inline
Side-by-side
coreapi/vtables.c
View file @
83f861b3
...
...
@@ -289,7 +289,7 @@ void v_table_reference_destroy(VTableReference *ref){
}
void
_linphone_core_add_listener
(
LinphoneCore
*
lc
,
LinphoneCoreVTable
*
vtable
,
bool_t
autorelease
,
bool_t
internal
)
{
ms_message
(
"Vtable [%p] registered on core [%p]"
,
lc
,
vtable
);
ms_message
(
"Vtable [%p] registered on core [%p]"
,
vtable
,
lc
);
lc
->
vtable_refs
=
ms_list_append
(
lc
->
vtable_refs
,
v_table_reference_new
(
vtable
,
autorelease
,
internal
));
}
...
...
tester/accountmanager.c
View file @
83f861b3
...
...
@@ -112,6 +112,15 @@ static void account_created_on_server_cb(LinphoneCore *lc, LinphoneProxyConfig *
}
}
// TEMPORARY CODE: remove function below when flexisip is updated, this is not needed anymore!
// The new flexisip now answer "200 Test account created" when creating a test account, and do not
// challenge authentication anymore! so this code is not used for newer version
static
void
account_created_auth_requested_cb
(
LinphoneCore
*
lc
,
const
char
*
username
,
const
char
*
realm
,
const
char
*
domain
){
Account
*
account
=
(
Account
*
)
linphone_core_get_user_data
(
lc
);
account
->
created
=
1
;
}
// TEMPORARY CODE: remove line above when flexisip is updated, this is not needed anymore!
void
account_create_on_server
(
Account
*
account
,
const
LinphoneProxyConfig
*
refcfg
){
LinphoneCoreVTable
vtable
=
{
0
};
LinphoneCore
*
lc
;
...
...
@@ -123,6 +132,8 @@ void account_create_on_server(Account *account, const LinphoneProxyConfig *refcf
LCSipTransports
tr
;
vtable
.
registration_state_changed
=
account_created_on_server_cb
;
// TEMPORARY CODE: remove line below when flexisip is updated, this is not needed anymore!
vtable
.
auth_info_requested
=
account_created_auth_requested_cb
;
lc
=
configure_lc_from
(
&
vtable
,
bc_tester_get_resource_dir_prefix
(),
NULL
,
account
);
tr
.
udp_port
=
LC_SIP_TRANSPORT_RANDOM
;
tr
.
tcp_port
=
LC_SIP_TRANSPORT_RANDOM
;
...
...
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