now senf could also be located in ../senf

[senf.git] / Packets / DefaultBundle / LlcSnapPacket.cc

diff --git a/Packets/DefaultBundle/LlcSnapPacket.cc b/Packets/DefaultBundle/LlcSnapPacket.cc
index 110b497..ae14712 100644 (file)
--- a/Packets/DefaultBundle/LlcSnapPacket.cc
+++ b/Packets/DefaultBundle/LlcSnapPacket.cc
@@ -1,9 +1,9 @@
 // $Id$
 //
 // Copyright (C) 2007
-// 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
+//     Thorsten Horstmann <tho@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
@@ -36,15 +36,15 @@
 prefix_ void senf::LlcSnapPacketType::dump(packet p, std::ostream & os)
 {
     boost::io::ios_all_saver ias(os);
-    os << "LLC/SNAP\n"
+    os << "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_length: 0x" << std::setw(4) << unsigned(p->type_length()) << "\n";
+       <<     "  LLC\n"
+       <<     "    dsap                  : 0x" << unsigned(p->dsap()) << "\n"
+       <<     "    ssap                  : 0x" << unsigned(p->ssap()) << "\n"
+       <<     "    control id            : 0x" << unsigned(p->ctrl()) << "\n"
+       <<     "  SNAP\n"       
+       <<     "    protocol id           : 0x" << std::setw(6) << unsigned(p->protocolId()) << "\n"
+       <<     "    type/length           : 0x" << std::setw(4) << unsigned(p->type_length()) << "\n";
 }
 
 prefix_ senf::PacketInterpreterBase::factory_t senf::LlcSnapPacketType::nextPacketType(packet p)
@@ -61,14 +61,11 @@ prefix_ senf::PacketInterpreterBase::factory_t senf::LlcSnapPacketType::nextPack
 
 prefix_ void senf::LlcSnapPacketType::finalize(packet p)
 {
-    optional_registry_key_t k = key(p.next());
+    optional_key_t k (key(p.next(nothrow)));
     if (k)
         p->type_length() << k;
-    else
-        if (p.next().is<EthernetPacket>())
-            p->type_length() << p.next().data().size();
-        else
-            p->type_length() << 0;
+    else if (p.next().is<EthernetPacket>())
+        p->type_length() << p.next().data().size();
 }