From: Adam Dickmeiss <adam@indexdata.dk>
Date: Tue, 8 Nov 2005 08:55:41 +0000 (+0000)
Subject: Call WSAStartup. Use port in test_pipe test
X-Git-Tag: YP2.0.0.2~142
X-Git-Url: http://lists.indexdata.dk/?a=commitdiff_plain;h=7da1eb44b26f8d8ec6c3aaddb0086eaa2c9d39b9;p=metaproxy-moved-to-github.git

Call WSAStartup. Use port in test_pipe test
---

diff --git a/src/pipe.cpp b/src/pipe.cpp
index 227f31d..e5ad991 100644
--- a/src/pipe.cpp
+++ b/src/pipe.cpp
@@ -1,5 +1,5 @@
 
-/* $Id: pipe.cpp,v 1.3 2005-11-07 22:43:17 adam Exp $
+/* $Id: pipe.cpp,v 1.4 2005-11-08 08:55:41 adam Exp $
    Copyright (c) 2005, Index Data.
 
 %LICENSE%
@@ -91,6 +91,12 @@ 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");
+#endif
     if (port_to_use)
     {
         // create server socket
@@ -175,6 +181,9 @@ Pipe::~Pipe()
     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
diff --git a/src/test_pipe.cpp b/src/test_pipe.cpp
index d1f1233..89f1ee6 100644
--- a/src/test_pipe.cpp
+++ b/src/test_pipe.cpp
@@ -1,4 +1,4 @@
-/* $Id: test_pipe.cpp,v 1.2 2005-11-07 21:57:10 adam Exp $
+/* $Id: test_pipe.cpp,v 1.3 2005-11-08 08:55:41 adam Exp $
    Copyright (c) 2005, Index Data.
 
 %LICENSE%
@@ -33,7 +33,7 @@ public:
 
 Timer::Timer(yazpp_1::ISocketObservable *obs,
 				 int duration) : 
-    m_obs(obs), m_pipe(0), m_timeout(false)
+    m_obs(obs), m_pipe(9122), m_timeout(false)
 {
     obs->addObserver(m_pipe.read_fd(), this);
     obs->maskObserver(this, yazpp_1::SOCKET_OBSERVE_READ);
@@ -50,8 +50,6 @@ BOOST_AUTO_TEST_CASE( test_pipe_1 )
 {
     yazpp_1::SocketManager mySocketManager;
     
-    yp2::Pipe pipe(9999);
-
     Timer t(&mySocketManager, 0);
 
     while (mySocketManager.processEvent() > 0)