X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2F80221Bundle%2FMIHPacket.cc;h=50b4439360d681970b46d26ceb18362bb9b3f67c;hb=57daeae6f2e924ce3f16f9677c3474f531cba9e5;hp=cf7fb417eebb04f4796153eab7cb30f6faf92f85;hpb=8dbb3db32c2a258edcbd70e3f1b526e7e3b97b49;p=senf.git diff --git a/senf/Packets/80221Bundle/MIHPacket.cc b/senf/Packets/80221Bundle/MIHPacket.cc index cf7fb41..50b4439 100644 --- a/senf/Packets/80221Bundle/MIHPacket.cc +++ b/senf/Packets/80221Bundle/MIHPacket.cc @@ -27,115 +27,44 @@ //#include "MIHPacket.ih" // Custom includes -#include -#include #include +#include #include #define prefix_ -///////////////////////////////cc.p//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// -namespace { - SENF_PACKET_REGISTRY_REGISTER( senf::EtherTypes, 0x8917, senf::MIHPacket); -} - -/////////////////////////////////////////////////////////////////////////// -// MIHFId_TLVParser - -prefix_ void senf::MIHFId_TLVParser::setString(std::string const &id) -{ - size_type str_size (id.size()); - // the maximum length of a MIHF_ID is 253 octets (see F.3.11 in 802.21) - if (str_size > 253) - throw std::length_error("maximum length of a MIHF_ID is 253 octets"); - safe_data_iterator si = resizeValueField( str_size); - std::copy( id.begin(), id.end(), si); -} - -prefix_ void senf::MIHFId_TLVParser::setMACAddress(senf::MACAddress const &mac) -{ - safe_data_iterator si = resizeValueField(12); - std::copy( mac.begin(), mac.end(), getNAIEncodedOutputIterator(si)); -} +SENF_PACKET_REGISTRY_REGISTER( senf::EtherTypes, 0x8917, senf::MIHPacket); -prefix_ void senf::MIHFId_TLVParser::setINet4Address(senf::INet4Address const &addr) -{ - safe_data_iterator si = resizeValueField(8); - std::copy( addr.begin(), addr.end(), getNAIEncodedOutputIterator(si)); -} - -prefix_ void senf::MIHFId_TLVParser::setINet6Address(senf::INet6Address const &addr) -{ - safe_data_iterator si = resizeValueField(32); - std::copy( addr.begin(), addr.end(), getNAIEncodedOutputIterator(si)); -} - -prefix_ void senf::MIHFId_TLVParser::setEUI64(senf::EUI64 const &addr) -{ - safe_data_iterator si = resizeValueField(16); - std::copy( addr.begin(), addr.end(), getNAIEncodedOutputIterator(si)); -} -prefix_ senf::MIHFId senf::MIHFId_TLVParser::valueAs(MIHFId::Type type) - const -{ - if (length() == 0) return MIHFId(); - switch (type) { - case MIHFId::Empty: - return MIHFId(); - case MIHFId::MACAddress: - return MIHFId( asMACAddress()); - case MIHFId::INet4Address: - return MIHFId( asINet4Address()); - case MIHFId::INet6Address: - return MIHFId( asINet6Address()); - case MIHFId::String: - return MIHFId( asINet6Address()); - case MIHFId::EUI64: - return MIHFId( asINet6Address()); - } - return MIHFId(); -} - - -/////////////////////////////////////////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// // MIHPacketType prefix_ void senf::MIHPacketType::dump(packet p, std::ostream &os) { boost::io::ios_all_saver ias(os); os << "MIH Packet:\n" - << " protocol header:\n" - << " version : " << unsigned( p->version()) << "\n" - << " ack request : " << p->ackRequest() << "\n" - << " ack response : " << p->ackResponse() << "\n" - << " UIR : " << p->uir() << "\n" - << " more fragments : " << p->moreFragment() << "\n" - << " fragment number : " << p->fragmentNr() << "\n" - << " message ID (MID) : " << unsigned( p->messageId()) << "\n" - << " sid : " << unsigned( p->sid()) << "\n" - << " opcode : " << unsigned( p->opcode()) << "\n" - << " aid : " << unsigned( p->aid()) << "\n" - << " transaction id : " << unsigned( p->transactionId()) << "\n" - << " payload length : " << unsigned( p->payloadLength()) << "\n" - << " source MIHF_Id TLV :\n" - << " type : " << unsigned (p->src_mihfId().type()) << "\n" - << " length : " << unsigned (p->src_mihfId().length()) << "\n" - << " value :\n"; - std::string src_mihfId (p->src_mihfId().asString()); - hexdump(src_mihfId.begin(), src_mihfId.end(), os); - os << " destination MIHF_Id TLV:\n" - << " type : " << unsigned (p->dst_mihfId().type()) << "\n" - << " length : " << unsigned (p->dst_mihfId().length()) << "\n" - << " value :\n"; - std::string dst_mihfId (p->dst_mihfId().asString()); - hexdump(dst_mihfId.begin(), dst_mihfId.end(), os); + << " protocol header:\n" + << senf::fieldName(" version") << unsigned( p->version()) << "\n" + << senf::fieldName(" ack request") << p->ackRequest() << "\n" + << senf::fieldName(" ack response") << p->ackResponse() << "\n" + << senf::fieldName(" UIR") << p->uir() << "\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(" opcode") << unsigned( p->opcode()) << "\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); + p->dst_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)); } @@ -144,18 +73,52 @@ prefix_ senf::PacketInterpreterBase::factory_t senf::MIHPacketType::nextPacketTy { if (p.data().size() < initSize()) return no_factory(); - PkReg_Entry const * e (PacketRegistry::lookup( p->messageId(), nothrow )); - return e ? e->factory() : MIHPayloadPacket::factory(); + PacketRegistry::Entry const * e ( + PacketRegistry::lookup( p->messageId(), nothrow )); + return e ? e->factory() : MIHGenericPayloadPacket::factory(); } -prefix_ void senf::MIHPayloadPacketType::dump(packet p, std::ostream &os) +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 (senf::TruncatedPacketException e) { + throw InvalidMIHPacketException("truncated MIH message"); + } +} + +//-///////////////////////////////////////////////////////////////////////////////////////////////// +// MIHGenericPayloadPacketType + +prefix_ void senf::MIHGenericPayloadPacketType::dump(packet p, std::ostream &os) { boost::io::ios_all_saver ias(os); - os << "MIH Payload (service specific TLVs):\n" - << " ToDo!\n"; + os << "MIH Payload (service specific TLVs):\n"; + typedef parser::tlvList_t::container tlvListContainer_t; + tlvListContainer_t tlvListContainer (p->tlvList()); + for (tlvListContainer_t::const_iterator i = tlvListContainer.begin(); i != tlvListContainer.end(); ++i) + i->dump( os); } -///////////////////////////////cc.e//////////////////////////////////////// +prefix_ void senf::MIHGenericPayloadPacketType::finalize(packet p) +{ + typedef parser::tlvList_t::container tlvContainer_t; + tlvContainer_t tlvs (p->tlvList() ); + for (tlvContainer_t::iterator i (tlvs.begin()); i != tlvs.end(); ++i) { + MIHGenericTLVParser p (*i); + p.finalize(); + } +} + + +//-///////////////////////////////////////////////////////////////////////////////////////////////// #undef prefix_