Fix Metaproxy stops logging after check config failed MP-590

[metaproxy-moved-to-github.git] / src / pipe.cpp

diff --git a/src/pipe.cpp b/src/pipe.cpp
index 5f8f8ba..309f51b 100644 (file)
--- a/src/pipe.cpp
+++ b/src/pipe.cpp
@@ -1,7 +1,5 @@
-/* $Id: pipe.cpp,v 1.12 2007-05-09 21:23:09 adam Exp $
-   Copyright (c) 2005-2007, Index Data.
-
-This file is part of Metaproxy.
+/* This file is part of Metaproxy.
+   Copyright (C) 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
@@ -14,10 +12,9 @@ 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 Metaproxy; see the file LICENSE.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
- */
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
 
 #include "config.hpp"
 
@@ -50,6 +47,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <boost/thread/condition.hpp>
 
 #include <stdio.h>
+#include <string.h>
 
 #include <deque>
 
@@ -125,7 +123,7 @@ Pipe::Pipe(int port_to_use) : m_p(new Rep)
             throw Pipe::Error("could not create socket");
 #ifndef WIN32
         unsigned long one = 1;
-        if (setsockopt(m_p->m_socket, SOL_SOCKET, SO_REUSEADDR, (char*) 
+        if (setsockopt(m_p->m_socket, SOL_SOCKET, SO_REUSEADDR, (char*)
                        &one, sizeof(one)) < 0)
             throw Pipe::Error("setsockopt error");
 #endif
@@ -135,10 +133,10 @@ Pipe::Pipe(int port_to_use) : m_p(new Rep)
         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");
 
@@ -149,11 +147,11 @@ Pipe::Pipe(int port_to_use) : m_p(new Rep)
             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)
@@ -225,8 +223,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
  */