#include <fstream>
#include <string>
#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"
std::ostream& stream;
public:
- MCSniffer(senf::INet4Address addr, std::ostream& s)
+ MCSniffer(senf::INet4SocketAddress addr, std::ostream& s)
: stream(s)
{
sock.protocol().bind(addr);
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";
}
std::ofstream f2 ("233.132.152.2.txt");
MCSniffer sniffer1 (
- senf::INet4Address::INet4Address("233.132.152.1:22344"), f1);
+ senf::INet4SocketAddress("233.132.152.1:22344"), f1);
MCSniffer sniffer2 (
- senf::INet4Address::INet4Address("233.132.152.2:22344"), f2);
+ senf::INet4SocketAddress("233.132.152.2:22344"), f2);
senf::Scheduler::instance().process();
}
// c-file-style: "senf"
// indent-tabs-mode: nil
// ispell-local-dictionary: "american"
-// compile-command: "scons -u test"
+// compile-command: "scons -u"
+// comment-column: 40
// End: