summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/wellenreiter/gui/wellenreiter.cpp36
1 files changed, 23 insertions, 13 deletions
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp
index 764ef34..0e95b28 100644
--- a/noncore/net/wellenreiter/gui/wellenreiter.cpp
+++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp
@@ -64,262 +64,272 @@ Wellenreiter::Wellenreiter( QWidget* parent, const char* name, WFlags fl )
if ( daemon_fd == -1 )
{
logwindow->log( "(E) Couldn't get file descriptor for commsocket." );
qDebug( "D'oh! Could not get file descriptor for daemon-->gui communication 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;
*/
// qDebug( "Sniffer sent: '%s'", (const char*) buffer );
hexwindow->log( (const char*) &buffer );
if ( result == NETFOUND ) /* new network found */
{
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." );
}
}
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 = 10;
int result = select( daemon_fd+1, &rfds, NULL, NULL, &tv );
if ( result == 0 )
{
return false;
}
else if ( result == -1 )
{
qDebug( "selected returned: %s", strerror( errno ) );
return false;
}
else
return true; //FD_ISSET( daemon_fd, &rfds ); gibbet 'eh nur einen Deskriptor
}
void Wellenreiter::timerEvent( QTimerEvent* e )
{
//qDebug( "checking for message..." );
if ( hasMessage() )
{
//qDebug( "got message from daemon" );
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(...)
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 = static_cast<MScanListItem*> ( netview->firstChild() );
while ( item && ( item->text( 0 ) != essid ) )
{
qDebug( "itemtext: %s", (const char*) item->text( 0 ) );
item = static_cast<MScanListItem*> ( item->itemBelow() );
}
if ( item )
{
// we have already seen this net, check all childs if MAC exists
network = item;
item = static_cast<MScanListItem*> ( item->firstChild() );
assert( item ); // this shouldn't fail
while ( item && ( item->text( 2 ) != macaddr ) )
{
qDebug( "subitemtext: %s", (const char*) item->text( 2 ) );
item = static_cast<MScanListItem*> ( item->itemBelow() );
}
if ( item )
{
// we have already seen this item, it's a dupe
qDebug( "%s is a dupe - ignoring...", (const char*) macaddr );
return;
}
}
else
{
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, "", 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()
{
if ( daemonRunning )
{
logwindow->log( "(i) Daemon has been stopped." );
button->setText( "Start Scanning" );
- // Stop daemon
+ // Stop daemon - ugly for now... later better
- // find out pids of wellenreiterd and orinoco_hopper
+ system( "killall orinoco_hopper" );
+ system( "killall wellenreiterd" );
+ // FIXME: reset the card trying to get into a usable state again
+
+ // for now, just message the user
+
+ QMessageBox::information( this, "Wellenreiter/Opie", "You should reset your\ndevice before using it again." );
}
else
{
+ logwindow->log( "(i) Daemon has been started." );
+ daemonRunning = true;
+ button->setText( "Stop Scanning" );
+
// get configuration from config window
const QString& interface = configwindow->interfaceName->currentText();
const QString& cardtype = configwindow->deviceType->currentText();
const QString& interval = configwindow->hopInterval->cleanText();
if ( ( interface == "<select>" ) || ( cardtype == "<select>" ) )
{
QMessageBox::information( this, "Wellenreiter/Opie", "You must configure your\ndevice before scanning." );
return;
}
- logwindow->log( "(i) Daemon has been started." );
- button->setText( "Stop Scanning" );
-
-#ifdef QWS
-
// set interface into monitor mode
+ /* Global::Execute definitely does not work very well with non-gui stuff! :( */
QString cmdline;
cmdline.sprintf( "iwpriv %s monitor 2", (const char*) interface );
system( cmdline );
cmdline.sprintf( "iwpriv %s monitor 2 1", (const char*) interface );
system( cmdline );
// start channel hopper
cmdline = "orinoco_hopper ";
cmdline += interface;
cmdline += " -i ";
cmdline += interval;
- //qDebug( "execute: %s", (const char*) cmdline );
- Global::execute( cmdline );
+ cmdline += " &";
+ qDebug( "execute: %s", (const char*) cmdline );
+ system( cmdline );
+ qDebug( "done" );
// start daemon
cmdline = "wellenreiterd ";
cmdline += interface;
cmdline += " 3";
- //qDebug( "execute: %s", (const char*) cmdline );
- Global::execute( cmdline );
-#endif
+ cmdline += " &";
- /*
+ qDebug( "execute: %s", (const char*) cmdline );
+ system( cmdline );
+ qDebug( "done" );
+ /*
+
// 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 );
addNewItem( "managed", "Vanille", "04:00:20:EF:A6:23", true, 11, 10 );
addNewItem( "adhoc", "ELAN", "40:03:43:E7:16:22", false, 3, 10 );
addNewItem( "adhoc", "ELAN", "40:03:53:E7:56:62", false, 3, 15 );
addNewItem( "adhoc", "ELAN", "40:03:63:E7:56:E2", false, 3, 20 );
QString command ("98");
//sendcomm( DAEMONADDR, DAEMONPORT, (const char*) command );
*/
}
}