summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2002-11-30 18:33:06 (UTC)
committer mickeyl <mickeyl>2002-11-30 18:33:06 (UTC)
commit2e2bbf823ba532f349ad9ca3dd84cf7f758f36b0 (patch) (side-by-side diff)
treeb554ae6b7f2bd4e7db9b34bf25e85b8f129fa2dd
parent197b74a6193151cca8b7f5f725fb19098cb76eb2 (diff)
downloadopie-2e2bbf823ba532f349ad9ca3dd84cf7f758f36b0.zip
opie-2e2bbf823ba532f349ad9ca3dd84cf7f758f36b0.tar.gz
opie-2e2bbf823ba532f349ad9ca3dd84cf7f758f36b0.tar.bz2
gui should now show newly found stations.
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
@@ -1,126 +1,172 @@
/**********************************************************************
** Copyright (C) 2002 Michael 'Mickey' Lauer. All rights reserved.
**
** This file is part of Opie Environment.
**
** This file may be distributed and/or modified under the terms of the
** GNU General Public License version 2 as published by the Free Software
** Foundation and appearing in the file LICENSE.GPL included in the
** packaging of this file.
**
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
***********************************************************************/
// Qt
#include <qpushbutton.h>
// Standard
#include <unistd.h>
#include <sys/types.h>
// Local
#include "wellenreiter.h"
#include "scanlistitem.h"
#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!
Wellenreiter::Wellenreiter( QWidget* parent, const char* name, WFlags fl )
: WellenreiterBase( parent, name, fl )
{
connect( button, SIGNAL( clicked() ), this, SLOT( buttonClicked() ) );
netview->setColumnWidthMode( 1, QListView::Manual );
//
// setup socket for daemon communication and start poller
//
daemon_fd = commsock( DAEMONADDR, DAEMONPORT );
if ( daemon_fd == -1 )
qDebug( "D'oh! Could not get file descriptor for daemon socket." );
else
startTimer( 700 );
}
Wellenreiter::~Wellenreiter()
{
// no need to delete child widgets, Qt does it all for us
}
void Wellenreiter::handleMessage()
{
// FIXME: receive message and handle it
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." );
+ }
+
}
bool Wellenreiter::hasMessage()
{
+
+ // FIXME: do this in libwellenreiter, not here!!!
+
fd_set rfds;
FD_ZERO( &rfds );
FD_SET( daemon_fd, &rfds );
struct timeval tv;
tv.tv_sec = 0;
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 );
}
void Wellenreiter::timerEvent( QTimerEvent* e )
{
- // qDebug( "checking for message..." );
+ qDebug( "checking for message..." );
if ( hasMessage() )
{
handleMessage();
}
else
{
- // qDebug( "no message :(" );
+ qDebug( "no message :(" );
}
}
-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 )
{
// FIXME: this code belongs in customized QListView, not into this class
// search, if we had an item with this essid once before
QListViewItem* item = netview->firstChild();
while ( item && ( item->text( 0 ) != essid ) )
{
qDebug( "itemtext: %s", (const char*) item->text( 0 ) );
item = item->itemBelow();
}
if ( item )
{
qDebug( "found!" );
new MScanListItem( item, type, essid, ap, wep, channel, signal );
}
else
{
new MScanListItem( netview, type, essid, ap, wep, channel, signal );
}
}
void Wellenreiter::buttonClicked()
{
// FIXME: communicate with daemon and set button text according to state
button->setText( "Stop Scanning" );
// add some icons, so that we can see if this works
- 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
@@ -1,48 +1,48 @@
/**********************************************************************
** Copyright (C) 2002 Michael 'Mickey' Lauer. All rights reserved.
**
** This file is part of Opie Environment.
**
** This file may be distributed and/or modified under the terms of the
** GNU General Public License version 2 as published by the Free Software
** Foundation and appearing in the file LICENSE.GPL included in the
** packaging of this file.
**
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
**********************************************************************/
#ifndef WELLENREITER_H
#define WELLENREITER_H
#include "wellenreiterbase.h"
class QTimerEvent;
class Wellenreiter : public WellenreiterBase {
Q_OBJECT
public:
Wellenreiter( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
~Wellenreiter();
protected:
virtual void timerEvent( QTimerEvent* );
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 );
private:
int daemon_fd; // socket filedescriptor for udp communication socket
bool hasMessage();
void handleMessage();
//void readConfig();
//void writeConfig();
};
#endif