X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Packets%2FMPEGDVBBundle%2FGREPacket.cc;h=74ead8c5ff672d3be83f13572ed5ef7a599d0586;hb=5443435c4c2b6e4386c5334b5b8358273f2bae93;hp=b2e7e083d4a5061ee4a6d044a76a9d3e40cf59d2;hpb=63e60fe2298fd88929abb0d56f0797ec4aced178;p=senf.git

diff --git a/Packets/MPEGDVBBundle/GREPacket.cc b/Packets/MPEGDVBBundle/GREPacket.cc
index b2e7e08..74ead8c 100644
--- a/Packets/MPEGDVBBundle/GREPacket.cc
+++ b/Packets/MPEGDVBBundle/GREPacket.cc
@@ -1,9 +1,9 @@
-// $Id:GREPacket.cc 327 2007-07-20 10:03:44Z tho $
+// $Id$
 //
 // Copyright (C) 2007
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
-//     Joachim Kaeber <joachim.kaeber@fokus.fraunhofer.de>
+// Fraunhofer Institute for Open Communication Systems (FOKUS)
+// Competence Center NETwork research (NET), St. Augustin, GERMANY
+//     Joachim Kaeber <jkaeber@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
@@ -27,27 +27,23 @@
 //#include "GREPacket.ih"
 
 // Custom includes
+#include <boost/io/ios_state.hpp>
 #include <iomanip>
+#include <senf/Packets/DefaultBundle/IPv4Packet.hh>
 
 #define prefix_
 ///////////////////////////////cc.p////////////////////////////////////////
 
+SENF_PACKET_REGISTRY_REGISTER( senf::EtherTypes, 0x6558, senf::EthernetPacket );
+SENF_PACKET_REGISTRY_REGISTER( senf::IpTypes, 47, senf::GREPacket );
+
 prefix_ void senf::GREPacketType::dump(packet p, std::ostream & os)
 {
-    /*
-    os << "GREPacket:\n"
-       << std::hex
-       << "  syncByte: 0x" << unsigned(p->sync_byte()) << "\n"
-       << "  transport_error_indicator: 0x" << unsigned(p->transport_error_indicator()) << "\n"
-       << "  payload_unit_start_indicator (pusi): 0x" << unsigned(p->pusi()) << "\n"
-       << "  transport_priority: 0x" << unsigned(p->transport_priority()) << "\n"
-       << std::dec
-       << "  pid: " << unsigned(p->pid()) << "\n"
-       << std::hex
-       << "  transport_scrambling_control: 0x" << unsigned(p->transport_scrmbl_ctrl()) << "\n"
-       << "  adaptation_field_control: 0x" << unsigned(p->adaptation_field_ctrl()) << "\n"
-       << "  continuity_counter: 0x" << unsigned(p->continuity_counter()) << "\n";
-    */
+    boost::io::ios_all_saver ias(os);
+    os << "GRE Encapsulation:\n"
+       << "  checksum_present : " << p->checksum_present() << "\n"
+       << "  protocol_type    : 0x" << std::hex << p->protocol_type() << "\n"
+       ;
 }
 
 ///////////////////////////////cc.e////////////////////////////////////////