Changeset 416:2db037c7ce5f in verona for libeXosip2/src/eXconf.c

Timestamp:

Jan 17, 2012 3:55:07 PM (16 months ago)

Author:

Vadim Lebedev <vadim@…>

Branch:

default

rebase_source:

6126c71f04a05bf0798d5cfae88e3467840eed65

Message:

fixes for socks transport

File:

• libeXosip2/src/eXconf.c (modified) (4 diffs)

libeXosip2/src/eXconf.c

@@ -636 +636 @@
         int i;
         struct eXtl_protocol* proto;
+        int port;
 
         for(i = 0; proto = socks_proto_tab[i]; i++)
@@ -650 +651 @@
 
         eXosip.eXtl = proto;
+        port = atoi(tport);
         proto->tl_init();
-        proto->tl_masquerade_contact(tserver, atoi(tport));
+        proto->tl_masquerade_contact(tserver, port);
         snprintf(eXosip.transport, sizeof(eXosip.transport), "%s",
                         proto->proto_num == IPPROTO_UDP ? "UDP" : "TCP");
@@ -666 +668 @@
         }
 #endif
-
         return 0;
 }
@@ -770 +771 @@
         eXosip.keep_alive = 17000;
 
-        eXtl_udp.tl_init();
-        eXtl_tcp.tl_init();
+        if (!eXosip.eXtl) {
+                eXtl_udp.tl_init();
+                eXtl_tcp.tl_init();
 #ifdef HAVE_OPENSSL_SSL_H
 #if !(OPENSSL_VERSION_NUMBER < 0x00908000L)
         eXtl_dtls.tl_init();
 #endif
-        eXtl_tls.tl_init();
+                eXtl_tls.tl_init();
+        }
 #endif
         return OSIP_SUCCESS;