X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FSocket%2FProtocols%2FINet%2FRawINetSocketHandle.test.cc;h=2526f54ff569cb5c04009a13c7d1599fed4ed52e;hb=ab7ff164ab5ae711ec09ce2b24228510f1ffdcff;hp=1ea5cd83e57576ab2a278b56a927559c1d102080;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git

diff --git a/senf/Socket/Protocols/INet/RawINetSocketHandle.test.cc b/senf/Socket/Protocols/INet/RawINetSocketHandle.test.cc
index 1ea5cd8..2526f54 100644
--- a/senf/Socket/Protocols/INet/RawINetSocketHandle.test.cc
+++ b/senf/Socket/Protocols/INet/RawINetSocketHandle.test.cc
@@ -2,24 +2,28 @@
 //
 // Copyright (C) 2007
 // Fraunhofer Institute for Open Communication Systems (FOKUS)
-// Competence Center NETwork research (NET), St. Augustin, GERMANY
-//     David Wagner <dw6@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):
+//   David Wagner <dw6@berlios.de>
 /** \file
     \brief RawINetSocketHandle unit tests */
 
@@ -32,7 +36,7 @@
 #include "RawINetSocketHandle.hh"
 #include <iostream>
 
-#include "../../../Utils/auto_unit_test.hh"
+#include <senf/Utils/auto_unit_test.hh>
 #include <boost/test/test_tools.hpp>
 
 namespace {
@@ -79,7 +83,7 @@ namespace {
 
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace {
 
@@ -90,12 +94,12 @@ namespace {
         sin.sin_family = AF_INET;
         sin.sin_port = htons(0);
         sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
-        
+
         int sockrec = socket(PF_INET,SOCK_RAW,47);
         if (sockrec<0) fail("server_v4","socket(rec)");
         int socksend = socket(PF_INET,SOCK_RAW,48);
         if (socksend<0) fail("server_v4","socket(send)");
-        
+
         char buffer[1024];
         while (1) {
             int n = read(sockrec,buffer,1024);
@@ -115,7 +119,7 @@ namespace {
         ::memset(&sin,0,sizeof(sin));
         sin.sin6_family = AF_INET6;
         sin.sin6_port = htons(0);
-        inet_pton(AF_INET6, "::1", &sin.sin6_addr);        
+        inet_pton(AF_INET6, "::1", &sin.sin6_addr);
         int sockrec6 = socket(PF_INET6,SOCK_RAW,47);
         if (sockrec6<0) fail("server_v6","socket(rec)");
         int socksend6 = socket(PF_INET6,SOCK_RAW,48);
@@ -137,10 +141,11 @@ namespace {
 
 }
 
-BOOST_AUTO_UNIT_TEST(RawV4ClientSocketHandle)
+SENF_AUTO_UNIT_TEST(RawV4ClientSocketHandle)
 {
     if (getuid() != 0) {
         BOOST_WARN_MESSAGE(false, "Cannot test senf::RawV4SocketHandle as non-root user");
+        BOOST_CHECK( true );
         return;
     }
     try {
@@ -155,7 +160,7 @@ BOOST_AUTO_UNIT_TEST(RawV4ClientSocketHandle)
         SENF_CHECK_NO_THROW( sock.writeto(senf::INet4SocketAddress("127.0.0.1:0"), test) );
         senf::RawV4ClientSocketHandle sockrec(48);  //IPPROTO_GRE+1
         std::string in = sockrec.read();
-        BOOST_CHECK_EQUAL(in.substr(20), test); 
+        BOOST_CHECK_EQUAL(in.substr(20), test);
         SENF_CHECK_NO_THROW( sock.writeto(senf::INet4SocketAddress("127.0.0.1:0"),"QUIT"));
         //sock.close();
         //sockrec.close();
@@ -166,10 +171,11 @@ BOOST_AUTO_UNIT_TEST(RawV4ClientSocketHandle)
     }
 }
 
-BOOST_AUTO_UNIT_TEST(RawV6ClientSocketHandle)
+SENF_AUTO_UNIT_TEST(RawV6ClientSocketHandle)
 {
     if (getuid() != 0) {
         BOOST_WARN_MESSAGE(false, "Cannot test senf::RawV6SocketHandle as non-root user");
+        BOOST_CHECK( true );
         return;
     }
     try {
@@ -185,7 +191,7 @@ BOOST_AUTO_UNIT_TEST(RawV6ClientSocketHandle)
         SENF_CHECK_NO_THROW( sock.writeto(senf::INet6SocketAddress("[::1]:0"), test) );
         senf::RawV6ClientSocketHandle sockrec(48);  //IPPROTO_GRE+1
         std::string in = sockrec.read();
-        BOOST_CHECK_EQUAL(in, test); 
+        BOOST_CHECK_EQUAL(in, test);
         SENF_CHECK_NO_THROW( sock.writeto(senf::INet6SocketAddress("[::1]:0"),"QUIT"));
         alarm(0);
     } catch (...) {
@@ -194,7 +200,7 @@ BOOST_AUTO_UNIT_TEST(RawV6ClientSocketHandle)
     }
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_