X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Sniffer%2FSniffer.cc;h=92239ff8dac1f695cbc568e3b6b1b8e4f36d312c;hb=5a66122a5731349c9361eccac4abaccc89be7d84;hp=f1221b6a9bfa8cc5c003bf9a0f3d2658b5972014;hpb=9fe6349b7a43740872b602ab5ee08c3d19f587dd;p=senf.git diff --git a/Sniffer/Sniffer.cc b/Sniffer/Sniffer.cc index f1221b6..92239ff 100644 --- a/Sniffer/Sniffer.cc +++ b/Sniffer/Sniffer.cc @@ -1,6 +1,6 @@ // $Id$ // -// Copyright (C) 2006 +// Copyright (C) 2006 // Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS) // Kompetenzzentrum fuer Satelitenkommunikation (SatCom) // Stefan Bund @@ -54,8 +54,8 @@ namespace { std::cout << " " << ascii << "\n"; ascii = ""; } - std::cout << " " - << std::hex << std::setw(4) << std::setfill('0') + std::cout << " " + << std::hex << std::setw(4) << std::setfill('0') << offset << ' '; break; case BLOCK_SIZE/2: @@ -63,7 +63,7 @@ namespace { ascii += ' '; break; } - std::cout << ' ' << std::hex << std::setw(2) << std::setfill('0') + std::cout << ' ' << std::hex << std::setw(2) << std::setfill('0') << unsigned(*i); ascii += (*i >= ' ' && *i < 126) ? *i : '.'; } @@ -81,22 +81,22 @@ namespace { void use_em() { // Pull in symbols from the wanted packets ... - satcom::pkf::Packet::create(0,0); - satcom::pkf::Packet::create(0,0); + senf::Packet::create(0,0); + senf::Packet::create(0,0); } } -int main (int argc, char * argv[]) +int main (int argc, char const * argv[]) { try { - satcom::lib::PacketSocketHandle sock; - sock.bind(satcom::lib::LLSocketAddress("eth0")); - // sock.protocol().promisc("eth0",satcom::lib::PacketProtocol::Promiscuous); - + senf::PacketSocketHandle sock; + sock.bind(senf::LLSocketAddress("eth0")); + // sock.protocol().promisc("eth0",senf::PacketProtocol::Promiscuous); + while (true) { // forever std::string data (sock.read()); - satcom::pkf::EthernetPacket::ptr packet ( - satcom::pkf::Packet::create( + senf::EthernetPacket::ptr packet ( + senf::Packet::create( data.begin(), data.end())); packet->dump(std::cout); hexdump(packet->last()->begin(), @@ -104,8 +104,8 @@ int main (int argc, char * argv[]) std::cout << "\n\n"; } } - catch (std::exception & ex) { - std::cerr << satcom::lib::prettyName(typeid(ex)) << ": " << ex.what() << "\n"; + catch (std::exception const & ex) { + std::cerr << senf::prettyName(typeid(ex)) << ": " << ex.what() << "\n"; } } @@ -116,5 +116,8 @@ int main (int argc, char * argv[]) // Local Variables: // mode: c++ -// c-file-style: "satcom" +// fill-column: 100 +// c-file-style: "senf" +// indent-tabs-mode: nil +// ispell-local-dictionary: "american" // End: