cleaned up some include dependencies

[senf.git] / Examples / Sniffer / Sniffer.cc

diff --git a/Examples/Sniffer/Sniffer.cc b/Examples/Sniffer/Sniffer.cc
index 7f74806..5c81dda 100644 (file)
--- a/Examples/Sniffer/Sniffer.cc
+++ b/Examples/Sniffer/Sniffer.cc
@@ -67,18 +67,19 @@ int loop_main (int argc, char const * argv[])
 class Sniffer
 {
     senf::PacketSocketHandle sock;
+    senf::scheduler::FdEvent event;
 
 public:
     Sniffer(std::string const & interface)
+        : event ("Sniffer", senf::membind(&Sniffer::dumpPacket, this),
+                 sock, senf::scheduler::FdEvent::EV_READ)
     {
         sock.bind(senf::LLSocketAddress(interface));
     }
 
     void run()
     {
-        senf::Scheduler::instance().add(
-            sock, senf::membind(&Sniffer::dumpPacket, this));
-        senf::Scheduler::instance().process();
+        senf::scheduler::process();
     }
 
 private:
@@ -113,11 +114,12 @@ int main(int argc, char const * argv[])
     std::cout << "Registered packets:\n\n";
     senf::dumpPacketRegistries(std::cout);
 
-    if (argc >= 3)
+    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;