Skip to content
Snippets Groups Projects
Commit 03f4e54b authored by g0dil's avatar g0dil
Browse files

Packets: Fix VariantParser invalid parser access bug

Clean up all file-defines and remove all tabs
parent c4e687c7
No related branches found
No related tags found
No related merge requests found
Showing with 53 additions and 53 deletions
...@@ -56,7 +56,7 @@ prefix_ MCReader::MCReader(unsigned n, std::string const & name_, ...@@ -56,7 +56,7 @@ prefix_ MCReader::MCReader(unsigned n, std::string const & name_,
UDPSocket::Address const & group) UDPSocket::Address const & group)
: name (name_), socket (), : name (name_), socket (),
event (name, senf::membind(&MCReader::handler, this), socket, event (name, senf::membind(&MCReader::handler, this), socket,
senf::scheduler::FdEvent::EV_READ) senf::scheduler::FdEvent::EV_READ)
{ {
socket.protocol().reuseaddr(true); socket.protocol().reuseaddr(true);
socket.bind(group); socket.bind(group);
...@@ -84,7 +84,7 @@ class MCWriter ...@@ -84,7 +84,7 @@ class MCWriter
public: public:
MCWriter(std::string const & name, UDPSocket::Address const & group, MCWriter(std::string const & name, UDPSocket::Address const & group,
senf::ClockService::clock_type interval); senf::ClockService::clock_type interval);
}; };
prefix_ MCWriter::MCWriter(std::string const & name_, UDPSocket::Address const & group_, prefix_ MCWriter::MCWriter(std::string const & name_, UDPSocket::Address const & group_,
...@@ -163,23 +163,23 @@ int main(int argc, char * argv[]) ...@@ -163,23 +163,23 @@ int main(int argc, char * argv[])
senf::scheduler::SignalEvent sigint (SIGINT, &sigintHandler); senf::scheduler::SignalEvent sigint (SIGINT, &sigintHandler);
UDPSocket::Address g1 ("225.1:43434"); UDPSocket::Address g1 ("225.1:43434");
UDPSocket::Address g2 ("225.2:43434"); UDPSocket::Address g2 ("225.2:43434");
MCReader r1g1 (1u, "r1g1", g1); MCReader r1g1 (1u, "r1g1", g1);
MCReader r2g1 (2u, "r2g1", g1); MCReader r2g1 (2u, "r2g1", g1);
MCReader r1g2 (3u, "r1g2", g2); MCReader r1g2 (3u, "r1g2", g2);
MCReader r2g2 (4u, "r2g2", g2); MCReader r2g2 (4u, "r2g2", g2);
MCWriter w1g1 ("w1g1", g1, senf::ClockService::milliseconds(600)); MCWriter w1g1 ("w1g1", g1, senf::ClockService::milliseconds(600));
MCWriter w2g1 ("w2g1", g1, senf::ClockService::milliseconds(800)); MCWriter w2g1 ("w2g1", g1, senf::ClockService::milliseconds(800));
MCWriter w1g2 ("w1g2", g2, senf::ClockService::milliseconds(700)); MCWriter w1g2 ("w1g2", g2, senf::ClockService::milliseconds(700));
MCWriter w2g2 ("w2g2", g2, senf::ClockService::milliseconds(900)); MCWriter w2g2 ("w2g2", g2, senf::ClockService::milliseconds(900));
senf::scheduler::process(); senf::scheduler::process();
} }
catch (std::exception const & ex) { catch (std::exception const & ex) {
std::cerr << ex.what() << "\n"; std::cerr << ex.what() << "\n";
return 1; return 1;
} }
}; };
......
...@@ -23,8 +23,8 @@ ...@@ -23,8 +23,8 @@
/** \file /** \file
\brief psi2ts.hh public header */ \brief psi2ts.hh public header */
#ifndef HH_psi2ts_ #ifndef HH_SENF_Examples_psi2tsModule_psi2ts_
#define HH_psi2ts_ 1 #define HH_SENF_Examples_psi2tsModule_psi2ts_ 1
// Custom includes // Custom includes
#include <senf/PPI/PPI.hh> #include <senf/PPI/PPI.hh>
......
...@@ -23,8 +23,8 @@ ...@@ -23,8 +23,8 @@
/** \file /** \file
\brief ActiveFeeder public header */ \brief ActiveFeeder public header */
#ifndef HH_ActiveFeeder_ #ifndef HH_SENF_PPI_ActiveFeeder_
#define HH_ActiveFeeder_ 1 #define HH_SENF_PPI_ActiveFeeder_ 1
// Custom includes // Custom includes
#include "Module.hh" #include "Module.hh"
......
...@@ -23,8 +23,8 @@ ...@@ -23,8 +23,8 @@
/** \file /** \file
\brief AnnotationRouter public header */ \brief AnnotationRouter public header */
#ifndef HH_AnnotationRouter_ #ifndef HH_SENF_PPI_AnnotationRouter_
#define HH_AnnotationRouter_ 1 #define HH_SENF_PPI_AnnotationRouter_ 1
// Custom includes // Custom includes
#include <boost/ptr_container/ptr_map.hpp> #include <boost/ptr_container/ptr_map.hpp>
......
...@@ -23,8 +23,8 @@ ...@@ -23,8 +23,8 @@
/** \file /** \file
\brief CloneSource public header */ \brief CloneSource public header */
#ifndef HH_CloneSource_ #ifndef HH_SENF_PPI_CloneSource_
#define HH_CloneSource_ 1 #define HH_SENF_PPI_CloneSource_ 1
// Custom includes // Custom includes
#include "../Packets/Packets.hh" #include "../Packets/Packets.hh"
......
...@@ -23,8 +23,8 @@ ...@@ -23,8 +23,8 @@
/** \file /** \file
\brief Connectors public header */ \brief Connectors public header */
#ifndef HH_Connectors_ #ifndef HH_SENF_PPI_Connectors_
#define HH_Connectors_ 1 #define HH_SENF_PPI_Connectors_ 1
// Custom includes // Custom includes
#include <deque> #include <deque>
......
...@@ -23,8 +23,8 @@ ...@@ -23,8 +23,8 @@
/** \file /** \file
\brief Connectors internal header */ \brief Connectors internal header */
#ifndef IH_Connectors_ #ifndef IH_SENF_PPI_Connectors_
#define IH_Connectors_ 1 #define IH_SENF_PPI_Connectors_ 1
// Custom includes // Custom includes
......
...@@ -23,8 +23,8 @@ ...@@ -23,8 +23,8 @@
/** \file /** \file
\brief DebugEvent public header */ \brief DebugEvent public header */
#ifndef HH_DebugEvent_ #ifndef HH_SENF_PPI_DebugEvent_
#define HH_DebugEvent_ 1 #define HH_SENF_PPI_DebugEvent_ 1
// Custom includes // Custom includes
#include "Events.hh" #include "Events.hh"
......
...@@ -23,8 +23,8 @@ ...@@ -23,8 +23,8 @@
/** \file /** \file
\brief DebugModules public header */ \brief DebugModules public header */
#ifndef HH_DebugModules_ #ifndef HH_SENF_PPI_DebugModules_
#define HH_DebugModules_ 1 #define HH_SENF_PPI_DebugModules_ 1
// Custom includes // Custom includes
#include <deque> #include <deque>
......
...@@ -23,8 +23,8 @@ ...@@ -23,8 +23,8 @@
/** \file /** \file
\brief DiscardSink public header */ \brief DiscardSink public header */
#ifndef HH_DiscardSink_ #ifndef HH_SENF_PPI_DiscardSink_
#define HH_DiscardSink_ 1 #define HH_SENF_PPI_DiscardSink_ 1
// Custom includes // Custom includes
#include "Connectors.hh" #include "Connectors.hh"
......
...@@ -23,8 +23,8 @@ ...@@ -23,8 +23,8 @@
/** \file /** \file
\brief EventManager public header */ \brief EventManager public header */
#ifndef HH_EventManager_ #ifndef HH_SENF_PPI_EventManager_
#define HH_EventManager_ 1 #define HH_SENF_PPI_EventManager_ 1
// Custom includes // Custom includes
#include <boost/ptr_container/ptr_vector.hpp> #include <boost/ptr_container/ptr_vector.hpp>
......
...@@ -23,8 +23,8 @@ ...@@ -23,8 +23,8 @@
/** \file /** \file
\brief Events public header */ \brief Events public header */
#ifndef HH_Events_ #ifndef HH_SENF_PPI_Events_
#define HH_Events_ 1 #define HH_SENF_PPI_Events_ 1
// Custom includes // Custom includes
#include <vector> #include <vector>
......
...@@ -23,8 +23,8 @@ ...@@ -23,8 +23,8 @@
/** \file /** \file
\brief Events internal header */ \brief Events internal header */
#ifndef IH_Events_ #ifndef IH_SENF_PPI_Events_
#define IH_Events_ 1 #define IH_SENF_PPI_Events_ 1
// Custom includes // Custom includes
......
...@@ -18,8 +18,8 @@ ...@@ -18,8 +18,8 @@
// Free Software Foundation, Inc., // Free Software Foundation, Inc.,
// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#ifndef FORWARDSWITCH_HH_ #ifndef HH_SENF_PPI_ForwardSwitch_
#define FORWARDSWITCH_HH_ #define HH_SENF_PPI_ForwardSwitch_
// Custom includes // Custom includes
#include "Connectors.hh" #include "Connectors.hh"
...@@ -51,4 +51,4 @@ private: ...@@ -51,4 +51,4 @@ private:
}}} //namespaces }}} //namespaces
#include "ForwardSwitch.cci" #include "ForwardSwitch.cci"
#endif /*FORWARDSWITCH_HH_*/ #endif /*HH_SENF_PPI_ForwardSwitch_*/
...@@ -23,8 +23,8 @@ ...@@ -23,8 +23,8 @@
/** \file /** \file
\brief IOEvent public header */ \brief IOEvent public header */
#ifndef HH_IOEvent_ #ifndef HH_SENF_PPI_IOEvent_
#define HH_IOEvent_ 1 #define HH_SENF_PPI_IOEvent_ 1
// Custom includes // Custom includes
#include "../Scheduler/Scheduler.hh" #include "../Scheduler/Scheduler.hh"
......
...@@ -23,8 +23,8 @@ ...@@ -23,8 +23,8 @@
/** \file /** \file
\brief IdleEvent public header */ \brief IdleEvent public header */
#ifndef HH_IdleEvent_ #ifndef HH_SENF_PPI_IdleEvent_
#define HH_IdleEvent_ 1 #define HH_SENF_PPI_IdleEvent_ 1
// Custom includes // Custom includes
#include "Events.hh" #include "Events.hh"
......
...@@ -23,8 +23,8 @@ ...@@ -23,8 +23,8 @@
/** \file /** \file
\brief IntervalTimer public header */ \brief IntervalTimer public header */
#ifndef HH_IntervalTimer_ #ifndef HH_SENF_PPI_IntervalTimer_
#define HH_IntervalTimer_ 1 #define HH_SENF_PPI_IntervalTimer_ 1
// Custom includes // Custom includes
#include "../Scheduler/ClockService.hh" #include "../Scheduler/ClockService.hh"
......
...@@ -23,8 +23,8 @@ ...@@ -23,8 +23,8 @@
/** \file /** \file
\brief Joins public header */ \brief Joins public header */
#ifndef HH_Joins_ #ifndef HH_SENF_PPI_Joins_
#define HH_Joins_ 1 #define HH_SENF_PPI_Joins_ 1
// Custom includes // Custom includes
#include <boost/ptr_container/ptr_vector.hpp> #include <boost/ptr_container/ptr_vector.hpp>
......
...@@ -24,8 +24,8 @@ ...@@ -24,8 +24,8 @@
\brief Module public header \brief Module public header
*/ */
#ifndef HH_Module_ #ifndef HH_SENF_PPI_Module_
#define HH_Module_ 1 #define HH_SENF_PPI_Module_ 1
// Custom includes // Custom includes
#include <vector> #include <vector>
......
...@@ -23,8 +23,8 @@ ...@@ -23,8 +23,8 @@
/** \file /** \file
\brief Module internal header */ \brief Module internal header */
#ifndef IH_Module_ #ifndef IH_SENF_PPI_Module_
#define IH_Module_ 1 #define IH_SENF_PPI_Module_ 1
// Custom includes // Custom includes
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment