X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Examples%2FSniffer%2FSniffer.cc;h=53cba175a7617ae38a2e0ee5f7363b9d9f0cbbbc;hb=99c145da3884f5c20a74337927ef2cbc073d80d7;hp=f1210a5d202a42727518ccb46b80d5537ec09909;hpb=2c4c9deecc7491fbfc916aeb41074dcb76e8a2c2;p=senf.git

diff --git a/Examples/Sniffer/Sniffer.cc b/Examples/Sniffer/Sniffer.cc
index f1210a5..53cba17 100644
--- a/Examples/Sniffer/Sniffer.cc
+++ b/Examples/Sniffer/Sniffer.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
@@ -29,71 +29,32 @@
 #include <string>
 #include <iostream>
 #include <iomanip>
-#include "Socket/Protocols/PacketSocketHandle.hh"
-#include "Scheduler/Scheduler.hh"
-#include "Utils/membind.hh"
-#include "Packets/DefaultBundle/EthernetPacket.hh"
+#include <senf/Socket/Protocols/Raw.hh>
+#include <senf/Utils/membind.hh>
+#include <senf/Utils/hexdump.hh>
+#include <senf/Packets/DefaultBundle/EthernetPacket.hh>
+#include <senf/Scheduler/Scheduler.hh>
 
 //#include "Sniffer.mpp"
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
-
-namespace {
-
-    static const unsigned BLOCK_SIZE = 16;
-
-    template <class Iterator>
-    void hexdump(Iterator i, Iterator const & i_end)
-    {
-        unsigned offset (0);
-        std::string ascii;
-        for (; i != i_end; ++i, ++offset) {
-            switch (offset % BLOCK_SIZE) {
-            case 0:
-                if (!ascii.empty()) {
-                    std::cout << "  " << ascii << "\n";
-                    ascii = "";
-                }
-                std::cout << "  "
-                          << std::hex << std::setw(4) << std::setfill('0')
-                          << offset << ' ';
-                break;
-            case BLOCK_SIZE/2:
-                std::cout << " ";
-                ascii += ' ';
-                break;
-            }
-            std::cout << ' ' << std::hex << std::setw(2) << std::setfill('0')
-                      << unsigned(*i);
-            ascii += (*i >= ' ' && *i < 126) ? *i : '.';
-        }
-        if (!ascii.empty()) {
-            for (; (offset % BLOCK_SIZE) != 0; ++offset) {
-                if ((offset % BLOCK_SIZE) == BLOCK_SIZE/2)
-                    std::cout << " ";
-                std::cout << "   ";
-            }
-            std::cout << "  " << ascii << "\n";
-        }
-        std::cout << std::dec;
-    }
-
-}
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 int loop_main (int argc, char const * argv[])
 {
     try {
         senf::PacketSocketHandle sock;
-        sock.bind(senf::LLSocketAddress("eth1"));
+        sock.bind(senf::LLSocketAddress(argv[2]));
         // sock.protocol().promisc("eth0",senf::PacketProtocol::Promiscuous);
 
         while (true) { // forever
             senf::EthernetPacket packet (senf::EthernetPacket::create(
-                                             senf::EthernetPacket::noinit));
+                                             senf::noinit));
             sock.read(packet.data(),0);
             packet.dump(std::cout);
-            hexdump(packet.last().data().begin(),
-                    packet.last().data().end());
+            senf::hexdump(
+                    packet.last().data().begin(),
+                    packet.last().data().end(),
+                    std::cout);
             std::cout << "\n\n";
         }
     }
@@ -106,29 +67,32 @@ int loop_main (int argc, char const * argv[])
 class Sniffer
 {
     senf::PacketSocketHandle sock;
+    senf::scheduler::FdEvent event;
 
 public:
-    Sniffer(std::string const & interface) 
+    Sniffer(std::string const & interface)
+        : event ("Sniffer", senf::membind(&Sniffer::dumpPacket, this),
+                 sock, senf::scheduler::FdEvent::EV_READ)
     {
-        sock.bind(senf::LLSocketAddress(interface)); 
+        sock.bind(senf::LLSocketAddress(interface));
     }
 
-    void run() 
+    void run()
     {
-        senf::Scheduler::instance().add(
-            sock, senf::membind(&Sniffer::dumpPacket, this));
-        senf::Scheduler::instance().process();
+        senf::scheduler::process();
     }
-         
+
 private:
-    void dumpPacket(senf::FileHandle /* ignored */, senf::Scheduler::EventId event)
+    void dumpPacket(int event)
     {
         senf::EthernetPacket packet (
-            senf::EthernetPacket::create(senf::EthernetPacket::noinit));
+            senf::EthernetPacket::create(senf::noinit));
         sock.read(packet.data(),0);
         packet.dump(std::cout);
-        hexdump(packet.last().data().begin(),
-                packet.last().data().end());
+        senf::hexdump(
+                packet.last().data().begin(),
+                packet.last().data().end(),
+                std::cout);
         std::cout << "\n\n";
     }
 };
@@ -136,7 +100,7 @@ private:
 int scheduler_main(int argc, char const * argv[])
 {
     try {
-        Sniffer sniffer ("eth1");
+        Sniffer sniffer (argv[2]);
         sniffer.run();
     }
     catch (std::exception const & ex) {
@@ -147,17 +111,21 @@ int scheduler_main(int argc, char const * argv[])
 
 int main(int argc, char const * argv[])
 {
-    if (argc >= 2)
+    std::cout << "Registered packets:\n\n";
+    senf::dumpPacketRegistries(std::cout);
+
+    if (argc >= 3) {
         if (std::string(argv[1]) == "loop")
             return loop_main(argc,argv);
         else if (std::string(argv[1]) == "scheduler")
             return scheduler_main(argc,argv);
+    }
 
-    std::cerr << "Usage: sniffer { loop | scheduler }" << std::endl;
+    std::cerr << "Usage: sniffer { loop | scheduler } [interface]" << std::endl;
     return 1;
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_
 //#include "Sniffer.mpp"