X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Packets%2FPacket.cci;h=f02dabd3c3e63d3c9dbce05b5d0fd4d9552ea4fe;hb=ccc827edda90ace7d2f8564660ee26b09a5a23b5;hp=7d20006268be612560f25ab98961f704442d8145;hpb=64e170521a221effc1ba11a0544f753544d03bac;p=senf.git

diff --git a/Packets/Packet.cci b/Packets/Packet.cci
index 7d20006..f02dabd 100644
--- a/Packets/Packet.cci
+++ b/Packets/Packet.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 <g0dil@berlios.de>
 //
 // This program is free software; you can redistribute it and/or modify
@@ -22,6 +24,7 @@
     \brief Packet inline non-template implementation */
 
 // Custom includes
+#include "../Utils/senfassert.hh"
 
 #define prefix_ inline
 ///////////////////////////////cci.p///////////////////////////////////////
@@ -29,11 +32,26 @@
 ///////////////////////////////////////////////////////////////////////////
 // senf::Packet
 
+// protected members
+
+prefix_  senf::Packet::Packet(PacketInterpreterBase::ptr packet)
+    : packet_(packet)
+{}
+
+prefix_ senf::PacketInterpreterBase::ptr senf::Packet::ptr()
+    const
+{
+    SENF_ASSERT(packet_);
+    return packet_;
+}
+
 // public structors
 
 prefix_ senf::Packet::Packet()
 {}
 
+// public members
+
 prefix_ senf::Packet senf::Packet::clone()
     const
 {
@@ -42,19 +60,35 @@ prefix_ senf::Packet senf::Packet::clone()
 
 // Interpreter chain access
 
-prefix_ senf::Packet senf::Packet::next()
+prefix_ senf::Packet senf::Packet::next(NoThrow_t)
     const
 {
     PacketInterpreterBase::ptr p (ptr()->next());
     return !p && ptr()->nextPacketRange() ? checkNext() : Packet(p);
 }
 
-prefix_ senf::Packet senf::Packet::prev()
+prefix_ senf::Packet senf::Packet::next()
+    const
+{
+    Packet p (next(nothrow));
+    if (!p) throw InvalidPacketChainException();
+    return p;
+}
+
+prefix_ senf::Packet senf::Packet::prev(NoThrow_t)
     const
 {
     return Packet(ptr()->prev());
 }
 
+prefix_ senf::Packet senf::Packet::prev()
+    const
+{
+    Packet p (prev(nothrow));
+    if (!p) throw InvalidPacketChainException();
+    return p;
+}
+
 prefix_ senf::Packet senf::Packet::first()
     const
 {
@@ -65,7 +99,7 @@ prefix_ senf::Packet senf::Packet::last()
     const
 {
     Packet p (ptr()->last());
-    return p.next() ? checkLast() : p;
+    return p.next(nothrow) ? checkLast() : p;
 }
 
 prefix_ senf::Packet senf::Packet::parseNextAs(factory_t factory)
@@ -135,19 +169,6 @@ prefix_ bool senf::Packet::boolean_test()
     return packet_ && packet_->valid();
 }
 
-// protected members
-
-prefix_  senf::Packet::Packet(PacketInterpreterBase::ptr packet)
-    : packet_(packet)
-{}
-
-prefix_ senf::PacketInterpreterBase::ptr senf::Packet::ptr()
-    const
-{
-    BOOST_ASSERT(packet_);
-    return packet_;
-}
-
 ///////////////////////////////cci.e///////////////////////////////////////
 #undef prefix_