From a2ddfcd3b8c29e109fa46fc8a575644ff9aacad9 Mon Sep 17 00:00:00 2001
From: g0dil <g0dil@wiback.org>
Date: Thu, 13 Nov 2008 15:25:01 +0000
Subject: [PATCH] Packets: Add descriptive dump() output to DataPacket
Packets/DefaultBundle: Fix EthernetPacketType::finalize() (don't throw when
no next packet) Scheduler/Console: Add some missing #undef's
---
PPI/Doxyfile | 1 +
Packets/DataPacket.cc | 53 +++++++++++++++++++++++++
Packets/DataPacket.hh | 5 ++-
Packets/DefaultBundle/EthernetPacket.cc | 13 +++---
Scheduler/Console/ParsedCommand.mpp | 8 +++-
5 files changed, 73 insertions(+), 7 deletions(-)
create mode 100644 Packets/DataPacket.cc
diff --git a/PPI/Doxyfile b/PPI/Doxyfile
index 276da6c5..e679a57c 100644
--- a/PPI/Doxyfile
+++ b/PPI/Doxyfile
@@ -4,6 +4,7 @@ PROJECT_NAME = libPPI
GENERATE_TAGFILE = doc/PPI.tag
RECURSIVE = Yes
SHOW_DIRECTORIES = Yes
+EXCLUDE = NetEmu
TAGFILES = \
"$(TOPDIR)/Scheduler/doc/Scheduler.tag" \
diff --git a/Packets/DataPacket.cc b/Packets/DataPacket.cc
new file mode 100644
index 00000000..3aba8ee4
--- /dev/null
+++ b/Packets/DataPacket.cc
@@ -0,0 +1,53 @@
+// $Id$
+//
+// Copyright (C) 2008
+// 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
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the
+// Free Software Foundation, Inc.,
+// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+/** \file
+ \brief DataPacket non-inline non-template implementation */
+
+#include "Packets.hh"
+//#include "DataPacket.ih"
+
+// Custom includes
+
+//#include "DataPacket.mpp"
+#define prefix_
+///////////////////////////////cc.p////////////////////////////////////////
+
+prefix_ void senf::DataPacketType::dump(packet p, std::ostream & os)
+{
+ os << "Payload data (" << p.size() << " bytes)\n";
+}
+
+///////////////////////////////cc.e////////////////////////////////////////
+#undef prefix_
+//#include "DataPacket.mpp"
+
+
+// Local Variables:
+// mode: c++
+// fill-column: 100
+// comment-column: 40
+// c-file-style: "senf"
+// indent-tabs-mode: nil
+// ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// End:
diff --git a/Packets/DataPacket.hh b/Packets/DataPacket.hh
index 8469e9ed..ae2b39e7 100644
--- a/Packets/DataPacket.hh
+++ b/Packets/DataPacket.hh
@@ -47,7 +47,10 @@ namespace senf {
\ingroup packet_module
*/
struct DataPacketType : public PacketTypeBase
- {};
+ {
+ typedef ConcretePacket<DataPacketType> packet;
+ static void dump(packet p, std::ostream & os);
+ };
/** \brief Generic payload-only packet typedef */
typedef ConcretePacket<DataPacketType> DataPacket;
diff --git a/Packets/DefaultBundle/EthernetPacket.cc b/Packets/DefaultBundle/EthernetPacket.cc
index 15ca8f42..78fe56c3 100644
--- a/Packets/DefaultBundle/EthernetPacket.cc
+++ b/Packets/DefaultBundle/EthernetPacket.cc
@@ -67,11 +67,14 @@ prefix_ senf::PacketInterpreterBase::factory_t senf::EthernetPacketType::nextPac
prefix_ void senf::EthernetPacketType::finalize(packet p)
{
- optional_key_t k (key(p.next(nothrow)));
- if (k)
- p->type_length() << k;
- else if (p.next().is<LlcSnapPacket>())
- p->type_length() << p.next().data().size();
+ Packet n (p.next(nothrow));
+ if (n) {
+ optional_key_t k (key(n));
+ if (k)
+ p->type_length() << k;
+ else if (n.is<LlcSnapPacket>())
+ p->type_length() << n.data().size();
+ }
// Do NOT reset type_length if the type is not known ... doing this will destroy read packets
}
diff --git a/Scheduler/Console/ParsedCommand.mpp b/Scheduler/Console/ParsedCommand.mpp
index f444a6b2..a8598faf 100644
--- a/Scheduler/Console/ParsedCommand.mpp
+++ b/Scheduler/Console/ParsedCommand.mpp
@@ -361,12 +361,18 @@ next_type arg ( BOOST_PP_ENUM_BINARY_PARAMS( BOOST_PP_ITERATION(), A, const & a
// ////////////////////////////////////////////////////////////////////////
// Undefine local Macros
+#undef mpp_TrailingBindArgs
+#undef mpp_BindArgs_
+
#undef mpp_TrailingArgs
#undef mpp_Args_
-#undef mpp_TrailingArgTypes
+#undef mpp_ArgTypes
#undef mpp_ArgTypes_
+#undef mpp_TrailingArgTypes
+#undef mpp_TrailingArgTypes_
+
#undef mpp_ArgN
#undef mpp_ArgTypeN
--
GitLab