X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Packets%2FEthernetPacket.cc;h=60c122e04f95a2fdc2188d5865ec0b7c60a86097;hb=0fff17bd2bcdbb1e91e216bf6e1bebc414713548;hp=f0e468e0aa3f28ceb165d44edad0c35dbd9cdf05;hpb=c52cd7d87dbb525c1267aad27391b8b7365dbb57;p=senf.git

diff --git a/Packets/EthernetPacket.cc b/Packets/EthernetPacket.cc
index f0e468e..60c122e 100644
--- a/Packets/EthernetPacket.cc
+++ b/Packets/EthernetPacket.cc
@@ -33,12 +33,11 @@
 ///////////////////////////////cc.p////////////////////////////////////////
 
 namespace {
-    namespace pkf = satcom::pkf;
-    pkf::PacketRegistry<pkf::EtherTypes>::RegistrationProxy<pkf::EthVLanPacket> 
+    senf::PacketRegistry<senf::EtherTypes>::RegistrationProxy<senf::EthVLanPacket> 
         registerEthVLanPacket(0x8100);
 }
 
-prefix_ void satcom::pkf::EthernetPacket::v_nextInterpreter()
+prefix_ void senf::EthernetPacket::v_nextInterpreter()
     const
 {
     // TODO: Add LLC/SNAP support -> only use the registry
@@ -48,7 +47,7 @@ prefix_ void satcom::pkf::EthernetPacket::v_nextInterpreter()
 
 namespace {
     
-    void dumpmac(std::ostream & os, satcom::pkf::EthernetPacket::Parse_MAC mac)
+    void dumpmac(std::ostream & os, senf::EthernetPacket::Parse_MAC mac)
     {
         for (unsigned i = 0; i < 6; ++i) {
             if (i > 0) 
@@ -60,7 +59,7 @@ namespace {
 
 }
 
-prefix_ void satcom::pkf::EthernetPacket::v_dump(std::ostream & os)
+prefix_ void senf::EthernetPacket::v_dump(std::ostream & os)
     const
 {
     if (type() <= 1500)
@@ -80,10 +79,10 @@ prefix_ void satcom::pkf::EthernetPacket::v_dump(std::ostream & os)
        << unsigned(type()) << "\n" << std::dec;
 }
 
-prefix_ void satcom::pkf::EthernetPacket::v_finalize()
+prefix_ void senf::EthernetPacket::v_finalize()
 {}
 
-prefix_ void satcom::pkf::EthVLanPacket::v_nextInterpreter()
+prefix_ void senf::EthVLanPacket::v_nextInterpreter()
     const
 {
     // TODO: Add LLC/SNAP support -> only use the registry
@@ -91,10 +90,10 @@ prefix_ void satcom::pkf::EthVLanPacket::v_nextInterpreter()
     registerInterpreter(type(),begin()+bytes(),end());
 }
 
-prefix_ void satcom::pkf::EthVLanPacket::v_finalize()
+prefix_ void senf::EthVLanPacket::v_finalize()
 {}
 
-prefix_ void satcom::pkf::EthVLanPacket::v_dump(std::ostream & os)
+prefix_ void senf::EthVLanPacket::v_dump(std::ostream & os)
     const
 {
     os << "Ethernet 802.1q (VLAN):\n"
@@ -110,5 +109,5 @@ prefix_ void satcom::pkf::EthVLanPacket::v_dump(std::ostream & os)
 
 // Local Variables:
 // mode: c++
-// c-file-style: "satcom"
+// c-file-style: "senf"
 // End: