X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Packets%2FDefaultBundle%2FEthernetPacket.cc;h=9926efce3489146a66dd5aabec7af0569137ea39;hb=5fc9de05bf3449d30a17f6e4c05115e7e101d228;hp=55513428e26ade782b741f0ca83db049fd623b33;hpb=edaa268609b73b4f48b28c5a7a577b6ffd4cec3b;p=senf.git

diff --git a/Packets/DefaultBundle/EthernetPacket.cc b/Packets/DefaultBundle/EthernetPacket.cc
index 5551342..9926efc 100644
--- a/Packets/DefaultBundle/EthernetPacket.cc
+++ b/Packets/DefaultBundle/EthernetPacket.cc
@@ -1,9 +1,9 @@
 // $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
@@ -27,6 +27,7 @@
 //#include "EthernetPacket.ih"
 
 // Custom includes
+#include "LlcSnapPacket.hh"
 #include <iomanip>
 #include <boost/io/ios_state.hpp>
 
@@ -65,20 +66,19 @@ prefix_ senf::PacketInterpreterBase::factory_t senf::EthernetPacketType::nextPac
         return e ? e->factory() : no_factory();
     }
     if (p->type_length() <= 1500)
-        return EthLlcSnapPacket::factory();
+        return LlcSnapPacket::factory();
     return no_factory();
 }
 
 prefix_ void senf::EthernetPacketType::finalize(packet p)
 {
-    optional_registry_key_t k = key(p.next());
+    optional_registry_key_t k = key(p.next(nothrow));
     if (k)
         p->type_length() << k;
     else
-        if (p.next().is<EthLlcSnapPacket>())
+        if (p.next().is<LlcSnapPacket>())
             p->type_length() << p.next().data().size();
-        else
-            p->type_length() << 0;
+    // 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)
@@ -94,26 +94,7 @@ prefix_ void senf::EthVLanPacketType::dump(packet p, std::ostream & os)
 
 prefix_ void senf::EthVLanPacketType::finalize(packet p)
 {
-    p->type() << key(p.next());
-}
-
-prefix_ void senf::EthLlcSnapPacketType::dump(packet p, std::ostream & os)
-{
-    boost::io::ios_all_saver ias(os);
-    os << "Ethernet LLC/SNAP\n"
-       << std::hex << std::setfill('0')
-       << "  LLC\n"
-       << "    DSAP: 0x" << unsigned(p->dsap()) << "\n"
-       << "    SSAP: 0x" << unsigned(p->ssap()) << "\n"
-       << "    controlId: 0x" << unsigned(p->ctrl()) << "\n"
-       << "  SNAP\n"       
-       << "    ProtocolId: 0x" << std::setw(6) << unsigned(p->protocolId()) << "\n"
-       << "    type      : 0x" << std::setw(4) << unsigned(p->type()) << "\n";
-}
-
-prefix_ void senf::EthLlcSnapPacketType::finalize(packet p)
-{
-    p->type() << key(p.next());
+    p->type() << key(p.next(nothrow));
 }