X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fpipe.cpp;h=309f51b0496aa406572ffdda5c66c3668dcf417c;hb=586d78659d671683f33ec55f4a7d32b28e345ccd;hp=d45dee6e2a5568349818d302ac0f73f76ac9a5ad;hpb=d8ae25e485e2b560d7990fadbd061c45e70b69a6;p=metaproxy-moved-to-github.git diff --git a/src/pipe.cpp b/src/pipe.cpp index d45dee6..309f51b 100644 --- a/src/pipe.cpp +++ b/src/pipe.cpp @@ -1,15 +1,28 @@ +/* This file is part of Metaproxy. + Copyright (C) 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 #endif +#include #include #ifdef WIN32 #include @@ -34,25 +47,41 @@ #include #include +#include #include -#include +#include #include #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 +92,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 +107,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 @@ -85,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 @@ -95,38 +133,45 @@ 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"); // 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)); 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 && - 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 +184,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 +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 */