// $Id$
//
// Copyright (C) 2006
-// Fraunhofer Institute for Open Communication Systems (FOKUS)
-// Competence Center NETwork research (NET), St. Augustin, GERMANY
+// 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
/** \file
\brief EthernetPacket public header */
-#ifndef HH_EthernetPacket_
-#define HH_EthernetPacket_ 1
+#ifndef HH_SENF_Packets_DefaultBundle_EthernetPacket_
+#define HH_SENF_Packets_DefaultBundle_EthernetPacket_ 1
// Custom includes
#include <algorithm>
: public PacketTypeBase,
public PacketTypeMixin<EthernetPacketType, EtherTypes>
{
-#ifndef DOXYGEN
typedef PacketTypeMixin<EthernetPacketType, EtherTypes> mixin;
typedef ConcretePacket<EthernetPacketType> packet;
typedef EthernetPacketParser parser;
-#endif
+
using mixin::nextPacketRange;
using mixin::initSize;
using mixin::init;
: public PacketTypeBase,
public PacketTypeMixin<EthVLanPacketType, EtherTypes>
{
-#ifndef DOXYGEN
typedef PacketTypeMixin<EthVLanPacketType, EtherTypes> mixin;
typedef ConcretePacket<EthVLanPacketType> packet;
typedef EthVLanPacketParser parser;
-#endif
+
using mixin::nextPacketRange;
using mixin::nextPacketType;
using mixin::initSize;
/** \todo Add LLC/SNAP support -> only use the registry
for type() values >=1536, otherwise expect an LLC header */
- static registry_key_t nextPacketKey(packet p)
+ static key_t nextPacketKey(packet p)
{ return p->type(); }
static void dump(packet p, std::ostream & os);