// $Id$
//
// Copyright (C) 2006
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
-// Stefan Bund <stefan.bund@fokus.fraunhofer.de>
+// Fraunhofer Institute for Open Communication Systems (FOKUS)
//
-// 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
#include <string>
#include <iostream>
#include <iomanip>
-#include "Socket/PacketSocketHandle.hh"
-#include "Scheduler/Scheduler.hh"
-#include "Utils/membind.hh"
-#include "Packets/DefaultBundle/EthernetPacket.hh"
+#include <senf/Socket/Protocols/Raw.hh>
+#include <senf/Utils/membind.hh>
+#include <senf/Utils/hexdump.hh>
+#include <senf/Packets/DefaultBundle/EthernetPacket.hh>
+#include <senf/Scheduler/Scheduler.hh>
//#include "Sniffer.mpp"
#define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
-
-namespace {
-
- static const unsigned BLOCK_SIZE = 16;
-
- template <class Iterator>
- void hexdump(Iterator i, Iterator const & i_end)
- {
- unsigned offset (0);
- std::string ascii;
- for (; i != i_end; ++i, ++offset) {
- switch (offset % BLOCK_SIZE) {
- case 0:
- if (!ascii.empty()) {
- std::cout << " " << ascii << "\n";
- ascii = "";
- }
- std::cout << " "
- << std::hex << std::setw(4) << std::setfill('0')
- << offset << ' ';
- break;
- case BLOCK_SIZE/2:
- std::cout << " ";
- ascii += ' ';
- break;
- }
- std::cout << ' ' << 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)
- std::cout << " ";
- std::cout << " ";
- }
- std::cout << " " << ascii << "\n";
- }
- std::cout << std::dec;
- }
-
-}
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
int loop_main (int argc, char const * argv[])
{
try {
senf::PacketSocketHandle sock;
- sock.bind(senf::LLSocketAddress("eth0"));
+ sock.bind(senf::LLSocketAddress(argv[2]));
// sock.protocol().promisc("eth0",senf::PacketProtocol::Promiscuous);
while (true) { // forever
senf::EthernetPacket packet (senf::EthernetPacket::create(
- senf::EthernetPacket::noinit));
+ senf::noinit));
sock.read(packet.data(),0);
packet.dump(std::cout);
- hexdump(packet.last().data().begin(),
- packet.last().data().end());
+ senf::hexdump(
+ packet.last().data().begin(),
+ packet.last().data().end(),
+ std::cout);
std::cout << "\n\n";
}
}
class Sniffer
{
senf::PacketSocketHandle sock;
+ senf::scheduler::FdEvent event;
public:
- Sniffer(std::string const & interface)
+ Sniffer(std::string const & interface)
+ : event ("Sniffer", senf::membind(&Sniffer::dumpPacket, this),
+ sock, senf::scheduler::FdEvent::EV_READ)
{
- sock.bind(senf::LLSocketAddress(interface));
+ sock.bind(senf::LLSocketAddress(interface));
}
- void run()
+ void run()
{
- senf::Scheduler::instance().add(
- sock, senf::membind(&Sniffer::dumpPacket, this));
- senf::Scheduler::instance().process();
+ senf::scheduler::process();
}
-
+
private:
- void dumpPacket(senf::FileHandle /* ignored */, senf::Scheduler::EventId event)
+ void dumpPacket(int event)
{
senf::EthernetPacket packet (
- senf::EthernetPacket::create(senf::EthernetPacket::noinit));
+ senf::EthernetPacket::create(senf::noinit));
sock.read(packet.data(),0);
packet.dump(std::cout);
- hexdump(packet.last().data().begin(),
- packet.last().data().end());
+ senf::hexdump(
+ packet.last().data().begin(),
+ packet.last().data().end(),
+ std::cout);
std::cout << "\n\n";
}
};
int scheduler_main(int argc, char const * argv[])
{
try {
- Sniffer sniffer ("eth0");
+ Sniffer sniffer (argv[2]);
sniffer.run();
}
catch (std::exception const & ex) {
int main(int argc, char const * argv[])
{
- if (argc >= 2)
+ 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 }" << std::endl;
+ std::cerr << "Usage: sniffer { loop | scheduler } [interface]" << std::endl;
return 1;
}
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
#undef prefix_
//#include "Sniffer.mpp"
projects / senf.git / blobdiff