X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FMPEGDVBBundle%2FMPESection.cc;h=98f3304ee6f3700d5259122dc8ce990b1212b69f;hb=ab7ff164ab5ae711ec09ce2b24228510f1ffdcff;hp=0130ba7210632b3cbac7cb200669eb3a7cc4788a;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git diff --git a/senf/Packets/MPEGDVBBundle/MPESection.cc b/senf/Packets/MPEGDVBBundle/MPESection.cc index 0130ba7..98f3304 100644 --- a/senf/Packets/MPEGDVBBundle/MPESection.cc +++ b/senf/Packets/MPEGDVBBundle/MPESection.cc @@ -2,23 +2,28 @@ // // Copyright (C) 2007 // Fraunhofer Institute for Open Communication Systems (FOKUS) -// Competence Center NETwork research (NET), St. Augustin, GERMANY -// Thorsten Horstmann // -// 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): +// Thorsten Horstmann /** \file \brief MPESection non-inline non-template implementation */ @@ -29,12 +34,12 @@ // Custom includes #include #include -#include "../../Packets/DefaultBundle/LlcSnapPacket.hh" -#include "../../Packets/DefaultBundle/IPv4Packet.hh" -#include "../../Packets/DefaultBundle/IPv6Packet.hh" +#include +#include +#include #define prefix_ -///////////////////////////////cc.p//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// prefix_ boost::uint32_t senf::MPESectionParser::calcCrc() @@ -52,27 +57,27 @@ prefix_ void senf::MPESectionType::dump(packet p, std::ostream & os) boost::io::ios_all_saver ias(os); os << "MPE Section:\n" << std::hex - << " table_id : 0x" << unsigned(p->table_id()) << "\n" - << " section syntax indicator: " << p->section_syntax_indicator() << "\n" - << " private indicator : " << p->private_indicator() << "\n" + << senf::fieldName("table_id") << "0x" << unsigned(p->table_id()) << "\n" + << senf::fieldName("section syntax indicator") << p->section_syntax_indicator() << "\n" + << senf::fieldName("private indicator") << p->private_indicator() << "\n" << std::dec - << " section length : " << p->section_length() << "\n" + << senf::fieldName("section length") << p->section_length() << "\n" << std::hex - << " MAC address 6 : 0x" << unsigned(p->mac_addr_6()) << "\n" - << " MAC address 5 : 0x" << unsigned(p->mac_addr_5()) << "\n" - << " payload scrambling ctrl : 0x" << p->payload_scrmbl_ctrl() << "\n" - << " address scrambling ctrl : 0x" << p-> addr_scrmbl_ctrl() << "\n" - << " LLC/SNAP flag : 0x" << p->llc_snap_flag() << "\n" - << " current next indicator : 0x" << p->curr_next_indicator() << "\n" - << " section number : 0x" << unsigned(p->section_num()) << "\n" - << " last section number : 0x" << unsigned(p->last_section_num()) << "\n" - << " real time parameters : \n" - << " delta_t : 0x" << unsigned(p->real_time_parameters().delta_t()) << "\n" - << " table boundary : 0x" << unsigned(p->real_time_parameters().table_boundary()) << "\n" - << " frame boundary : 0x" << unsigned(p->real_time_parameters().frame_boundary()) << "\n" - << " address : 0x" << unsigned(p->real_time_parameters().address()) << "\n" + << senf::fieldName("MAC address 6") << "0x" << unsigned(p->mac_addr_6()) << "\n" + << senf::fieldName("MAC address 5") << "0x" << unsigned(p->mac_addr_5()) << "\n" + << senf::fieldName("payload scrambling ctrl") << "0x" << p->payload_scrmbl_ctrl() << "\n" + << senf::fieldName("address scrambling ctrl") << "0x" << p-> addr_scrmbl_ctrl() << "\n" + << senf::fieldName("LLC/SNAP flag") << "0x" << p->llc_snap_flag() << "\n" + << senf::fieldName("current next indicator") << "0x" << p->curr_next_indicator() << "\n" + << senf::fieldName("section number") << "0x" << unsigned(p->section_num()) << "\n" + << senf::fieldName("last section number") << "0x" << unsigned(p->last_section_num()) << "\n" + << senf::fieldName("real time parameters") << "\n" + << senf::fieldName(" delta_t") << "0x" << unsigned(p->real_time_parameters().delta_t()) << "\n" + << senf::fieldName(" table boundary") << "0x" << unsigned(p->real_time_parameters().table_boundary()) << "\n" + << senf::fieldName(" frame boundary") << "0x" << unsigned(p->real_time_parameters().frame_boundary()) << "\n" + << senf::fieldName(" address") << "0x" << unsigned(p->real_time_parameters().address()) << "\n" << std::dec - << " crc : " << unsigned(p->crc()) << "\n"; + << senf::fieldName("crc") << unsigned(p->crc()) << "\n"; } prefix_ senf::PacketParserBase::size_type senf::MPESectionType::initSize() @@ -105,10 +110,10 @@ prefix_ void senf::MPESectionType::finalize(packet p) p->crc() = p->calcCrc(); } -///////////////////////////////cc.e//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// #undef prefix_ - + // Local Variables: // mode: c++ // fill-column: 100