X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FSocket%2FProtocols%2FINet%2FTCPSocketHandle.test.cc;h=4bb827b02cf5f94e9bfd5357d0f39a44ff78deee;hb=72cc548dfc3fa72d14d4d8c1a178f162165e933a;hp=8a0038590ec6407cc55839e93b5fb01f7cd4a74d;hpb=26610f603ebdd465307b9621f532c1fe19fd5571;p=senf.git diff --git a/senf/Socket/Protocols/INet/TCPSocketHandle.test.cc b/senf/Socket/Protocols/INet/TCPSocketHandle.test.cc index 8a00385..4bb827b 100644 --- a/senf/Socket/Protocols/INet/TCPSocketHandle.test.cc +++ b/senf/Socket/Protocols/INet/TCPSocketHandle.test.cc @@ -2,23 +2,28 @@ // // Copyright (C) 2006 // Fraunhofer Institute for Open Communication Systems (FOKUS) -// Competence Center NETwork research (NET), St. Augustin, GERMANY -// Stefan Bund // -// This program 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 of the License, or -// (at your option) any later version. +// The contents of this file are subject to the Fraunhofer FOKUS Public License +// Version 1.0 (the "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// http://senf.berlios.de/license.html // -// This program 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. +// The Fraunhofer FOKUS Public License Version 1.0 is based on, +// but modifies the Mozilla Public License Version 1.1. +// See the full license text for the amendments. // -// 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., -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Software distributed under the License is distributed on an "AS IS" basis, +// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +// for the specific language governing rights and limitations under the License. +// +// The Original Code is Fraunhofer FOKUS code. +// +// The Initial Developer of the Original Code is Fraunhofer-Gesellschaft e.V. +// (registered association), Hansastraße 27 c, 80686 Munich, Germany. +// All Rights Reserved. +// +// Contributor(s): +// Stefan Bund /** \file \brief TCPSocketHandle unit tests */ @@ -35,61 +40,15 @@ #include #include #include "TCPSocketHandle.hh" +#include "net.test.hh" #include #include #define prefix_ -///////////////////////////////cc.p//////////////////////////////////////// - -namespace { - - void error(char const * fn, char const * proc="") - { - std::cerr << "\n" << proc << ((*proc)?": ":"") << fn << ": " << strerror(errno) << std::endl; - } - - void fail(char const * proc, char const * fn) - { - error(fn,proc); - _exit(1); - } - - int server_pid = 0; - - void start(void (*fn)()) - { - server_pid = ::fork(); - if (server_pid < 0) BOOST_FAIL("fork()"); - if (server_pid == 0) { - signal(SIGCHLD, SIG_IGN); - (*fn)(); - _exit(0); - } - signal(SIGCHLD, SIG_DFL); - ::sleep(1); - } - - void wait() - { - int status; - if (waitpid(server_pid,&status,0)<0) - BOOST_FAIL("waitpid()"); - BOOST_CHECK_EQUAL( status , 0 ); - } - - void stop() - { - if (server_pid) { - kill(server_pid,9); - wait(); - server_pid = 0; - } - } - -} +//-///////////////////////////////////////////////////////////////////////////////////////////////// -/////////////////////////////////////////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// namespace { @@ -103,7 +62,7 @@ namespace { struct sockaddr_in sin; ::memset(&sin,0,sizeof(sin)); sin.sin_family = AF_INET; - sin.sin_port = htons(12345); + sin.sin_port = htons(port(0)); sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK); if (bind(serv,(struct sockaddr *)&sin,sizeof(sin))<0) fail("server_v4","bind()"); if (listen(serv,1)<0) fail("server_v4","listen()"); @@ -115,7 +74,7 @@ namespace { int n = read(sock,buffer,1024); if (n == 4 && strncmp(buffer,"QUIT",4) == 0) break; - write(sock,buffer,n); + senf::IGNORE( write(sock,buffer,n) ); } if (shutdown(sock, SHUT_RDWR) < 0) fail("server_v4","shutdown()"); @@ -133,7 +92,7 @@ namespace { struct sockaddr_in6 sin; ::memset(&sin,0,sizeof(sin)); sin.sin6_family = AF_INET6; - sin.sin6_port = htons(12345); + sin.sin6_port = htons(port(0)); sin.sin6_addr = in6addr_loopback; if (bind(serv,(struct sockaddr *)&sin,sizeof(sin))<0) fail("server_v6","bind()"); if (listen(serv,1)<0) fail("server_v6","listen()"); @@ -145,7 +104,7 @@ namespace { int n = read(sock,buffer,1024); if (n == 4 && strncmp(buffer,"QUIT",4) == 0) break; - write(sock,buffer,n); + senf::IGNORE( write(sock,buffer,n) ); } if (shutdown(sock, SHUT_RDWR) < 0) fail("server_v6","shutdown()"); @@ -155,12 +114,12 @@ namespace { } -BOOST_AUTO_UNIT_TEST(tcpv4ClientSocketHandle) +SENF_AUTO_UNIT_TEST(tcpv4ClientSocketHandle) { { senf::TCPv4ClientSocketHandle sock; - BOOST_CHECK_THROW( sock.connect(senf::INet4SocketAddress("127.0.0.1:12345")), + BOOST_CHECK_THROW( sock.connect(senf::INet4SocketAddress(localhost4str(0))), senf::SystemException ); } @@ -168,10 +127,10 @@ BOOST_AUTO_UNIT_TEST(tcpv4ClientSocketHandle) alarm(10); start(server_v4); senf::TCPv4ClientSocketHandle sock; - SENF_CHECK_NO_THROW( sock.bind(senf::INet4SocketAddress("127.0.0.1:23456")) ); - SENF_CHECK_NO_THROW( sock.connect(senf::INet4SocketAddress("127.0.0.1:12345")) ); - BOOST_CHECK( sock.peer() == senf::INet4SocketAddress("127.0.0.1:12345") ); - BOOST_CHECK( sock.local() == senf::INet4SocketAddress("127.0.0.1:23456") ); + SENF_CHECK_NO_THROW( sock.bind(senf::INet4SocketAddress(localhost4str(1))) ); + SENF_CHECK_NO_THROW( sock.connect(senf::INet4SocketAddress(localhost4str(0))) ); + BOOST_CHECK( sock.peer() == senf::INet4SocketAddress(localhost4str(0)) ); + BOOST_CHECK( sock.local() == senf::INet4SocketAddress(localhost4str(1)) ); BOOST_CHECK( sock.blocking() ); SENF_CHECK_NO_THROW( sock.protocol().rcvbuf(2048) ); BOOST_CHECK_EQUAL( sock.protocol().rcvbuf(), 2048u ); @@ -226,12 +185,12 @@ BOOST_AUTO_UNIT_TEST(tcpv4ClientSocketHandle) } } -BOOST_AUTO_UNIT_TEST(tcpv6ClientSocketHandle) +SENF_AUTO_UNIT_TEST(tcpv6ClientSocketHandle) { { senf::TCPv6ClientSocketHandle sock; - BOOST_CHECK_THROW( sock.connect(senf::INet6SocketAddress("[::1]:12345")), + BOOST_CHECK_THROW( sock.connect(senf::INet6SocketAddress(localhost6str(0))), senf::SystemException ); } @@ -239,10 +198,10 @@ BOOST_AUTO_UNIT_TEST(tcpv6ClientSocketHandle) alarm(10); start(server_v6); senf::TCPv6ClientSocketHandle sock; - SENF_CHECK_NO_THROW( sock.bind(senf::INet6SocketAddress("[::1]:23456")) ); - SENF_CHECK_NO_THROW( sock.connect(senf::INet6SocketAddress("[::1]:12345")) ); - BOOST_CHECK( sock.peer() == senf::INet6SocketAddress("[::1]:12345") ); - BOOST_CHECK( sock.local() == senf::INet6SocketAddress("[::1]:23456") ); + SENF_CHECK_NO_THROW( sock.bind(senf::INet6SocketAddress(localhost6str(1))) ); + SENF_CHECK_NO_THROW( sock.connect(senf::INet6SocketAddress(localhost6str(0))) ); + BOOST_CHECK( sock.peer() == senf::INet6SocketAddress(localhost6str(0)) ); + BOOST_CHECK( sock.local() == senf::INet6SocketAddress(localhost6str(1)) ); BOOST_CHECK( sock.blocking() ); SENF_CHECK_NO_THROW( sock.protocol().rcvbuf(2048) ); BOOST_CHECK_EQUAL( sock.protocol().rcvbuf(), 2048u ); @@ -285,7 +244,7 @@ BOOST_AUTO_UNIT_TEST(tcpv6ClientSocketHandle) } } -/////////////////////////////////////////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// namespace { @@ -296,7 +255,7 @@ namespace { struct sockaddr_in sin; ::memset(&sin,0,sizeof(sin)); sin.sin_family = AF_INET; - sin.sin_port = htons(12346); + sin.sin_port = htons(port(2)); sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK); if (connect(sock,(struct sockaddr *)&sin,sizeof(sin)) < 0) fail("client_v4","connect()"); @@ -306,7 +265,7 @@ namespace { int n = read(sock,buffer,1024); if (n == 4 && strncmp(buffer,"QUIT",4) == 0) break; - write(sock,buffer,n); + senf::IGNORE( write(sock,buffer,n) ); } if (shutdown(sock, SHUT_RDWR) < 0) fail("client_v4","shutdown()"); @@ -320,7 +279,7 @@ namespace { struct sockaddr_in6 sin; ::memset(&sin,0,sizeof(sin)); sin.sin6_family = AF_INET6; - sin.sin6_port = htons(12347); + sin.sin6_port = htons(port(3)); sin.sin6_addr = in6addr_loopback; if (connect(sock,(struct sockaddr *)&sin,sizeof(sin)) < 0) fail("client_v6","connect()"); @@ -330,7 +289,7 @@ namespace { int n = read(sock,buffer,1024); if (n == 4 && strncmp(buffer,"QUIT",4) == 0) break; - write(sock,buffer,n); + senf::IGNORE( write(sock,buffer,n) ); } if (shutdown(sock, SHUT_RDWR) < 0) fail("client_v6","shutdown()"); @@ -339,12 +298,12 @@ namespace { } -BOOST_AUTO_UNIT_TEST(tcpv4ServerSocketHandle) +SENF_AUTO_UNIT_TEST(tcpv4ServerSocketHandle) { try { alarm(10); BOOST_CHECKPOINT("Opening server socket"); - senf::TCPv4ServerSocketHandle server (senf::INet4SocketAddress("127.0.0.1:12346")); + senf::TCPv4ServerSocketHandle server (senf::INet4SocketAddress(localhost4str(2))); BOOST_CHECKPOINT("Starting client"); start(client_v4); @@ -365,12 +324,12 @@ BOOST_AUTO_UNIT_TEST(tcpv4ServerSocketHandle) } } -BOOST_AUTO_UNIT_TEST(tcpv6ServerSocketHandle) +SENF_AUTO_UNIT_TEST(tcpv6ServerSocketHandle) { try { alarm(10); BOOST_CHECKPOINT("Opening server socket"); - senf::TCPv6ServerSocketHandle server (senf::INet6SocketAddress("[::1]:12347")); + senf::TCPv6ServerSocketHandle server (senf::INet6SocketAddress(localhost6str(3))); BOOST_CHECKPOINT("Starting client"); start(client_v6); @@ -391,7 +350,7 @@ BOOST_AUTO_UNIT_TEST(tcpv6ServerSocketHandle) } } -///////////////////////////////cc.e//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// #undef prefix_