Calling scripts on new {Network, Client, Station} works now. Possible substitution

values are $SSID, $MAC, $WEP, $CHAN.

5 files changed, 56 insertions, 21 deletions

diff --git a/noncore/net/wellenreiter/gui/configwindow.cpp b/noncore/net/wellenreiter/gui/configwindow.cpp
index 1341d03..7f39230 100644
--- a/noncore/net/wellenreiter/gui/configwindow.cpp
+++ b/noncore/net/wellenreiter/gui/configwindow.cpp
@@ -13,40 +13,44 @@
 **
 **********************************************************************/
 
 /* LOCAL */
 #include "configwindow.h"
 #include "mainwindow.h"
 
 /* OPIE */
 #include <opie2/onetwork.h>
 #ifdef QWS
 #include <opie2/oapplication.h>
 #include <opie2/oconfig.h>
+#include <opie/odevice.h>
+using namespace Opie;
 #endif
 
 /* QT */
 #include <qapplication.h>
 #include <qcheckbox.h>
 #include <qcombobox.h>
 #include <qfile.h>
 #include <qlineedit.h>
 #include <qlayout.h>
 #include <qmap.h>
 #include <qpushbutton.h>
 #include <qtabwidget.h>
 #include <qtoolbutton.h>
 #include <qspinbox.h>
 #include <qtextstream.h>
 
+/* POSIX */
+#include <assert.h>
 
 WellenreiterConfigWindow* WellenreiterConfigWindow::_instance = 0;
 
 WellenreiterConfigWindow::WellenreiterConfigWindow( QWidget * parent, const char * name, WFlags f )
            :WellenreiterConfigBase( parent, name, true, f )
 {
     _devicetype[ "cisco" ] = DEVTYPE_CISCO;
     _devicetype[ "wlan-ng" ] = DEVTYPE_WLAN_NG;
     _devicetype[ "hostap" ] = DEVTYPE_HOSTAP;
     _devicetype[ "orinoco" ] = DEVTYPE_ORINOCO;
     _devicetype[ "<manual>" ] = DEVTYPE_MANUAL;
     _devicetype[ "<file>" ] = DEVTYPE_FILE;
@@ -263,60 +267,88 @@ const QString WellenreiterConfigWindow::gpsHost() const
 {
     return useGPS() ? gpsdHost->currentText() : QString::null;
 }
 
 
 int WellenreiterConfigWindow::gpsPort() const
 {
     bool ok;
     return useGPS() ? gpsdPort->value() : -1;
 }
 
 
-void WellenreiterConfigWindow::performAction( const QString& type )
+void WellenreiterConfigWindow::performAction( const QString& type,
+                                              const QString& essid,
+                                              const QString& mac,
+                                              bool wep,
+                                              int channel,
+                                              int signal
+                                              /* , const GpsLocation& loc */ )
 {
     int action;
     QString script;
 
     if ( type == "network" )
     {
         action = newNetworkAction->currentItem();
         script = newNetworkScript->text();
     }
     else if ( type == "managed" || type == "adhoc" )
     {
         action = newClientAction->currentItem();
         script = newClientScript->text();
     }
     else if ( type == "station" )
     {
         action = newStationAction->currentItem();
         script = newStationScript->text();
     }
     else
     {
-        qWarning( "WellenreiterConfigWindow::performAction(): unknown type '%s'", (const char*) type ); 
+        qWarning( "WellenreiterConfigWindow::performAction(): unknown type '%s'", (const char*) type );
         return;
     }
 
     qDebug( "going to perform action %d (script='%s')", action, (const char*) script );
 
-    /*
-
-    if ( sound == "Ignore" ) return;
-    else if ( sound == "Touch" ) ODevice::inst()->touchSound();
-    else if ( sound == "Key" ) ODevice::inst()->keySound();
-    else if ( sound == "Alarm" ) ODevice::inst()->alarmSound();
-
-    */
+    switch( action )
+    {
+        case 0: /* Ignore */ return;
+        case 1: /* Play Alarm */ ODevice::inst()->alarmSound(); return;
+        case 2: /* Play Click */ ODevice::inst()->touchSound(); return;
+        case 3: /* Blink LED */ break; //FIXME: Implement this
+        case 4: /* Run Script */
+        {
+            /**
+                *
+                * Script Substitution Information:
+                *
+                * $SSID = SSID
+                * $MAC = MAC
+                * $WEP = Wep
+                * $CHAN = Channel
+                *
+                **/
+            script = script.replace( QRegExp( "$SSID" ), essid );
+            script = script.replace( QRegExp( "$MAC" ), mac );
+            script = script.replace( QRegExp( "$WEP" ), wep ? QString( "true" ) : QString( "false" ) );
+            script = script.replace( QRegExp( "$CHAN" ), QString::number( channel ) );
+
+            qDebug( "going to call script '%s'", (const char*) script );
+            ::system( script );
+            qDebug( "script returned." );
+            return;
+        }
+        default: assert( false );
+    }
 }
 
 
 void WellenreiterConfigWindow::load()
 {
 #ifdef Q_WS_X11
     #warning Persistent Configuration not yet implemented for standalone X11 build
     performAutodetection();
 #else
     qDebug( "loading configuration settings..." );
 
     /* This is dumb monkey typing stuff... We _need_ to do this automatically! */
diff --git a/noncore/net/wellenreiter/gui/configwindow.h b/noncore/net/wellenreiter/gui/configwindow.h
index b082331..5c998cb 100644
--- a/noncore/net/wellenreiter/gui/configwindow.h
+++ b/noncore/net/wellenreiter/gui/configwindow.h
@@ -8,24 +8,27 @@
 ** 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 WELLENREITERCONFIGWINDOW_H
 #define WELLENREITERCONFIGWINDOW_H
 
 #include "configbase.h"
+#include "gps.h"
+
+/* QT */
 #include <qmap.h>
 #include <qcombobox.h>
 #include <qstring.h>
 
 const int DEVTYPE_SELECT = 0;
 const int DEVTYPE_CISCO = 1;
 const int DEVTYPE_WLAN_NG = 2;
 const int DEVTYPE_HOSTAP = 3;
 const int DEVTYPE_ORINOCO = 4;
 const int DEVTYPE_MANUAL = 5;
 const int DEVTYPE_FILE = 6;
 
@@ -54,25 +57,25 @@ class WellenreiterConfigWindow : public WellenreiterConfigBase
 
     void save();
     void load();
 
   public slots:
     void changedDeviceType(int);
     void changedNetworkAction(int t);
     void changedClientAction(int t);
     void changedStationAction(int t);
     void getCaptureFileNameClicked();
     void performAutodetection();
     void channelAllClicked(int);
-    void performAction( const QString& );
+    void performAction( const QString&, const QString&, const QString&, bool, int, int /* , const GpsLocation& */ );
 
   protected:
     void synchronizeActionsAndScripts();
 
   protected:
     QMap<QString, int> _devicetype;
     static WellenreiterConfigWindow* _instance;
     int _guess;
 
 };
 
 #endif
diff --git a/noncore/net/wellenreiter/gui/main.cpp b/noncore/net/wellenreiter/gui/main.cpp
index dd757b5..702a7cc 100644
--- a/noncore/net/wellenreiter/gui/main.cpp
+++ b/noncore/net/wellenreiter/gui/main.cpp
@@ -112,20 +112,20 @@ int main( int argc, char **argv )
     }
 
     a.exec();
 
     if ( check )
     {
 
         if ( killed )
         {
             result = QMessageBox::warning( w, " - Wellenreiter II -  (dhcp)", QObject::tr( "Restart your dhcp client?" ), QMessageBox::Yes, QMessageBox::No );
             if ( result == QMessageBox::Yes )
             {
-                system( QString().sprintf( "dhclient &; udhcpcd &; dhcpcd &" ) );
+                ::system( QString().sprintf( "dhclient &; udhcpcd &; dhcpcd &" ) );
             }
         }
 
         delete w;
     }
     return 0;
 }
diff --git a/noncore/net/wellenreiter/gui/scanlist.cpp b/noncore/net/wellenreiter/gui/scanlist.cpp
index 470646d..aea7eb6 100644
--- a/noncore/net/wellenreiter/gui/scanlist.cpp
+++ b/noncore/net/wellenreiter/gui/scanlist.cpp
@@ -400,41 +400,41 @@ void MScanListView::contextMenuRequested( QListViewItem* item, const QPoint&, in
         QPopupMenu m( this );
         m.insertItem( entry, 37773, 0 );
         int result = m.exec( QCursor::pos() );
         if ( result == 37773 )
             emit joinNetwork( itm->type, itm->essid(), itm->channel(), itm->macaddr() );
     }
 }
 
 //============================================================
 // MScanListItem
 //============================================================
 
-MScanListItem::MScanListItem( QListView* parent, QString type, QString essid, QString macaddr,
+MScanListItem::MScanListItem( QListView* parent, const QString& type, const QString& essid, const 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( 1 )
 {
     #ifdef DEBUG
     qDebug( "creating scanlist item" );
     #endif
 
     if ( WellenreiterConfigWindow::instance() )
-        WellenreiterConfigWindow::instance()->performAction( type ); // better use signal/slot combination here
+        WellenreiterConfigWindow::instance()->performAction( type, essid, macaddr, wep, channel, signal ); // better use signal/slot combination here
 
     decorateItem( type, essid, macaddr, wep, channel, signal );
 }
 
-MScanListItem::MScanListItem( QListViewItem* parent, QString type, QString essid, QString macaddr,
+MScanListItem::MScanListItem( QListViewItem* parent, const QString& type, const QString& essid, const QString& macaddr,
                               bool wep, int channel, int signal )
                :OListViewItem( parent, essid, QString::null, macaddr, QString::null, QString::null )
 {
     #ifdef DEBUG
     qDebug( "creating scanlist item" );
     #endif
     decorateItem( type, essid, macaddr, wep, channel, signal );
 }
 
 const QString& MScanListItem::essid() const
 {
     if ( type == "network" )
diff --git a/noncore/net/wellenreiter/gui/scanlist.h b/noncore/net/wellenreiter/gui/scanlist.h
index 42f35c2..e8d48c3 100644
--- a/noncore/net/wellenreiter/gui/scanlist.h
+++ b/noncore/net/wellenreiter/gui/scanlist.h
@@ -59,35 +59,35 @@ class MScanListView: public OListView
 
   protected:
     void addIfNotExisting( MScanListItem* parent, const OMacAddress& addr, const QString& type = "station" );
 
 };
 
 //****************************** MScanListItem ****************************************************************
 
 class MScanListItem: public OListViewItem
 {
   public:
     MScanListItem::MScanListItem( QListView* parent,
-                                  QString type = "unknown",
-                                  QString essid = "unknown",
-                                  QString macaddr = "unknown",
+                                  const QString& type = "unknown",
+                                  const QString& essid = "unknown",
+                                  const QString& macaddr = "unknown",
                                   bool wep = false,
                                   int channel = 0,
                                   int signal = 0 );
 
     MScanListItem::MScanListItem( QListViewItem* parent,
-                                  QString type = "unknown",
-                                  QString essid = "unknown",
-                                  QString macaddr = "unknown",
+                                  const QString& type = "unknown",
+                                  const QString& essid = "unknown",
+                                  const QString& macaddr = "unknown",
                                   bool wep = false,
                                   int channel = 0,
                                   int signal = 0 );
 
 
   protected:
     virtual void decorateItem( QString type, QString essid, QString macaddr, bool wep, int channel, int signal );
 
   public:
     QString type;
 
   public: