X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Fpipe.cpp;h=42f009bb51827ae262868bfdcd464ddb00386773;hb=77dee8966dd1304a0fb8540c3fc68d02dc6ce84a;hp=f0306f410929bcf8bb14fd8a681a23324140a82c;hpb=7ccf90cb13451e3d024eff6239815f92aff6e51b;p=metaproxy-moved-to-github.git

diff --git a/src/pipe.cpp b/src/pipe.cpp
index f0306f4..42f009b 100644
--- a/src/pipe.cpp
+++ b/src/pipe.cpp
@@ -1,5 +1,4 @@
-
-/* $Id: pipe.cpp,v 1.1 2005-11-07 12:32:01 adam Exp $
+/* $Id: pipe.cpp,v 1.5 2005-11-10 23:10:42 adam Exp $
    Copyright (c) 2005, Index Data.
 
 %LICENSE%
@@ -10,6 +9,7 @@
 #include <unistd.h>
 #endif
 
+#include <errno.h>
 #ifdef WIN32
 #include <winsock.h>
 #else
@@ -17,6 +17,8 @@
 #include <netdb.h>
 #include <arpa/inet.h>
 #include <netinet/tcp.h>
+
+#include <fcntl.h>
 #endif
 
 #if HAVE_SYS_SOCKET_H
@@ -45,65 +47,142 @@ namespace yp2 {
         Rep();
         int m_fd[2];
         int m_socket;
+        bool nonblock(int s);
+        void close(int &fd);
     };
 }
 
 using namespace yp2;
 
+void Pipe::Rep::close(int &fd)
+{
+#ifdef WIN32
+    if (fd != -1)
+        ::closesocket(fd);
+#else
+    if (fd != -1)
+        ::close(fd);
+#endif
+    fd = -1;
+}
+
 Pipe::Rep::Rep()
 {
     m_fd[0] = m_fd[1] = -1;
     m_socket = -1;
 }
 
+bool Pipe::Rep::nonblock(int s)
+{
+#ifdef WIN32
+    unsigned long tru = 1;
+    if (ioctlsocket(s, FIONBIO, &tru) < 0)
+        return false;
+#else
+    if (fcntl(s, F_SETFL, O_NONBLOCK) < 0)
+        return false;
+#ifndef MSG_NOSIGNAL
+    signal (SIGPIPE, SIG_IGN);
+#endif
+#endif
+    return true;
+}
+
 Pipe::Pipe(int port_to_use) : m_p(new Rep)
 {
+#ifdef WIN32
+    WSADATA wsaData;
+    WORD wVersionRequested = MAKEWORD(2, 0);
+    if (WSAStartup( wVersionRequested, &wsaData ))
+        throw Pipe::Error("WSAStartup failed");
+#endif
     if (port_to_use)
     {
+        // create server socket
         m_p->m_socket = socket(AF_INET, SOCK_STREAM, 0);
         if (m_p->m_socket < 0)
             throw Pipe::Error("could not create socket");
-
-        m_p->m_fd[1] = socket(AF_INET, SOCK_STREAM, 0);
-        if (m_p->m_fd[1] < 0)
-            throw Pipe::Error("could not create socket");
-        
+#ifndef WIN32
+        unsigned long one = 1;
+        if (setsockopt(m_p->m_socket, SOL_SOCKET, SO_REUSEADDR, (char*) 
+                       &one, sizeof(one)) < 0)
+            throw Pipe::Error("setsockopt error");
+#endif
+        // bind server socket
         struct sockaddr_in add;
         add.sin_family = AF_INET;
         add.sin_port = htons(port_to_use);
         add.sin_addr.s_addr = INADDR_ANY;
         struct sockaddr *addr = ( struct sockaddr *) &add;
-        
+      
         if (bind(m_p->m_socket, addr, sizeof(struct sockaddr_in)))
             throw Pipe::Error("could not bind on socket");
         
         if (listen(m_p->m_socket, 3) < 0)
             throw Pipe::Error("could not listen on socket");
 
+        // client socket
+        unsigned int tmpadd;
+        tmpadd = (unsigned) inet_addr("127.0.0.1");
+        if (tmpadd)
+            memcpy(&add.sin_addr.s_addr, &tmpadd, sizeof(struct in_addr));
+        else
+            throw Pipe::Error("inet_addr failed");
+            
+        m_p->m_fd[1] = socket(AF_INET, SOCK_STREAM, 0);
+        if (m_p->m_fd[1] < 0)
+            throw Pipe::Error("could not create socket");
+        
+        m_p->nonblock(m_p->m_fd[1]);
+
+        if (connect(m_p->m_fd[1], addr, sizeof(*addr)) < 0)
+        {
+#ifdef WIN32
+            if (WSAGetLastError() != WSAEWOULDBLOCK)
+                throw Pipe::Error("could not connect to socket");
+#else
+            if (errno != EINPROGRESS)
+                throw Pipe::Error("could not connect to socket");
+#endif
+        }
+
+        // server accept
         struct sockaddr caddr;
+#ifdef WIN32
+        int caddr_len = sizeof(caddr);
+#else
         socklen_t caddr_len = sizeof(caddr);
+#endif
         m_p->m_fd[0] = accept(m_p->m_socket, &caddr, &caddr_len);
         if (m_p->m_fd[0] < 0)
             throw Pipe::Error("could not accept on socket");
-        
-        if (connect(m_p->m_fd[1], addr, sizeof(addr)) < 0)
-            throw Pipe::Error("could not connect to socket");
+
+        // complete connect
+        fd_set write_set;
+        FD_ZERO(&write_set);
+        FD_SET(m_p->m_fd[1], &write_set);
+        int r = select(m_p->m_fd[1]+1, 0, &write_set, 0, 0);
+        if (r != 1)
+            throw Pipe::Error("could not complete connect");
+
+        m_p->close(m_p->m_socket);
     }
     else
     {
-        m_p->m_socket = 0;
+#ifndef WIN32
         pipe(m_p->m_fd);
+#endif
     }
 }
 
 Pipe::~Pipe()
 {
-    if (m_p->m_fd[0] != -1)
-        close(m_p->m_fd[0]);
-    if (m_p->m_fd[1] != -1)
-        close(m_p->m_fd[1]);
-    if (m_p->m_socket != -1)
-        close(m_p->m_socket);
+    m_p->close(m_p->m_fd[0]);
+    m_p->close(m_p->m_fd[1]);
+    m_p->close(m_p->m_socket);
+#ifdef WIN32
+    WSACleanup();
+#endif
 }
 
 int &Pipe::read_fd() const