Changeset 474:5da95acd7b11 in verona

Timestamp:

May 3, 2012 1:43:14 PM (14 months ago)

Author:

Vadim Lebedev <vadim@…>

Branch:

default

Message:

fixes for WIN32 and OS/X to avoid blocking recv and SIGPIPE

File:

• phapi/ph_socks_rtp.c (modified) (8 diffs)

phapi/ph_socks_rtp.c

@@ -36 +36 @@
 #ifndef WIN32
 #define closesocket close
+#else
+static int
+socknonblocking(SOCKET sock, int yes)
+{
+   return  sockioctl(sock, FIONBIO, (char *)&yes);
+}
+
+static int
+recvAll(SOCKET sock, char* buf, size_t s)
+{
+        // the socket is in non blocking mode in WIN32
+        int count = 100;
+        int total = 0;
+
+        while(total < (int) s && count--) {
+                int res = recv(sock, buf, s, 0);
+
+                if (res == SOCKET_ERROR) {
+                        int err = WSAGetLastError();
+
+                        if (err == WSAEWOULDBLOCK) {
+                                continue;
+                        }
+                        return -1;
+                }
+                toal += res;
+                buf += res;
+                s -= res;
+
+        }
+
+        return total;
+}
+#endif
+
+#ifndef MSG_NOSIGNAL
+#define MSG_NOSIGNAL 0
 #endif
 
@@ -96 +133 @@
                 connreq.port =  as_sin(&sk->addr).sin_port;
 
-                res = send(sk->socket, &connreq, 10, 0);
+                res = send(sk->socket, &connreq, 10, MSG_DONTWAIT|MSG_NOSIGNAL);
                 if (res != 10)
                         return -1;
@@ -106 +143 @@
         plen = htonl(slen);
 
-        res = send(sk->socket, &plen, 4, 0);
+        res = send(sk->socket, &plen, 4, MSG_DONTWAIT|MSG_NOSIGNAL);
         if (res != 4)
                 return -1;
-        res = send(sk->socket, m->b_rptr, slen, MSG_DONTWAIT);
+        res = send(sk->socket, m->b_rptr, slen, MSG_DONTWAIT|MSG_NOSIGNAL);
         return res;
 }
@@ -141 +178 @@
                 return 0;
 
-
+#ifdef WIN32
+        res = recvAll(sk->socket, m->b_wptr, expectlen);
+#else
         res = recv(sk->socket, m->b_wptr, expectlen, 0);
+#endif
         if (res <= 0)
                 return res;
@@ -203 +243 @@
         struct in_addr ina;
 
-        ret = send(sk->socket, msg1, 3, 0);
+        ret = send(sk->socket, msg1, 3, MSG_NOSIGNAL);
         if (ret != 3)
                 return -1;
@@ -223 +263 @@
         req.dport  = as_sin(&sk->addr).sin_port;
 
-        ret = send(sk->socket, &req, sizeof(req), 0);
+        ret = send(sk->socket, &req, sizeof(req), MSG_NOSIGNAL);
         if (ret != sizeof(req))
                 return -1;
@@ -240 +280 @@
                 return -1;
 
-        ret = recv(sk->socket, &resp.destip, 6, 0);
+        ret = recv(sk->socket, &resp.destip, 6, MSG_NOSIGNAL);
         if (ret != 6)
                 return 0;
@@ -246 +286 @@
         sk->publicip = resp.destip;
         sk->publicport = resp.dport;
+
+#ifdef WIN32
+        /* make socket non-blocking */
+        {
+                char yes = 1;
+
+                 sockioctl(sk->socket, FIONBIO, (char *)&yes);
+        }
+#endif
+#ifdef APPLE
+        {
+                int set = 1;
+                setsockopt(sk->socket, SOL_SOCKET, SO_NOSIGPIPE, (void *)&set, sizeof(int));
+        }
+#endif
+
 
         return 0;