X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Packets%2FPacketParser.cci;h=4978b4bf8bf75d574b287d2d60d74f5ef123f229;hb=0734bd14c709ca5ba1d0ed69c5b9f5d1487e5faa;hp=d18cf3a93f9347bc11bc8fd400446ceb2dd7f030;hpb=47368f306a577d1e46df69a7f729bd3893cbe5e7;p=senf.git diff --git a/Packets/PacketParser.cci b/Packets/PacketParser.cci index d18cf3a..4978b4b 100644 --- a/Packets/PacketParser.cci +++ b/Packets/PacketParser.cci @@ -1,6 +1,8 @@ -// Copyright (C) 2007 -// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS) -// Kompetenzzentrum fuer Satelitenkommunikation (SatCom) +// $Id$ +// +// Copyright (C) 2007 +// Fraunhofer Institute for Open Communication Systems (FOKUS) +// Competence Center NETwork research (NET), St. Augustin, GERMANY // Stefan Bund // // This program is free software; you can redistribute it and/or modify @@ -37,6 +39,13 @@ prefix_ senf::PacketParserBase::data_iterator senf::PacketParserBase::i() return i_; } +prefix_ senf::PacketParserBase::data_iterator senf::PacketParserBase::i(size_type offset) + const +{ + validate(offset); + return boost::next(i_, offset); +} + prefix_ senf::PacketParserBase::state_type senf::PacketParserBase::state() const { @@ -53,6 +62,19 @@ prefix_ void senf::PacketParserBase::init() const {} +prefix_ void senf::PacketParserBase::defaultInit() + const +{} + +prefix_ senf::Packet senf::PacketParserBase::packet() + const +{ + // OUCH ... I hate this but for some awkward packet types, access to the packet + // from the parser is really needed (e.g. UDP when building the pseudo-header + // for calculating the checksum). + return Packet(PacketInterpreterBase::ptr(static_cast(&data()))); +} + //////////////////////////////////////// // protected members @@ -68,11 +90,13 @@ prefix_ senf::PacketParserBase::PacketParserBase(data_iterator i, state_type s, } prefix_ bool senf::PacketParserBase::check(size_type size) + const { return size <= size_type(std::distance(i(),end())); } prefix_ void senf::PacketParserBase::validate(size_type size) + const { if (! check(size)) throw TruncatedPacketException(); @@ -82,6 +106,7 @@ prefix_ void senf::PacketParserBase::validate(size_type size) // private members prefix_ senf::PacketParserBase::data_iterator senf::PacketParserBase::end() + const { return data_->end(); } @@ -96,4 +121,6 @@ prefix_ senf::PacketParserBase::data_iterator senf::PacketParserBase::end() // c-file-style: "senf" // indent-tabs-mode: nil // ispell-local-dictionary: "american" +// compile-command: "scons -u test" +// comment-column: 40 // End: