1 files changed, 8 insertions, 23 deletions

diff --git a/noncore/net/wellenreiter/gui/wellenreiter.h b/noncore/net/wellenreiter/gui/wellenreiter.h
index ee9dca9..3ec4021 100644
--- a/noncore/net/wellenreiter/gui/wellenreiter.h
+++ b/noncore/net/wellenreiter/gui/wellenreiter.h
@@ -25,19 +25,7 @@ using namespace Opie;
 
-// ugly... not here!
-
-#include <assert.h>
-#include <errno.h>
-#include <unistd.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#include <daemon/source/config.hh>
-#include <libwellenreiter/source/wl_types.hh>
-#include <libwellenreiter/source/wl_sock.hh>
-#include <libwellenreiter/source/wl_proto.hh>
-
 class QTimerEvent;
 class QPixmap;
+class OPacket;
+class OPacketCapturer;
+class OWirelessNetworkInterface;
 class ManufacturerDB;
@@ -55,9 +43,6 @@ class Wellenreiter : public WellenreiterBase {
     MLogWindow* logWindow() const { return logwindow; };
-    bool isDaemonRunning() const { return daemonRunning; };
-
-  protected:
-    bool daemonRunning;
+    bool isDaemonRunning() const { return sniffing; };
 
   public slots:
-    void dataReceived();
+    void receivePacket(OPacket*);
     void startStopClicked();
@@ -65,3 +50,2 @@ class Wellenreiter : public WellenreiterBase {
   private:
-    int daemon_fd;                  // socket filedescriptor for udp communication socket
     #ifdef QWS
@@ -69,7 +53,8 @@ class Wellenreiter : public WellenreiterBase {
     #endif
-    void handleMessage();
 
+    bool sniffing;
+    OWirelessNetworkInterface* iface;
+    OPacketCapturer* pcap;
     ManufacturerDB* manufacturerdb;
     WellenreiterConfigWindow* configwindow;
-    struct sockaddr_in sockaddr;