X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FSocket%2FProtocols%2FINet%2FUDPSocketHandle.test.cc;h=2d4186a7055ff0df710330080bd1960fb13aad3b;hb=HEAD;hp=ee75c4b7aa2d15ab205a1eb8d796135eca0a0afd;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git diff --git a/senf/Socket/Protocols/INet/UDPSocketHandle.test.cc b/senf/Socket/Protocols/INet/UDPSocketHandle.test.cc index ee75c4b..2d4186a 100644 --- a/senf/Socket/Protocols/INet/UDPSocketHandle.test.cc +++ b/senf/Socket/Protocols/INet/UDPSocketHandle.test.cc @@ -2,23 +2,28 @@ // // Copyright (C) 2007 // 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 UDPSocketHandle unit tests */ @@ -33,62 +38,17 @@ #include #include #include -#include "UDPSocketHandle.hh" #include +#include "UDPSocketHandle.hh" +#include "net.test.hh" -#include "../../../Utils/auto_unit_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); - } - - 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; - } - } - -} - -/////////////////////////////////////////////////////////////////////////// +using namespace senf::test; namespace { @@ -99,11 +59,11 @@ 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(sock,(struct sockaddr *)&sin,sizeof(sin))<0) fail("server_v4","bind()"); - sin.sin_port = htons(23456); + sin.sin_port = htons(port(1)); char buffer[1024]; while (1) { int n = read(sock,buffer,1024); @@ -115,48 +75,48 @@ namespace { if (close(sock) < 0) fail("server_v4","close()"); } - void server_v6() - { - int sock = socket(PF_INET6,SOCK_DGRAM,0); - if (sock<0) fail("server_v6","socket()"); - struct sockaddr_in6 sin; - ::memset(&sin,0,sizeof(sin)); - sin.sin6_family = AF_INET6; - sin.sin6_port = htons(12345); - sin.sin6_addr = in6addr_loopback; - if (bind(sock,(struct sockaddr *)&sin,sizeof(sin))<0) fail("server_v6","bind()"); - - sin.sin6_port = htons(23456); - char buffer[1024]; - while (1) { - int n = read(sock,buffer,1024); - if (n == 4 && strncmp(buffer,"QUIT",4) == 0) - break; - sendto(sock,buffer,n,0,(struct sockaddr *)&sin,sizeof(sin)); - } - - if (close(sock) < 0) fail("server_v6","close()"); - } +// void server_v6() +// { +// int sock = socket(PF_INET6,SOCK_DGRAM,0); +// if (sock<0) fail("server_v6","socket()"); +// struct sockaddr_in6 sin; +// ::memset(&sin,0,sizeof(sin)); +// sin.sin6_family = AF_INET6; +// sin.sin6_port = htons(port(0)); +// sin.sin6_addr = in6addr_loopback; +// if (bind(sock,(struct sockaddr *)&sin,sizeof(sin))<0) fail("server_v6","bind()"); +// +// sin.sin6_port = htons(port(1)); +// char buffer[1024]; +// while (1) { +// int n = read(sock,buffer,1024); +// if (n == 4 && strncmp(buffer,"QUIT",4) == 0) +// break; +// sendto(sock,buffer,n,0,(struct sockaddr *)&sin,sizeof(sin)); +// } +// +// if (close(sock) < 0) fail("server_v6","close()"); +// } } -BOOST_AUTO_UNIT_TEST(udpv4ClientSocketHandle) +SENF_AUTO_UNIT_TEST(udpv4ClientSocketHandle) { try { alarm(10); start(server_v4); senf::UDPv4ClientSocketHandle sock; - SENF_CHECK_NO_THROW( sock.bind(senf::INet4SocketAddress("127.0.0.1:23456")) ); - BOOST_CHECK( sock.local() == senf::INet4SocketAddress("127.0.0.1:23456") ); + SENF_CHECK_NO_THROW( sock.bind(senf::INet4SocketAddress(localhost4str(1))) ); + BOOST_CHECK( sock.local() == senf::INet4SocketAddress(localhost4str(1)) ); SENF_CHECK_NO_THROW( sock.protocol().rcvbuf(2048) ); BOOST_CHECK_EQUAL( sock.protocol().rcvbuf(), 2048u ); SENF_CHECK_NO_THROW( sock.protocol().sndbuf(2048) ); BOOST_CHECK_EQUAL( sock.protocol().sndbuf(), 2048u ); - SENF_CHECK_NO_THROW( sock.writeto(senf::INet4SocketAddress("127.0.0.1:12345"), + SENF_CHECK_NO_THROW( sock.writeto(senf::INet4SocketAddress(localhost4str(0)), std::string("TEST-WRITE")) ); BOOST_CHECK_EQUAL( sock.read(), "TEST-WRITE" ); SENF_CHECK_NO_THROW( sock.protocol().timestamp() ); - sock.writeto(senf::INet4SocketAddress("127.0.0.1:12345"), std::string("QUIT")); + sock.writeto(senf::INet4SocketAddress(localhost4str(0)), std::string("QUIT")); sleep(1); stop(); sleep(1); @@ -170,7 +130,7 @@ BOOST_AUTO_UNIT_TEST(udpv4ClientSocketHandle) } } -///////////////////////////////cc.e//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// #undef prefix_