// $Id$
//
// Copyright (C) 2007
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
-// Stefan Bund <stefan.bund@fokus.fraunhofer.de>
+// Fraunhofer Institute for Open Communication Systems (FOKUS)
+// Competence Center NETwork research (NET), St. Augustin, GERMANY
+// Thorsten Horstmann <tho@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
// Custom includes
#include <iomanip>
-#include "Utils/hexdump.hh"
-#include "Packets/DefaultBundle/EthernetPacket.hh"
+#include "../../Utils/hexdump.hh"
+#include "../../Packets/DefaultBundle/EthernetPacket.hh"
#define prefix_
//}
-prefix_ senf::PacketParserBase::size_type senf::Parse_SNDUPacket::bytes()
- const
-{
- if ( d_bit() )
- return 2 + 2 + 4; // D-Bit + 15 bits length + 16 bits type field + 32 bits crc
- else
- return 2 + 2 + 4 + 6; // + 6 Byte NPA destination address
-}
-
-prefix_ boost::uint32_t senf::Parse_SNDUPacket::calcCrc()
+prefix_ boost::uint32_t senf::SNDUPacketParser::calcCrc()
const
{
return std::for_each(
ule_crc32() ).checksum();
}
-//prefix_ senf::SNDUPacketType::registry_key_t senf::SNDUPacketType::nextPacketKey(packet p)
+//prefix_ senf::SNDUPacketType::key_t senf::SNDUPacketType::nextPacketKey(packet p)
//{
// return p->type();
//}
if (p->type() < 1536)
e = PacketRegistry<senf::ULEExtHeaderTypes>::lookup( p->type(), nothrow );
else
- e = PacketRegistry<senf::EtherTypes>::lookup( 0x86dd, nothrow );
+ e = PacketRegistry<senf::EtherTypes>::lookup( p->type(), nothrow );
return e ? e->factory() : no_factory();
}
{
os << "SNDUPacket:\n"
<< std::dec
- << " d_bit: " << p->d_bit() << "\n"
- << " length: " << unsigned(p->length()) << "\n"
+ << " d_bit : " << p->d_bit() << "\n"
+ << " length : " << unsigned(p->length()) << "\n"
<< std::hex
- << " type: 0x" << unsigned(p->type()) << "\n"
+ << " type : 0x" << unsigned(p->type()) << "\n"
<< std::dec
- << " crc: " << unsigned(p->crc()) << "\n";
+ << " crc : " << unsigned(p->crc()) << "\n";
}
prefix_ senf::PacketParserBase::size_type senf::SNDUPacketType::initSize()