X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Examples%2FMCSniffer%2FMCSniffer.cc;h=172fea335d84be61df18ea6c8676aba1a7d7ce5d;hb=e3179a2123ad51d0d9eb63834a581145c4f77c92;hp=71913ac27d8e93d1856395edf0731764d42c6128;hpb=ceba483d966a9fd884b30fb9dac07156b29a4b31;p=senf.git

diff --git a/Examples/MCSniffer/MCSniffer.cc b/Examples/MCSniffer/MCSniffer.cc
index 71913ac..172fea3 100644
--- a/Examples/MCSniffer/MCSniffer.cc
+++ b/Examples/MCSniffer/MCSniffer.cc
@@ -1,9 +1,9 @@
 // $Id$
 //
 // Copyright (C) 2007
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
-//     Thorsten Horstmann <thorsten.horstmann@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
@@ -29,35 +29,35 @@
 #include <fstream>
 #include <string>
 #include <iomanip>
-#include "Socket/Protocols/INet/UDPSocketHandle.hh"
-#include "Scheduler/Scheduler.hh"
-#include "Packets/DefaultBundle/EthernetPacket.hh"
-#include "Utils/membind.hh"
-#include "Utils/hexdump.hh"
+#include <senf/Socket/Protocols/INet.hh>
+#include <senf/Scheduler/Scheduler.hh>
+#include <senf/Packets/DefaultBundle/EthernetPacket.hh>
+#include <senf/Utils/membind.hh>
+#include <senf/Utils/hexdump.hh>
 
 
 //#include "MCSniffer.mpp"
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 class MCSniffer
 {
     senf::UDPv4ClientSocketHandle sock;
     std::ostream& stream;
+    senf::scheduler::FdEvent event;
 
 public:
-    MCSniffer(senf::INet4SocketAddress addr, std::ostream& s)
-        : stream(s)
+    MCSniffer(senf::INet4Address addr, std::ostream& s)
+        : stream(s), event("MCSniffer", senf::membind(&MCSniffer::dumpPacket, this),
+                           sock, senf::scheduler::FdEvent::EV_READ)
     {
-        sock.protocol().bind(addr);
+        // sock.bind(addr);
         sock.protocol().mcLoop(true);
         sock.protocol().mcAddMembership(addr);
-        senf::Scheduler::instance().add(
-            sock, senf::membind(&MCSniffer::dumpPacket, this));
     }
 
 private:
-    void dumpPacket(senf::FileHandle /* ignored */, senf::Scheduler::EventId event)
+    void dumpPacket(int event)
     {
         std::string data (sock.read());
         senf::EthernetPacket packet (
@@ -72,17 +72,17 @@ private:
 
 
 int main(int argc, char const * argv[])
-{       
+{
     try {
         std::ofstream f1 ("233.132.152.1.txt");
         std::ofstream f2 ("233.132.152.2.txt");
-        
+
         MCSniffer sniffer1 (
-            senf::INet4SocketAddress("233.132.152.1:22344"), f1);
+            senf::INet4Address::from_string("233.132.152.1"), f1);
         MCSniffer sniffer2 (
-            senf::INet4SocketAddress("233.132.152.2:22344"), f2);
-            
-        senf::Scheduler::instance().process();
+            senf::INet4Address::from_string("233.132.152.2"), f2);
+
+        senf::scheduler::process();
     }
     catch (std::exception const & ex) {
         std::cerr << senf::prettyName(typeid(ex)) << ": " << ex.what() << "\n";
@@ -90,8 +90,8 @@ int main(int argc, char const * argv[])
     return 0;
 }
 
- 
-///////////////////////////////cc.e////////////////////////////////////////
+
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_
 //#include "MCSniffer.mpp"