X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Examples%2FSniffer%2FSniffer.cc;h=b182ca7c4f6a062cfe5ed544e2e2cbad185a69ff;hb=74febc7a9abc84c4939269b3443d15fc27f4e960;hp=0c53e5fb1521bd8b40ba2828eee8dbde6531c496;hpb=1aa319962e09f32d2dfd612ca1854e8d85e443ba;p=senf.git

diff --git a/Examples/Sniffer/Sniffer.cc b/Examples/Sniffer/Sniffer.cc
index 0c53e5f..b182ca7 100644
--- a/Examples/Sniffer/Sniffer.cc
+++ b/Examples/Sniffer/Sniffer.cc
@@ -2,23 +2,29 @@
 //
 // Copyright (C) 2006
 // 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
-// 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):
+//   Stefan Bund <g0dil@berlios.de>
+
 
 // Definition of non-inline non-template functions
 
@@ -37,7 +43,7 @@
 
 //#include "Sniffer.mpp"
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 int loop_main (int argc, char const * argv[])
 {
@@ -67,22 +73,23 @@ 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:
-    void dumpPacket(senf::Scheduler::EventId event)
+    void dumpPacket(int event)
     {
         senf::EthernetPacket packet (
             senf::EthernetPacket::create(senf::noinit));
@@ -110,17 +117,21 @@ 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;
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_
 //#include "Sniffer.mpp"