Changeset 419:1f087a2bf661 in verona

Timestamp:

Jan 23, 2012 3:29:39 PM (17 months ago)

Author:

Vadim Lebedev <vadim@…>

Branch:

default

rebase_source:

d04508730cd4ba67335d6e7f1eace86b6938aea9

Message:

fixes for sip over socks support

Location:

libeXosip2/src

Files:

• eXtl_socks.c (modified) (7 diffs)
• udp.c (modified) (2 diffs)

libeXosip2/src/eXtl_socks.c

@@ -452 +452 @@
                                         int need_more = sk->udplen - sk->pbuflen;
 
-                                        i = recv(sk->socket, sk->pbuf, need_more, 0);
+                                        i = recv(sk->socket, sk->pbuf+sk->pbuflen, need_more, 0);
                                         if (i > 0) {
                                                 sk->pbuflen += i;
@@ -463 +463 @@
                                                                                                                         sk->remote_port);
                                                         sk->udplen = 0;
+                                                        sk->pbuflen = 0;
 
                                                 }
@@ -718 +719 @@
 }
 
-static int _socks_tl_connect_socket2(char *host, int port, int mode)
+static int _socks_tl_connect_socket2(char *host, int port, int mode, int *tabx)
 {
         int res;
@@ -737 +738 @@
                 return -1;
 
+
         sock = sk->socket;
 
 
         if (sock > 0) {
-                if (mode & SOCKST_UDPMASK) {
-                        sk->pbuf = (char *) osip_malloc(SIP_MESSAGE_MAX_LENGTH);
-                        if (!sk->pbuf) {
-                                closesocket(sk->socket);
-                                memset(sk, 0, sizeof(*sk));
-                                return -1;
-                        }
-
-                }
-
+                if (*tabx)
+                        *tabx = sk - socks_socket_tab;
                 return sock;
         }
@@ -757 +751 @@
 }
 
+static int socks_tl_fix_message(osip_message_t *sip,  int tlx)
+{
+        char  portstr[16];
+
+        osip_contact_t *ctct = (osip_contact_t*) osip_list_get(&sip->contacts, 0);
+        osip_via_t *via = (osip_via_t *) osip_list_get(&sip->vias, 0);
+
+        snprintf(portstr,16,"%d", socks_socket_tab[tlx].public_port);
+
+
+        if (ctct && ctct->url) {
+                if (ctct->url->port)
+                        osip_free(ctct->url->port);
+
+                ctct->url->port = osip_strdup(portstr);
+                sip->message_property = 2;
+        }
+
+        if (via) {
+                if (via->port)
+                        osip_free(via->port);
+                via->port = osip_strdup(portstr);
+                sip->message_property = 2;
+        }
+
+        return 0;
+
+}
 
 static int
@@ -774 +796 @@
         }
 
+        /* Step 1: find existing socket to send message */
+        if (out_socket <= 0) {
+                out_socket = _socks_tl_find_socket(host, port);
+
+                /* Step 2: create new socket with host:port */
+                if (out_socket <= 0) {
+                        int tlx;
+
+                        out_socket = _socks_tl_connect_socket2(host, port, mode, &tlx);
+                        if (out_socket > 0) {
+
+                                socks_tl_fix_message(sip, tlx);
+                        }
+                }
+        } else {
+                OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO1, NULL,
+                                                          "reusing REQUEST connection (to dest=%s:%i)\n",
+                                                          host, port));
+        }
+
+        if (out_socket <= 0) {
+                osip_free(message);
+                return -1;
+        }
+
         /* remove preloaded route if there is no tag in the To header
          */
@@ -795 +842 @@
         }
 
-        /* Step 1: find existing socket to send message */
-        if (out_socket <= 0) {
-                out_socket = _socks_tl_find_socket(host, port);
-
-                /* Step 2: create new socket with host:port */
-                if (out_socket <= 0) {
-                        out_socket = _socks_tl_connect_socket2(host, port, mode);
-                }
-        } else {
-                OSIP_TRACE(osip_trace(__FILE__, __LINE__, OSIP_INFO1, NULL,
-                                                          "reusing REQUEST connection (to dest=%s:%i)\n",
-                                                          host, port));
-        }
-
-        if (out_socket <= 0) {
-                osip_free(message);
-                return -1;
-        }
 
         i = _socks_tl_is_connected(out_socket);

libeXosip2/src/udp.c

@@ -1592 +1592 @@
                 eXtl_udp.tl_set_fdset(&osip_fdset, &max);
                 eXtl_tcp.tl_set_fdset(&osip_fdset, &max);
+                if (eXosip.eXtl)
+                        eXosip.eXtl->tl_set_fdset(&osip_fdset, &max);
 #ifdef HAVE_OPENSSL_SSL_H
 #if !(OPENSSL_VERSION_NUMBER < 0x00908000L)
@@ -1635 +1637 @@
                         eXtl_udp.tl_read_message(&osip_fdset);
                         eXtl_tcp.tl_read_message(&osip_fdset);
+                        if (eXosip.eXtl)
+                                eXosip.eXtl->tl_read_message(&osip_fdset);
+
 #ifdef HAVE_OPENSSL_SSL_H
 #if !(OPENSSL_VERSION_NUMBER < 0x00908000L)