summaryrefslogtreecommitdiff
path: root/noncore/net/wellenreiter/gui/wellenreiter.cpp
Unidiff
Diffstat (limited to 'noncore/net/wellenreiter/gui/wellenreiter.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/wellenreiter/gui/wellenreiter.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp
index 0e95b28..0fd929f 100644
--- a/noncore/net/wellenreiter/gui/wellenreiter.cpp
+++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp
@@ -40,15 +40,15 @@
40#include "wellenreiter.h" 40#include "wellenreiter.h"
41#include "scanlistitem.h" 41#include "scanlistitem.h"
42#include "logwindow.h" 42#include "logwindow.h"
43#include "hexwindow.h" 43#include "hexwindow.h"
44#include "configwindow.h" 44#include "configwindow.h"
45 45
46#include "../libwellenreiter/source/sock.hh" // <--- ugly path, FIX THIS! 46#include <libwellenreiter/source/wl_sock.hh>
47#include "../libwellenreiter/source/proto.hh" // <--- ugly path, FIX THIS! 47#include <libwellenreiter/source/wl_proto.hh>
48#include "../daemon/source/config.hh" // <--- ugly path, FIX THIS! 48#include <daemon/source/config.hh>
49 49
50Wellenreiter::Wellenreiter( QWidget* parent, const char* name, WFlags fl ) 50Wellenreiter::Wellenreiter( QWidget* parent, const char* name, WFlags fl )
51 : WellenreiterBase( parent, name, fl ), daemonRunning( false ) 51 : WellenreiterBase( parent, name, fl ), daemonRunning( false )
52{ 52{
53 53
54 logwindow->log( "(i) Wellenreiter has been started." ); 54 logwindow->log( "(i) Wellenreiter has been started." );
@@ -57,13 +57,13 @@ Wellenreiter::Wellenreiter( QWidget* parent, const char* name, WFlags fl )
57 netview->setColumnWidthMode( 1, QListView::Manual ); 57 netview->setColumnWidthMode( 1, QListView::Manual );
58 58
59 // 59 //
60 // setup socket for daemon communication and start poller 60 // setup socket for daemon communication and start poller
61 // 61 //
62 62
63 daemon_fd = commsock( GUIADDR, GUIPORT ); 63 daemon_fd = wl_setupsock( GUIADDR, GUIPORT );
64 if ( daemon_fd == -1 ) 64 if ( daemon_fd == -1 )
65 { 65 {
66 logwindow->log( "(E) Couldn't get file descriptor for commsocket." ); 66 logwindow->log( "(E) Couldn't get file descriptor for commsocket." );
67 qDebug( "D'oh! Could not get file descriptor for daemon-->gui communication socket." ); 67 qDebug( "D'oh! Could not get file descriptor for daemon-->gui communication socket." );
68 } 68 }
69 else 69 else
@@ -81,13 +81,13 @@ void Wellenreiter::handleMessage()
81 // FIXME: receive message and handle it 81 // FIXME: receive message and handle it
82 82
83 qDebug( "received message from daemon." ); 83 qDebug( "received message from daemon." );
84 84
85 char buffer[128]; 85 char buffer[128];
86 86
87 int result = recvcomm( &daemon_fd, (char*) &buffer, sizeof(buffer) ); 87 int result = wl_recv( &daemon_fd, (char*) &buffer, sizeof(buffer) );
88 qDebug( "received %d from recvcomm", result ); 88 qDebug( "received %d from recvcomm", result );
89 89
90/* 90/*
91typedef struct { 91typedef struct {
92 int net_type; 1 = Accesspoint ; 2 = Ad-Hoc 92 int net_type; 1 = Accesspoint ; 2 = Ad-Hoc
93 int ssid_len; Length of SSID 93 int ssid_len; Length of SSID