From 8e8a66002b8640bb6d0a4c015e750d41bb17630f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?= Date: Wed, 17 Sep 2014 10:04:41 +0200 Subject: [PATCH] Rename some linphone_tunnel_* functions --- coreapi/linphone_tunnel.cc | 6 +++--- coreapi/linphone_tunnel.h | 14 +++++++------- coreapi/linphone_tunnel_stubs.c | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/coreapi/linphone_tunnel.cc b/coreapi/linphone_tunnel.cc index 8804bcc23..60d490063 100644 --- a/coreapi/linphone_tunnel.cc +++ b/coreapi/linphone_tunnel.cc @@ -328,12 +328,12 @@ bool_t linphone_tunnel_auto_detect_enabled(LinphoneTunnel *tunnel) { return tunnel->auto_detect_enabled; } -void linphone_tunnel_enable_sip_packets_transport(LinphoneTunnel *tunnel, bool_t enable) { +void linphone_tunnel_enable_sip(LinphoneTunnel *tunnel, bool_t enable) { bcTunnel(tunnel)->tunnelizeSipPackets(enable); lp_config_set_int(config(tunnel), "tunnel", "transport_SIP", (enable ? TRUE : FALSE)); } -bool_t linphone_tunnel_sip_packets_transport_is_enabled(const LinphoneTunnel *tunnel) { +bool_t linphone_tunnel_sip_enabled(const LinphoneTunnel *tunnel) { return bcTunnel(tunnel)->tunnelizeSipPacketsEnabled() ? TRUE : FALSE; } @@ -350,6 +350,6 @@ void linphone_tunnel_configure(LinphoneTunnel *tunnel){ bool_t tunnelizeSIPPackets = (bool_t)lp_config_get_int(config(tunnel), "tunnel", "transport_SIP", TRUE); linphone_tunnel_enable_logs_with_handler(tunnel,TRUE,my_ortp_logv); linphone_tunnel_load_config(tunnel); - linphone_tunnel_enable_sip_packets_transport(tunnel, tunnelizeSIPPackets); + linphone_tunnel_enable_sip(tunnel, tunnelizeSIPPackets); linphone_tunnel_enable(tunnel, enabled); } diff --git a/coreapi/linphone_tunnel.h b/coreapi/linphone_tunnel.h index a6266a2f1..38d577eb6 100644 --- a/coreapi/linphone_tunnel.h +++ b/coreapi/linphone_tunnel.h @@ -197,18 +197,18 @@ LINPHONE_PUBLIC void linphone_tunnel_auto_detect(LinphoneTunnel *tunnel); LINPHONE_PUBLIC bool_t linphone_tunnel_auto_detect_enabled(LinphoneTunnel *tunnel); /** - * @brief Set whether SIP packets must be directly sent to a UA or pass through a tunnel + * @brief Set whether SIP packets must be directly sent to a UA or pass through the tunnel * @param tunnel Tunnel to configure - * @param enable If true, SIP packets shall pass through a tunnel + * @param enable If true, SIP packets shall pass through the tunnel */ -LINPHONE_PUBLIC void linphone_tunnel_enable_sip_packets_transport(LinphoneTunnel *tunnel, bool_t enable); +LINPHONE_PUBLIC void linphone_tunnel_enable_sip(LinphoneTunnel *tunnel, bool_t enable); /** - * @brief Checks wether tunnel is set to transport SIP packets - * @param LinphoneTunnel - * @return tunnel True, SIP packets shall pass through a tunnel + * @brief Check whether tunnel is set to transport SIP packets + * @param tunnel Tunnel to check + * @return True, SIP packets shall pass through through tunnel */ -LINPHONE_PUBLIC bool_t linphone_tunnel_sip_packets_transport_is_enabled(const LinphoneTunnel *tunnel); +LINPHONE_PUBLIC bool_t linphone_tunnel_sip_enabled(const LinphoneTunnel *tunnel); /** * Set an optional http proxy to go through when connecting to tunnel server. diff --git a/coreapi/linphone_tunnel_stubs.c b/coreapi/linphone_tunnel_stubs.c index cacfb99fe..acba492a4 100644 --- a/coreapi/linphone_tunnel_stubs.c +++ b/coreapi/linphone_tunnel_stubs.c @@ -85,5 +85,5 @@ void linphone_tunnel_auto_detect(LinphoneTunnel *tunnel){ void linphone_tunnel_configure(LinphoneTunnel *tunnel){ } -void linphone_tunnel_enable_sip_packets_transport(LinphoneTunnel *tunnel, bool_t enable) {} -bool_t linphone_tunnel_sip_packets_transport_is_enabled(const LinphoneTunnel *tunnel) { return FALSE; } +void linphone_tunnel_enable_sip(LinphoneTunnel *tunnel, bool_t enable) {} +bool_t linphone_tunnel_sip_enabled(const LinphoneTunnel *tunnel) { return FALSE; }