X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Packets%2FDefaultBundle%2FLlcSnapPacket.cc;h=44424633df61364c86727008dce1559c8baadef3;hb=3863d46dd898b7bc35ea8c6ccd8563b18762a6b6;hp=77378cd27bdfcb0341a2c976dba580ca4a5be802;hpb=15aafcdbb483b75f1b03c45af47d01a2d019c903;p=senf.git

diff --git a/Packets/DefaultBundle/LlcSnapPacket.cc b/Packets/DefaultBundle/LlcSnapPacket.cc
index 77378cd..4442463 100644
--- a/Packets/DefaultBundle/LlcSnapPacket.cc
+++ b/Packets/DefaultBundle/LlcSnapPacket.cc
@@ -1,9 +1,9 @@
-// $Id: EthernetPacket.cc 523 2007-11-16 10:34:57Z tho $
+// $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
@@ -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();
 }