X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Examples%2FMCSniffer%2FMCSniffer.cc;h=896ef3ad904adf461ec6a028e29c36992d2d0335;hb=456ee576285b76aa46240f8001f426757810dcc1;hp=71913ac27d8e93d1856395edf0731764d42c6128;hpb=ceba483d966a9fd884b30fb9dac07156b29a4b31;p=senf.git diff --git a/Examples/MCSniffer/MCSniffer.cc b/Examples/MCSniffer/MCSniffer.cc index 71913ac..896ef3a 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 +// Fraunhofer Institute for Open Communication Systems (FOKUS) +// Competence Center NETwork research (NET), St. Augustin, GERMANY +// Thorsten Horstmann // // 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 #include #include -#include "Socket/Protocols/INet/UDPSocketHandle.hh" -#include "Scheduler/Scheduler.hh" -#include "Packets/DefaultBundle/EthernetPacket.hh" -#include "Utils/membind.hh" -#include "Utils/hexdump.hh" +#include +#include +#include +#include +#include //#include "MCSniffer.mpp" @@ -46,10 +46,10 @@ class MCSniffer std::ostream& stream; public: - MCSniffer(senf::INet4SocketAddress addr, std::ostream& s) + MCSniffer(senf::INet4Address addr, std::ostream& s) : stream(s) { - sock.protocol().bind(addr); + // sock.bind(addr); sock.protocol().mcLoop(true); sock.protocol().mcAddMembership(addr); senf::Scheduler::instance().add( @@ -57,7 +57,7 @@ public: } private: - void dumpPacket(senf::FileHandle /* ignored */, senf::Scheduler::EventId event) + void dumpPacket(senf::Scheduler::EventId event) { std::string data (sock.read()); senf::EthernetPacket packet ( @@ -78,9 +78,9 @@ int main(int argc, char const * argv[]) 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::INet4Address::from_string("233.132.152.2"), f2); senf::Scheduler::instance().process(); }