// Custom includes
#include <boost/io/ios_state.hpp>
+#include <senf/Utils/String.hh>
#include <senf/Packets/DefaultBundle/EthernetPacket.hh>
#define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
SENF_PACKET_REGISTRY_REGISTER( senf::EtherTypes, 0x8917, senf::MIHPacket);
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
// MIHPacketType
-prefix_ void senf::MIHPacketType::dump(packet p, std::ostream &os)
+prefix_ void senf::MIHPacketType::dump(packet p, std::ostream & os)
{
boost::io::ios_all_saver ias(os);
os << "MIH Packet:\n"
<< senf::fieldName(" more fragments") << p->moreFragment() << "\n"
<< senf::fieldName(" fragment number") << p->fragmentNr() << "\n"
<< senf::fieldName(" message ID (MID)") << unsigned( p->messageId()) << "\n"
- << senf::fieldName(" sid") << unsigned( p->sid()) << "\n"
+ << senf::fieldName(" sid") << unsigned( p->sid()) << "\n"
<< senf::fieldName(" opcode") << unsigned( p->opcode()) << "\n"
- << senf::fieldName(" aid") << unsigned( p->aid()) << "\n"
+ << senf::fieldName(" aid") << unsigned( p->aid()) << "\n"
<< senf::fieldName(" transaction id") << unsigned( p->transactionId()) << "\n"
<< senf::fieldName(" payload length") << unsigned( p->payloadLength()) << "\n";
p->src_mihfId().dump( os);
prefix_ void senf::MIHPacketType::finalize(packet p)
{
- p->src_mihfId().finalizeLength();
- p->dst_mihfId().finalizeLength();
+ p->src_mihfId().finalize();
+ p->dst_mihfId().finalize();
p->payloadLength_() << p.size() - 8;
p->messageId() << key(p.next(nothrow));
}
{
if (p.data().size() < initSize())
return no_factory();
- PkReg_Entry const * e (PacketRegistry<MIHMessageRegistry>::lookup( p->messageId(), nothrow ));
+ PacketRegistry<MIHMessageRegistry>::Entry const * e (
+ PacketRegistry<MIHMessageRegistry>::lookup( p->messageId(), nothrow ));
return e ? e->factory() : MIHGenericPayloadPacket::factory();
}
-///////////////////////////////////////////////////////////////////////////
+prefix_ void senf::MIHPacketType::validate(packet p)
+{
+ try {
+ if (p.data().size() < initSize())
+ throw InvalidMIHPacketException("truncated MIH message");
+ if (p->version() != 1)
+ throw InvalidMIHPacketException("invalid MIH version: ") << senf::str(p->version());
+ if (p->payloadLength() != p.size()-8)
+ throw InvalidMIHPacketException("wrong MIH length: ") << senf::str(p->payloadLength());
+ if (p.next(senf::nothrow))
+ MIHMessageRegistry::instance().validate( p->messageId(), p.next());
+ } catch (TruncatedPacketException & e) {
+ throw InvalidMIHPacketException("truncated MIH message");
+ }
+}
+
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
// MIHGenericPayloadPacketType
-prefix_ void senf::MIHGenericPayloadPacketType::dump(packet p, std::ostream &os)
+prefix_ void senf::MIHGenericPayloadPacketType::dump(packet p, std::ostream & os)
{
boost::io::ios_all_saver ias(os);
os << "MIH Payload (service specific TLVs):\n";
{
typedef parser::tlvList_t::container tlvContainer_t;
tlvContainer_t tlvs (p->tlvList() );
- for (tlvContainer_t::iterator i (tlvs.begin()); i != tlvs.end(); ++i)
- i->finalizeLength();
+ for (tlvContainer_t::iterator i (tlvs.begin()); i != tlvs.end(); ++i) {
+ MIHGenericTLVParser p (*i);
+ p.finalize();
+ }
}
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
#undef prefix_
\f