X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FConsole%2FUDPServer.test.cc;h=5c4ec85dae2731bf1b5e5d628c67d0d0c3139510;hb=1342c5d49ca8bd523c9fdf7d89b40448cdfd394b;hp=e35f4d07a51c5822add94afb1a43e9079c52c433;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git

diff --git a/senf/Utils/Console/UDPServer.test.cc b/senf/Utils/Console/UDPServer.test.cc
index e35f4d0..5c4ec85 100644
--- a/senf/Utils/Console/UDPServer.test.cc
+++ b/senf/Utils/Console/UDPServer.test.cc
@@ -1,24 +1,29 @@
 // $Id$
 //
-// Copyright (C) 2009 
+// Copyright (C) 2009
 // Fraunhofer Institute for Open Communication Systems (FOKUS)
-// Competence Center NETwork research (NET), St. Augustin, GERMANY
-//     Stefan Bund <g0dil@berlios.de>
 //
-// 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 <g0dil@berlios.de>
 
 /** \file
     \brief UDPServer.test unit tests */
@@ -27,13 +32,14 @@
 //#include "UDPServer.test.ih"
 
 // Custom includes
-#include "UDPServer.hh"
+#include "Console.hh"
+#include <senf/Scheduler/Scheduler.hh>
 
-#include "../../Utils/auto_unit_test.hh"
+#include <senf/Utils/auto_unit_test.hh>
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace {
 
@@ -42,10 +48,29 @@ namespace {
         senf::scheduler::terminate();
     }
 
+    int base_pid = 0;
+
+    unsigned port(unsigned i)
+    {
+        if (! base_pid)
+            base_pid = ::getpid();
+        return 23456u + (((base_pid^(base_pid>>8)^(base_pid>>16)^(base_pid>>24))&0xff)<<2) + i;
+    }
+
+    std::string localhost4str(unsigned i)
+    {
+        return (boost::format("localhost:%d") % port(i)).str();
+    }
+
+    std::string localhost6str(unsigned i)
+    {
+        return (boost::format("[::1]:%d") % port(i)).str();
+    }
+
     unsigned nread (0);
     unsigned flags (0);
     std::string data;
-    
+
     void read(senf::ConnectedUDPv4ClientSocketHandle socket, int ev)
     {
         flags |= ev;
@@ -60,10 +85,10 @@ namespace {
 
 }
 
-BOOST_AUTO_UNIT_TEST(udpServer)
+SENF_AUTO_UNIT_TEST(udpServer)
 {
-    senf::console::UDPServer server (senf::INet4SocketAddress("127.0.0.1:23232"));
-    senf::ConnectedUDPv4ClientSocketHandle socket (senf::INet4SocketAddress("127.0.0.1:23232"));
+    senf::console::UDPServer server (senf::INet4SocketAddress(localhost4str(0)));
+    senf::ConnectedUDPv4ClientSocketHandle socket (senf::INet4SocketAddress(localhost4str(0)));
     senf::scheduler::TimerEvent timer ("udpServer test timer", &timeout);
     senf::scheduler::FdEvent fdev ("udpServer test fd", boost::bind(&read, socket, _1),
                                    socket, senf::scheduler::FdEvent::EV_READ);
@@ -112,7 +137,7 @@ BOOST_AUTO_UNIT_TEST(udpServer)
     BOOST_CHECK_EQUAL( data, "sys/                        \n" );
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_