X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Examples%2FSniffer%2FSniffer.cc;h=5c81ddafe82ff4672da82598f9ebdca89c0b043f;hb=834416e1c5669c1687d63e29b8055afe3b44ad63;hp=450b789f740c662b08e1a8550a4a750f0b1a0be0;hpb=9cd0c7d8fc22ecf342c5d2a45980c245b827a67f;p=senf.git

diff --git a/Examples/Sniffer/Sniffer.cc b/Examples/Sniffer/Sniffer.cc
index 450b789..5c81dda 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,11 +29,11 @@
 #include <string>
 #include <iostream>
 #include <iomanip>
-#include "Socket/Protocols/Raw/PacketSocketHandle.hh"
-#include "Scheduler/Scheduler.hh"
-#include "Utils/membind.hh"
-#include "Utils/hexdump.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_
@@ -48,7 +48,7 @@ int loop_main (int argc, char const * argv[])
 
         while (true) { // forever
             senf::EthernetPacket packet (senf::EthernetPacket::create(
-                                             senf::EthernetPacket::noinit));
+                                             senf::noinit));
             sock.read(packet.data(),0);
             packet.dump(std::cout);
             senf::hexdump(
@@ -67,25 +67,26 @@ 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);
         senf::hexdump(
@@ -110,11 +111,15 @@ int scheduler_main(int argc, char const * argv[])
 
 int main(int argc, char const * argv[])
 {
-    if (argc >= 3)
+    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 } [interface]" << std::endl;
     return 1;