-// $id: EthernetPacket.hh 299 2007-07-10 21:23:49Z g0dil $
+// $Id$
//
// Copyright (C) 2006
// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
-// Stefan Bund <stefan.bund@fokus.fraunhofer.de>
+// Thorsten Horstmann <thorsten.horstmann@fokus.fraunhofer.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
// Custom includes
#include <algorithm>
-#include "Socket/Protocols/Raw/MACAddress.hh"
-#include "Packets/Packets.hh"
+#include "../../Socket/Protocols/Raw/MACAddress.hh"
+#include "../../Packets/Packets.hh"
//#include "EthernetPacket.mpp"
///////////////////////////////hh.p////////////////////////////////////////
*/
struct Parse_Ethernet : public PacketParserBase
{
- typedef Parse_UInt16 Parse_Type;
+# include SENF_FIXED_PARSER()
-# ifndef DOXYGEN
+ SENF_PARSER_FIELD( destination, Parse_MAC );
+ SENF_PARSER_FIELD( source, Parse_MAC );
+ SENF_PARSER_FIELD( type_length, Parse_UInt16 );
- SENF_PACKET_PARSER_INIT(Parse_Ethernet);
-
- SENF_PACKET_PARSER_DEFINE_FIXED_FIELDS(
- ((Field)( destination, Parse_MAC ))
- ((Field)( source, Parse_MAC ))
- ((Field)( type, Parse_Type )) );
-
-# else
-
- Parse_MAC destination();
- Parse_MAC source();
- Parse_Type type();
-
-# endif
+ SENF_PARSER_FINALIZE(Parse_Ethernet);
};
/** \brief EtherType registry
\par Associated registries:
\ref EtherTypes
+ \par Finalize action:
+ Set \a type from type of next packet if found in \ref EtherTypes
+
\ingroup protocolbundle_default
*/
struct EthernetPacketType
: public PacketTypeBase,
public PacketTypeMixin<EthernetPacketType, EtherTypes>
{
+#ifndef DOXYGEN
typedef PacketTypeMixin<EthernetPacketType, EtherTypes> mixin;
typedef ConcretePacket<EthernetPacketType> packet;
typedef Parse_Ethernet parser;
-
+#endif
using mixin::nextPacketRange;
- using mixin::nextPacketType;
using mixin::initSize;
using mixin::init;
- /** \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)
- { return p->type(); }
-
+ static factory_t nextPacketType(packet p);
static void dump(packet p, std::ostream & os);
+ static void finalize(packet p);
};
/** \brief Ethernet packet typedef */
- typedef EthernetPacketType::packet EthernetPacket;
+ typedef ConcretePacket<EthernetPacketType> EthernetPacket;
/** \brief Parse an ethernet VLAN tag
*/
struct Parse_EthVLan : public PacketParserBase
{
- typedef Parse_UIntField < 0, 3 > Parse_Priority;
- typedef Parse_Flag < 3 > Parse_CFI;
- typedef Parse_UIntField < 4, 16 > Parse_VLanId;
- typedef Parse_UInt16 Parse_Type;
-
-# ifndef DOXYGEN
-
- SENF_PACKET_PARSER_INIT(Parse_EthVLan);
-
- SENF_PACKET_PARSER_DEFINE_FIXED_FIELDS(
- ((OverlayField)( priority, Parse_Priority ))
- ((OverlayField)( cfi, Parse_CFI ))
- ((Field )( vlanId, Parse_VLanId ))
- ((Field )( type, Parse_Type )) );
+# include SENF_FIXED_PARSER()
-# else
+ SENF_PARSER_BITFIELD( priority, 3, unsigned );
+ SENF_PARSER_BITFIELD( cfi, 1, bool );
+ SENF_PARSER_BITFIELD( vlanId, 12, unsigned );
- Parse_Priority priority();
- Parse_CFI cfi();
- Parse_VLanId vlanId();
- Parse_Type type();
+ SENF_PARSER_FIELD( type, Parse_UInt16 );
-# endif
+ SENF_PARSER_FINALIZE(Parse_EthVLan);
};
/** \brief Ethernet VLAN tag
\par Associated registries:
\ref EtherTypes
+ \par Finalize action:
+ Set \a type from type of next packet if found in \ref EtherTypes
+
\ingroup protocolbundle_default
*/
struct EthVLanPacketType
: public PacketTypeBase,
public PacketTypeMixin<EthVLanPacketType, EtherTypes>
{
+#ifndef DOXYGEN
typedef PacketTypeMixin<EthVLanPacketType, EtherTypes> mixin;
typedef ConcretePacket<EthVLanPacketType> packet;
typedef Parse_EthVLan parser;
-
+#endif
using mixin::nextPacketRange;
using mixin::nextPacketType;
using mixin::initSize;
{ return p->type(); }
static void dump(packet p, std::ostream & os);
+ static void finalize(packet p);
};
/** \brief Ethernet VLAN tag typedef */
- typedef EthVLanPacketType::packet EthVLanPacket;
-}
+ typedef ConcretePacket<EthVLanPacketType> EthVLanPacket;
+}
///////////////////////////////hh.e////////////////////////////////////////
#endif