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
b9b283dc
Commit
b9b283dc
authored
Jul 13, 2017
by
Ghislain MARY
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Compile source files as C++.
parent
f2121d52
Changes
95
Hide whitespace changes
Inline
Side-by-side
Showing
95 changed files
with
372 additions
and
384 deletions
+372
-384
coreapi/AccountCreator.cc
coreapi/AccountCreator.cc
+56
-70
coreapi/AccountCreatorService.cc
coreapi/AccountCreatorService.cc
+0
-0
coreapi/Address.cc
coreapi/Address.cc
+0
-0
coreapi/Authentication.cc
coreapi/Authentication.cc
+1
-1
coreapi/Buffer.cc
coreapi/Buffer.cc
+1
-1
coreapi/CMakeLists.txt
coreapi/CMakeLists.txt
+86
-83
coreapi/Call.cc
coreapi/Call.cc
+26
-15
coreapi/CallLog.cc
coreapi/CallLog.cc
+4
-4
coreapi/CallParams.cc
coreapi/CallParams.cc
+0
-0
coreapi/Callbacks.cc
coreapi/Callbacks.cc
+13
-10
coreapi/CardDav.cc
coreapi/CardDav.cc
+2
-2
coreapi/CardDav.h
coreapi/CardDav.h
+0
-0
coreapi/Chat.cc
coreapi/Chat.cc
+3
-3
coreapi/ChatFileTransfer.cc
coreapi/ChatFileTransfer.cc
+2
-2
coreapi/Conference.cc
coreapi/Conference.cc
+1
-1
coreapi/Conference.h
coreapi/Conference.h
+0
-0
coreapi/Config.cc
coreapi/Config.cc
+6
-6
coreapi/ContactProvider.cc
coreapi/ContactProvider.cc
+1
-1
coreapi/ContactProvider.h
coreapi/ContactProvider.h
+0
-0
coreapi/Content.cc
coreapi/Content.cc
+1
-1
coreapi/Core.cc
coreapi/Core.cc
+30
-23
coreapi/DialPlan.cc
coreapi/DialPlan.cc
+0
-0
coreapi/Dict.cc
coreapi/Dict.cc
+0
-0
coreapi/EcCalibrator.cc
coreapi/EcCalibrator.cc
+2
-1
coreapi/EchoTester.cc
coreapi/EchoTester.cc
+2
-1
coreapi/Enum.cc
coreapi/Enum.cc
+3
-3
coreapi/Enum.h
coreapi/Enum.h
+0
-0
coreapi/ErrorInfo.cc
coreapi/ErrorInfo.cc
+0
-0
coreapi/Event.cc
coreapi/Event.cc
+0
-0
coreapi/Factory.cc
coreapi/Factory.cc
+0
-0
coreapi/Fonis.cc
coreapi/Fonis.cc
+0
-0
coreapi/Friend.cc
coreapi/Friend.cc
+2
-2
coreapi/FriendList.cc
coreapi/FriendList.cc
+4
-4
coreapi/ImEncryptionEngine.cc
coreapi/ImEncryptionEngine.cc
+0
-0
coreapi/ImNotifPolicy.cc
coreapi/ImNotifPolicy.cc
+8
-8
coreapi/Info.cc
coreapi/Info.cc
+0
-0
coreapi/LdapProvider.cc
coreapi/LdapProvider.cc
+1
-1
coreapi/Lime.cc
coreapi/Lime.cc
+7
-7
coreapi/Lime.h
coreapi/Lime.h
+10
-1
coreapi/LocalPlayer.cc
coreapi/LocalPlayer.cc
+0
-0
coreapi/Lpc2Xml.cc
coreapi/Lpc2Xml.cc
+4
-4
coreapi/Lpc2Xml.h
coreapi/Lpc2Xml.h
+0
-0
coreapi/Lsd.cc
coreapi/Lsd.cc
+0
-0
coreapi/MessageStorage.cc
coreapi/MessageStorage.cc
+3
-3
coreapi/Misc.cc
coreapi/Misc.cc
+4
-4
coreapi/NatPolicy.cc
coreapi/NatPolicy.cc
+4
-4
coreapi/OfferAnswer.cc
coreapi/OfferAnswer.cc
+1
-1
coreapi/OfferAnswer.h
coreapi/OfferAnswer.h
+6
-0
coreapi/PayloadType.cc
coreapi/PayloadType.cc
+0
-0
coreapi/Player.cc
coreapi/Player.cc
+1
-1
coreapi/Presence.cc
coreapi/Presence.cc
+5
-5
coreapi/Proxy.cc
coreapi/Proxy.cc
+5
-5
coreapi/QualityReporting.cc
coreapi/QualityReporting.cc
+2
-2
coreapi/QualityReporting.h
coreapi/QualityReporting.h
+0
-0
coreapi/RemoteProvisioning.cc
coreapi/RemoteProvisioning.cc
+1
-1
coreapi/RingTonePlayer.cc
coreapi/RingTonePlayer.cc
+0
-0
coreapi/Sal.cc
coreapi/Sal.cc
+1
-1
coreapi/SipLogin.cc
coreapi/SipLogin.cc
+0
-0
coreapi/SipSetup.cc
coreapi/SipSetup.cc
+0
-0
coreapi/Sqlite3BctbxVfs.cc
coreapi/Sqlite3BctbxVfs.cc
+1
-1
coreapi/Sqlite3BctbxVfs.h
coreapi/Sqlite3BctbxVfs.h
+0
-0
coreapi/Tunnel.cc
coreapi/Tunnel.cc
+0
-0
coreapi/TunnelConfig.cc
coreapi/TunnelConfig.cc
+0
-0
coreapi/TunnelStubs.cc
coreapi/TunnelStubs.cc
+0
-0
coreapi/Upnp.cc
coreapi/Upnp.cc
+0
-0
coreapi/UpnpPrivate.h
coreapi/UpnpPrivate.h
+0
-0
coreapi/Vcard.cc
coreapi/Vcard.cc
+1
-1
coreapi/Vcard.h
coreapi/Vcard.h
+0
-0
coreapi/VcardStubs.cc
coreapi/VcardStubs.cc
+0
-0
coreapi/VideoDefinition.cc
coreapi/VideoDefinition.cc
+0
-0
coreapi/Vtables.cc
coreapi/Vtables.cc
+0
-0
coreapi/Xml.cc
coreapi/Xml.cc
+0
-0
coreapi/Xml2Lpc.cc
coreapi/Xml2Lpc.cc
+2
-2
coreapi/Xml2Lpc.h
coreapi/Xml2Lpc.h
+0
-0
coreapi/XmlRpc.cc
coreapi/XmlRpc.cc
+2
-27
coreapi/bellesip_sal/sal_address_impl.cc
coreapi/bellesip_sal/sal_address_impl.cc
+0
-0
coreapi/bellesip_sal/sal_impl.cc
coreapi/bellesip_sal/sal_impl.cc
+13
-16
coreapi/bellesip_sal/sal_op_call.cc
coreapi/bellesip_sal/sal_op_call.cc
+9
-7
coreapi/bellesip_sal/sal_op_call_transfer.cc
coreapi/bellesip_sal/sal_op_call_transfer.cc
+1
-1
coreapi/bellesip_sal/sal_op_events.cc
coreapi/bellesip_sal/sal_op_events.cc
+0
-0
coreapi/bellesip_sal/sal_op_impl.cc
coreapi/bellesip_sal/sal_op_impl.cc
+1
-1
coreapi/bellesip_sal/sal_op_info.cc
coreapi/bellesip_sal/sal_op_info.cc
+0
-0
coreapi/bellesip_sal/sal_op_message.cc
coreapi/bellesip_sal/sal_op_message.cc
+0
-0
coreapi/bellesip_sal/sal_op_presence.cc
coreapi/bellesip_sal/sal_op_presence.cc
+1
-1
coreapi/bellesip_sal/sal_op_publish.cc
coreapi/bellesip_sal/sal_op_publish.cc
+0
-0
coreapi/bellesip_sal/sal_op_registration.cc
coreapi/bellesip_sal/sal_op_registration.cc
+0
-0
coreapi/bellesip_sal/sal_sdp.cc
coreapi/bellesip_sal/sal_sdp.cc
+8
-3
coreapi/private.h
coreapi/private.h
+5
-5
include/linphone/sipsetup.h
include/linphone/sipsetup.h
+1
-1
include/linphone/xmlrpc.h
include/linphone/xmlrpc.h
+0
-8
include/sal/sal.h
include/sal/sal.h
+8
-13
tester/account_creator_tester.c
tester/account_creator_tester.c
+8
-12
tester/message_tester.c
tester/message_tester.c
+1
-1
tester/vcard_tester.c
tester/vcard_tester.c
+1
-1
tools/python/apixml2python.py
tools/python/apixml2python.py
+0
-1
No files found.
coreapi/
a
ccount
_c
reator.c
→
coreapi/
A
ccount
C
reator.c
c
View file @
b9b283dc
...
...
@@ -680,11 +680,9 @@ LinphoneAccountCreatorStatus linphone_account_creator_is_account_exist_linphone(
(
creator
->
username
)
?
"username"
:
"phone number"
,
(
creator
->
username
)
?
creator
->
username
:
creator
->
phone_number
,
linphone_proxy_config_get_domain
(
creator
->
proxy_cfg
));
request
=
linphone_xml_rpc_request_new_with_args
(
LinphoneXmlRpcArgString
,
"get_phone_number_for_account"
,
LinphoneXmlRpcArgString
,
creator
->
username
?
creator
->
username
:
creator
->
phone_number
,
LinphoneXmlRpcArgString
,
linphone_proxy_config_get_domain
(
creator
->
proxy_cfg
),
LinphoneXmlRpcArgNone
);
request
=
linphone_xml_rpc_request_new
(
LinphoneXmlRpcArgString
,
"get_phone_number_for_account"
);
linphone_xml_rpc_request_add_string_arg
(
request
,
creator
->
username
?
creator
->
username
:
creator
->
phone_number
);
linphone_xml_rpc_request_add_string_arg
(
request
,
linphone_proxy_config_get_domain
(
creator
->
proxy_cfg
));
linphone_xml_rpc_request_set_user_data
(
request
,
creator
);
linphone_xml_rpc_request_cbs_set_response
(
linphone_xml_rpc_request_get_callbacks
(
request
),
_is_account_exist_response_cb
);
linphone_xml_rpc_session_send_request
(
creator
->
xmlrpc_session
,
request
);
...
...
@@ -722,14 +720,14 @@ static LinphoneXmlRpcRequest * _create_account_with_phone_custom(LinphoneAccount
linphone_proxy_config_get_domain
(
creator
->
proxy_cfg
),
creator
->
language
);
request
=
linphone_xml_rpc_request_new
_with_args
(
LinphoneXmlRpcArgString
,
"create_phone_account"
,
L
inphone
XmlRpcArgString
,
creator
->
phone_number
,
L
inphone
XmlRpcArgString
,
creator
->
username
?
creator
->
username
:
creator
->
phone_number
,
L
inphone
XmlRpcArgString
,
creator
->
password
?
ha1_for_passwd
(
creator
->
username
?
creator
->
username
:
creator
->
phone_number
,
linphone_proxy_config_get_domain
(
creator
->
proxy_cfg
)
,
creator
->
password
)
:
""
,
LinphoneXmlRpcArgString
,
linphone_core_get_user_agent
(
creator
->
core
),
L
inphone
XmlRpcArgString
,
linphone_proxy_config_get_domain
(
creator
->
proxy_cfg
),
L
inphone
XmlRpcArgString
,
creator
->
language
,
L
inphone
XmlRpcArgNon
e
);
request
=
linphone_xml_rpc_request_new
(
LinphoneXmlRpcArgString
,
"create_phone_account"
);
l
inphone
_xml_rpc_request_add_string_arg
(
request
,
creator
->
phone_number
);
l
inphone
_xml_rpc_request_add_string_arg
(
request
,
creator
->
username
?
creator
->
username
:
creator
->
phone_number
);
l
inphone
_xml_rpc_request_add_string_arg
(
request
,
creator
->
password
?
ha1_for_passwd
(
creator
->
username
?
creator
->
username
:
creator
->
phone_number
,
linphone_proxy_config_get_domain
(
creator
->
proxy_cfg
),
creator
->
password
)
:
""
);
l
inphone
_xml_rpc_request_add_string_arg
(
request
,
linphone_core_get_user_agent
(
creator
->
core
));
l
inphone
_xml_rpc_request_add_string_arg
(
request
,
linphone_proxy_config_get_domain
(
creator
->
proxy_cfg
));
l
inphone
_xml_rpc_request_add_string_arg
(
request
,
creator
->
languag
e
);
return
request
;
}
...
...
@@ -743,13 +741,13 @@ static LinphoneXmlRpcRequest * _create_account_with_email_custom(LinphoneAccount
creator
->
email
,
linphone_proxy_config_get_domain
(
creator
->
proxy_cfg
));
request
=
linphone_xml_rpc_request_new
_with_args
(
LinphoneXmlRpcArgString
,
"create_email_account"
,
L
inphone
XmlRpcArgString
,
creator
->
username
,
L
inphone
XmlRpcArgString
,
creator
->
email
,
L
inphone
XmlRpcArgString
,
ha1_for_passwd
(
creator
->
username
?
creator
->
username
:
creator
->
phone_number
,
linphone_proxy_config_get_domain
(
creator
->
proxy_cfg
),
creator
->
password
)
,
LinphoneXmlRpcArgString
,
linphone_core_get_user_agent
(
creator
->
core
),
L
inphone
XmlRpcArgString
,
linphone_proxy_config_get_domain
(
creator
->
proxy_cfg
),
L
inphone
XmlRpcArgNone
);
request
=
linphone_xml_rpc_request_new
(
LinphoneXmlRpcArgString
,
"create_email_account"
);
l
inphone
_xml_rpc_request_add_string_arg
(
request
,
creator
->
username
);
l
inphone
_xml_rpc_request_add_string_arg
(
request
,
creator
->
email
);
l
inphone
_xml_rpc_request_add_string_arg
(
request
,
ha1_for_passwd
(
creator
->
username
?
creator
->
username
:
creator
->
phone_number
,
linphone_proxy_config_get_domain
(
creator
->
proxy_cfg
),
creator
->
password
));
l
inphone
_xml_rpc_request_add_string_arg
(
request
,
linphone_core_get_user_agent
(
creator
->
core
));
l
inphone
_xml_rpc_request_add_string_arg
(
request
,
linphone_proxy_config_get_domain
(
creator
->
proxy_cfg
)
);
return
request
;
}
...
...
@@ -808,13 +806,11 @@ LinphoneAccountCreatorStatus linphone_account_creator_activate_account_linphone(
creator
->
activation_code
,
linphone_proxy_config_get_domain
(
creator
->
proxy_cfg
));
request
=
linphone_xml_rpc_request_new_with_args
(
LinphoneXmlRpcArgString
,
"activate_phone_account"
,
LinphoneXmlRpcArgString
,
creator
->
phone_number
,
LinphoneXmlRpcArgString
,
creator
->
username
?
creator
->
username
:
creator
->
phone_number
,
LinphoneXmlRpcArgString
,
creator
->
activation_code
,
linphone_proxy_config_get_domain
(
creator
->
proxy_cfg
),
LinphoneXmlRpcArgNone
);
request
=
linphone_xml_rpc_request_new
(
LinphoneXmlRpcArgString
,
"activate_phone_account"
);
linphone_xml_rpc_request_add_string_arg
(
request
,
creator
->
phone_number
);
linphone_xml_rpc_request_add_string_arg
(
request
,
creator
->
username
?
creator
->
username
:
creator
->
phone_number
);
linphone_xml_rpc_request_add_string_arg
(
request
,
creator
->
activation_code
);
linphone_xml_rpc_request_add_string_arg
(
request
,
linphone_proxy_config_get_domain
(
creator
->
proxy_cfg
));
linphone_xml_rpc_request_set_user_data
(
request
,
creator
);
linphone_xml_rpc_request_cbs_set_response
(
linphone_xml_rpc_request_get_callbacks
(
request
),
_activate_account_cb_custom
);
linphone_xml_rpc_session_send_request
(
creator
->
xmlrpc_session
,
request
);
...
...
@@ -836,12 +832,10 @@ LinphoneAccountCreatorStatus linphone_account_creator_activate_email_account_lin
creator
->
activation_code
,
linphone_proxy_config_get_domain
(
creator
->
proxy_cfg
));
request
=
linphone_xml_rpc_request_new_with_args
(
LinphoneXmlRpcArgString
,
"activate_email_account"
,
LinphoneXmlRpcArgString
,
creator
->
username
,
LinphoneXmlRpcArgString
,
creator
->
activation_code
,
linphone_proxy_config_get_domain
(
creator
->
proxy_cfg
),
LinphoneXmlRpcArgNone
);
request
=
linphone_xml_rpc_request_new
(
LinphoneXmlRpcArgString
,
"activate_email_account"
);
linphone_xml_rpc_request_add_string_arg
(
request
,
creator
->
username
);
linphone_xml_rpc_request_add_string_arg
(
request
,
creator
->
activation_code
);
linphone_xml_rpc_request_add_string_arg
(
request
,
linphone_proxy_config_get_domain
(
creator
->
proxy_cfg
));
linphone_xml_rpc_request_set_user_data
(
request
,
creator
);
linphone_xml_rpc_request_cbs_set_response
(
linphone_xml_rpc_request_get_callbacks
(
request
),
_activate_account_cb_custom
);
linphone_xml_rpc_session_send_request
(
creator
->
xmlrpc_session
,
request
);
...
...
@@ -876,10 +870,9 @@ LinphoneAccountCreatorStatus linphone_account_creator_is_account_activated_linph
creator
->
username
?
creator
->
username
:
creator
->
phone_number
,
linphone_proxy_config_get_domain
(
creator
->
proxy_cfg
));
request
=
linphone_xml_rpc_request_new_with_args
(
LinphoneXmlRpcArgString
,
"is_account_activated"
,
LinphoneXmlRpcArgString
,
creator
->
username
?
creator
->
username
:
creator
->
phone_number
,
LinphoneXmlRpcArgString
,
linphone_proxy_config_get_domain
(
creator
->
proxy_cfg
),
LinphoneXmlRpcArgNone
);
request
=
linphone_xml_rpc_request_new
(
LinphoneXmlRpcArgString
,
"is_account_activated"
);
linphone_xml_rpc_request_add_string_arg
(
request
,
creator
->
username
?
creator
->
username
:
creator
->
phone_number
);
linphone_xml_rpc_request_add_string_arg
(
request
,
linphone_proxy_config_get_domain
(
creator
->
proxy_cfg
));
linphone_xml_rpc_request_set_user_data
(
request
,
creator
);
linphone_xml_rpc_request_cbs_set_response
(
linphone_xml_rpc_request_get_callbacks
(
request
),
_is_account_activated_cb_custom
);
linphone_xml_rpc_session_send_request
(
creator
->
xmlrpc_session
,
request
);
...
...
@@ -919,10 +912,9 @@ LinphoneAccountCreatorStatus linphone_account_creator_is_phone_number_used_linph
creator
->
phone_number
,
linphone_proxy_config_get_domain
(
creator
->
proxy_cfg
));
request
=
linphone_xml_rpc_request_new_with_args
(
LinphoneXmlRpcArgString
,
"is_phone_number_used"
,
LinphoneXmlRpcArgString
,
creator
->
phone_number
,
LinphoneXmlRpcArgString
,
linphone_proxy_config_get_domain
(
creator
->
proxy_cfg
),
LinphoneXmlRpcArgNone
);
request
=
linphone_xml_rpc_request_new
(
LinphoneXmlRpcArgString
,
"is_phone_number_used"
);
linphone_xml_rpc_request_add_string_arg
(
request
,
creator
->
phone_number
);
linphone_xml_rpc_request_add_string_arg
(
request
,
linphone_proxy_config_get_domain
(
creator
->
proxy_cfg
));
linphone_xml_rpc_request_set_user_data
(
request
,
creator
);
linphone_xml_rpc_request_cbs_set_response
(
linphone_xml_rpc_request_get_callbacks
(
request
),
_is_phone_number_used_cb_custom
);
linphone_xml_rpc_session_send_request
(
creator
->
xmlrpc_session
,
request
);
...
...
@@ -961,12 +953,11 @@ LinphoneAccountCreatorStatus linphone_account_creator_link_phone_number_with_acc
linphone_proxy_config_get_domain
(
creator
->
proxy_cfg
),
creator
->
language
);
request
=
linphone_xml_rpc_request_new_with_args
(
LinphoneXmlRpcArgString
,
"link_phone_number_with_account"
,
LinphoneXmlRpcArgString
,
creator
->
phone_number
,
LinphoneXmlRpcArgString
,
creator
->
username
,
LinphoneXmlRpcArgString
,
linphone_proxy_config_get_domain
(
creator
->
proxy_cfg
),
LinphoneXmlRpcArgString
,
creator
->
language
,
LinphoneXmlRpcArgNone
);
request
=
linphone_xml_rpc_request_new
(
LinphoneXmlRpcArgString
,
"link_phone_number_with_account"
);
linphone_xml_rpc_request_add_string_arg
(
request
,
creator
->
phone_number
);
linphone_xml_rpc_request_add_string_arg
(
request
,
creator
->
username
);
linphone_xml_rpc_request_add_string_arg
(
request
,
linphone_proxy_config_get_domain
(
creator
->
proxy_cfg
));
linphone_xml_rpc_request_add_string_arg
(
request
,
creator
->
language
);
linphone_xml_rpc_request_set_user_data
(
request
,
creator
);
linphone_xml_rpc_request_cbs_set_response
(
linphone_xml_rpc_request_get_callbacks
(
request
),
_link_phone_number_with_account_cb_custom
);
linphone_xml_rpc_session_send_request
(
creator
->
xmlrpc_session
,
request
);
...
...
@@ -998,10 +989,9 @@ LinphoneAccountCreatorStatus linphone_account_creator_is_account_linked_linphone
creator
->
username
,
linphone_proxy_config_get_domain
(
creator
->
proxy_cfg
));
request
=
linphone_xml_rpc_request_new_with_args
(
LinphoneXmlRpcArgString
,
"get_phone_number_for_account"
,
LinphoneXmlRpcArgString
,
creator
->
username
,
LinphoneXmlRpcArgString
,
linphone_proxy_config_get_domain
(
creator
->
proxy_cfg
),
LinphoneXmlRpcArgNone
);
request
=
linphone_xml_rpc_request_new
(
LinphoneXmlRpcArgString
,
"get_phone_number_for_account"
);
linphone_xml_rpc_request_add_string_arg
(
request
,
creator
->
username
);
linphone_xml_rpc_request_add_string_arg
(
request
,
linphone_proxy_config_get_domain
(
creator
->
proxy_cfg
));
linphone_xml_rpc_request_set_user_data
(
request
,
creator
);
linphone_xml_rpc_request_cbs_set_response
(
linphone_xml_rpc_request_get_callbacks
(
request
),
_get_phone_number_for_account_cb_custom
);
linphone_xml_rpc_session_send_request
(
creator
->
xmlrpc_session
,
request
);
...
...
@@ -1038,13 +1028,12 @@ LinphoneAccountCreatorStatus linphone_account_creator_activate_phone_number_link
creator
->
activation_code
,
linphone_proxy_config_get_domain
(
creator
->
proxy_cfg
));
request
=
linphone_xml_rpc_request_new_with_args
(
LinphoneXmlRpcArgString
,
"activate_phone_number_link"
,
LinphoneXmlRpcArgString
,
creator
->
phone_number
,
LinphoneXmlRpcArgString
,
creator
->
username
,
LinphoneXmlRpcArgString
,
creator
->
activation_code
,
LinphoneXmlRpcArgString
,
creator
->
ha1
?
creator
->
ha1
:
ha1_for_passwd
(
creator
->
username
,
linphone_proxy_config_get_domain
(
creator
->
proxy_cfg
),
creator
->
password
),
LinphoneXmlRpcArgString
,
linphone_proxy_config_get_domain
(
creator
->
proxy_cfg
),
LinphoneXmlRpcArgNone
);
request
=
linphone_xml_rpc_request_new
(
LinphoneXmlRpcArgString
,
"activate_phone_number_link"
);
linphone_xml_rpc_request_add_string_arg
(
request
,
creator
->
phone_number
);
linphone_xml_rpc_request_add_string_arg
(
request
,
creator
->
username
);
linphone_xml_rpc_request_add_string_arg
(
request
,
creator
->
activation_code
);
linphone_xml_rpc_request_add_string_arg
(
request
,
creator
->
ha1
?
creator
->
ha1
:
ha1_for_passwd
(
creator
->
username
,
linphone_proxy_config_get_domain
(
creator
->
proxy_cfg
),
creator
->
password
));
linphone_xml_rpc_request_add_string_arg
(
request
,
linphone_proxy_config_get_domain
(
creator
->
proxy_cfg
));
linphone_xml_rpc_request_set_user_data
(
request
,
creator
);
linphone_xml_rpc_request_cbs_set_response
(
linphone_xml_rpc_request_get_callbacks
(
request
),
_activate_phone_number_link_cb_custom
);
linphone_xml_rpc_session_send_request
(
creator
->
xmlrpc_session
,
request
);
...
...
@@ -1087,11 +1076,10 @@ LinphoneAccountCreatorStatus linphone_account_creator_recover_phone_account_linp
linphone_proxy_config_get_domain
(
creator
->
proxy_cfg
),
creator
->
language
);
request
=
linphone_xml_rpc_request_new_with_args
(
LinphoneXmlRpcArgString
,
"recover_phone_account"
,
LinphoneXmlRpcArgString
,
creator
->
phone_number
,
LinphoneXmlRpcArgString
,
linphone_proxy_config_get_domain
(
creator
->
proxy_cfg
),
LinphoneXmlRpcArgString
,
creator
->
language
,
LinphoneXmlRpcArgNone
);
request
=
linphone_xml_rpc_request_new
(
LinphoneXmlRpcArgString
,
"recover_phone_account"
);
linphone_xml_rpc_request_add_string_arg
(
request
,
creator
->
phone_number
);
linphone_xml_rpc_request_add_string_arg
(
request
,
linphone_proxy_config_get_domain
(
creator
->
proxy_cfg
));
linphone_xml_rpc_request_add_string_arg
(
request
,
creator
->
language
);
linphone_xml_rpc_request_set_user_data
(
request
,
creator
);
linphone_xml_rpc_request_cbs_set_response
(
linphone_xml_rpc_request_get_callbacks
(
request
),
_recover_phone_account_cb_custom
);
linphone_xml_rpc_session_send_request
(
creator
->
xmlrpc_session
,
request
);
...
...
@@ -1143,13 +1131,11 @@ LinphoneAccountCreatorStatus linphone_account_creator_update_password_linphone(L
creator
->
username
,
linphone_proxy_config_get_domain
(
creator
->
proxy_cfg
));
request
=
linphone_xml_rpc_request_new_with_args
(
LinphoneXmlRpcArgString
,
"update_hash"
,
LinphoneXmlRpcArgString
,
username
,
LinphoneXmlRpcArgString
,
ha1
,
LinphoneXmlRpcArgString
,
new_ha1
,
LinphoneXmlRpcArgString
,
linphone_proxy_config_get_domain
(
creator
->
proxy_cfg
),
LinphoneXmlRpcArgNone
);
request
=
linphone_xml_rpc_request_new
(
LinphoneXmlRpcArgString
,
"update_hash"
);
linphone_xml_rpc_request_add_string_arg
(
request
,
username
);
linphone_xml_rpc_request_add_string_arg
(
request
,
ha1
);
linphone_xml_rpc_request_add_string_arg
(
request
,
new_ha1
);
linphone_xml_rpc_request_add_string_arg
(
request
,
linphone_proxy_config_get_domain
(
creator
->
proxy_cfg
));
linphone_xml_rpc_request_set_user_data
(
request
,
creator
);
linphone_xml_rpc_request_cbs_set_response
(
linphone_xml_rpc_request_get_callbacks
(
request
),
_password_updated_cb_custom
);
linphone_xml_rpc_session_send_request
(
creator
->
xmlrpc_session
,
request
);
...
...
coreapi/
a
ccount
_c
reator
_s
ervice.c
→
coreapi/
A
ccount
C
reator
S
ervice.c
c
View file @
b9b283dc
File moved
coreapi/
a
ddress.c
→
coreapi/
A
ddress.c
c
View file @
b9b283dc
File moved
coreapi/
a
uthentication.c
→
coreapi/
A
uthentication.c
c
View file @
b9b283dc
...
...
@@ -229,7 +229,7 @@ void linphone_auth_info_write_config(LpConfig *config, LinphoneAuthInfo *obj, in
}
if
(
!
obj
->
ha1
&&
obj
->
realm
&&
obj
->
passwd
&&
(
obj
->
username
||
obj
->
userid
)
&&
store_ha1_passwd
)
{
/*compute ha1 to avoid storing clear text password*/
obj
->
ha1
=
ms_malloc
(
33
);
obj
->
ha1
=
reinterpret_cast
<
char
*>
(
ms_malloc
(
33
)
)
;
sal_auth_compute_ha1
(
obj
->
userid
?
obj
->
userid
:
obj
->
username
,
obj
->
realm
,
obj
->
passwd
,
obj
->
ha1
);
}
if
(
obj
->
username
!=
NULL
)
{
...
...
coreapi/
b
uffer.c
→
coreapi/
B
uffer.c
c
View file @
b9b283dc
...
...
@@ -78,7 +78,7 @@ const uint8_t * linphone_buffer_get_content(const LinphoneBuffer *buffer) {
void
linphone_buffer_set_content
(
LinphoneBuffer
*
buffer
,
const
uint8_t
*
content
,
size_t
size
)
{
buffer
->
size
=
size
;
if
(
buffer
->
content
)
belle_sip_free
(
buffer
->
content
);
buffer
->
content
=
belle_sip_malloc
(
size
+
1
);
buffer
->
content
=
reinterpret_cast
<
uint8_t
*>
(
belle_sip_malloc
(
size
+
1
)
)
;
memcpy
(
buffer
->
content
,
content
,
size
);
((
char
*
)
buffer
->
content
)[
size
]
=
'\0'
;
}
...
...
coreapi/CMakeLists.txt
View file @
b9b283dc
...
...
@@ -36,90 +36,93 @@ endif()
set
(
LINPHONE_PRIVATE_HEADER_FILES
bellesip_sal/sal_impl.h
c
ard
d
av.h
c
onference
_private
.h
c
ontact
_p
rovider
s_priv
.h
e
num.h
l
ime.h
l
pc2
x
ml.h
o
ffer
a
nswer.h
C
ard
D
av.h
C
onference.h
C
ontact
P
rovider.h
E
num.h
L
ime.h
L
pc2
X
ml.h
O
ffer
A
nswer.h
private.h
q
uality
_r
eporting.h
s
qlite3
_b
ctbx
_v
fs.h
v
card
_private
.h
x
ml2
l
pc.h
Q
uality
R
eporting.h
S
qlite3
B
ctbx
V
fs.h
V
card.h
X
ml2
L
pc.h
)
set
(
LINPHONE_SOURCE_FILES_C
account_creator.c
account_creator_service.c
address.c
authentication.c
bellesip_sal/sal_address_impl.c
bellesip_sal/sal_impl.c
bellesip_sal/sal_op_call.c
bellesip_sal/sal_op_call_transfer.c
bellesip_sal/sal_op_events.c
bellesip_sal/sal_op_impl.c
bellesip_sal/sal_op_info.c
bellesip_sal/sal_op_message.c
bellesip_sal/sal_op_presence.c
bellesip_sal/sal_op_publish.c
bellesip_sal/sal_op_registration.c
bellesip_sal/sal_sdp.c
buffer.c
callbacks.c
call_log.c
call_params.c
carddav.c
chat.c
chat_file_transfer.c
contactprovider.c
content.c
dial_plan.c
dict.c
ec-calibrator.c
echo-tester.c
enum.c
error_info.c
event.c
factory.c
friend.c
friendlist.c
im_notif_policy.c
info.c
ldapprovider.c
lime.c
im_encryption_engine.c
linphonecall.c
linphonecore.c
linphone_tunnel_config.c
localplayer.c
lpc2xml.c
lpconfig.c
lsd.c
message_storage.c
misc.c
nat_policy.c
offeranswer.c
payload_type.c
player.c
presence.c
proxy.c
quality_reporting.c
remote_provisioning.c
ringtoneplayer.c
sal.c
siplogin.c
sipsetup.c
sqlite3_bctbx_vfs.c
video_definition.c
xml2lpc.c
xml.c
xmlrpc.c
vtables.c
bellesip_sal/sal_address_impl.cc
bellesip_sal/sal_impl.cc
bellesip_sal/sal_op_call.cc
bellesip_sal/sal_op_call_transfer.cc
bellesip_sal/sal_op_events.cc
bellesip_sal/sal_op_impl.cc
bellesip_sal/sal_op_info.cc
bellesip_sal/sal_op_message.cc
bellesip_sal/sal_op_presence.cc
bellesip_sal/sal_op_publish.cc
bellesip_sal/sal_op_registration.cc
bellesip_sal/sal_sdp.cc
)
set
(
LINPHONE_SOURCE_FILES_CXX conference.cc
)
set
(
LINPHONE_SOURCE_FILES_CXX
AccountCreator.cc
AccountCreatorService.cc
Address.cc
Authentication.cc
Buffer.cc
Call.cc
Callbacks.cc
CallLog.cc
CallParams.cc
CardDav.cc
Chat.cc
ChatFileTransfer.cc
Conference.cc
Config.cc
ContactProvider.cc
Content.cc
Core.cc
DialPlan.cc
Dict.cc
EcCalibrator.cc
EchoTester.cc
Enum.cc
ErrorInfo.cc
Event.cc
Factory.cc
Friend.cc
FriendList.cc
ImEncryptionEngine.cc
ImNotifPolicy.cc
Info.cc
LdapProvider.cc
Lime.cc
LocalPlayer.cc
Lpc2Xml.cc
Lsd.cc
MessageStorage.cc
Misc.cc
NatPolicy.cc
OfferAnswer.cc
PayloadType.cc
Player.cc
Presence.cc
Proxy.cc
QualityReporting.cc
RemoteProvisioning.cc
RingTonePlayer.cc
Sal.cc
SipLogin.cc
SipSetup.cc
Sqlite3BctbxVfs.cc
TunnelConfig.cc
VideoDefinition.cc
Vtables.cc
Xml.cc
Xml2Lpc.cc
XmlRpc.cc
)
if
(
ANDROID
)
list
(
APPEND LINPHONE_SOURCE_FILES_CXX linphonecore_jni.cc
)
set_source_files_properties
(
linphonecore_jni.cc PROPERTIES COMPILE_DEFINITIONS
"USE_JAVAH"
)
...
...
@@ -134,12 +137,12 @@ endif()
if
(
ENABLE_TUNNEL
)
list
(
APPEND LINPHONE_SOURCE_FILES_CXX
linphone_t
unnel.cc
T
unnel.cc
TunnelManager.cc
)
add_definitions
(
-DTUNNEL_ENABLED
)
else
()
list
(
APPEND LINPHONE_SOURCE_FILES_C
linphone_t
unnel
_s
tubs.c
)
list
(
APPEND LINPHONE_SOURCE_FILES_C
XX T
unnel
S
tubs.c
c
)
endif
()
bc_git_version
(
liblinphone
${
PROJECT_VERSION
}
)
...
...
@@ -185,7 +188,7 @@ if(INTL_FOUND)
endif
()
if
(
BELCARD_FOUND
)
list
(
APPEND LIBS
${
BELCARD_LIBRARIES
}
)
list
(
APPEND LINPHONE_SOURCE_FILES_CXX
v
card.cc
)
list
(
APPEND LINPHONE_SOURCE_FILES_CXX
V
card.cc
)
if
(
NOT MSVC
)
list
(
APPEND STRICT_OPTIONS_CXX
"-std=c++11"
)
endif
()
...
...
@@ -193,7 +196,7 @@ if(BELCARD_FOUND)
list
(
APPEND STRICT_OPTIONS_CXX
"-stdlib=libc++"
)
endif
()
else
()
list
(
APPEND LINPHONE_SOURCE_FILES_C
v
card
_s
tubs.c
)
list
(
APPEND LINPHONE_SOURCE_FILES_C
XX V
card
S
tubs.c
)
endif
()
bc_apply_compile_flags
(
LINPHONE_SOURCE_FILES_C STRICT_OPTIONS_CPP STRICT_OPTIONS_C
)
...
...
coreapi/
linphonec
all.c
→
coreapi/
C
all.c
c
View file @
b9b283dc
...
...
@@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "linphone/sipsetup.h"
#include "linphone/lpconfig.h"
#include "private.h"
#include "
c
onference
_private
.h"
#include "
C
onference.h"
#include <ortp/event.h>
#include <ortp/b64.h>
...
...
@@ -44,6 +44,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include <bctoolbox/defs.h>
inline
OrtpRtcpXrStatSummaryFlag
operator
|
(
OrtpRtcpXrStatSummaryFlag
a
,
OrtpRtcpXrStatSummaryFlag
b
)
{
return
static_cast
<
OrtpRtcpXrStatSummaryFlag
>
(
static_cast
<
int
>
(
a
)
|
static_cast
<
int
>
(
b
));
}
static
const
char
*
EC_STATE_STORE
=
".linphone.ecstate"
;
#define EC_STATE_MAX_LEN 1048576 // 1Mo
...
...
@@ -186,7 +191,7 @@ static bool_t generate_b64_crypto_key(size_t key_length, char* key_out, size_t k
return
FALSE
;
}
b64_size
=
b64_encode
((
const
char
*
)
tmp
,
key_length
,
NULL
,
0
);
b64_size
=
b64
::
b64_encode
((
const
char
*
)
tmp
,
key_length
,
NULL
,
0
);
if
(
b64_size
==
0
)
{
ms_error
(
"Failed to get b64 result size"
);
ms_free
(
tmp
);
...
...
@@ -197,7 +202,7 @@ static bool_t generate_b64_crypto_key(size_t key_length, char* key_out, size_t k
ms_free
(
tmp
);
return
FALSE
;
}
b64_size
=
b64_encode
((
const
char
*
)
tmp
,
key_length
,
key_out
,
key_out_size
);
b64_size
=
b64
::
b64_encode
((
const
char
*
)
tmp
,
key_length
,
key_out
,
key_out_size
);
if
(
b64_size
==
0
)
{
ms_error
(
"Failed to b64 encode key"
);
ms_free
(
tmp
);
...
...
@@ -588,7 +593,7 @@ static int setup_encryption_key(SalSrtpCryptoAlgo *crypto, MSCryptoSuite suite,
}
if
(
keylen
==
0
||
!
generate_b64_crypto_key
(
keylen
,
crypto
->
master_key
,
SAL_SRTP_KEY_SIZE
)){
ms_error
(
"Could not generate SRTP key."
);
crypto
->
algo
=
0
;
crypto
->
algo
=
MS_CRYPTO_SUITE_INVALID
;
return
-
1
;
}
return
0
;
...
...
@@ -1116,9 +1121,9 @@ static void linphone_call_init_common(LinphoneCall *call, LinphoneAddress *from,
linphone_core_get_text_port_range
(
call
->
core
,
&
min_port
,
&
max_port
);
port_config_set
(
call
,
call
->
main_text_stream_index
,
min_port
,
max_port
);
linphone_call_init_stats
(
call
->
audio_stats
,
L
INPHONE_CALL_STATS_AUDIO
);
linphone_call_init_stats
(
call
->
video_stats
,
L
INPHONE_CALL_STATS_VIDEO
);
linphone_call_init_stats
(
call
->
text_stats
,
L
INPHONE_CALL_STATS_TEXT
);
linphone_call_init_stats
(
call
->
audio_stats
,
L
inphoneStreamTypeAudio
);
linphone_call_init_stats
(
call
->
video_stats
,
L
inphoneStreamTypeVideo
);
linphone_call_init_stats
(
call
->
text_stats
,
L
inphoneStreamTypeText
);
if
(
call
->
dest_proxy
==
NULL
)
{
/* Try to define the destination proxy if it has not already been done to have a correct contact field in the SIP messages */
...
...
@@ -1135,7 +1140,7 @@ static void linphone_call_init_common(LinphoneCall *call, LinphoneAddress *from,
}
void
linphone_call_init_stats
(
LinphoneCallStats
*
stats
,
in
t
type
)
{
void
linphone_call_init_stats
(
LinphoneCallStats
*
stats
,
L
in
phoneStreamType
type
)
{
stats
->
type
=
type
;
stats
->
received_rtcp
=
NULL
;
stats
->
sent_rtcp
=
NULL
;
...
...
@@ -2712,7 +2717,7 @@ void linphone_call_init_audio_stream(LinphoneCall *call){
framesize
=
lp_config_get_int
(
lc
->
config
,
"sound"
,
"ec_framesize"
,
0
);
audio_stream_set_echo_canceller_params
(
audiostream
,
len
,
delay
,
framesize
);
if
(
audiostream
->
ec
)
{
char
*
statestr
=
ms_malloc0
(
EC_STATE_MAX_LEN
);
char
*
statestr
=
(
char
*
)
ms_malloc0
(
EC_STATE_MAX_LEN
);
if
(
lp_config_relative_file_exists
(
lc
->
config
,
EC_STATE_STORE
)
&&
lp_config_read_relative_file
(
lc
->
config
,
EC_STATE_STORE
,
statestr
,
EC_STATE_MAX_LEN
)
==
0
)
{
ms_filter_call_method
(
audiostream
->
ec
,
MS_ECHO_CANCELLER_SET_STATE_STRING
,
statestr
);
...
...
@@ -5312,9 +5317,10 @@ LinphoneStatus linphone_call_terminate(LinphoneCall *call) {
LinphoneStatus
linphone_call_terminate_with_error_info
(
LinphoneCall
*
call
,
const
LinphoneErrorInfo
*
ei
){
SalErrorInfo
sei
=
{
0
}
;
SalErrorInfo
sei
;
LinphoneErrorInfo
*
p_ei
=
(
LinphoneErrorInfo
*
)
ei
;
memset
(
&
sei
,
0
,
sizeof
(
sei
));
ms_message
(
"Terminate call [%p] which is currently in state %s"
,
call
,
linphone_call_state_to_string
(
call
->
state
));
switch
(
call
->
state
)
{
case
LinphoneCallReleased
:
...
...
@@ -5352,7 +5358,7 @@ LinphoneStatus linphone_call_redirect(LinphoneCall *call, const char *redirect_u
char
*
real_url
=
NULL
;
LinphoneCore
*
lc
;
LinphoneAddress
*
real_parsed_url
;
SalErrorInfo
sei
=
{
0
}
;
SalErrorInfo
sei
;
if
(
call
->
state
!=
LinphoneCallIncomingReceived
)
{
ms_error
(
"Bad state for call redirection."
);
...
...
@@ -5367,6 +5373,7 @@ LinphoneStatus linphone_call_redirect(LinphoneCall *call, const char *redirect_u
return
-
1
;
}
memset
(
&
sei
,
0
,
sizeof
(
sei
));
real_url
=
linphone_address_as_string
(
real_parsed_url
);
sal_error_info_set
(
&
sei
,
SalReasonRedirect
,
"SIP"
,
0
,
NULL
,
NULL
);
sal_call_decline_with_error_info
(
call
->
op
,
&
sei
,
real_url
);
...
...
@@ -5390,9 +5397,11 @@ LinphoneStatus linphone_call_decline(LinphoneCall * call, LinphoneReason reason)
LinphoneStatus
linphone_call_decline_with_error_info
(
LinphoneCall
*
call
,
const
LinphoneErrorInfo
*
ei
)
{
SalErrorInfo
sei
=
{
0
}
;
SalErrorInfo
sub_sei
=
{
0
}
;
SalErrorInfo
sei
;
SalErrorInfo
sub_sei
;
memset
(
&
sei
,
0
,
sizeof
(
sei
));
memset
(
&
sub_sei
,
0
,
sizeof
(
sub_sei
));
sei
.
sub_sei
=
&
sub_sei
;
if
((
call
->
state
!=
LinphoneCallIncomingReceived
)
&&
(
call
->
state
!=
LinphoneCallIncomingEarlyMedia
))
{
...
...
@@ -6005,10 +6014,12 @@ void linphone_call_reinvite_to_recover_from_connection_loss(LinphoneCall *call)
}
void
linphone_call_repair_if_broken
(
LinphoneCall
*
call
){
SalErrorInfo
sei
=
{
0
}
;
SalErrorInfo
sei
;
if
(
!
call
->
broken
)
return
;
if
(
!
call
->
core
->
media_network_reachable
)
return
;
memset
(
&
sei
,
0
,
sizeof
(
sei
));
/*Make sure that the proxy from which we received this call, or to which we routed this call is registered first*/
if
(
call
->
dest_proxy
){
/*in all other cases, ie no proxy config, or a proxy config for which no registration was requested, we can start the
...
...
@@ -6174,7 +6185,7 @@ void linphone_call_notify_info_message_received(LinphoneCall *call, const Linpho
linphone_core_notify_info_received
(
linphone_call_get_core
(
call
),
call
,
msg
);
}
void
linphone_call_notify_ack_processing
(
LinphoneCall
*
call
,
void
*
msg
,
bool_t
is_received
)
{
void
linphone_call_notify_ack_processing
(
LinphoneCall
*
call
,
LinphoneHeaders
*
msg
,
bool_t
is_received
)
{
NOTIFY_IF_EXIST
(
ack_processing
,
call
,
msg
,
is_received
)
}
coreapi/
c
all
_l
og.c
→
coreapi/
C
all
L
og.c
c
View file @
b9b283dc
...
...
@@ -135,8 +135,8 @@ bctbx_list_t * call_logs_read_from_config_file(LinphoneCore *lc){
if
(
tmp
)
to
=
linphone_address_new
(
tmp
);
if
(
!
from
||
!
to
)