X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FDefaultBundle%2FMldv2Packet.test.cc;h=ac9d89645317e3dcd843bf9c865d30c80246c421;hb=HEAD;hp=f42a48fe872627dbcfae15fd041fff91fb17c2b2;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git

diff --git a/senf/Packets/DefaultBundle/Mldv2Packet.test.cc b/senf/Packets/DefaultBundle/Mldv2Packet.test.cc
index f42a48f..ac9d896 100644
--- a/senf/Packets/DefaultBundle/Mldv2Packet.test.cc
+++ b/senf/Packets/DefaultBundle/Mldv2Packet.test.cc
@@ -2,50 +2,53 @@
 //
 // Copyright (C) 2006
 // Fraunhofer Institute for Open Communication Systems (FOKUS)
-// Competence Center NETwork research (NET), St. Augustin, GERMANY
-//     Philipp Batroff <Philipp.Batroff@fokus.fraunhofer.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):
+//   Philipp Batroff <pug@berlios.de>
 
 // Definition of non-inline non-template functions
 
 // Custom includes
-
 #include "ICMPv6Packet.hh"
 #include "ICMPv6TypePacket.hh"
-#include "../../Packets/DataPacket.hh"
-#include "../../Utils/String.hh"
+#include <senf/Packets/DataPacket.hh>
 
-#include "../../Utils/auto_unit_test.hh"
+#include <senf/Utils/auto_unit_test.hh>
 #include <boost/test/test_tools.hpp>
 
 
-BOOST_AUTO_UNIT_TEST(ICMPv6_MLDv2_Packet_packet)
+SENF_AUTO_UNIT_TEST(ICMPv6_MLDv2_Packet_packet)
 {
     unsigned char data[] = {
-        0x00 ,0x00 ,0x00 ,0x01 ,0x04 ,0x00 ,0x00 ,0x00 ,
-        0xff ,0x15 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,
-        0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x16
+        0x00, 0x00, 0x00, 0x01, 0x04, 0x00, 0x00, 0x00,
+        0xff, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16
     };
 
-
     senf::MLDv2ListenerReport p ( senf::MLDv2ListenerReport::create(data) );
-    BOOST_CHECK_EQUAL(p->reserved(),0x0000 );    
-    senf::MLDv2ListenerReport::Parser::mcastAddrRecords_t::container mcastAddrRecords (p->mcastAddrRecords());
-    senf::MLDv2ListenerReport::Parser::mcastAddrRecords_t::container::iterator mcAddrIt (mcastAddrRecords.begin() );
-    BOOST_CHECK_EQUAL(mcAddrIt->recordType(), 0x04);
-    BOOST_CHECK_EQUAL(senf::str(mcAddrIt->mcAddress() ), "ff15::16");
+    BOOST_CHECK_EQUAL(p->reserved(),0x0000 );
+    typedef senf::MLDv2ListenerReport::Parser::mcastAddrRecords_t::container recContainer_t;
+    recContainer_t mcastAddrRecords (p->mcastAddrRecords());
+    recContainer_t::iterator mcAddrIt (mcastAddrRecords.begin() );
+    BOOST_CHECK_EQUAL( mcAddrIt->recordType(), 0x04);
+    BOOST_CHECK_EQUAL( mcAddrIt->mcAddress().value(), senf::MACAddress(0xff1516));
 }