From 22c098efd225fb362ea099810aa4b8fe3dcf73ec Mon Sep 17 00:00:00 2001
From: tho <tho@wiback.org>
Date: Fri, 19 Dec 2008 13:08:19 +0000
Subject: [PATCH] added new 802.21 Packet Bundle with empty MIH Packet and
moved TLVPacket
---
Packets/80221Bundle/MIHPacket.cc | 47 +++++++++++++++
Packets/80221Bundle/MIHPacket.hh | 57 +++++++++++++++++++
Packets/80221Bundle/MIHPacket.test.cc | 52 +++++++++++++++++
Packets/80221Bundle/Mainpage.dox | 47 +++++++++++++++
Packets/80221Bundle/SConscript | 22 +++++++
.../TLVPacket.cc | 0
.../TLVPacket.ct | 0
.../TLVPacket.hh | 4 +-
.../TLVPacket.test.cc | 0
Packets/80221Bundle/main.test.cc | 49 ++++++++++++++++
10 files changed, 276 insertions(+), 2 deletions(-)
create mode 100644 Packets/80221Bundle/MIHPacket.cc
create mode 100644 Packets/80221Bundle/MIHPacket.hh
create mode 100644 Packets/80221Bundle/MIHPacket.test.cc
create mode 100644 Packets/80221Bundle/Mainpage.dox
create mode 100644 Packets/80221Bundle/SConscript
rename Packets/{MPEGDVBBundle => 80221Bundle}/TLVPacket.cc (100%)
rename Packets/{MPEGDVBBundle => 80221Bundle}/TLVPacket.ct (100%)
rename Packets/{MPEGDVBBundle => 80221Bundle}/TLVPacket.hh (97%)
rename Packets/{MPEGDVBBundle => 80221Bundle}/TLVPacket.test.cc (100%)
create mode 100644 Packets/80221Bundle/main.test.cc
diff --git a/Packets/80221Bundle/MIHPacket.cc b/Packets/80221Bundle/MIHPacket.cc
new file mode 100644
index 000000000..3e173a8aa
--- /dev/null
+++ b/Packets/80221Bundle/MIHPacket.cc
@@ -0,0 +1,47 @@
+// $Id$
+//
+// Copyright (C) 2009
+// Fraunhofer Institute for Open Communication Systems (FOKUS)
+// Competence Center NETwork research (NET), St. Augustin, GERMANY
+// Thorsten Horstmann <tho@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 MIH protocol non-inline non-template implementation */
+
+#include "MIHPacket.hh"
+//#include "MIHPacket.ih"
+
+// Custom includes
+
+
+#define prefix_
+
+
+
+#undef prefix_
+
+
+// Local Variables:
+// mode: c++
+// fill-column: 100
+// c-file-style: "senf"
+// indent-tabs-mode: nil
+// ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
+// End:
diff --git a/Packets/80221Bundle/MIHPacket.hh b/Packets/80221Bundle/MIHPacket.hh
new file mode 100644
index 000000000..2021102bc
--- /dev/null
+++ b/Packets/80221Bundle/MIHPacket.hh
@@ -0,0 +1,57 @@
+// $Id$
+//
+// Copyright (C) 2009
+// Fraunhofer Institute for Open Communication Systems (FOKUS)
+// Competence Center NETwork research (NET), St. Augustin, GERMANY
+// Thorsten Horstmann <tho@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 MIH protocol public header */
+
+#ifndef HH_SENF_Packets_80221Bundle_MIHPacket_
+#define HH_SENF_Packets_80221Bundle_MIHPacket_ 1
+
+// Custom includes
+#include "../../Packets/Packets.hh"
+
+//#include "MIHPacket.mpp"
+///////////////////////////////hh.p////////////////////////////////////////
+
+namespace senf {
+
+}
+
+
+///////////////////////////////hh.e////////////////////////////////////////
+#endif
+#ifndef SENF_PACKETS_DECL_ONLY
+//#include "MIHPacket.cci"
+//#include "MIHPacket.ct"
+//#include "MIHPacket.cti"
+#endif
+
+
+// Local Variables:
+// mode: c++
+// fill-column: 100
+// c-file-style: "senf"
+// indent-tabs-mode: nil
+// ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
+// End:
diff --git a/Packets/80221Bundle/MIHPacket.test.cc b/Packets/80221Bundle/MIHPacket.test.cc
new file mode 100644
index 000000000..9edeabe82
--- /dev/null
+++ b/Packets/80221Bundle/MIHPacket.test.cc
@@ -0,0 +1,52 @@
+// $Id$
+//
+// Copyright (C) 2009
+// Fraunhofer Institute for Open Communication Systems (FOKUS)
+// Competence Center NETwork research (NET), St. Augustin, GERMANY
+// Thorsten Horstmann <tho@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 MIHPacket unit tests */
+
+//#include "MIHPacket.test.hh"
+//#include "MIHPacket.test.ih"
+
+#include "../../Utils/auto_unit_test.hh"
+#include <boost/test/test_tools.hpp>
+
+#include "MIHPacket.hh"
+
+
+#define prefix_
+///////////////////////////////cc.p////////////////////////////////////////
+
+
+
+///////////////////////////////cc.e////////////////////////////////////////
+#undef prefix_
+
+
+// Local Variables:
+// mode: c++
+// fill-column: 100
+// c-file-style: "senf"
+// indent-tabs-mode: nil
+// ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
+// End:
diff --git a/Packets/80221Bundle/Mainpage.dox b/Packets/80221Bundle/Mainpage.dox
new file mode 100644
index 000000000..03f39b9f5
--- /dev/null
+++ b/Packets/80221Bundle/Mainpage.dox
@@ -0,0 +1,47 @@
+// $Id: Mainpage.dox 881 2008-06-20 14:27:37Z g0dil $
+//
+// 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
+// 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.
+
+/** \defgroup protocolbundle_80221 The 802.21 Bundle
+
+ Each protocol consists of several objects
+
+ \li The packet \c typedef symbol. This is the only object explicitly accessed from the outside
+ \li The associated parser object. This is, where the field names are documented
+ \li The internal packet type object
+
+ Below you find a list of the internal packet type object for each of the implemented
+ protocols. You will never use this type directly, however the documentation will reference the
+ packet typedef to use and will document the parser used to parse the packet's fields.
+ */
+
+
+// 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 doc"
+// mode: auto-fill
+// End:
+
diff --git a/Packets/80221Bundle/SConscript b/Packets/80221Bundle/SConscript
new file mode 100644
index 000000000..b2ec091d9
--- /dev/null
+++ b/Packets/80221Bundle/SConscript
@@ -0,0 +1,22 @@
+# -*- python -*-
+
+Import('env')
+import SENFSCons, glob
+
+###########################################################################
+
+sources = SENFSCons.GlobSources()
+
+SENFSCons.StandardTargets(env)
+
+SENFSCons.Object(env,
+ target = '80221Bundle',
+ sources=sources,
+ LIBS = ['Packets', 'Socket', 'Utils'])
+
+SENFSCons.Lib(env,
+ library = 'Packets_80221Bundle',
+ sources = sources[0],
+ no_includes = 1)
+
+SConscript(glob.glob("*/SConscript"))
diff --git a/Packets/MPEGDVBBundle/TLVPacket.cc b/Packets/80221Bundle/TLVPacket.cc
similarity index 100%
rename from Packets/MPEGDVBBundle/TLVPacket.cc
rename to Packets/80221Bundle/TLVPacket.cc
diff --git a/Packets/MPEGDVBBundle/TLVPacket.ct b/Packets/80221Bundle/TLVPacket.ct
similarity index 100%
rename from Packets/MPEGDVBBundle/TLVPacket.ct
rename to Packets/80221Bundle/TLVPacket.ct
diff --git a/Packets/MPEGDVBBundle/TLVPacket.hh b/Packets/80221Bundle/TLVPacket.hh
similarity index 97%
rename from Packets/MPEGDVBBundle/TLVPacket.hh
rename to Packets/80221Bundle/TLVPacket.hh
index f033a4d46..8f9398b59 100644
--- a/Packets/MPEGDVBBundle/TLVPacket.hh
+++ b/Packets/80221Bundle/TLVPacket.hh
@@ -23,8 +23,8 @@
/** \file
\brief TLVPacket public header */
-#ifndef HH_SENF_Packets_MPEGDVBBundle_TLVPacket_
-#define HH_SENF_Packets_MPEGDVBBundle_TLVPacket_ 1
+#ifndef HH_SENF_Packets_80221Bundle_TLVPacket_
+#define HH_SENF_Packets_80221Bundle_TLVPacket_ 1
// Custom includes
#include <algorithm>
diff --git a/Packets/MPEGDVBBundle/TLVPacket.test.cc b/Packets/80221Bundle/TLVPacket.test.cc
similarity index 100%
rename from Packets/MPEGDVBBundle/TLVPacket.test.cc
rename to Packets/80221Bundle/TLVPacket.test.cc
diff --git a/Packets/80221Bundle/main.test.cc b/Packets/80221Bundle/main.test.cc
new file mode 100644
index 000000000..c6b4f2495
--- /dev/null
+++ b/Packets/80221Bundle/main.test.cc
@@ -0,0 +1,49 @@
+// $Id$
+//
+// Copyright (C) 2006
+// 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.
+
+// Definition of non-inline non-template functions
+
+//#include "test.hh"
+//#include "test.ih"
+
+// Custom includes
+#define BOOST_AUTO_TEST_MAIN
+#include "../../Utils/auto_unit_test.hh"
+#include <boost/test/test_tools.hpp>
+
+#define prefix_
+///////////////////////////////cc.p////////////////////////////////////////
+
+
+///////////////////////////////cc.e////////////////////////////////////////
+#undef prefix_
+
+
+// Local Variables:
+// mode: c++
+// fill-column: 100
+// c-file-style: "senf"
+// indent-tabs-mode: nil
+// ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
+// End:
--
GitLab