#define prefix_
//-/////////////////////////////////////////////////////////////////////////////////////////////////
-SENF_PACKET_REGISTRY_REGISTER( senf::EtherTypes, 0x8917, senf::MIHPacket);
+SENF_PACKET_REGISTRY_REGISTER( senf::EtherTypes, senf::MIHPacketType::etherType, 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"
return e ? e->factory() : MIHGenericPayloadPacket::factory();
}
-prefix_ std::pair<bool, std::string> senf::MIHPacketType::validate(packet p)
+prefix_ void senf::MIHPacketType::validate(packet p)
{
try {
if (p.data().size() < initSize())
- return std::make_pair(false, "truncated MIH message");
+ throw InvalidMIHPacketException("truncated MIH message");
if (p->version() != 1)
- return std::make_pair(false, "invalid MIH version: " + senf::str(p->version()) );
+ throw InvalidMIHPacketException("invalid MIH version: ") << senf::str(p->version());
if (p->payloadLength() != p.size()-8)
- return std::make_pair(false, "wrong MIH length: " + senf::str(p->payloadLength()) );
+ throw InvalidMIHPacketException("wrong MIH length: ") << senf::str(p->payloadLength());
if (p.next(senf::nothrow))
- return MIHMessageRegistry::instance().validate( p->messageId(), p.next());
- } catch (senf::TruncatedPacketException e) {
- return std::make_pair(false, "truncated MIH message");
+ MIHMessageRegistry::instance().validate( p->messageId(), p.next());
+ } catch (TruncatedPacketException & e) {
+ throw InvalidMIHPacketException("truncated MIH message");
}
- return std::make_pair(true, "");
}
//-/////////////////////////////////////////////////////////////////////////////////////////////////
// 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";