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
33b72ce6
Commit
33b72ce6
authored
Nov 15, 2016
by
Ghislain MARY
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move public header files in the include/linphone directory.
parent
a14a8f9f
Changes
138
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
138 changed files
with
930 additions
and
655 deletions
+930
-655
CMakeLists.txt
CMakeLists.txt
+1
-1
console/Makefile.am
console/Makefile.am
+0
-1
console/commands.c
console/commands.c
+2
-2
console/linphonec.c
console/linphonec.c
+1
-1
coreapi/CMakeLists.txt
coreapi/CMakeLists.txt
+14
-32
coreapi/Makefile.am
coreapi/Makefile.am
+4
-32
coreapi/TunnelManager.cc
coreapi/TunnelManager.cc
+2
-2
coreapi/TunnelManager.hh
coreapi/TunnelManager.hh
+1
-1
coreapi/account_creator.c
coreapi/account_creator.c
+1
-1
coreapi/address.c
coreapi/address.c
+6
-131
coreapi/authentication.c
coreapi/authentication.c
+2
-2
coreapi/bellesip_sal/sal_op_message.c
coreapi/bellesip_sal/sal_op_message.c
+1
-1
coreapi/buffer.c
coreapi/buffer.c
+1
-1
coreapi/callbacks.c
coreapi/callbacks.c
+2
-2
coreapi/carddav.c
coreapi/carddav.c
+2
-2
coreapi/carddav.h
coreapi/carddav.h
+2
-2
coreapi/chat.c
coreapi/chat.c
+2
-2
coreapi/chat_file_transfer.c
coreapi/chat_file_transfer.c
+1
-1
coreapi/conference_private.h
coreapi/conference_private.h
+2
-2
coreapi/contact_providers_priv.h
coreapi/contact_providers_priv.h
+1
-1
coreapi/contactprovider.c
coreapi/contactprovider.c
+1
-1
coreapi/contactprovider.h
coreapi/contactprovider.h
+1
-1
coreapi/content.c
coreapi/content.c
+1
-1
coreapi/dial_plan.c
coreapi/dial_plan.c
+1
-1
coreapi/dict.c
coreapi/dict.c
+2
-2
coreapi/ec-calibrator.c
coreapi/ec-calibrator.c
+1
-1
coreapi/event.c
coreapi/event.c
+1
-1
coreapi/friend.c
coreapi/friend.c
+2
-2
coreapi/friendlist.c
coreapi/friendlist.c
+1
-1
coreapi/help/CMakeLists.txt
coreapi/help/CMakeLists.txt
+0
-1
coreapi/help/Doxyfile.in
coreapi/help/Doxyfile.in
+1
-1
coreapi/help/Makefile.am
coreapi/help/Makefile.am
+0
-1
coreapi/help/buddy_status.c
coreapi/help/buddy_status.c
+1
-5
coreapi/help/chatroom.c
coreapi/help/chatroom.c
+1
-5
coreapi/help/filetransfer.c
coreapi/help/filetransfer.c
+1
-5
coreapi/help/helloworld.c
coreapi/help/helloworld.c
+2
-5
coreapi/help/notify.c
coreapi/help/notify.c
+1
-5
coreapi/help/realtimetext_receiver.c
coreapi/help/realtimetext_receiver.c
+2
-5
coreapi/help/realtimetext_sender.c
coreapi/help/realtimetext_sender.c
+2
-5
coreapi/help/registration.c
coreapi/help/registration.c
+1
-5
coreapi/info.c
coreapi/info.c
+2
-2
coreapi/ldap/ldapprovider.c
coreapi/ldap/ldapprovider.c
+1
-1
coreapi/lime.c
coreapi/lime.c
+1
-1
coreapi/linphone_tunnel.cc
coreapi/linphone_tunnel.cc
+2
-2
coreapi/linphone_tunnel_config.c
coreapi/linphone_tunnel_config.c
+1
-1
coreapi/linphone_tunnel_stubs.c
coreapi/linphone_tunnel_stubs.c
+3
-3
coreapi/linphonecall.c
coreapi/linphonecall.c
+3
-43
coreapi/linphonecore.c
coreapi/linphonecore.c
+3
-3
coreapi/lpc2xml.h
coreapi/lpc2xml.h
+1
-1
coreapi/lpconfig.c
coreapi/lpconfig.c
+2
-2
coreapi/lsd.c
coreapi/lsd.c
+1
-1
coreapi/message_storage.c
coreapi/message_storage.c
+1
-1
coreapi/misc.c
coreapi/misc.c
+1
-1
coreapi/nat_policy.c
coreapi/nat_policy.c
+1
-1
coreapi/plugins/buddylookup/src/lookup.c
coreapi/plugins/buddylookup/src/lookup.c
+1
-6
coreapi/presence.c
coreapi/presence.c
+3
-3
coreapi/private.h
coreapi/private.h
+9
-8
coreapi/proxy.c
coreapi/proxy.c
+4
-4
coreapi/quality_reporting.c
coreapi/quality_reporting.c
+1
-1
coreapi/quality_reporting.h
coreapi/quality_reporting.h
+1
-1
coreapi/siplogin.c
coreapi/siplogin.c
+1
-1
coreapi/sipsetup.c
coreapi/sipsetup.c
+1
-1
coreapi/vcard.cc
coreapi/vcard.cc
+2
-2
coreapi/vcard_private.h
coreapi/vcard_private.h
+97
-0
coreapi/vcard_stubs.c
coreapi/vcard_stubs.c
+2
-2
coreapi/xml2lpc.h
coreapi/xml2lpc.h
+1
-1
coreapi/xmlrpc.c
coreapi/xmlrpc.c
+1
-1
daemon/Makefile.am
daemon/Makefile.am
+2
-2
daemon/commands/register.cc
daemon/commands/register.cc
+2
-2
daemon/daemon.h
daemon/daemon.h
+2
-2
gtk/Makefile.am
gtk/Makefile.am
+1
-1
gtk/audio_assistant.c
gtk/audio_assistant.c
+1
-1
gtk/buddylookup.c
gtk/buddylookup.c
+1
-1
gtk/config-fetching.c
gtk/config-fetching.c
+1
-1
gtk/linphone.h
gtk/linphone.h
+2
-2
gtk/main.c
gtk/main.c
+1
-1
gtk/propertybox.c
gtk/propertybox.c
+1
-1
gtk/setupwizard.h
gtk/setupwizard.h
+2
-2
gtk/support.c
gtk/support.c
+1
-1
include/CMakeLists.txt
include/CMakeLists.txt
+64
-0
include/Makefile.am
include/Makefile.am
+1
-0
include/linphone/Makefile.am
include/linphone/Makefile.am
+33
-0
include/linphone/account_creator.h
include/linphone/account_creator.h
+0
-0
include/linphone/address.h
include/linphone/address.h
+244
-0
include/linphone/buffer.h
include/linphone/buffer.h
+0
-0
include/linphone/call_log.h
include/linphone/call_log.h
+0
-0
include/linphone/call_params.h
include/linphone/call_params.h
+0
-0
include/linphone/call_stats.h
include/linphone/call_stats.h
+142
-0
include/linphone/conference.h
include/linphone/conference.h
+0
-0
include/linphone/content.h
include/linphone/content.h
+0
-0
include/linphone/core.h
include/linphone/core.h
+4
-133
include/linphone/core_utils.h
include/linphone/core_utils.h
+1
-5
include/linphone/event.h
include/linphone/event.h
+0
-0
include/linphone/friend.h
include/linphone/friend.h
+0
-0
include/linphone/friendlist.h
include/linphone/friendlist.h
+2
-7
include/linphone/linphone_proxy_config.h
include/linphone/linphone_proxy_config.h
+25
-0
include/linphone/linphone_tunnel.h
include/linphone/linphone_tunnel.h
+32
-0
include/linphone/linphonecore.h
include/linphone/linphonecore.h
+26
-0
include/linphone/linphonecore_utils.h
include/linphone/linphonecore_utils.h
+26
-0
include/linphone/linphonefriend.h
include/linphone/linphonefriend.h
+25
-0
include/linphone/linphonepresence.h
include/linphone/linphonepresence.h
+25
-0
include/linphone/lpconfig.h
include/linphone/lpconfig.h
+0
-0
include/linphone/nat_policy.h
include/linphone/nat_policy.h
+0
-0
include/linphone/presence.h
include/linphone/presence.h
+0
-0
include/linphone/proxy_config.h
include/linphone/proxy_config.h
+0
-0
include/linphone/sipsetup.h
include/linphone/sipsetup.h
+0
-0
include/linphone/tunnel.h
include/linphone/tunnel.h
+1
-1
include/linphone/vcard.h
include/linphone/vcard.h
+7
-77
include/linphone/xmlrpc.h
include/linphone/xmlrpc.h
+0
-0
tester/Makefile.am
tester/Makefile.am
+1
-1
tester/call_multi_tester.c
tester/call_multi_tester.c
+2
-2
tester/call_multicast_tester.c
tester/call_multicast_tester.c
+1
-1
tester/call_single_tester.c
tester/call_single_tester.c
+2
-2
tester/call_video_tester.c
tester/call_video_tester.c
+1
-1
tester/complex_sip_case_tester.c
tester/complex_sip_case_tester.c
+2
-2
tester/eventapi_tester.c
tester/eventapi_tester.c
+2
-2
tester/flexisip_tester.c
tester/flexisip_tester.c
+2
-2
tester/liblinphone_tester.c
tester/liblinphone_tester.c
+1
-1
tester/liblinphone_tester.h
tester/liblinphone_tester.h
+1
-1
tester/log_collection_tester.c
tester/log_collection_tester.c
+1
-1
tester/message_tester.c
tester/message_tester.c
+1
-1
tester/offeranswer_tester.c
tester/offeranswer_tester.c
+2
-2
tester/presence_server_tester.c
tester/presence_server_tester.c
+1
-1
tester/presence_tester.c
tester/presence_tester.c
+1
-1
tester/quality_reporting_tester.c
tester/quality_reporting_tester.c
+1
-1
tester/register_tester.c
tester/register_tester.c
+1
-1
tester/remote_provisioning_tester.c
tester/remote_provisioning_tester.c
+1
-1
tester/setup_tester.c
tester/setup_tester.c
+2
-2
tester/stun_tester.c
tester/stun_tester.c
+1
-1
tester/tester.c
tester/tester.c
+1
-1
tester/tunnel_tester.c
tester/tunnel_tester.c
+2
-2
tester/upnp_tester.c
tester/upnp_tester.c
+2
-2
tester/vcard_tester.c
tester/vcard_tester.c
+1
-1
tester/video_tester.c
tester/video_tester.c
+2
-2
tools/CMakeLists.txt
tools/CMakeLists.txt
+0
-1
tools/Makefile.am
tools/Makefile.am
+0
-1
tools/auto_answer.c
tools/auto_answer.c
+1
-5
tools/lpsendmsg.c
tools/lpsendmsg.c
+1
-5
No files found.
CMakeLists.txt
View file @
33b72ce6
...
...
@@ -228,7 +228,6 @@ if(MSVC)
include_directories
(
${
MSVC_INCLUDE_DIR
}
)
endif
()
add_definitions
(
"-DIN_LINPHONE"
)
if
(
ENABLE_DEBUG_LOGS
)
add_definitions
(
"-DDEBUG"
)
endif
()
...
...
@@ -307,6 +306,7 @@ endif()
add_subdirectory
(
java
)
add_subdirectory
(
coreapi
)
add_subdirectory
(
include
)
add_subdirectory
(
share
)
if
(
ENABLE_CONSOLE_UI
)
add_subdirectory
(
console
)
...
...
console/Makefile.am
View file @
33b72ce6
...
...
@@ -6,7 +6,6 @@ AM_CPPFLAGS=\
-I
$(top_srcdir)
/include
COMMON_CFLAGS
=
\
-DIN_LINPHONE
\
-D_ORTP_SOURCE
\
$(STRICT_OPTIONS)
\
$(STRICT_OPTIONS_CC)
\
...
...
console/commands.c
View file @
33b72ce6
...
...
@@ -31,9 +31,9 @@
#endif
/*_WIN32_WCE*/
#include <limits.h>
#include <ctype.h>
#include <linphonecore.h>
#include <linphone
/
core.h>
#include "linphonec.h"
#include
"
lpconfig.h
"
#include
<linphone/
lpconfig.h
>
#ifndef _WIN32
#include <sys/wait.h>
...
...
console/linphonec.c
View file @
33b72ce6
...
...
@@ -34,7 +34,7 @@
#include <ctype.h>
#include <stdlib.h>
#include <linphonecore.h>
#include <linphone
/
core.h>
#include "linphonec.h"
#include <bctoolbox/vfs.h>
...
...
coreapi/CMakeLists.txt
View file @
33b72ce6
...
...
@@ -30,31 +30,23 @@ if(NOT WIN32)
endif
()
set
(
LINPHONE_HEADER_FILES
account_creator.h
buffer.h
call_log.h
call_params.h
set
(
LINPHONE_PRIVATE_HEADER_FILES
bellesip_sal/sal_impl.h
carddav.h
conference.h
content.h
event.h
friendlist.h
linphonecore.h
linphonecore_utils.h
linphonefriend.h
linphonepresence.h
linphone_proxy_config.h
linphone_tunnel.h
conference_private.h
contactprovider.h
contact_providers_priv.h
enum.h
ldap/ldapprovider.h
lime.h
lpc2xml.h
lpconfig.h
nat_policy.h
offeranswer.h
private.h
quality_reporting.h
ringtoneplayer.h
sipsetup.h
sqlite3_bctbx_vfs.h
vcard_private.h
xml2lpc.h
xmlrpc.h
vcard.h
)
set
(
LINPHONE_SOURCE_FILES_C
...
...
@@ -63,7 +55,6 @@ set(LINPHONE_SOURCE_FILES_C
authentication.c
bellesip_sal/sal_address_impl.c
bellesip_sal/sal_impl.c
bellesip_sal/sal_impl.h
bellesip_sal/sal_op_call.c
bellesip_sal/sal_op_call_transfer.c
bellesip_sal/sal_op_events.c
...
...
@@ -88,7 +79,6 @@ set(LINPHONE_SOURCE_FILES_C
ec-calibrator.c
echo-tester.c
enum.c
enum.h
event.c
friend.c
friendlist.c
...
...
@@ -101,16 +91,13 @@ set(LINPHONE_SOURCE_FILES_C
localplayer.c
lpc2xml.c
lpconfig.c
lpconfig.h
lsd.c
message_storage.c
misc.c
nat_policy.c
offeranswer.c
offeranswer.h
player.c
presence.c
private.h
proxy.c
quality_reporting.c
remote_provisioning.c
...
...
@@ -202,7 +189,7 @@ apply_compile_flags(LINPHONE_SOURCE_FILES_CXX "CPP" "CXX")
apply_compile_flags
(
LINPHONE_SOURCE_FILES_OBJC
"CPP"
"OBJC"
)
if
(
ENABLE_STATIC
)
add_library
(
linphone-static STATIC
${
LINPHONE_HEADER_FILES
}
${
LINPHONE_SOURCE_FILES_C
}
${
LINPHONE_SOURCE_FILES_CXX
}
${
LINPHONE_SOURCE_FILES_OBJC
}
)
add_library
(
linphone-static STATIC
${
LINPHONE_HEADER_FILES
}
${
LINPHONE_PRIVATE_HEADER_FILES
}
${
LINPHONE_SOURCE_FILES_C
}
${
LINPHONE_SOURCE_FILES_CXX
}
${
LINPHONE_SOURCE_FILES_OBJC
}
)
set_target_properties
(
linphone-static PROPERTIES OUTPUT_NAME linphone
)
add_dependencies
(
linphone-static liblinphone-git-version
)
target_link_libraries
(
linphone-static
${
LIBS
}
)
...
...
@@ -218,7 +205,7 @@ if(ENABLE_STATIC)
)
endif
()
if
(
ENABLE_SHARED
)
add_library
(
linphone SHARED
${
LINPHONE_HEADER_FILES
}
${
LINPHONE_SOURCE_FILES_C
}
${
LINPHONE_SOURCE_FILES_CXX
}
${
LINPHONE_SOURCE_FILES_OBJC
}
)
add_library
(
linphone SHARED
${
LINPHONE_HEADER_FILES
}
${
LINPHONE_PRIVATE_HEADER_FILES
}
${
LINPHONE_SOURCE_FILES_C
}
${
LINPHONE_SOURCE_FILES_CXX
}
${
LINPHONE_SOURCE_FILES_OBJC
}
)
if
(
BELCARD_FOUND
)
if
(
APPLE
)
...
...
@@ -273,9 +260,4 @@ if(ICONV_FOUND)
endif
()
endif
()
install
(
FILES
${
LINPHONE_HEADER_FILES
}
DESTINATION
${
CMAKE_INSTALL_INCLUDEDIR
}
/linphone
PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
)
add_subdirectory
(
help
)
coreapi/Makefile.am
View file @
33b72ce6
...
...
@@ -22,34 +22,6 @@ BUILT_SOURCES=$(GITVERSION_FILE)
CLEANFILES
=
$(GITVERSION_FILE)
## Process this file with automake to produce Makefile.in
linphone_includedir
=
$(includedir)
/linphone
linphone_include_HEADERS
=
\
account_creator.h
\
buffer.h
\
call_log.h
\
call_params.h
\
conference.h
\
content.h
\
event.h
\
friendlist.h
\
linphonecore.h
\
linphonecore_utils.h
\
ringtoneplayer.h
\
linphonefriend.h
\
linphonepresence.h
\
linphone_proxy_config.h
\
linphone_tunnel.h
\
lpc2xml.h
\
lpconfig.h
\
nat_policy.h
\
sipsetup.h
\
sqlite3_bctbx_vfs.h
\
xml2lpc.h
\
xmlrpc.h
\
vcard.h
\
carddav.h
lib_LTLIBRARIES
=
liblinphone.la
liblinphone_la_SOURCES
=
\
...
...
@@ -58,6 +30,7 @@ liblinphone_la_SOURCES=\
authentication.c
\
buffer.c
\
callbacks.c
\
carddav.h
\
call_log.c
\
call_params.c
\
chat.c
\
...
...
@@ -78,7 +51,7 @@ liblinphone_la_SOURCES=\
linphonecall.c
\
linphonecore.c
\
localplayer.c
\
lpc2xml.c
\
lpc2xml.c
lpc2xml.h
\
lime.c lime.h
\
lpconfig.c
\
lsd.c
\
...
...
@@ -95,7 +68,8 @@ liblinphone_la_SOURCES=\
sal.c
\
siplogin.c
\
sipsetup.c
\
xml2lpc.c
\
vcard_private.h
\
xml2lpc.c xml2lpc.h
\
xml.c
\
xmlrpc.c
\
vtables.c
\
...
...
@@ -165,7 +139,6 @@ liblinphone_la_LIBADD= \
AM_CPPFLAGS
=
\
-DIN_LINPHONE
\
-I
$(top_srcdir)
-I
$(top_srcdir)
/include
-I
$(builddir)
\
$(ORTP_CFLAGS)
\
$(MEDIASTREAMER_CFLAGS)
\
...
...
@@ -173,7 +146,6 @@ AM_CPPFLAGS=\
COMMON_CFLAGS
=
\
$(STRICT_OPTIONS)
\
-DIN_LINPHONE
\
$(SIPSTACK_CFLAGS)
\
-DENABLE_TRACE
\
-DLOG_DOMAIN
=
\"
LinphoneCore
\"
\
...
...
coreapi/TunnelManager.cc
View file @
33b72ce6
...
...
@@ -14,8 +14,8 @@
#include "TunnelManager.hh"
#include "ortp/rtpsession.h"
#include "linphonecore.h"
#include "linphonecore_utils.h"
#include "linphone
/
core.h"
#include "linphone
/
core_utils.h"
#include "private.h"
#ifdef ANDROID
...
...
coreapi/TunnelManager.hh
View file @
33b72ce6
...
...
@@ -14,7 +14,7 @@
#include <string>
#include <tunnel/client.hh>
#include <tunnel/udp_mirror.hh>
#include "linphonecore.h"
#include "linphone
/
core.h"
#include "linphone_tunnel.h"
#ifndef USE_BELLESIP
...
...
coreapi/account_creator.c
View file @
33b72ce6
...
...
@@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include "account_creator.h"
#include "
linphone/
account_creator.h"
#include "private.h"
#if !_WIN32
#include "regex.h"
...
...
coreapi/address.c
View file @
33b72ce6
...
...
@@ -17,19 +17,10 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include "linphonecore.h"
#include "lpconfig.h"
#include "linphone
/
core.h"
#include "
linphone/
lpconfig.h"
#include "private.h"
/**
* @addtogroup linphone_address
* @{
**/
/**
* Constructs a LinphoneAddress object by parsing the user supplied address,
* given as a string.
**/
LinphoneAddress
*
linphone_address_new
(
const
char
*
addr
){
SalAddress
*
saddr
=
sal_address_new
(
addr
);
if
(
saddr
==
NULL
)
...
...
@@ -37,167 +28,99 @@ LinphoneAddress * linphone_address_new(const char *addr){
return
saddr
;
}
/**
* Clones a LinphoneAddress object.
**/
LinphoneAddress
*
linphone_address_clone
(
const
LinphoneAddress
*
addr
){
return
sal_address_clone
(
addr
);
}
/**
* Increment reference count of LinphoneAddress object.
**/
LinphoneAddress
*
linphone_address_ref
(
LinphoneAddress
*
addr
){
return
sal_address_ref
(
addr
);
}
/**
* Decrement reference count of LinphoneAddress object. When dropped to zero, memory is freed.
**/
void
linphone_address_unref
(
LinphoneAddress
*
addr
){
sal_address_unref
(
addr
);
}
/**
* Returns the address scheme, normally "sip".
**/
const
char
*
linphone_address_get_scheme
(
const
LinphoneAddress
*
u
){
return
sal_address_get_scheme
(
u
);
}
/**
* Returns the display name.
**/
const
char
*
linphone_address_get_display_name
(
const
LinphoneAddress
*
u
){
return
sal_address_get_display_name
(
u
);
}
/**
* Returns the username.
**/
const
char
*
linphone_address_get_username
(
const
LinphoneAddress
*
u
){
return
sal_address_get_username
(
u
);
}
/**
* Returns the domain name.
**/
const
char
*
linphone_address_get_domain
(
const
LinphoneAddress
*
u
){
return
sal_address_get_domain
(
u
);
}
/**
* Sets the display name.
**/
int
linphone_address_get_port
(
const
LinphoneAddress
*
u
)
{
return
sal_address_get_port
(
u
);
}
int
linphone_address_set_display_name
(
LinphoneAddress
*
u
,
const
char
*
display_name
){
sal_address_set_display_name
(
u
,
display_name
);
return
0
;
}
/**
* Sets the username.
**/
int
linphone_address_set_username
(
LinphoneAddress
*
uri
,
const
char
*
username
){
sal_address_set_username
(
uri
,
username
);
return
0
;
}
/**
* Sets the domain.
**/
int
linphone_address_set_domain
(
LinphoneAddress
*
uri
,
const
char
*
host
){
sal_address_set_domain
(
uri
,
host
);
return
0
;
}
/**
* Sets the port number.
**/
int
linphone_address_set_port
(
LinphoneAddress
*
uri
,
int
port
){
sal_address_set_port
(
uri
,
port
);
return
0
;
}
/**
* Set a transport.
**/
int
linphone_address_set_transport
(
LinphoneAddress
*
uri
,
LinphoneTransportType
tp
){
sal_address_set_transport
(
uri
,(
SalTransport
)
tp
);
return
0
;
}
/**
* Get the transport.
**/
LinphoneTransportType
linphone_address_get_transport
(
const
LinphoneAddress
*
uri
){
return
(
LinphoneTransportType
)
sal_address_get_transport
(
uri
);
}
/**
* Set the value of the method parameter
**/
void
linphone_address_set_method_param
(
LinphoneAddress
*
addr
,
const
char
*
method
)
{
sal_address_set_method_param
(
addr
,
method
);
}
/**
* Get the value of the method parameter
**/
const
char
*
linphone_address_get_method_param
(
const
LinphoneAddress
*
addr
)
{
return
sal_address_get_method_param
(
addr
);
}
/**
* Removes address's tags and uri headers so that it is displayable to the user.
**/
void
linphone_address_clean
(
LinphoneAddress
*
uri
){
sal_address_clean
(
uri
);
}
/**
* Returns the address as a string.
* The returned char * must be freed by the application. Use ms_free().
**/
char
*
linphone_address_as_string
(
const
LinphoneAddress
*
u
){
return
sal_address_as_string
(
u
);
}
/**
* Returns the SIP uri only as a string, that is display name is removed.
* The returned char * must be freed by the application. Use ms_free().
**/
char
*
linphone_address_as_string_uri_only
(
const
LinphoneAddress
*
u
){
return
sal_address_as_string_uri_only
(
u
);
}
/**
* Returns true if address refers to a secure location (sips)
* @deprecated use linphone_address_get_secure()
**/
bool_t
linphone_address_is_secure
(
const
LinphoneAddress
*
uri
){
return
sal_address_is_secure
(
uri
);
}
/**
* Returns true if address refers to a secure location (sips)
**/
bool_t
linphone_address_get_secure
(
const
LinphoneAddress
*
uri
){
return
sal_address_is_secure
(
uri
);
}
/**
* Make the address refer to a secure location (sips scheme)
* @param[in] addr A #LinphoneAddress object
* @param[in] enabled TRUE if address is requested to be secure.
**/
void
linphone_address_set_secure
(
LinphoneAddress
*
addr
,
bool_t
enabled
){
sal_address_set_secure
(
addr
,
enabled
);
}
/**
* returns true if address is a routable sip address
*/
bool_t
linphone_address_is_sip
(
const
LinphoneAddress
*
uri
){
return
sal_address_is_sip
(
uri
);
}
...
...
@@ -208,13 +131,6 @@ static bool_t strings_equals(const char *s1, const char *s2){
return
FALSE
;
}
/**
* Compare two LinphoneAddress ignoring tags and headers, basically just domain, username, and port.
* @param[in] a1 LinphoneAddress object
* @param[in] a2 LinphoneAddress object
* @return Boolean value telling if the LinphoneAddress objects are equal.
* @see linphone_address_equal()
**/
bool_t
linphone_address_weak_equal
(
const
LinphoneAddress
*
a1
,
const
LinphoneAddress
*
a2
){
const
char
*
u1
,
*
u2
;
const
char
*
h1
,
*
h2
;
...
...
@@ -228,13 +144,6 @@ bool_t linphone_address_weak_equal(const LinphoneAddress *a1, const LinphoneAddr
return
strings_equals
(
u1
,
u2
)
&&
strings_equals
(
h1
,
h2
)
&&
p1
==
p2
;
}
/**
* Compare two LinphoneAddress taking the tags and headers into account.
* @param[in] a1 LinphoneAddress object
* @param[in] a2 LinphoneAddress object
* @return Boolean value telling if the LinphoneAddress objects are equal.
* @see linphone_address_weak_equal()
*/
bool_t
linphone_address_equal
(
const
LinphoneAddress
*
a1
,
const
LinphoneAddress
*
a2
)
{
char
*
s1
;
char
*
s2
;
...
...
@@ -249,52 +158,18 @@ bool_t linphone_address_equal(const LinphoneAddress *a1, const LinphoneAddress *
return
res
;
}
/**
* Destroys a LinphoneAddress object (actually calls linphone_address_unref()).
* @deprecated Use linphone_address_unref() instead
**/
void
linphone_address_destroy
(
LinphoneAddress
*
u
){
sal_address_unref
(
u
);
}
/**
* Get port number as an integer value.
*/
/**
* Get port number, 0 if not present.
*/
int
linphone_address_get_port
(
const
LinphoneAddress
*
u
)
{
return
sal_address_get_port
(
u
);
}
/**
* Set the password encoded in the address.
* It is used for basic authentication (not recommended).
* @param addr the LinphoneAddress
* @param passwd the password to set.
**/
void
linphone_address_set_password
(
LinphoneAddress
*
addr
,
const
char
*
passwd
){
sal_address_set_password
(
addr
,
passwd
);
}
/**
* Get the password encoded in the address.
* It is used for basic authentication (not recommended).
* @param addr the address
* @return the password, if any, NULL otherwise.
**/
const
char
*
linphone_address_get_password
(
const
LinphoneAddress
*
addr
){
return
sal_address_get_password
(
addr
);
}
/**
* Set a header into the address.
* Headers appear in the URI with '?', such as <sip:test@linphone.org?SomeHeader=SomeValue>.
* @param addr the address
* @param header_name the header name
* @param header_value the header value
**/
void
linphone_address_set_header
(
LinphoneAddress
*
addr
,
const
char
*
header_name
,
const
char
*
header_value
){
sal_address_set_header
(
addr
,
header_name
,
header_value
);
}
...
...
coreapi/authentication.c
View file @
33b72ce6
...
...
@@ -22,9 +22,9 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#include "linphonecore.h"
#include "linphone
/
core.h"
#include "private.h"
#include "lpconfig.h"
#include "
linphone/
lpconfig.h"
/**
* @addtogroup authentication
...
...
coreapi/bellesip_sal/sal_op_message.c
View file @
33b72ce6
...
...
@@ -18,7 +18,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include "sal_impl.h"
#include "linphonecore.h"
#include "linphone
/
core.h"
#include "private.h"
#include "lime.h"
#include <libxml/xmlwriter.h>
...
...
coreapi/buffer.c
View file @
33b72ce6
...
...
@@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include "linphonecore.h"
#include "linphone
/
core.h"
#include "private.h"
...
...
coreapi/callbacks.c
View file @
33b72ce6
...
...
@@ -20,10 +20,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "sal/sal.h"
#include "linphonecore.h"
#include "linphone
/
core.h"
#include "private.h"
#include "mediastreamer2/mediastream.h"
#include "lpconfig.h"
#include "
linphone/
lpconfig.h"
// stat
#ifndef _WIN32
...
...
coreapi/carddav.c
View file @
33b72ce6
...
...
@@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include "linphonecore.h"
#include "linphone
/
core.h"
#include "private.h"
LinphoneCardDavContext
*
linphone_carddav_context_new
(
LinphoneFriendList
*
lfl
)
{
...
...
@@ -764,4 +764,4 @@ static LinphoneCardDavQuery* linphone_carddav_create_addressbook_multiget_query(
void
linphone_carddav_pull_vcards
(
LinphoneCardDavContext
*
cdc
,
bctbx_list_t
*
vcards_to_pull
)
{
LinphoneCardDavQuery
*
query
=
linphone_carddav_create_addressbook_multiget_query
(
cdc
,
vcards_to_pull
);
linphone_carddav_send_query
(
query
);
}
\ No newline at end of file
}
coreapi/carddav.h
View file @
33b72ce6
...
...
@@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#ifndef LINPHONE_CARDDAV_H
#define LINPHONE_CARDDAV_H