summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/wellenreiter/gui/wellenreiter.cpp58
-rw-r--r--noncore/net/wellenreiter/gui/wellenreiter.h2
2 files changed, 53 insertions, 7 deletions
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp
index afb010c..02a6f76 100644
--- a/noncore/net/wellenreiter/gui/wellenreiter.cpp
+++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp
@@ -30,2 +30,3 @@
#include "../libwellenreiter/source/sock.hh" // <--- ugly path, FIX THIS!
+#include "../libwellenreiter/source/proto.hh" // <--- ugly path, FIX THIS!
#include "../daemon/source/config.hh" // <--- ugly path, FIX THIS!
@@ -61,2 +62,43 @@ void Wellenreiter::handleMessage()
qDebug( "received message from daemon." );
+
+ char buffer[128];
+
+ int result = recvcomm( &daemon_fd, (char*) &buffer, sizeof(buffer) );
+ qDebug( "received %d from recvcomm", result );
+
+/*
+typedef struct {
+ int net_type; 1 = Accesspoint ; 2 = Ad-Hoc
+ int ssid_len; Length of SSID
+ int channel; Channel
+ int wep; 1 = WEP enabled ; 0 = disabled
+ char mac[64]; MAC address of Accesspoint
+ char bssid[128]; BSSID of Accesspoint
+} wl_network_t;
+*/
+
+ if ( result == 1 ) /* new network found */
+ {
+ qDebug( "Sniffer said: new network found." );
+ wl_network_t n;
+ get_network_found( &n, (const char*) &buffer );
+ n.bssid[n.ssid_len] = "\0";
+
+ QString type;
+
+ if ( n.net_type == 1 )
+ type == "managed";
+ else
+ type == "adhoc";
+
+ addNewItem( type, n.bssid, n.mac, n.wep, n.channel, 0 );
+
+ }
+
+ else
+
+ {
+ qDebug( "unknown sniffer command." );
+ }
+
}
@@ -66,2 +108,5 @@ bool Wellenreiter::hasMessage()
{
+
+ // FIXME: do this in libwellenreiter, not here!!!
+
fd_set rfds;
@@ -72,3 +117,4 @@ bool Wellenreiter::hasMessage()
tv.tv_usec = 0;
- return select( 1, &rfds, NULL, NULL, &tv );
+ int result = select( daemon_fd+1, &rfds, NULL, NULL, &tv );
+ return FD_ISSET( daemon_fd, &rfds );
}
@@ -77,3 +123,3 @@ void Wellenreiter::timerEvent( QTimerEvent* e )
{
- // qDebug( "checking for message..." );
+ qDebug( "checking for message..." );
@@ -85,3 +131,3 @@ void Wellenreiter::timerEvent( QTimerEvent* e )
{
- // qDebug( "no message :(" );
+ qDebug( "no message :(" );
}
@@ -89,3 +135,3 @@ void Wellenreiter::timerEvent( QTimerEvent* e )
-void Wellenreiter::addNewStation( QString type, QString essid, QString ap, bool wep, int channel, int signal )
+void Wellenreiter::addNewItem( QString type, QString essid, QString ap, bool wep, int channel, int signal )
{
@@ -122,4 +168,4 @@ void Wellenreiter::buttonClicked()
- addNewStation( "managed", "MyNet", "04:00:20:EF:A6:43", true, 6, 80 );
- addNewStation( "adhoc", "YourNet", "40:03:A3:E7:56:22", false, 11, 30 );
+ addNewItem( "managed", "MyNet", "04:00:20:EF:A6:43", true, 6, 80 );
+ addNewItem( "adhoc", "YourNet", "40:03:A3:E7:56:22", false, 11, 30 );
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.h b/noncore/net/wellenreiter/gui/wellenreiter.h
index b0f41e3..61f7503 100644
--- a/noncore/net/wellenreiter/gui/wellenreiter.h
+++ b/noncore/net/wellenreiter/gui/wellenreiter.h
@@ -35,3 +35,3 @@ public slots:
void buttonClicked();
- void addNewStation( QString type, QString essid, QString ap, bool wep, int channel, int signal );
+ void addNewItem( QString type, QString essid, QString ap, bool wep, int channel, int signal );