Socket/Protocols/INet: Updated INet4SocketAddress to use INet4Address

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

diff --git a/Examples/MCSniffer/MCSniffer.cc b/Examples/MCSniffer/MCSniffer.cc
index 7eecb55..8976c3d 100644 (file)
--- a/Examples/MCSniffer/MCSniffer.cc
+++ b/Examples/MCSniffer/MCSniffer.cc
@@ -21,24 +21,17 @@
 
 // Definition of non-inline non-template functions
 
-//#include "Sniffer.hh"
-//#include "Sniffer.ih"
+//#include "MCSniffer.hh"
+//#include "MCSniffer.ih"
 
 // Custom includes
-#include <string>
 #include <fstream>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-#include <sys/ioctl.h>
-#include <linux/sockios.h>
 #include <string>
-#include <iostream>
 #include <iomanip>
-#include "Socket/UDPSocketHandle.hh"
+#include "Socket/Protocols/INet/UDPSocketHandle.hh"
 #include "Scheduler/Scheduler.hh"
+#include "Packets/DefaultBundle/EthernetPacket.hh"
 #include "Utils/membind.hh"
-#include "Packets/EthernetPacket.hh"
 
 
 //#include "MCSniffer.mpp"
@@ -87,32 +80,31 @@ namespace {
 }
 
 
-class MSniffer
+class MCSniffer
 {
     senf::UDPv4ClientSocketHandle sock;
     std::ostream& stream;
 
 public:
-    MSniffer(senf::INet4Address addr, std::ostream& s)
+    MCSniffer(senf::INet4SocketAddress addr, std::ostream& s)
         : stream(s)
     {
         sock.protocol().bind(addr);
         sock.protocol().mcLoop(true);
         sock.protocol().mcAddMembership(addr);
         senf::Scheduler::instance().add(
-            sock, senf::membind(&MSniffer::dumpPacket, this));
+            sock, senf::membind(&MCSniffer::dumpPacket, this));
     }
 
 private:
     void dumpPacket(senf::FileHandle /* ignored */, senf::Scheduler::EventId event)
     {
         std::string data (sock.read());
-        senf::EthernetPacket::ptr packet (
-            senf::Packet::create<senf::EthernetPacket>(
-                data.begin(), data.end()));
-        packet->dump(stream);
-        hexdump(packet->last()->begin(),
-                packet->last()->end(),
+        senf::EthernetPacket packet (
+            senf::EthernetPacket::create(data));
+        packet.dump(stream);
+        hexdump(packet.last().data().begin(),
+                packet.last().data().end(),
                 stream);
         stream << "\n\n";
      }
@@ -125,10 +117,10 @@ int main(int argc, char const * argv[])
         std::ofstream f1 ("233.132.152.1.txt");
         std::ofstream f2 ("233.132.152.2.txt");
         
-        MSniffer sniffer1 (
-            senf::INet4Address::INet4Address("233.132.152.1:22344"), f1);
-        MSniffer sniffer2 (
-            senf::INet4Address::INet4Address("233.132.152.2:22344"), f2);
+        MCSniffer sniffer1 (
+            senf::INet4SocketAddress("233.132.152.1:22344"), f1);
+        MCSniffer sniffer2 (
+            senf::INet4SocketAddress("233.132.152.2:22344"), f2);
             
         senf::Scheduler::instance().process();
     }
@@ -141,7 +133,7 @@ int main(int argc, char const * argv[])
  
 ///////////////////////////////cc.e////////////////////////////////////////
 #undef prefix_
-//#include "Sniffer.mpp"
+//#include "MCSniffer.mpp"
 
 \f
 // Local Variables:
@@ -150,4 +142,6 @@ int main(int argc, char const * argv[])
 // c-file-style: "senf"
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
+// compile-command: "scons -u"
+// comment-column: 40
 // End: