Changeset 416:2db037c7ce5f in verona

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

Files:

• libeXosip2/src/eXconf.c (modified) (4 diffs)
• libeXosip2/src/eXtl_socks.c (modified) (6 diffs)
• libeXosip2/src/jcallback.c (modified) (1 diff)
• phapi/phapi.c (modified) (5 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;

libeXosip2/src/eXtl_socks.c

@@ -284 +284 @@
                 return -1;
 
-        if (resp.atp != 0)
+        if (resp.atp != 1)
                 return -1;
 
@@ -293 +293 @@
         ina.s_addr = resp.destip;
         osip_strncpy(sk->public_ip, inet_ntoa(ina), sizeof(sk->public_ip)-1);
-        sk->public_port = ntohl(resp.dport);
+        sk->public_port = ntohs(resp.dport);
 
         return 0;
@@ -334 +334 @@
                                 curinfo->ai_protocol);
 
-
-                if (sock < 0) {
-                        OSIP_TRACE(osip_trace
-                                        (__FILE__, __LINE__, OSIP_ERROR, NULL,
-                                                        "Cannot create socket %s!\n", strerror(ex_errno)));
-                        continue;
-                }
+                if (sock)
+                        break;
+
+                OSIP_TRACE(osip_trace
+                                (__FILE__, __LINE__, OSIP_ERROR, NULL,
+                                                "Cannot create socket %s!\n", strerror(ex_errno)));
 
         }
@@ -348 +347 @@
                 sk->socket = sock;
                 sk->remote_port = port;
-                osip_strncpy(sk->remote_ip, addr, sizeof(sk->remote_ip));
+                osip_strncpy(sk->remote_ip, addr, sizeof(sk->remote_ip)-1);
                 if (!socks_negotiate(sk)) {
                         eXosip_freeaddrinfo(addrinfo);
@@ -375 +374 @@
                                 if (mode & SOCKST_UDPMASK) {
                                         sk->pbuf = osip_malloc(SIP_MESSAGE_MAX_LENGTH);
-                                        if (sk->pbuf) {
+                                        if (!sk->pbuf) {
                                                 closesocket(sk->socket);
                                                 return 0;
@@ -852 +851 @@
                         return -1;
                 memcpy(pfx+1, message, length);
+                pfx->len = htonl(length);
                 length += sizeof(*pfx);
                 osip_free(message);

libeXosip2/src/jcallback.c

@@ -193 +193 @@
 
         i = -1;
-        if (osip_strcasecmp(via->protocol, "udp") == 0) {
+        if (eXosip.eXtl) {
+                i = eXosip.eXtl->tl_send_message(tr, sip, host, port, out_socket);
+        }
+        else if (osip_strcasecmp(via->protocol, "udp") == 0) {
                 i = eXtl_udp.tl_send_message(tr, sip, host, port, out_socket);
         } else if (osip_strcasecmp(via->protocol, "tcp") == 0) {

phapi/phapi.c

@@ -290 +290 @@
                 eos++;
 
-        while(*uri && !isspace(*uri))
+        while(*uri && isspace(*uri))
                 uri++;
 
 
-        copyfield(tun->tunnel_proto,  uri, addr-1, sizeof(tun->tunnel_proto)-1);
+        copyfield(tun->tunnel_proto,  uri, addr, sizeof(tun->tunnel_proto)-1);
         copyfield(tun->tunnel_server,  addr+3, port, sizeof(tun->tunnel_server)-1);
         copyfield(tun->tunnel_port,  port+1, eos, sizeof(tun->tunnel_port)-1);
@@ -320 +320 @@
         }
 
-        return tun - tinfo;
+        return i;
 }
 
@@ -4262 +4262 @@
         }
 
-        if (phcfg.use_tunnel & PH_TUNNEL_USE) {
-                tun = ph_select_tunnel(sip_tunnel_set, TUNNEL_MAX);
-                if (tun)
-                        eXosip_set_tunnel(tun->tunnel_proto, tun->tunnel_server, tun->tunnel_port);;
-        }
+        return 0;
 #endif
 
@@ -4728 +4724 @@
         if (i)
                 return -1;
+
+        if (phcfg.use_tunnel & PH_TUNNEL_USE) {
+                struct tunnel_info *tun;
+
+                tun = ph_select_tunnel(sip_tunnel_set, sip_tunnel_count);
+                if (tun)
+                        eXosip_set_tunnel(tun->tunnel_proto, tun->tunnel_server, tun->tunnel_port);;
+        }
+
         
         ph_nat_init();
@@ -4739 +4744 @@
         }
 
-        i = phListenAddr(atoi(phcfg.sipport));
-        if(i)
-                return -1;
+        if (!(phcfg.use_tunnel & PH_TUNNEL_USE)) {
+                i = phListenAddr(atoi(phcfg.sipport));
+                if(i)
+                        return -1;
+        }
 
         {