- work around yet another g++ 2.x bug

- started work on saving session to xml
[ any classes from libopie I can reuse without too much effort? ]

9 files changed, 118 insertions, 27 deletions

diff --git a/noncore/net/wellenreiter/cornucopia/olistview.cpp b/noncore/net/wellenreiter/cornucopia/olistview.cpp
index bca17b2..8bc59de 100644
--- a/noncore/net/wellenreiter/cornucopia/olistview.cpp
+++ b/noncore/net/wellenreiter/cornucopia/olistview.cpp
@@ -77,186 +77,186 @@ int OListView::addColumn( const QString& label, int width )
     #endif
     return result;
 }
 
 int OListView::addColumn( const QIconSet& iconset, const QString& label, int width )
 {
     int result = QListView::addColumn( iconset, label, width );
     #if QT_VERSION > 290
     if (m_fullWidth) {
         header()->setStretchEnabled( false, columns()-2 );
         header()->setStretchEnabled( true, columns()-1 );
     }
     #endif
     return result;
 }
 
 void OListView::removeColumn( int index )
 {
     QListView::removeColumn(index);
     #if QT_VERSION > 290
     if ( m_fullWidth && index == columns() )
     {
         header()->setStretchEnabled( true, columns()-1 );
     }
     #endif
 }
 
 const QColor& OListView::alternateBackground() const
 {
     return m_alternateBackground;
 }
 
 void OListView::setAlternateBackground( const QColor &c )
 {
     m_alternateBackground = c;
     repaint();
 }
 
 const QPen& OListView::columnSeparator() const
 {
     return m_columnSeparator;
 }
 
 void OListView::setColumnSeparator( const QPen& p )
 {
     m_columnSeparator = p;
     repaint();
 }
 
 //****************************** OListViewItem ***********************************************************************
 
 OListViewItem::OListViewItem(QListView *parent)
   : QListViewItem(parent)
 {
     init();
 }
 
 OListViewItem::OListViewItem(QListViewItem *parent)
   : QListViewItem(parent)
 {
     init();
 }
 
 OListViewItem::OListViewItem(QListView *parent, QListViewItem *after)
   : QListViewItem(parent, after)
 {
     init();
 }
 
 OListViewItem::OListViewItem(QListViewItem *parent, QListViewItem *after)
   : QListViewItem(parent, after)
 {
     init();
 }
 
 OListViewItem::OListViewItem(QListView *parent,
     QString label1, QString label2, QString label3, QString label4,
     QString label5, QString label6, QString label7, QString label8)
   : QListViewItem(parent, label1, label2, label3, label4, label5, label6, label7, label8)
 {
     init();
 }
 
 OListViewItem::OListViewItem(QListViewItem *parent,
     QString label1, QString label2, QString label3, QString label4,
     QString label5, QString label6, QString label7, QString label8)
   : QListViewItem(parent, label1, label2, label3, label4, label5, label6, label7, label8)
 {
     init();
 }
 
 OListViewItem::OListViewItem(QListView *parent, QListViewItem *after,
     QString label1, QString label2, QString label3, QString label4,
     QString label5, QString label6, QString label7, QString label8)
   : QListViewItem(parent, after, label1, label2, label3, label4, label5, label6, label7, label8)
 {
     init();
 }
 
 OListViewItem::OListViewItem(QListViewItem *parent, QListViewItem *after,
     QString label1, QString label2, QString label3, QString label4,
     QString label5, QString label6, QString label7, QString label8)
   : QListViewItem(parent, after, label1, label2, label3, label4, label5, label6, label7, label8)
 {
     init();
 }
 
 OListViewItem::~OListViewItem()
 {
 }
 
 void OListViewItem::init()
 {
     m_known = false;
 }
 
 const QColor &OListViewItem::backgroundColor()
 {
     return isAlternate() ? static_cast<OListView*>(listView())->alternateBackground() :
                            listView()->viewport()->colorGroup().base();
 }
 
 bool OListViewItem::isAlternate()
 {
     OListView *lv = static_cast<OListView*>( listView() );
 
     // check if the item above is an OListViewItem
     OListViewItem *above = static_cast<OListViewItem*>( itemAbove() );
-    /*if (not itemAbove()->inherits( "OListViewItem" )) return false;*/
+    /*if (! itemAbove()->inherits( "OListViewItem" )) return false;*/
 
     // check if we have a valid alternate background color
-    if (not (lv && lv->alternateBackground().isValid())) return false;
+    if (!(lv && lv->alternateBackground().isValid())) return false;
 
     m_known = above ? above->m_known : true;
     if (m_known)
     {
        m_odd = above ? !above->m_odd : false;
     }
     else
     {
         OListViewItem *item;
         bool previous = true;
         if (parent())
         {
             item = static_cast<OListViewItem *>(parent());
             if ( item /*&& item->inherits( "OListViewItem" )*/ ) previous = item->m_odd;
             item = static_cast<OListViewItem *>(parent()->firstChild());
-            /* if !( item.inherits( "OListViewItem" ) item = 0; */
+            /* if ( !item.inherits( "OListViewItem" ) item = 0; */
         }
         else
         {
             item = static_cast<OListViewItem *>(lv->firstChild());
         }
 
         while(item)
         {
             item->m_odd = previous = !previous;
             item->m_known = true;
             item = static_cast<OListViewItem *>(item->nextSibling());
-            /* if !(item.inherits( "OListViewItem" ) ) break; */
+            /* if (!item.inherits( "OListViewItem" ) ) break; */
         }
     }
     return m_odd;
 }
 
 void OListViewItem::paintCell(QPainter *p, const QColorGroup &cg, int column, int width, int alignment)
 {
     QColorGroup _cg = cg;
     const QPixmap *pm = listView()->viewport()->backgroundPixmap();
     if (pm && !pm->isNull())
     {
         _cg.setBrush(QColorGroup::Base, QBrush(backgroundColor(), *pm));
         p->setBrushOrigin( -listView()->contentsX(), -listView()->contentsY() );
     }
     else if ( isAlternate() )
     {
         _cg.setColor( QColorGroup::Base, static_cast<OListView*>( listView() )->alternateBackground() );
     }
     QListViewItem::paintCell(p, _cg, column, width, alignment);
 
     //FIXME: Use styling here?
 
     const QPen& pen = static_cast<OListView*>( listView() )->columnSeparator();
     p->setPen( pen );
     p->drawLine( width-1, 0, width-1, height() );
 }
diff --git a/noncore/net/wellenreiter/gui/mainwindow.cpp b/noncore/net/wellenreiter/gui/mainwindow.cpp
index cb003dd..e388fc5 100644
--- a/noncore/net/wellenreiter/gui/mainwindow.cpp
+++ b/noncore/net/wellenreiter/gui/mainwindow.cpp
@@ -1,198 +1,240 @@
 /**********************************************************************
 ** 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.
 **
 **********************************************************************/
 
 #include "configwindow.h"
 #include "logwindow.h"
 #include "mainwindow.h"
 #include "wellenreiter.h"
 
 #include "scanlist.h"
 
 #include <qcombobox.h>
 #include <qfile.h>
 #include <qiconset.h>
 #include <qmenubar.h>
+#include <qmessagebox.h>
 #include <qpopupmenu.h>
 #include <qstatusbar.h>
 #include <qtextstream.h>
 #include <qtoolbutton.h>
 
 #ifdef QWS
 #include <qpe/resource.h>
 #else
 #include "resource.h"
 #endif
 
 WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * name, WFlags f )
            :QMainWindow( parent, name, f )
 {
     cw = new WellenreiterConfigWindow( this );
     mw = new Wellenreiter( this );
     mw->setConfigWindow( cw );
     setCentralWidget( mw );
 
     // setup icon sets
 
     infoIconSet = new QIconSet( Resource::loadPixmap( "wellenreiter/InfoIcon" ) );
     settingsIconSet = new QIconSet( Resource::loadPixmap( "wellenreiter/SettingsIcon" ) );
     #ifdef QWS
     searchIconSet = new QIconSet( Resource::loadPixmap( "wellenreiter/SearchIcon" ) );
     cancelIconSet = new QIconSet( Resource::loadPixmap( "wellenreiter/CancelIcon" ) );
     #else
     startStopIconSet = new QIconSet();
     startStopIconSet->setPixmap( Resource::loadPixmap( "wellenreiter/SearchIcon" ), QIconSet::Automatic, QIconSet::Normal, QIconSet::Off );
     startStopIconSet->setPixmap( Resource::loadPixmap( "wellenreiter/CancelIcon" ), QIconSet::Automatic, QIconSet::Normal, QIconSet::On );
     #endif
 
     // setup tool buttons
 
     startStopButton = new QToolButton( 0 );
+    #ifdef QWS
     startStopButton->setAutoRaise( true );
+    #endif
     #ifdef QWS
     startStopButton->setOnIconSet( *cancelIconSet );
     startStopButton->setOffIconSet( *searchIconSet );
     #else
     startStopButton->setIconSet( *startStopIconSet );
     #endif
     startStopButton->setToggleButton( true );
     connect( startStopButton, SIGNAL( clicked() ), mw, SLOT( startStopClicked() ) );
     startStopButton->setEnabled( false );
 
     QToolButton* c = new QToolButton( 0 );
+    #ifdef QWS
     c->setAutoRaise( true );
+    #endif
     c->setIconSet( *infoIconSet );
     c->setEnabled( false );
 
     QToolButton* d = new QToolButton( 0 );
+    #ifdef QWS
     d->setAutoRaise( true );
+    #endif
     d->setIconSet( *settingsIconSet );
     connect( d, SIGNAL( clicked() ), this, SLOT( showConfigure() ) );
 
     // setup menu bar
 
     int id;
 
     QMenuBar* mb = menuBar();
 
     QPopupMenu* fileSave = new QPopupMenu( mb );
+    fileSave->insertItem( "&Session", this, SLOT( fileSaveSession() ) );
     fileSave->insertItem( "&Log", this, SLOT( fileSaveLog() ) );
 
+    QPopupMenu* fileLoad = new QPopupMenu( mb );
+    fileLoad->insertItem( "&Session", this, SLOT( fileLoadSession() ) );
+    fileLoad->insertItem( "&Log", this, SLOT( fileLoadLog() ) );
+
     QPopupMenu* file = new QPopupMenu( mb );
-    id = file->insertItem( "&Load" );
+    id = file->insertItem( "&Load", fileLoad );
     file->setItemEnabled( id, false );
     file->insertItem( "&Save", fileSave );
 
     QPopupMenu* view = new QPopupMenu( mb );
     view->insertItem( "&Configure..." );
 
     QPopupMenu* sniffer = new QPopupMenu( mb );
     sniffer->insertItem( "&Configure..." );
     sniffer->insertSeparator();
 
     QPopupMenu* demo = new QPopupMenu( mb );
     demo->insertItem( "&Add something", this, SLOT( demoAddStations() ) );
 
     id = mb->insertItem( "&File", file );
     id = mb->insertItem( "&View", view );
     mb->setItemEnabled( id, false );
     id = mb->insertItem( "&Sniffer", sniffer );
     mb->setItemEnabled( id, false );
     id = mb->insertItem( "&Demo", demo );
     mb->setItemEnabled( id, true );
 
     #ifdef QWS
     mb->insertItem( startStopButton );
     mb->insertItem( c );
     mb->insertItem( d );
     #else // Qt3 changed the insertion order. It's now totally random :(
     mb->insertItem( d );
     mb->insertItem( c );
     mb->insertItem( startStopButton );
     #endif
 
     // setup status bar (for now only on X11)
 
     #ifndef QWS
     statusBar()->message( "Ready." );
     #endif
 
 };
 
 void WellenreiterMainWindow::showConfigure()
 {
     qDebug( "show configure..." );
     cw->setCaption( tr( "Configure" ) );
     #ifdef QWS
     cw->showMaximized();
     #endif
     int result = cw->exec();
 
     if ( result )
     {
         // check configuration from config window
 
         const QString& interface = cw->interfaceName->currentText();
         const int cardtype = cw->daemonDeviceType();
         const int interval = cw->daemonHopInterval();
 
         if ( ( interface != "<select>" ) && ( cardtype != 0 ) )
             startStopButton->setEnabled( true );
             //TODO ...
         else
             startStopButton->setEnabled( false );
             //TODO ...
     }
 }
 
 WellenreiterMainWindow::~WellenreiterMainWindow()
 {
 
     delete infoIconSet;
     delete settingsIconSet;
     #ifdef QWS
     delete searchIconSet;
     delete cancelIconSet;
     #else
     delete startStopIconSet;
     #endif
 
 };
 
 void WellenreiterMainWindow::demoAddStations()
 {
-    mw->netView()->addNewItem( "managed", "Vanille", "04:00:20:EF:A6:43", true, 6, 80 );
-    mw->netView()->addNewItem( "managed", "Vanille", "04:00:20:EF:A6:23", true, 11, 10 );
-    mw->netView()->addNewItem( "adhoc", "ELAN", "40:03:43:E7:16:22", false, 3, 10 );
-    mw->netView()->addNewItem( "adhoc", "ELAN", "40:03:53:E7:56:62", false, 3, 15 );
-    mw->netView()->addNewItem( "adhoc", "ELAN", "40:03:63:E7:56:E2", false, 3, 20 );
+    mw->netView()->addNewItem( "managed", "Vanille", "00:00:20:EF:A6:43", true, 6, 80 );
+    mw->netView()->addNewItem( "managed", "Vanille", "00:00:1c:EF:A6:23", true, 11, 10 );
+    mw->netView()->addNewItem( "adhoc", "ELAN", "00:A0:F8:E7:16:22", false, 3, 10 );
+    mw->netView()->addNewItem( "adhoc", "ELAN", "00:AA:01:E7:56:62", false, 3, 15 );
+    mw->netView()->addNewItem( "adhoc", "ELAN", "00:B0:8E:E7:56:E2", false, 3, 20 );
 }
 
 void WellenreiterMainWindow::fileSaveLog()
 {
     const QString fname( "/tmp/log.txt" );
     QFile f( fname );
     if ( f.open(IO_WriteOnly) )
     {
         QTextStream t( &f );
         t << mw->logWindow()->getLog();
         f.close();
-        qDebug( "saved log in file '%s'", (const char*) fname );
+        qDebug( "Saved log to file '%s'", (const char*) fname );
+    }
+    else
+    {
+        qDebug( "Problem saving log to file '%s'", (const char*) fname );
+    }
+
+}
+
+void WellenreiterMainWindow::fileSaveSession()
+{
+    const QString fname( "/tmp/session.xml" );
+    QFile f( fname );
+    if ( f.open(IO_WriteOnly) )
+    {
+        QTextStream t( &f );
+        mw->netView()->dump( t );
+        f.close();
+        qDebug( "Saved session to file '%s'", (const char*) fname );
     }
     else
     {
-        qDebug( "Problem saving log in file '%s'", (const char*) fname );
+        qDebug( "Problem saving session to file '%s'", (const char*) fname );
     }
+}
 
-}
\ No newline at end of file
+void WellenreiterMainWindow::closeEvent( QCloseEvent* e )
+{
+    if ( mw->isDaemonRunning() )
+    {
+        QMessageBox::warning( this, "Wellenreiter/Opie", "Sniffing in progress!\nPlease stop sniffing before closing." );
+        e->ignore();
+    }
+    else
+    {
+        QMainWindow::closeEvent( e );
+    }
+}
diff --git a/noncore/net/wellenreiter/gui/mainwindow.h b/noncore/net/wellenreiter/gui/mainwindow.h
index 03aa08a..8bfccf3 100644
--- a/noncore/net/wellenreiter/gui/mainwindow.h
+++ b/noncore/net/wellenreiter/gui/mainwindow.h
@@ -1,52 +1,56 @@
 /**********************************************************************
 ** 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 MAINWINDOW_H
 #define MAINWINDOW_H
 
 #include <qmainwindow.h>
 
 class Wellenreiter;
 class WellenreiterConfigWindow;
 class QIconSet;
 class QToolButton;
 
 class WellenreiterMainWindow: public QMainWindow
 {
   Q_OBJECT
 
   public:
     WellenreiterMainWindow( QWidget * parent = 0, const char * name = "mainwindow", WFlags f = 0 );
     ~WellenreiterMainWindow();
 
   protected:
     Wellenreiter* mw;
     WellenreiterConfigWindow* cw;
 
     QIconSet* startStopIconSet;
     const QIconSet* searchIconSet;
     const QIconSet* infoIconSet;
     const QIconSet* settingsIconSet;
     const QIconSet* cancelIconSet;
 
     QToolButton* startStopButton;
 
+  protected:
+    virtual void closeEvent( QCloseEvent* );
+
   public slots:
     void showConfigure();
     void demoAddStations();
     void fileSaveLog();
+    void fileSaveSession();
 };
 
 #endif
diff --git a/noncore/net/wellenreiter/gui/scanlist.cpp b/noncore/net/wellenreiter/gui/scanlist.cpp
index 6d3469c..cdc2c48 100644
--- a/noncore/net/wellenreiter/gui/scanlist.cpp
+++ b/noncore/net/wellenreiter/gui/scanlist.cpp
@@ -1,153 +1,167 @@
 /**********************************************************************
 ** 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.
 **
 **********************************************************************/
 
 #include "scanlist.h"
 #include "scanlistitem.h"
 
 #include <assert.h>
 
 #include "manufacturers.h"
 
+#include <qtextstream.h>
+
 MScanListView::MScanListView( QWidget* parent, const char* name )
               :OListView( parent, name ), _manufacturerdb( 0 )
 {
 
     setFrameShape( QListView::StyledPanel );
     setFrameShadow( QListView::Sunken );
-    
+
     addColumn( tr( "Net/Station" ) );
     setColumnAlignment( 0, AlignLeft || AlignVCenter );
     addColumn( tr( "B" ) );
     setColumnAlignment( 1, AlignCenter );
     addColumn( tr( "AP" ) );
     setColumnAlignment( 2, AlignCenter );
     addColumn( tr( "Chn" ) );
     setColumnAlignment( 3, AlignCenter );
     addColumn( tr( "W" ) );
     setColumnAlignment( 4, AlignCenter );
     addColumn( tr( "T" ) );
     setColumnAlignment( 5, AlignCenter );
     addColumn( tr( "Manufacturer" ) );
     setColumnAlignment( 6, AlignCenter );
     addColumn( tr( "First Seen" ) );
     setColumnAlignment( 7, AlignCenter );
     addColumn( tr( "Last Seen" ) );
     setColumnAlignment( 8, AlignCenter );
     setRootIsDecorated( true );
     setAllColumnsShowFocus( true );
 };
     
 MScanListView::~MScanListView()
 {
 };
 
 void MScanListView::setManufacturerDB( ManufacturerDB* manufacturerdb )
 {
     _manufacturerdb = manufacturerdb;
 }
 
 void MScanListView::addNewItem( QString type, QString essid, QString macaddr, bool wep, int channel, int signal )
 {
     // FIXME: scanlistitem needs a proper encapsulation and not such a damn dealing with text(...)
 
         qDebug( "MScanList::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*> ( firstChild() );
 
     while ( item && ( item->text( 0 ) != essid ) )
     {
         qDebug( "itemtext: %s", (const char*) item->text( 0 ) );
         item = static_cast<MScanListItem*> ( item->itemBelow() );
     }
     if ( item )
     {
         // animate the item
         
         /*
         
         const QPixmap* pixmap = item->pixmap( 0 );
         const QPixmap* nextpixmap = ani2;
         if ( pixmap == ani1 )
             nextpixmap = ani2;
         else if ( pixmap == ani2 )
             nextpixmap = ani3;
         else if ( pixmap == ani3 )
             nextpixmap = ani4;
         else if ( pixmap == ani4 )
             nextpixmap = ani1;
         item->setPixmap( 0, *nextpixmap ); */
         
         //qDebug( "current pixmap %d, next %d", pixmap, nextpixmap );
         
         // 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
             #ifdef DEBUG
             qDebug( "%s is a dupe - ignoring...", (const char*) macaddr );
             #endif
             item->receivedBeacon();
             return;
         }
     }
     else
     {
         s.sprintf( "(i) new network: '%s'", (const char*) essid );
-        
+
         network = new MScanListItem( this, "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 );
-    
+
     MScanListItem* station = new MScanListItem( network, type, "", macaddr, wep, channel, signal );
     if ( _manufacturerdb )
         station->setManufacturer( _manufacturerdb->lookup( macaddr ) );
 
     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 );
     }
-    
+
 }
 
+void MScanListView::dump( QTextStream& t ) const
+{
+    qDebug( "dumping scanlist..." );
+
+    QListViewItemIterator it( const_cast<MScanListView*>( this ) );
+    for ( ; it.current(); ++it )
+    {
+        static_cast<MScanListItem*>( it.current() )->dump( t );
+    }
+
+    qDebug( "dump finished." );
+}
diff --git a/noncore/net/wellenreiter/gui/scanlist.h b/noncore/net/wellenreiter/gui/scanlist.h
index 475f7b6..f06f251 100644
--- a/noncore/net/wellenreiter/gui/scanlist.h
+++ b/noncore/net/wellenreiter/gui/scanlist.h
@@ -1,44 +1,46 @@
 /**********************************************************************
 ** 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 SCANLIST_H
 #define SCANLIST_H
 
 #include <cornucopia/olistview.h>
 
-class QString;
+#include <qtextstream.h>
 
+class QString;
 class ManufacturerDB;
 
 class MScanListView: public OListView
 {
   Q_OBJECT
-  
+
   public:
     MScanListView( QWidget* parent = 0, const char* name = 0 );
     virtual ~MScanListView();
-  
+
     void setManufacturerDB( ManufacturerDB* manufacturerdb );
-  
+    void dump( QTextStream& t ) const;
+
   public slots:
     void addNewItem( QString type, QString essid, QString macaddr, bool wep, int channel, int signal );
     
   private:
     ManufacturerDB* _manufacturerdb;
 
 };
 
 #endif
 
diff --git a/noncore/net/wellenreiter/gui/scanlistitem.cpp b/noncore/net/wellenreiter/gui/scanlistitem.cpp
index bfa7aa9..4aecd2b 100644
--- a/noncore/net/wellenreiter/gui/scanlistitem.cpp
+++ b/noncore/net/wellenreiter/gui/scanlistitem.cpp
@@ -1,102 +1,121 @@
 /**********************************************************************
 ** 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.
 **
 **********************************************************************/
 
 #include "scanlistitem.h"
 #include <assert.h>
 #include <qdatetime.h>
 #include <qpixmap.h>
 
 #ifdef QWS
 #include <qpe/resource.h>
 #else
 #include "resource.h"
 #endif
 
 const int col_type = 0;
 const int col_essid = 0;
 const int col_sig = 1;
 const int col_ap = 2;
 const int col_channel = 3;
 const int col_wep = 4;
 const int col_traffic = 5;
 const int col_manuf = 6;
 const int col_firstseen = 7;
 const int col_lastseen = 8;
 
 MScanListItem::MScanListItem( QListView* parent, QString type, QString essid, QString macaddr,
                               bool wep, int channel, int signal )
                :OListViewItem( parent, essid, QString::null, macaddr, QString::null, QString::null ),
                 _type( type ), _essid( essid ), _macaddr( macaddr ), _wep( wep ),
                 _channel( channel ), _signal( signal ), _beacons( 0 )
 {
     qDebug( "creating scanlist item" );
     decorateItem( type, essid, macaddr, wep, channel, signal );
 }
 
 MScanListItem::MScanListItem( QListViewItem* parent, QString type, QString essid, QString macaddr,
                               bool wep, int channel, int signal )
                :OListViewItem( 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 %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" ) ); //FIXME: rename the pixmap!
 
     // set channel and signal text
 
     if ( signal != -1 )
         setText( col_sig, QString::number( signal ) );
     if ( channel != -1 )
         setText( col_channel, QString::number( channel ) );
 
     setText( col_firstseen, QTime::currentTime().toString() );
     //setText( col_lastseen, QTime::currentTime().toString() );
 
     listView()->triggerUpdate();
 
     this->type = type;
-
+    _type = type;
+    _essid = essid;
+    _macaddr = macaddr;
+    _channel = channel;
+    _beacons = 0;
+    _signal = 0;
 }
 
 void MScanListItem::setManufacturer( const QString& manufacturer )
 {
     setText( col_manuf, manufacturer );
 }
 
 void MScanListItem::receivedBeacon()
 {
     _beacons++;
     #ifdef DEBUG
     qDebug( "MScanListItem %s: received beacon #%d", (const char*) _macaddr, _beacons );
     #endif
     setText( col_sig, QString::number( _beacons ) );
     setText( col_lastseen, QTime::currentTime().toString() );
 }
+
+void MScanListItem::dump( QTextStream& t ) const
+{
+    qDebug( "dumping scanlistitem at <%d>", this );
+    t << "<ITEM type=" << _type;
+    t << " ESSID='" << _essid;
+    t << "' MAC=" << _macaddr;
+    t << " WEP=" << _wep;
+    t << " CHANNEL=" << _channel;
+    t << " SIGNAL=" << _signal;
+    t << " BEACONS=" << _beacons;
+    t << ">\n";
+}
+
diff --git a/noncore/net/wellenreiter/gui/scanlistitem.h b/noncore/net/wellenreiter/gui/scanlistitem.h
index 89b3bc4..5f6ae40 100644
--- a/noncore/net/wellenreiter/gui/scanlistitem.h
+++ b/noncore/net/wellenreiter/gui/scanlistitem.h
@@ -1,79 +1,83 @@
 /**********************************************************************
 ** 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 SCANLISTITEM_H
 #define SCANLISTITEM_H
 
 #include <cornucopia/olistview.h>
 
+#include <qtextstream.h>
+
 class QString;
 
 class MScanListItem: public OListViewItem
 {
   public:
 
     MScanListItem::MScanListItem( QListView* parent,
                                   QString type,
                                   QString essid,
                                   QString macaddr,
                                   bool wep,
                                   int channel,
                                   int signal );
 
     MScanListItem::MScanListItem( QListViewItem* parent,
                                   QString type,
                                   QString essid,
                                   QString macaddr,
                                   bool wep,
                                   int channel,
                                   int signal );
 
 
   protected:
 
     virtual void decorateItem( QString type, QString essid, QString macaddr, bool wep, int channel, int signal );
 
   public:
 
     QString type;
 
   public:
 
     //const QString& type() { return _type; };
     const QString& essid() { return _essid; };
     const QString& macaddr() { return _macaddr; };
     bool wep() { return _wep; };
     int channel() { return _channel; };
     int signal() { return _signal; };
     int beacons() { return _beacons; };
 
     void setSignal( int signal ) { /* TODO */ };
     void receivedBeacon();
 
     void setManufacturer( const QString& manufacturer );
 
+    void dump( QTextStream& t ) const;
+
   private:
     QString _type;
     QString _essid;
     QString _macaddr;
     bool _wep;
     int _channel;
     int _signal;
     int _beacons;
 
 };
 
 #endif
 
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp
index c599bb4..1ccf971 100644
--- a/noncore/net/wellenreiter/gui/wellenreiter.cpp
+++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp
@@ -1,253 +1,258 @@
 /**********************************************************************
 ** 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>
 #include <qmessagebox.h>
 #include <qcombobox.h>
 #include <qspinbox.h>
 #include <qsocketnotifier.h>
 
 // Qtopia
 
 #ifdef QWS
 #include <qpe/qpeapplication.h>
 #include <qpe/global.h>
 #endif
 
 // Opie
 
 #ifdef QWS
 #include <opie/odevice.h>
 using namespace Opie;
 #endif
 
 // Standard
 
 #include <assert.h>
 #include <errno.h>
 #include <unistd.h>
 #include <string.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <stdlib.h>
 #include <fcntl.h>
 
 // Local
 
 #include "wellenreiter.h"
 #include "scanlist.h"
 #include "logwindow.h"
 #include "hexwindow.h"
 #include "configwindow.h"
 
 #include "manufacturers.h"
 
 #include <daemon/source/config.hh>
 #include <libwellenreiter/source/wl_types.hh>
 #include <libwellenreiter/source/wl_sock.hh>
 #include <libwellenreiter/source/wl_proto.hh>
 
 Wellenreiter::Wellenreiter( QWidget* parent )
     : WellenreiterBase( parent, 0, 0 ),
       daemonRunning( false ), manufacturerdb( 0 ), configwindow( 0 )
 {
 
     //
     // construct manufacturer database
     //
 
     QString manufile;
     #ifdef QWS
     manufile.sprintf( "%s/share/wellenreiter/manufacturers.dat", (const char*) QPEApplication::qpeDir() );
     #else
     manufile.sprintf( "/usr/local/share/wellenreiter/manufacturers.dat" );
     #endif
     manufacturerdb = new ManufacturerDB( manufile );
 
     logwindow->log( "(i) Wellenreiter has been started." );
 
     //
     // detect operating system
     //
 
     #ifdef QWS
     QString sys;
     sys.sprintf( "(i) Running on '%s'.", (const char*) ODevice::inst()->systemString() );
     _system = ODevice::inst()->system();
     logwindow->log( sys );
     #endif
 
     //
     // setup socket for daemon communication, register socket notifier
     //
 
     // struct sockaddr_in sockaddr;
     daemon_fd = wl_setupsock( GUIADDR, GUIPORT, sockaddr );
     if ( daemon_fd == -1 )
     {
         logwindow->log( "(E) Couldn't get file descriptor for commsocket." );
     }
     else
     {
         int flags;
         flags = fcntl( daemon_fd, F_GETFL, 0 );
         fcntl( daemon_fd, F_SETFL, flags | O_NONBLOCK );
         QSocketNotifier *sn  = new QSocketNotifier( daemon_fd, QSocketNotifier::Read, parent );
         connect( sn, SIGNAL( activated( int ) ), this, SLOT( dataReceived() ) );
     }
 
     // setup GUI
     netview->setColumnWidthMode( 1, QListView::Manual );
 
     if ( manufacturerdb )
         netview->setManufacturerDB( manufacturerdb );
 
 }
 
 Wellenreiter::~Wellenreiter()
 {
     // no need to delete child widgets, Qt does it all for us
 
     delete manufacturerdb;
+    if ( daemon_fd != -1 )
+    {
+        qDebug( "closing comm socket" );
+        close( daemon_fd );
+    }
 }
 
 void Wellenreiter::setConfigWindow( WellenreiterConfigWindow* cw )
 {
     configwindow = cw;
 }
 
 void Wellenreiter::handleMessage()
 {
     // FIXME: receive message and handle it
 
     qDebug( "received message from daemon." );
 
     /*char buffer[10000];
     memset( &buffer, 0, sizeof( buffer ) );*/
     
     char buffer[WL_SOCKBUF];
 
     // int result = #wl_recv( &daemon_fd, (char*) &buffer, sizeof(buffer) );
     
     /*
     
     struct sockaddr from;
     socklen_t len;
     
     int result = recvfrom( daemon_fd, &buffer, 8192, MSG_WAITALL, &from, &len );
     qDebug( "received %d from recv [%d bytes]", result, len );
     
     */
     
     int result = wl_recv( &daemon_fd, sockaddr, (char*) &buffer, WL_SOCKBUF );
 
     if ( result == -1 )
     {
         qDebug( "Warning: %s", strerror( errno ) );
         return;
     }
 
     int command = buffer[1] - 48;
 
 /*
 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( "Recv result: %d", ( result ) );
     qDebug( "Sniffer sent: '%s'", (const char*) buffer );
     hexwindow->log( (const char*) &buffer );
 
     if ( command == 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";
 
         netview->addNewItem( type, n.bssid, QString( (const char*) &n.mac ), n.wep, n.channel, 0 );
 
     }
 
     else
 
     {
         qDebug( "unknown sniffer command." );
     }
 
 }
 
 void Wellenreiter::dataReceived()
 {
     logwindow->log( "(d) Received data from daemon" );
     handleMessage();
 }
 
 void Wellenreiter::startStopClicked()
 {
     if ( daemonRunning )
     {
         daemonRunning = false;
 
         logwindow->log( "(i) Daemon has been stopped." );
         setCaption( tr( "Wellenreiter/Opie" ) );
 
         // Stop daemon - ugly for now... later better
 
         system( "killall wellenreiterd" );
 
         // get configuration from config window
 
         const QString& interface = configwindow->interfaceName->currentText();
 
         // reset the interface trying to get it into a usable state again
 
         QString cmdline;
         cmdline.sprintf( "iwpriv %s monitor 0; ifdown %s; ifup %s", (const char*) interface, (const char*) interface, (const char*) interface );
         system( cmdline );
 
         // message the user
 
         QMessageBox::information( this, "Wellenreiter/Opie", "Your wireless card\nshould now be usable again." );
     }
 
     else
     {
 
         // get configuration from config window
 
         const QString& interface = configwindow->interfaceName->currentText();
         const int cardtype = configwindow->daemonDeviceType();
         const int interval = configwindow->daemonHopInterval();
 
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.h b/noncore/net/wellenreiter/gui/wellenreiter.h
index ff523d4..ee9dca9 100644
--- a/noncore/net/wellenreiter/gui/wellenreiter.h
+++ b/noncore/net/wellenreiter/gui/wellenreiter.h
@@ -1,81 +1,82 @@
 /**********************************************************************
 ** 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"
 
 #ifdef QWS
 #include <opie/odevice.h>
 using namespace Opie;
 #endif
 
 // ugly... not here!
 
 #include <assert.h>
 #include <errno.h>
 #include <unistd.h>
 #include <string.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <stdlib.h>
 #include <fcntl.h>
 #include <daemon/source/config.hh>
 #include <libwellenreiter/source/wl_types.hh>
 #include <libwellenreiter/source/wl_sock.hh>
 #include <libwellenreiter/source/wl_proto.hh>
 
 class QTimerEvent;
 class QPixmap;
 class ManufacturerDB;
 class WellenreiterConfigWindow;
 
 class Wellenreiter : public WellenreiterBase {
     Q_OBJECT
 
   public:
     Wellenreiter( QWidget* parent = 0 );
     ~Wellenreiter();
 
     void setConfigWindow( WellenreiterConfigWindow* cw );
     MScanListView* netView() const { return netview; };
     MLogWindow* logWindow() const { return logwindow; };
+    bool isDaemonRunning() const { return daemonRunning; };
 
   protected:
     bool daemonRunning;
 
   public slots:
     void dataReceived();
     void startStopClicked();
 
   private:
     int daemon_fd;                  // socket filedescriptor for udp communication socket
     #ifdef QWS
     OSystem _system;                // Opie Operating System identifier
     #endif
     void handleMessage();
 
     ManufacturerDB* manufacturerdb;
     WellenreiterConfigWindow* configwindow;
     struct sockaddr_in sockaddr;
 
     //void readConfig();
     //void writeConfig();
 };
 
 
 
 #endif