summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2002-12-09 19:37:47 (UTC)
committer mickeyl <mickeyl>2002-12-09 19:37:47 (UTC)
commit046f040efcb0f313818d1dbb1dc1db9021678175 (patch) (side-by-side diff)
tree7fe87d0cfecc6a61856285e307dfc592bbd55fbd
parent711d8c1af3ebdd6f88ff3e9ffa46624c9b63badd (diff)
downloadopie-046f040efcb0f313818d1dbb1dc1db9021678175.zip
opie-046f040efcb0f313818d1dbb1dc1db9021678175.tar.gz
opie-046f040efcb0f313818d1dbb1dc1db9021678175.tar.bz2
improved display logic
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/wellenreiter/gui/logwindow.cpp1
-rw-r--r--noncore/net/wellenreiter/gui/scanlistitem.cpp6
-rw-r--r--noncore/net/wellenreiter/gui/wellenreiter.cpp81
3 files changed, 65 insertions, 23 deletions
diff --git a/noncore/net/wellenreiter/gui/logwindow.cpp b/noncore/net/wellenreiter/gui/logwindow.cpp
index dafb429..c355f09 100644
--- a/noncore/net/wellenreiter/gui/logwindow.cpp
+++ b/noncore/net/wellenreiter/gui/logwindow.cpp
@@ -23,16 +23,17 @@ MLogWindow::MLogWindow( QWidget * parent, const char * name, WFlags f )
ledit = new QMultiLineEdit( this );
// FIXME: Set properties( font, read-only, etc...)
};
void MLogWindow::log( QString text )
{
QTime time = QTime::currentTime();
QString line;
line.sprintf( "[%s] %s", (const char*) time.toString(), (const char*) text );
ledit->append( line );
+ qDebug( line );
};
diff --git a/noncore/net/wellenreiter/gui/scanlistitem.cpp b/noncore/net/wellenreiter/gui/scanlistitem.cpp
index 189a12d..398b42d 100644
--- a/noncore/net/wellenreiter/gui/scanlistitem.cpp
+++ b/noncore/net/wellenreiter/gui/scanlistitem.cpp
@@ -35,25 +35,29 @@ MScanListItem::MScanListItem( QListView* parent, QString type, QString essid, QS
}
MScanListItem::MScanListItem( QListViewItem* parent, QString type, QString essid, QString macaddr,
bool wep, int channel, int signal )
:QListViewItem( parent, essid, QString::null, macaddr, QString::null, QString::null )
{
qDebug( "creating scanlist item" );
decorateItem( type, essid, macaddr, wep, channel, signal );
}
void MScanListItem::decorateItem( QString type, QString essid, QString macaddr, bool wep, int channel, int signal )
{
- qDebug( "decorating scanlist item" );
+ qDebug( "decorating scanlist item %s / %s / %s [%d]",
+ (const char*) type,
+ (const char*) essid,
+ (const char*) macaddr,
+ channel );
// set icon for managed or adhoc mode
QString name;
name.sprintf( "wellenreiter/%s", (const char*) type );
setPixmap( col_type, Resource::loadPixmap( name ) );
// set icon for wep (wireless encryption protocol)
if ( wep )
setPixmap( col_wep, Resource::loadPixmap( "wellenreiter/cracked" ) ); // rename the pixmap!
// set channel and signal text
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp
index 9c8630f..6d62fa8 100644
--- a/noncore/net/wellenreiter/gui/wellenreiter.cpp
+++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp
@@ -10,24 +10,25 @@
**
** 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 <assert.h>
#include <unistd.h>
#include <sys/types.h>
// Local
#include "wellenreiter.h"
#include "scanlistitem.h"
#include "logwindow.h"
#include "hexwindow.h"
#include "../libwellenreiter/source/sock.hh" // <--- ugly path, FIX THIS!
#include "../libwellenreiter/source/proto.hh" // <--- ugly path, FIX THIS!
@@ -75,46 +76,45 @@ void Wellenreiter::handleMessage()
/*
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;
*/
- qDebug( "Sniffer sent: '%s'", (const char*) &buffer );
+ // qDebug( "Sniffer sent: '%s'", (const char*) buffer );
hexwindow->log( (const char*) &buffer );
if ( result == NETFOUND ) /* new network found */
{
- logwindow->log( "(i) found new network" );
qDebug( "Sniffer said: new network found." );
wl_network_t n;
get_network_found( &n, (char*) &buffer );
qDebug( "Sniffer said: net_type is %d.", n.net_type );
qDebug( "Sniffer said: MAC is %s", (const char*) &n.mac );
//n.bssid[n.ssid_len] = "\0";
QString type;
-
+
if ( n.net_type == 1 )
type = "managed";
else
type = "adhoc";
-
+
addNewItem( type, n.bssid, QString( (const char*) &n.mac ), n.wep, n.channel, 0 );
}
else
{
qDebug( "unknown sniffer command." );
}
}
@@ -129,72 +129,109 @@ bool Wellenreiter::hasMessage()
FD_SET( daemon_fd, &rfds );
struct timeval tv;
tv.tv_sec = 0;
tv.tv_usec = 10;
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..." );
- if ( hasMessage() )
+ int result = hasMessage();
+ qDebug( "hasMessage() returned %d", result );
+
+ if ( result )
{
handleMessage();
}
else
{
qDebug( "no message :(" );
}
}
void Wellenreiter::addNewItem( QString type, QString essid, QString macaddr, bool wep, int channel, int signal )
{
// FIXME: this code belongs in customized QListView, not into this class
+ // FIXME: scanlistitem needs a proper encapsulation and not such a damn dealing with text(...)
- // search, if we had an item with this essid once before
-
- //MScanListItem* item = dynamic_cast<MScanListItem*>( netview->firstChild() );
- MScanListItem* item = static_cast<MScanListItem*>( netview->firstChild() );
+ qDebug( "Wellenreiter::addNewItem( %s / %s / %s [%d]",
+ (const char*) type,
+ (const char*) essid,
+ (const char*) macaddr,
+ channel );
+
+ // search, if we already have seen this net
+
+ QString s;
+ MScanListItem* network;
+ MScanListItem* item = (MScanListItem*) netview->firstChild();
while ( item && ( item->text( 0 ) != essid ) )
{
qDebug( "itemtext: %s", (const char*) item->text( 0 ) );
- item = dynamic_cast<MScanListItem*>( item->itemBelow() );
+ item = item->itemBelow();
}
if ( item )
{
- qDebug( "found!" );
+ // we have already seen this net, check all childs if MAC exists
- // check, if it is the same item (based on MACaddr)
+ network = item;
- if ( macaddr == item->text( 2 ) )
+ item = item->firstChild();
+ assert( item ); // this shouldn't fail
+
+ while ( item && ( item->text( 2 ) != macaddr ) )
{
- qDebug( "already had item with mac %s", (const char*) item->text( 2 ) );
- return;
+ qDebug( "subitemtext: %s", (const char*) item->text( 2 ) );
+ item = item->itemBelow();
}
-
- // another item belonging to the same net, so: insert the new item as child
- new MScanListItem( item, type, essid, macaddr, wep, channel, signal );
+ if ( item )
+ {
+ // we have already seen this item, it's a dupe
+ qDebug( "%s is a dupe - ignoring...", (const char*) macaddr );
+ return;
+ }
}
-
else
{
- qDebug( "inserting new network" );
- MScanListItem* network = new MScanListItem( netview, "networks", essid, QString::null, 0, 0, 0 );
+ s.sprintf( "(i) new network: '%s'", (const char*) essid );
+ logwindow->log( s );
+
+ network = new MScanListItem( netview, "networks", essid, QString::null, 0, 0, 0 );
+ }
+
+
+ // insert new station as child from network
+
+ // no essid to reduce clutter, maybe later we have a nick or stationname to display!?
+
+ qDebug( "inserting new station %s", (const char*) macaddr );
- new MScanListItem( network, type, essid, macaddr, wep, channel, signal );
+ new MScanListItem( network, type, "", macaddr, wep, channel, signal );
+
+ if ( type == "managed" )
+ {
+ s.sprintf( "(i) new AP in '%s' [%d]", (const char*) essid, channel );
+ }
+ else
+ {
+ s.sprintf( "(i) new adhoc station in '%s' [%d]", (const char*) essid, channel );
}
+
+ logwindow->log( s );
+
}
void Wellenreiter::buttonClicked()
{
// FIXME: communicate with daemon and set button text according to state
button->setText( "Stop Scanning" );
// add some test stations, so that we can see if the GUI part works
addNewItem( "managed", "Vanille", "04:00:20:EF:A6:43", true, 6, 80 );