// Copyright (C) 2007
// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
+// Thorsten Horstmann <thorsten.horstmann@fokus.fraunhofer.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
#include <fstream>
#include <string>
#include <iomanip>
-#include "Socket/UDPSocketHandle.hh"
-#include "Scheduler/Scheduler.hh"
-#include "Packets/DefaultBundle/EthernetPacket.hh"
-#include "Utils/membind.hh"
+#include <senf/Socket/Protocols/INet.hh>
+#include <senf/Scheduler/Scheduler.hh>
+#include <senf/Packets/DefaultBundle/EthernetPacket.hh>
+#include <senf/Utils/membind.hh>
+#include <senf/Utils/hexdump.hh>
//#include "MCSniffer.mpp"
#define prefix_
///////////////////////////////cc.p////////////////////////////////////////
-namespace {
-
- static const unsigned BLOCK_SIZE = 16;
-
- template <class Iterator>
- void hexdump(Iterator i, Iterator const & i_end, std::ostream& stream)
- {
- unsigned offset (0);
- std::string ascii;
- for (; i != i_end; ++i, ++offset) {
- switch (offset % BLOCK_SIZE) {
- case 0:
- if (!ascii.empty()) {
- stream << " " << ascii << "\n";
- ascii = "";
- }
- stream << " "
- << std::hex << std::setw(4) << std::setfill('0')
- << offset << ' ';
- break;
- case BLOCK_SIZE/2:
- stream << " ";
- ascii += ' ';
- break;
- }
- stream << ' ' << std::hex << std::setw(2) << std::setfill('0')
- << unsigned(*i);
- ascii += (*i >= ' ' && *i < 126) ? *i : '.';
- }
- if (!ascii.empty()) {
- for (; (offset % BLOCK_SIZE) != 0; ++offset) {
- if ((offset % BLOCK_SIZE) == BLOCK_SIZE/2)
- stream << " ";
- stream << " ";
- }
- stream << " " << ascii << "\n";
- }
- stream << std::dec;
- }
-}
-
-
class MCSniffer
{
senf::UDPv4ClientSocketHandle sock;
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);
+ senf::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"
+// comment-column: 40
// End: