[Guessnet-devel] [svn] r165 - in trunk: . src tests
Enrico Zini
enrico at costa.debian.org
Sat Sep 23 11:42:02 UTC 2006
Author: enrico
Date: Sat Sep 23 11:42:00 2006
New Revision: 165
Removed:
trunk/src/Buffer.cc
trunk/src/Buffer.h
trunk/src/NetBuffer.h
Modified:
trunk/ (props changed)
trunk/src/DHCPScanner.cc
trunk/src/DHCPScanner.h
trunk/src/Makefile.am
trunk/src/NetSender.cc
trunk/src/NetSender.h
trunk/src/NetWatcher.cc
trunk/src/NetWatcher.h
trunk/src/PacketMaker.cc
trunk/src/PacketMaker.h
trunk/src/PeerScanner.cc
trunk/src/PeerScanner.h
trunk/src/TrafficScanner.cc
trunk/tests/Makefile.am
trunk/tests/test-netsender.cc
Log:
r428 at viaza: enrico | 2006-09-23 12:41:48 +0100
Use Buffer and NetBuffer from wibble
Modified: trunk/src/DHCPScanner.cc
==============================================================================
--- trunk/src/DHCPScanner.cc (original)
+++ trunk/src/DHCPScanner.cc Sat Sep 23 11:42:00 2006
@@ -21,7 +21,6 @@
#include "DHCPScanner.h"
#include "PacketMaker.h"
#include "Environment.h"
-#include "NetBuffer.h"
#include <netinet/in.h> // ntohs, htons, ...
@@ -32,6 +31,7 @@
*/
using namespace std;
+using namespace wibble::sys;
void DHCPScanner::handleDHCP(const NetBuffer& dhcp) throw ()
Modified: trunk/src/DHCPScanner.h
==============================================================================
--- trunk/src/DHCPScanner.h (original)
+++ trunk/src/DHCPScanner.h Sat Sep 23 11:42:00 2006
@@ -45,7 +45,7 @@
: Scanner(listener), sender(sender) {}
virtual ~DHCPScanner() throw () {}
- virtual void handleDHCP(const NetBuffer& dhcp) throw ();
+ virtual void handleDHCP(const wibble::sys::NetBuffer& dhcp) throw ();
void addCandidate(const DHCPScan* scan) throw ();
};
Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am (original)
+++ trunk/src/Makefile.am Sat Sep 23 11:42:00 2006
@@ -8,7 +8,6 @@
sbin_PROGRAMS = guessnet guessnet-scan
guessnet_SOURCES = \
- Buffer.cc \
Thread.cc \
Exec.cc \
ChildProcess.cc \
@@ -32,7 +31,6 @@
guessnet_LDADD = @LIBNET_LIBS@ @LIBWIBBLE_LIBS@
guessnet_scan_SOURCES = \
- Buffer.cc \
Thread.cc \
Exec.cc \
ChildProcess.cc \
@@ -51,7 +49,6 @@
INCLUDES=@LIBNET_CFLAGS@ @LIBWIBBLE_CFLAGS@ -DSCRIPTDIR=\"@scriptdir@\" -DCOMPILE_TESTSUITE
EXTRA_DIST = \
- Buffer.h \
ChildProcess.h \
DHCPScanner.h \
Environment.h \
@@ -63,7 +60,6 @@
IFace.h \
IfaceParser.h \
Mutex.h \
- NetBuffer.h \
NetSender.h \
nettypes.h \
NetWatcher.h \
Modified: trunk/src/NetSender.cc
==============================================================================
--- trunk/src/NetSender.cc (original)
+++ trunk/src/NetSender.cc Sat Sep 23 11:42:00 2006
@@ -35,6 +35,7 @@
#define DEBUG(args...) do {} while(0)
using namespace std;
+using namespace wibble::sys;
class NetSenderImpl : public Thread
{
Modified: trunk/src/NetSender.h
==============================================================================
--- trunk/src/NetSender.h (original)
+++ trunk/src/NetSender.h Sat Sep 23 11:42:00 2006
@@ -22,7 +22,7 @@
*/
#include <wibble/exception.h>
-#include "Buffer.h"
+#include <wibble/sys/buffer.h>
#include "nettypes.h"
#include <string>
@@ -87,12 +87,12 @@
libnet_t *getLibnetContext() throw ();
// Send packet once
- void post(Buffer packet) throw ();
+ void post(wibble::sys::Buffer packet) throw ();
// Send packet at regular intervals.
// msinterval: interval between sends (in milliseconds)
// mstimeout: keep sending for mstimeout time (in millisecond)
- void post(Buffer packet, int msinterval, int mstimeout) throw ();
+ void post(wibble::sys::Buffer packet, int msinterval, int mstimeout) throw ();
};
// vim:set ts=4 sw=4:
Modified: trunk/src/NetWatcher.cc
==============================================================================
--- trunk/src/NetWatcher.cc (original)
+++ trunk/src/NetWatcher.cc Sat Sep 23 11:42:00 2006
@@ -35,8 +35,8 @@
#include "Environment.h"
-
using namespace std;
+using namespace wibble::sys;
class NetWatcherImpl : public Thread
{
Modified: trunk/src/NetWatcher.h
==============================================================================
--- trunk/src/NetWatcher.h (original)
+++ trunk/src/NetWatcher.h Sat Sep 23 11:42:00 2006
@@ -22,7 +22,7 @@
*/
#include <wibble/exception.h>
-#include "NetBuffer.h"
+#include <wibble/sys/netbuffer.h>
#include "nettypes.h"
#include <string>
@@ -59,10 +59,10 @@
{
public:
virtual ~PacketListener() {}
- virtual void handleARP(const NetBuffer& pkt) throw () {}
- virtual void handleDHCP(const NetBuffer& pkt) throw () {}
- virtual void handleICMP(const NetBuffer& pkt) throw () {}
- virtual void handleEthernet(const NetBuffer& pkt) throw () {}
+ virtual void handleARP(const wibble::sys::NetBuffer& pkt) throw () {}
+ virtual void handleDHCP(const wibble::sys::NetBuffer& pkt) throw () {}
+ virtual void handleICMP(const wibble::sys::NetBuffer& pkt) throw () {}
+ virtual void handleEthernet(const wibble::sys::NetBuffer& pkt) throw () {}
};
/*
Modified: trunk/src/PacketMaker.cc
==============================================================================
--- trunk/src/PacketMaker.cc (original)
+++ trunk/src/PacketMaker.cc Sat Sep 23 11:42:00 2006
@@ -4,6 +4,7 @@
#include <libnet.h>
}
+using namespace wibble::sys;
static Buffer buffer_from_libnet(libnet_t* ln_context)
{
Modified: trunk/src/PacketMaker.h
==============================================================================
--- trunk/src/PacketMaker.h (original)
+++ trunk/src/PacketMaker.h Sat Sep 23 11:42:00 2006
@@ -1,7 +1,7 @@
#ifndef PACKET_MAKER_H
#define PACKET_MAKER_H
-#include "Buffer.h"
+#include <wibble/sys/buffer.h>
#include "NetSender.h"
#include "nettypes.h"
@@ -13,10 +13,10 @@
public:
PacketMaker(NetSender& sender) : sender(sender) {}
- Buffer makeARPRequest(const IPAddress& ip, const IPAddress& src) throw ();
- Buffer makeARPRequest(const ether_addr& mac, const IPAddress& src) throw ();
- Buffer makePingRequest(const ether_addr& mac, const IPAddress& src) throw ();
- Buffer makeDHCPRequest() throw ();
+ wibble::sys::Buffer makeARPRequest(const IPAddress& ip, const IPAddress& src) throw ();
+ wibble::sys::Buffer makeARPRequest(const ether_addr& mac, const IPAddress& src) throw ();
+ wibble::sys::Buffer makePingRequest(const ether_addr& mac, const IPAddress& src) throw ();
+ wibble::sys::Buffer makeDHCPRequest() throw ();
};
// vim:set ts=4 sw=4:
Modified: trunk/src/PeerScanner.cc
==============================================================================
--- trunk/src/PeerScanner.cc (original)
+++ trunk/src/PeerScanner.cc Sat Sep 23 11:42:00 2006
@@ -33,6 +33,7 @@
*/
using namespace std;
+using namespace wibble::sys;
void PeerScanner::registerWith(NetWatcher& watcher) throw ()
{
Modified: trunk/src/PeerScanner.h
==============================================================================
--- trunk/src/PeerScanner.h (original)
+++ trunk/src/PeerScanner.h Sat Sep 23 11:42:00 2006
@@ -47,8 +47,8 @@
: Scanner(listener), sender(sender) {}
virtual ~PeerScanner() throw () {}
- virtual void handleEthernet(const NetBuffer& arp) throw ();
- virtual void handleARP(const NetBuffer& arp) throw ();
+ virtual void handleEthernet(const wibble::sys::NetBuffer& arp) throw ();
+ virtual void handleARP(const wibble::sys::NetBuffer& arp) throw ();
void addCandidate(const PeerScan* scan) throw ();
Modified: trunk/src/TrafficScanner.cc
==============================================================================
--- trunk/src/TrafficScanner.cc (original)
+++ trunk/src/TrafficScanner.cc Sat Sep 23 11:42:00 2006
@@ -28,6 +28,7 @@
}
using namespace std;
+using namespace wibble::sys;
/*
static string fmt_ip(unsigned int ip) throw ()
Modified: trunk/tests/Makefile.am
==============================================================================
--- trunk/tests/Makefile.am (original)
+++ trunk/tests/Makefile.am Sat Sep 23 11:42:00 2006
@@ -2,7 +2,6 @@
check_PROGRAMS = guessnet-test
guessnet_test_SOURCES = tut-main.cpp
guessnet_test_LDADD = \
- ../src/Buffer.o \
../src/ChildProcess.o \
../src/DHCPScanner.o \
../src/Environment.o \
@@ -18,7 +17,6 @@
../src/Parser.o \
../src/PeerScanner.o \
../src/ProcessRunner.o \
- ../src/Regexp.o \
../src/ScanBag.o \
../src/Scans.o \
../src/ScriptScanner.o \
@@ -52,7 +50,6 @@
test_netsender_LDADD = \
../src/nettypes.o \
../src/Environment.o \
- ../src/Buffer.o \
../src/Thread.o \
../src/IFace.o \
../src/PacketMaker.o \
@@ -64,7 +61,6 @@
test-netwatcher.cc
test_netwatcher_LDADD = \
../src/Environment.o \
- ../src/Buffer.o \
../src/Thread.o \
../src/IFace.o \
../src/NetWatcher.o \
@@ -74,7 +70,6 @@
test-processrunner.cc
test_processrunner_LDADD = \
../src/Environment.o \
- ../src/Buffer.o \
../src/Thread.o \
../src/Exec.o \
../src/ChildProcess.o \
Modified: trunk/tests/test-netsender.cc
==============================================================================
--- trunk/tests/test-netsender.cc (original)
+++ trunk/tests/test-netsender.cc Sat Sep 23 11:42:00 2006
@@ -13,6 +13,7 @@
}
using namespace std;
+using namespace wibble::sys;
class PacketPrinter : public PacketListener
{
More information about the Guessnet-devel
mailing list