rename LinphoneTunnelManager LinphoneTunnel

diff --git a/coreapi/linphone_tunnel_manager.cc b/coreapi/linphone_tunnel_manager.cc
index 0bf2efa3ff500f9475d7ad584eecce4958502a48..6578b74950b52e71393d9177a27cbe8814937e7d 100644 (file)
--- a/coreapi/linphone_tunnel_manager.cc
+++ b/coreapi/linphone_tunnel_manager.cc
@@ -30,86 +30,86 @@
 #include "private.h"
 #include "lpconfig.h"
 
-static inline belledonnecomm::TunnelManager *bcTunnel(LinphoneTunnelManager *tunnel){
+static inline belledonnecomm::TunnelManager *bcTunnel(LinphoneTunnel *tunnel){
        return (belledonnecomm::TunnelManager *)tunnel;
 }
 
-extern "C" LinphoneTunnelManager* linphone_core_tunnel_new(LinphoneCore *lc){
-       LinphoneTunnelManager* tunnel= (LinphoneTunnelManager*) new belledonnecomm::TunnelManager(lc);
+extern "C" LinphoneTunnel* linphone_core_tunnel_new(LinphoneCore *lc){
+       LinphoneTunnel* tunnel= (LinphoneTunnel*) new belledonnecomm::TunnelManager(lc);
        return tunnel;
 }
 
-LinphoneTunnelManager* linphone_tunnel_get(LinphoneCore *lc){
+LinphoneTunnel* linphone_tunnel_get(LinphoneCore *lc){
        return lc->tunnel;
 }
 
-void linphone_tunnel_destroy(LinphoneTunnelManager *tunnel){
+void linphone_tunnel_destroy(LinphoneTunnel *tunnel){
        delete bcTunnel(tunnel);
 }
 
-void linphone_tunnel_add_server(LinphoneTunnelManager *tunnel, const char *host, int port){
+void linphone_tunnel_add_server(LinphoneTunnel *tunnel, const char *host, int port){
        bcTunnel(tunnel)->addServer(host, port);
 }
 
-void linphone_tunnel_add_server_and_mirror(LinphoneTunnelManager *tunnel, const char *host, int port, int remote_udp_mirror, int delay){
+void linphone_tunnel_add_server_and_mirror(LinphoneTunnel *tunnel, const char *host, int port, int remote_udp_mirror, int delay){
        bcTunnel(tunnel)->addServer(host, port, remote_udp_mirror, delay);
 }
 
-void linphone_tunnel_clean_servers(LinphoneTunnelManager *tunnel){
+void linphone_tunnel_clean_servers(LinphoneTunnel *tunnel){
        bcTunnel(tunnel)->cleanServers();
 }
 
-void linphone_tunnel_enable(LinphoneTunnelManager *tunnel, bool_t enabled){
+void linphone_tunnel_enable(LinphoneTunnel *tunnel, bool_t enabled){
        bcTunnel(tunnel)->enable(enabled);
 }
 
-bool_t linphone_tunnel_enabled(LinphoneTunnelManager *tunnel){
+bool_t linphone_tunnel_enabled(LinphoneTunnel *tunnel){
        return bcTunnel(tunnel)->isEnabled();
 }
 
-void linphone_tunnel_enable_logs(LinphoneTunnelManager *tunnel, bool_t enabled){
+void linphone_tunnel_enable_logs(LinphoneTunnel *tunnel, bool_t enabled){
        bcTunnel(tunnel)->enableLogs(enabled);
 }
 
-void linphone_tunnel_enable_logs_with_handler(LinphoneTunnelManager *tunnel, bool_t enabled, LogHandler logHandler){
+void linphone_tunnel_enable_logs_with_handler(LinphoneTunnel *tunnel, bool_t enabled, LogHandler logHandler){
        bcTunnel(tunnel)->enableLogs(enabled, logHandler);
 }
 
-void linphone_tunnel_set_http_proxy_auth_info(LinphoneTunnelManager *tunnel, const char* username,const char* passwd){
+void linphone_tunnel_set_http_proxy_auth_info(LinphoneTunnel *tunnel, const char* username,const char* passwd){
        bcTunnel(tunnel)->setHttpProxyAuthInfo(username, passwd);
 }
 
-void linphone_tunnel_reconnect(LinphoneTunnelManager *tunnel){
+void linphone_tunnel_reconnect(LinphoneTunnel *tunnel){
        bcTunnel(tunnel)->reconnect();
 }
 
-void linphone_tunnel_auto_detect(LinphoneTunnelManager *tunnel){
+void linphone_tunnel_auto_detect(LinphoneTunnel *tunnel){
        bcTunnel(tunnel)->autoDetect();
 }
 
 
-static inline _LpConfig *config(LinphoneTunnelManager *tunnel){
+static inline _LpConfig *config(LinphoneTunnel *tunnel){
        return ((belledonnecomm::TunnelManager *)tunnel)->getLinphoneCore()->config;
 }
 
 /**
  * Set tunnel server addresses. "host1:port1 host2:port2 host3:port3"
 **/
-void linphone_tunnel_set_server_addresses(LinphoneTunnelManager *tunnel, const char *addresses){
+void linphone_tunnel_set_server_addresses(LinphoneTunnel *tunnel, const char *addresses){
        lp_config_set_string(config(tunnel),"tunnel","server_addresses",addresses);
 }
 
 /**
  * Get tunnel server addresses. "host1:port1 host2:port2 host3:port3"
 **/
-const char *linphone_tunnel_get_server_addresses(LinphoneTunnelManager *tunnel){
+const char *linphone_tunnel_get_server_addresses(LinphoneTunnel *tunnel){
        return lp_config_get_string(config(tunnel),"tunnel","server_addresses", NULL);
 }
 
 /**
  * Set tunnel state.
 **/
-void linphone_tunnel_set_state(LinphoneTunnelManager *tunnel, LinphoneTunnelState state){
+void linphone_tunnel_set_state(LinphoneTunnel *tunnel, LinphoneTunnelState state){
        switch (state) {
                case LinphoneTunnelEnabled:
                        lp_config_set_string(config(tunnel),"tunnel","tunnel_state","enabled");
@@ -126,7 +126,7 @@ void linphone_tunnel_set_state(LinphoneTunnelManager *tunnel, LinphoneTunnelStat
 /**
  * Get tunnel state.
 **/
-LinphoneTunnelState linphone_tunnel_get_state(LinphoneTunnelManager *tunnel){
+LinphoneTunnelState linphone_tunnel_get_state(LinphoneTunnel *tunnel){
        const char *state=lp_config_get_string(config(tunnel),"tunnel","tunnel_state","disabled");
        if (0==strcmp("enabled", state)){
                return LinphoneTunnelEnabled;

diff --git a/coreapi/linphone_tunnel_manager.h b/coreapi/linphone_tunnel_manager.h
index 2569534e7ddc76bec71a71b7f8a7364f9c5ffbf5..45e0db16780a241ade7d26f16d426139f887bbd2 100644 (file)
--- a/coreapi/linphone_tunnel_manager.h
+++ b/coreapi/linphone_tunnel_manager.h
@@ -33,21 +33,21 @@ extern "C"
 {
 #endif
 
-typedef struct LinphoneTunnelManager LinphoneTunnelManager;
+typedef struct LinphoneTunnel LinphoneTunnel;
 typedef void (*LogHandler)(int log_level, const char *str, va_list l);
 
 
-LinphoneTunnelManager *linphone_tunnel_get(LinphoneCore *lc);
-void linphone_tunnel_destroy(LinphoneTunnelManager *tunnel);
-void linphone_tunnel_add_server(LinphoneTunnelManager *tunnel, const char *host, int port);
-void linphone_tunnel_add_server_and_mirror(LinphoneTunnelManager *tunnel, const char *host, int port, int remote_udp_mirror, int delay);
-void linphone_tunnel_clean_servers(LinphoneTunnelManager *tunnel);
-void linphone_tunnel_enable(LinphoneTunnelManager *tunnel, bool_t enabled);
-bool_t linphone_tunnel_enabled(LinphoneTunnelManager *tunnel);
-void linphone_tunnel_enable_logs(LinphoneTunnelManager *tunnel, bool_t enabled);
-void linphone_tunnel_enable_logs_with_handler(LinphoneTunnelManager *tunnel, bool_t enabled, LogHandler logHandler);
-void linphone_tunnel_reconnect(LinphoneTunnelManager *tunnel);
-void linphone_tunnel_auto_detect(LinphoneTunnelManager *tunnel);
+LinphoneTunnel *linphone_tunnel_get(LinphoneCore *lc);
+
+void linphone_tunnel_add_server(LinphoneTunnel *tunnel, const char *host, int port);
+void linphone_tunnel_add_server_and_mirror(LinphoneTunnel *tunnel, const char *host, int port, int remote_udp_mirror, int delay);
+void linphone_tunnel_clean_servers(LinphoneTunnel *tunnel);
+void linphone_tunnel_enable(LinphoneTunnel *tunnel, bool_t enabled);
+bool_t linphone_tunnel_enabled(LinphoneTunnel *tunnel);
+void linphone_tunnel_enable_logs(LinphoneTunnel *tunnel, bool_t enabled);
+void linphone_tunnel_enable_logs_with_handler(LinphoneTunnel *tunnel, bool_t enabled, LogHandler logHandler);
+void linphone_tunnel_reconnect(LinphoneTunnel *tunnel);
+void linphone_tunnel_auto_detect(LinphoneTunnel *tunnel);
 void linphone_tunnel_set_http_proxy_auth_info(const char* username,const char* passwd);
 
 
@@ -63,22 +63,22 @@ typedef enum _LinphoneTunnelState{
 /**
  * Set tunnel addresses.
 **/
-void linphone_tunnel_set_server_addresses(LinphoneTunnelManager *tunnel, const char *lists);
+void linphone_tunnel_set_server_addresses(LinphoneTunnel *tunnel, const char *lists);
 
 /**
  * Get tunnel addresses.
 **/
-const char *linphone_tunnel_get_server_addresses(LinphoneTunnelManager *tunnel);
+const char *linphone_tunnel_get_server_addresses(LinphoneTunnel *tunnel);
 
 /**
  * Set tunnel state.
 **/
-void linphone_tunnel_set_state(LinphoneTunnelManager *tunnel, LinphoneTunnelState state);
+void linphone_tunnel_set_state(LinphoneTunnel *tunnel, LinphoneTunnelState state);
 
 /**
  * Get tunnel state.
 **/
-LinphoneTunnelState linphone_tunnel_get_state(LinphoneTunnelManager *tunnel);
+LinphoneTunnelState linphone_tunnel_get_state(LinphoneTunnel *tunnel);
 
 
 #ifdef __cplusplus

diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index e9554b0a09409e1b0782128341bd0bacac3c3368..30f5997628c1ef3438b5fd52dd9a3d183d4b11f6 100644 (file)
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -998,7 +998,7 @@ static void misc_config_read (LinphoneCore *lc) {
 }
 
 #ifdef TUNNEL_ENABLED
-static void tunnel_add_servers_from_config(LinphoneTunnelManager *tunnel, const char* confaddress){
+static void tunnel_add_servers_from_config(LinphoneTunnel *tunnel, const char* confaddress){
        char *addresses=(char*)ms_strdup(confaddress);
        char *str1;
        for(str1=addresses;;str1=NULL){

diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc
index eca9152f40716090cd976ccdabc0bc2ed0c66ddf..0396fcd4850e0ea154105681ab11ed89747ac6c9 100644 (file)
--- a/coreapi/linphonecore_jni.cc
+++ b/coreapi/linphonecore_jni.cc
@@ -1599,7 +1599,7 @@ extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setMaxCalls(JNIEnv *env,
 extern "C" void Java_org_linphone_core_LinphoneCoreImpl_tunnelAddServerAndMirror(JNIEnv *env,jobject thiz,jlong pCore,
                jstring jHost, jint port, jint mirror, jint delay) {
 #ifdef TUNNEL_ENABLED
-       LinphoneTunnelManager *tunnel=((LinphoneCore *) pCore)->tunnel; if (!tunnel) return;
+       LinphoneTunnel *tunnel=((LinphoneCore *) pCore)->tunnel; if (!tunnel) return;
        const char* cHost=env->GetStringUTFChars(jHost, NULL);
        linphone_tunnel_add_server_and_mirror(tunnel, cHost, port, mirror, delay);
        env->ReleaseStringUTFChars(jHost, cHost);
@@ -1608,28 +1608,28 @@ extern "C" void Java_org_linphone_core_LinphoneCoreImpl_tunnelAddServerAndMirror
 
 extern "C" void Java_org_linphone_core_LinphoneCoreImpl_tunnelAutoDetect(JNIEnv *env,jobject thiz,jlong pCore) {
 #ifdef TUNNEL_ENABLED
-       LinphoneTunnelManager *tunnel=((LinphoneCore *) pCore)->tunnel; if (!tunnel) return;
+       LinphoneTunnel *tunnel=((LinphoneCore *) pCore)->tunnel; if (!tunnel) return;
        linphone_tunnel_auto_detect(tunnel);
 #endif
 }
 
 extern "C" void Java_org_linphone_core_LinphoneCoreImpl_tunnelCleanServers(JNIEnv *env,jobject thiz,jlong pCore) {
 #ifdef TUNNEL_ENABLED
-       LinphoneTunnelManager *tunnel=((LinphoneCore *) pCore)->tunnel; if (!tunnel) return;
+       LinphoneTunnel *tunnel=((LinphoneCore *) pCore)->tunnel; if (!tunnel) return;
        linphone_tunnel_clean_servers(tunnel);
 #endif
 }
 
 extern "C" void Java_org_linphone_core_LinphoneCoreImpl_tunnelEnable(JNIEnv *env,jobject thiz,jlong pCore, jboolean enable) {
 #ifdef TUNNEL_ENABLED
-       LinphoneTunnelManager *tunnel=((LinphoneCore *) pCore)->tunnel; if (!tunnel) return;
+       LinphoneTunnel *tunnel=((LinphoneCore *) pCore)->tunnel; if (!tunnel) return;
        linphone_tunnel_enable(tunnel, enable);
 #endif
 }
 
 extern "C" void Java_org_linphone_core_LinphoneCoreImpl_tunnelEnableLogs(JNIEnv *env,jobject thiz,jlong pCore, jboolean enable) {
 #ifdef TUNNEL_ENABLED
-       LinphoneTunnelManager *tunnel=((LinphoneCore *) pCore)->tunnel; if (!tunnel) return;
+       LinphoneTunnel *tunnel=((LinphoneCore *) pCore)->tunnel; if (!tunnel) return;
        linphone_tunnel_enable_logs(tunnel, enable);
 #endif
 }

diff --git a/coreapi/private.h b/coreapi/private.h
index bda52f016c9ce8ddf9207d685733fc3426651d1e..987dd7951d749291f7bd1119b01ca72a3ebf7ded 100644 (file)
--- a/coreapi/private.h
+++ b/coreapi/private.h
@@ -476,11 +476,12 @@ struct _LinphoneCore
        int device_rotation;
        bool_t ringstream_autorelease;
        int max_calls;
-       LinphoneTunnelManager *tunnel;
+       LinphoneTunnel *tunnel;
 };
 
-LinphoneTunnelManager *linphone_core_tunnel_new(LinphoneCore *lc);
-
+LinphoneTunnel *linphone_core_tunnel_new(LinphoneCore *lc);
+void linphone_tunnel_destroy(LinphoneTunnel *tunnel);
+       
 bool_t linphone_core_can_we_add_call(LinphoneCore *lc);
 int linphone_core_add_call( LinphoneCore *lc, LinphoneCall *call);
 int linphone_core_del_call( LinphoneCore *lc, LinphoneCall *call);
@@ -544,6 +545,8 @@ void __linphone_core_invalidate_registers(LinphoneCore* lc);
 #endif
 void call_logs_write_to_config_file(LinphoneCore *lc);
 
+
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/gtk/propertybox.c b/gtk/propertybox.c
index 7c414dc835ea6e767f39e9b6be378c4ebdfea857..0e69550cd2d09e8fc272e745bd52ab19acfb83f1 100644 (file)
--- a/gtk/propertybox.c
+++ b/gtk/propertybox.c
@@ -1004,7 +1004,7 @@ void linphone_gtk_edit_tunnel_closed(GtkWidget *button){
 }
 
 #ifdef TUNNEL_ENABLED
-static void tunnel_get_server_host_and_port(LinphoneTunnelManager *tunnel, char *host, int size, int *port){
+static void tunnel_get_server_host_and_port(LinphoneTunnel *tunnel, char *host, int size, int *port){
        char *colon;
         char *addresses=(char*)ms_strdup(linphone_tunnel_get_server_addresses(tunnel));
        char *str1=addresses;
@@ -1023,7 +1023,7 @@ void linphone_gtk_edit_tunnel(GtkButton *button){
 #ifdef TUNNEL_ENABLED
        LinphoneCore *lc=linphone_gtk_get_core();
        GtkWidget *w=linphone_gtk_create_window("tunnel_config");
-       LinphoneTunnelManager *tunnel=linphone_tunnel_get(lc);
+       LinphoneTunnel *tunnel=linphone_tunnel_get(lc);
        char host[50]={'\0'};
        int port=0;
        tunnel_get_server_host_and_port(tunnel, host, sizeof(host), &port);
@@ -1050,7 +1050,7 @@ void linphone_gtk_tunnel_ok(GtkButton *button){
        LinphoneCore *lc=linphone_gtk_get_core();
        GtkWidget *w=gtk_widget_get_toplevel(GTK_WIDGET(button));
        char address[50]={'\0'};
-       LinphoneTunnelManager *tunnel=linphone_tunnel_get(lc);
+       LinphoneTunnel *tunnel=linphone_tunnel_get(lc);
 
        gint port = (gint)gtk_spin_button_get_value(GTK_SPIN_BUTTON(linphone_gtk_get_widget(w,"port")));
        gboolean enabled=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(linphone_gtk_get_widget(w,"radio_enable")));