X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2F80221Bundle%2FMIHPacket.cc;h=3f549c54967ab9415cfb6a292ed7c70c52efbf45;hb=4d90b955bf3590e215488395d1c9cec827476e07;hp=7f8852835e561c75773bd8ccfe9cee5fb39b5e4a;hpb=0061f12af7284b2d2f03de23014ac2faccfd37ed;p=senf.git diff --git a/senf/Packets/80221Bundle/MIHPacket.cc b/senf/Packets/80221Bundle/MIHPacket.cc index 7f88528..3f549c5 100644 --- a/senf/Packets/80221Bundle/MIHPacket.cc +++ b/senf/Packets/80221Bundle/MIHPacket.cc @@ -51,9 +51,9 @@ prefix_ void senf::MIHPacketType::dump(packet p, std::ostream &os) << 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); @@ -62,8 +62,8 @@ prefix_ void senf::MIHPacketType::dump(packet p, std::ostream &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)); } @@ -72,7 +72,8 @@ 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 )); + PacketRegistry::Entry const * e ( + PacketRegistry::lookup( p->messageId(), nothrow )); return e ? e->factory() : MIHGenericPayloadPacket::factory(); } @@ -94,7 +95,7 @@ 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) - i->finalizeLength(); + i->finalize(); }