minor fixes for clang++

[senf.git] / senf / Socket / Protocols / INet / UDPSocketHandle.test.cc

diff --git a/senf/Socket/Protocols/INet/UDPSocketHandle.test.cc b/senf/Socket/Protocols/INet/UDPSocketHandle.test.cc
index 1125ef8..2d4186a 100644 (file)
--- 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 <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 UDPSocketHandle unit tests */
@@ -41,9 +46,9 @@
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
-///////////////////////////////////////////////////////////////////////////
+using namespace senf::test;
 
 namespace {
 
@@ -70,28 +75,28 @@ 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(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()");
-    }
+//    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()");
+//    }
 
 }
 
@@ -125,7 +130,7 @@ SENF_AUTO_UNIT_TEST(udpv4ClientSocketHandle)
     }
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_
 
 \f