// $Id$
//
// Copyright (C) 2006
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
-// Stefan Bund <stefan.bund@fokus.fraunhofer.de>
+// 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
//#include "EthernetPacket.ih"
// Custom includes
+#include "LlcSnapPacket.hh"
#include <iomanip>
#include <boost/io/ios_state.hpp>
prefix_ void senf::EthernetPacketType::dump(packet p, std::ostream & os)
{
boost::io::ios_all_saver ias(os);
- if (p->type() <= 1500)
+ if (p->type_length() <= 1500)
os << "Ethernet 802.3";
- else if (p->type() >= 0x600)
+ else if (p->type_length() >= 0x600)
os << "Ethernet II (DIX)";
else
os << "Ethernet 802.3 (bad ethertype >1500 and <1536)";
os << ": \n"
- << " destination : " << p->destination() << "\n"
- << " source : " << p->source() << "\n"
- << " ethertype : 0x"
- << std::hex << std::setw(4) << std::setfill('0') << p->type() << "\n";
+ << " destination : " << p->destination() << "\n"
+ << " source : " << p->source() << "\n"
+ << " type/length : 0x"
+ << std::hex << std::setw(4) << std::setfill('0') << p->type_length() << "\n";
+}
+
+prefix_ senf::PacketInterpreterBase::factory_t senf::EthernetPacketType::nextPacketType(packet p)
+{
+ if (p->type_length() >= 1536) return lookup(p->type_length());
+ else if (p->type_length() <= 1500) return LlcSnapPacket::factory();
+ else return no_factory();
}
prefix_ void senf::EthernetPacketType::finalize(packet p)
{
- p->type() << key(p.next());
+ 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();
+ // Do NOT reset type_length if the type is not known ... doing this will destroy read packets
}
prefix_ void senf::EthVLanPacketType::dump(packet p, std::ostream & os)
prefix_ void senf::EthVLanPacketType::finalize(packet p)
{
- p->type() << key(p.next());
+ p->type() << key(p.next(nothrow));
}
+
///////////////////////////////cc.e////////////////////////////////////////
#undef prefix_