X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Fpipe.cpp;h=3964b79faf7dd52784daeaa23aa4ba0eb6c60372;hb=665559cbc22546e8df69be33a7d492294cab9fb1;hp=d45dee6e2a5568349818d302ac0f73f76ac9a5ad;hpb=d8ae25e485e2b560d7990fadbd061c45e70b69a6;p=metaproxy-moved-to-github.git

diff --git a/src/pipe.cpp b/src/pipe.cpp
index d45dee6..3964b79 100644
--- a/src/pipe.cpp
+++ b/src/pipe.cpp
@@ -1,15 +1,28 @@
+/* This file is part of Metaproxy.
+   Copyright (C) 2005-2008 Index Data
 
-/* $Id: pipe.cpp,v 1.2 2005-11-07 21:57:10 adam Exp $
-   Copyright (c) 2005, Index Data.
+Metaproxy is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Metaproxy is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
 
-%LICENSE%
- */
 #include "config.hpp"
 
 #if HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 
+#include <signal.h>
 #include <errno.h>
 #ifdef WIN32
 #include <winsock.h>
@@ -37,22 +50,37 @@
 
 #include <deque>
 
-#include <yaz++/socket-observer.h>
+#include <yazpp/socket-observer.h>
 #include <yaz/log.h>
 
 #include "pipe.hpp"
 
-namespace yp2 {
+namespace mp = metaproxy_1;
+
+namespace metaproxy_1 {
     class Pipe::Rep : public boost::noncopyable {
         friend class Pipe;
         Rep();
         int m_fd[2];
         int m_socket;
         bool nonblock(int s);
+        void close(int &fd);
     };
 }
 
-using namespace yp2;
+using namespace mp;
+
+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()
 {
@@ -63,6 +91,7 @@ Pipe::Rep::Rep()
 bool Pipe::Rep::nonblock(int s)
 {
 #ifdef WIN32
+    unsigned long tru = 1;
     if (ioctlsocket(s, FIONBIO, &tru) < 0)
         return false;
 #else
@@ -77,6 +106,14 @@ bool Pipe::Rep::nonblock(int s)
 
 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");
+#else
+    port_to_use = 0;  // we'll just use pipe on Unix
+#endif
     if (port_to_use)
     {
         // create server socket
@@ -103,7 +140,7 @@ Pipe::Pipe(int port_to_use) : m_p(new Rep)
             throw Pipe::Error("could not listen on socket");
 
         // client socket
-        in_addr_t tmpadd;
+        unsigned int tmpadd;
         tmpadd = (unsigned) inet_addr("127.0.0.1");
         if (tmpadd)
             memcpy(&add.sin_addr.s_addr, &tmpadd, sizeof(struct in_addr));
@@ -116,17 +153,24 @@ Pipe::Pipe(int port_to_use) : m_p(new Rep)
         
         m_p->nonblock(m_p->m_fd[1]);
 
-        if (connect(m_p->m_fd[1], addr, sizeof(*addr)) < 0 &&
-            errno != EINPROGRESS)
+        if (connect(m_p->m_fd[1], addr, sizeof(*addr)) < 0)
         {
-            fprintf(stderr, "errno=%d[%s] tmpadd=%x\n", 
-                    errno, strerror(errno), tmpadd);
-            throw Pipe::Error("could not connect to socket");
+#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");
@@ -139,23 +183,30 @@ Pipe::Pipe(int port_to_use) : m_p(new Rep)
         if (r != 1)
             throw Pipe::Error("could not complete connect");
 
-        close(m_p->m_socket);
-        m_p->m_socket = -1;
+        m_p->close(m_p->m_socket);
     }
     else
     {
-        pipe(m_p->m_fd);
+#ifndef WIN32
+        if (pipe(m_p->m_fd))
+            throw Pipe::Error("pipe failed");
+        else
+        {
+            assert(m_p->m_fd[0] >= 0);
+            assert(m_p->m_fd[1] >= 0);
+        }
+#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
@@ -171,8 +222,8 @@ int &Pipe::write_fd() const
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
- * c-file-style: "stroustrup"
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  */