Added SENF_NO_DEBUG symbol and removed dependency on NDEBUG

[senf.git] / Packets / PacketParser.cci

diff --git a/Packets/PacketParser.cci b/Packets/PacketParser.cci
index 173e54e..c53e29a 100644 (file)
--- a/Packets/PacketParser.cci
+++ b/Packets/PacketParser.cci
@@ -1,6 +1,8 @@
+// $Id$
+//
 // Copyright (C) 2007 
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
+// Fraunhofer Institute for Open Communication Systems (FOKUS) 
+// Competence Center NETwork research (NET), St. Augustin, GERMANY 
 //     Stefan Bund <g0dil@berlios.de>
 //
 // 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<PacketInterpreterBase*>(&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();
 }