X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Examples%2FMCSniffer%2FMCSniffer.cc;h=81882a146491950ecd4994cd7cbcf8ebc19d99dc;hb=aeb7c57c3b42e83cb0b429989f9c3ab0900a76a4;hp=252734d772751326ed052f1e4ecd2413bd6c4aed;hpb=739eecfbeffc911e700660864ff1d7f05c6283d0;p=senf.git

diff --git a/Examples/MCSniffer/MCSniffer.cc b/Examples/MCSniffer/MCSniffer.cc
index 252734d..81882a1 100644
--- a/Examples/MCSniffer/MCSniffer.cc
+++ b/Examples/MCSniffer/MCSniffer.cc
@@ -1,24 +1,30 @@
 // $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)
 //
-// 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
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
+// The contents of this file are subject to the Fraunhofer FOKUS Public License
+// Version 1.0 (the "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at 
+// http://senf.berlios.de/license.html
 //
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+// The Fraunhofer FOKUS Public License Version 1.0 is based on, 
+// but modifies the Mozilla Public License Version 1.1.
+// See the full license text for the amendments.
 //
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the
-// Free Software Foundation, Inc.,
-// 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+// Software distributed under the License is distributed on an "AS IS" basis, 
+// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License 
+// for the specific language governing rights and limitations under the License.
+//
+// The Original Code is Fraunhofer FOKUS code.
+//
+// The Initial Developer of the Original Code is Fraunhofer-Gesellschaft e.V. 
+// (registered association), Hansastraße 27 c, 80686 Munich, Germany.
+// All Rights Reserved.
+//
+// Contributor(s):
+//   Thorsten Horstmann <tho@berlios.de>
+
 
 // Definition of non-inline non-template functions
 
@@ -38,26 +44,26 @@
 
 //#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 +78,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 +96,8 @@ int main(int argc, char const * argv[])
     return 0;
 }
 
- 
-///////////////////////////////cc.e////////////////////////////////////////
+
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_
 //#include "MCSniffer.mpp"