@ -27,16 +27,16 @@
# include <iostream> # include <iostream>
# include <linux/version.h> //provides LINUX_VERSION* macros # include <linux/version.h> //provides LINUX_VERSION* macros
# include < qregexp.h># include < t qregexp.h>
# include < qlabel.h># include < t qlabel.h>
# include < qprocess.h># include < t qprocess.h>
# include < qcursor.h># include < t qcursor.h>
# include < qeventloop.h># include < t qeventloop.h>
# include < qtimer.h># include < t qtimer.h>
# include < qcheckbox.h># include < t qcheckbox.h>
# include < qspinbox.h># include < t qspinbox.h>
# include < qwidgetstack.h># include < t qwidgetstack.h>
# include < qtooltip.h># include < t qtooltip.h>
# include <kpushbutton.h> # include <kpushbutton.h>
# include <kcombobox.h> # include <kcombobox.h>
@ -48,8 +48,8 @@
# include <klocale.h> # include <klocale.h>
# include <kstandarddirs.h> # include <kstandarddirs.h>
WirelessAssistant : : WirelessAssistant ( * , const char * name , bool modal , WFlags fl ) WirelessAssistant : : WirelessAssistant ( T QWidget* tq parent, const char * name , bool modal , WFlags fl )
: mainWindow ( , name , modal , fl )
: mainWindow ( tq parent, name , modal , fl )
{ {
buttonScan - > setIconSet ( SmallIconSet ( " reload " ) ) ;
buttonScan - > setIconSet ( SmallIconSet ( " reload " ) ) ;
buttonConnect - > setIconSet ( SmallIconSet ( " connect_creating " ) ) ;
buttonConnect - > setIconSet ( SmallIconSet ( " connect_creating " ) ) ;
@ -61,35 +61,35 @@ WirelessAssistant::WirelessAssistant(QWidget* parent, const char* name, bool mod
frameDevice - > hide ( ) ;
frameDevice - > hide ( ) ;
/// Network List Widget
/// Network List Widget
connect ( buttonScan , ( clicked ( ) ) ,
connect ( buttonScan , TQT_ SIGNAL( clicked ( ) ) ,
this , ( netScan ( ) ) ) ;
this , TQT_ SLOT( netScan ( ) ) ) ;
connect ( buttonConnect , ( clicked ( ) ) ,
connect ( buttonConnect , TQT_ SIGNAL( clicked ( ) ) ,
this , ( itemAction ( ) ) ) ;
this , TQT_ SLOT( itemAction ( ) ) ) ;
connect ( buttonClose , ( clicked ( ) ) ,
connect ( buttonClose , TQT_ SIGNAL( clicked ( ) ) ,
this , ( close ( ) ) ) ;
this , TQT_ SLOT( close ( ) ) ) ;
connect ( devCombo , ( activated ( const & ) ) ,
connect ( devCombo , TQT_ SIGNAL( activated ( const T QString & ) ) ,
this , ( setDev ( const & ) ) ) ;
this , TQT_ SLOT( setDev ( const T QString & ) ) ) ;
connect ( netList , ( rightButtonPressed ( * , const & , int ) ) ,
connect ( netList , TQT_ SIGNAL( rightButtonPressed ( T QListViewItem* , const T QPoint& , int ) ) ,
( showItemContextMenu ( * , const & , int ) ) ) ;
TQT_ SLOT( showItemContextMenu ( T QListViewItem* , const T QPoint& , int ) ) ) ;
/// Settings Widget
/// Settings Widget
connect ( buttonOptions , ( toggled ( bool ) ) ,
connect ( buttonOptions , TQT_ SIGNAL( toggled ( bool ) ) ,
this , ( togglePage ( bool ) ) ) ;
this , TQT_ SLOT( togglePage ( bool ) ) ) ;
connect ( buttonEnableAllMessages , ( clicked ( ) ) ,
connect ( buttonEnableAllMessages , TQT_ SIGNAL( clicked ( ) ) ,
this , ( enableAllMessages ( ) ) ) ;
this , TQT_ SLOT( enableAllMessages ( ) ) ) ;
/// Global KDE Options
/// Global KDE Options
connect ( KApplication : : kApplication ( ) , ( settingsChanged ( int ) ) ,
connect ( KApplication : : kApplication ( ) , TQT_ SIGNAL( settingsChanged ( int ) ) ,
this , ( updateConfiguration ( int ) ) ) ;
this , TQT_ SLOT( updateConfiguration ( int ) ) ) ;
setMouseBehaviour ( ) ;
setMouseBehaviour ( ) ;
: : singleShot ( 10 , this , ( init ( ) ) ) ; //WAIT FOR THE UI TO BE READY BEFORE FURTHER SETUP (msec)
T QTimer: : singleShot ( 10 , this , TQT_ SLOT( init ( ) ) ) ; //WAIT FOR THE UI TO BE READY BEFORE FURTHER SETUP (msec)
} }
WirelessAssistant : : ~ WirelessAssistant ( ) WirelessAssistant : : ~ WirelessAssistant ( )
@ -101,11 +101,11 @@ WirelessAssistant::~WirelessAssistant()
void WirelessAssistant : : init ( ) void WirelessAssistant : : init ( )
{ {
statusLabel - > setText ( i18n ( " Initializing... " ) ) ;
statusLabel - > setText ( i18n ( " Initializing... " ) ) ;
statusLabel - > ( ) ;
statusLabel - > tq repaint( ) ;
////////////////////////////////////////
////////////////////////////////////////
///// CHECK FOR SYSFS (KERNEL 2.6) /////
///// CHECK FOR SYSFS (KERNEL 2.6) /////
if ( ! : : exists ( " /sys " ) ) {
if ( ! T QFile: : exists ( " /sys " ) ) {
std : : cout < < " Sysfs not present. Exiting. " < < std : : endl ;
std : : cout < < " Sysfs not present. Exiting. " < < std : : endl ;
KMessageBox : : error ( 0 , i18n ( " Kernel 2.6 or later not present. \n Wireless Assistant will now quit. " ) ) ;
KMessageBox : : error ( 0 , i18n ( " Kernel 2.6 or later not present. \n Wireless Assistant will now quit. " ) ) ;
close ( ) ;
close ( ) ;
@ -150,7 +150,7 @@ void WirelessAssistant::init()
///////////////////////////////////
///////////////////////////////////
///// DETECT WIRELESS DEVICES /////
///// DETECT WIRELESS DEVICES /////
devList = interfaceList ( ) ;
T QStringList devList = interfaceList ( ) ;
if ( devList . count ( ) = = 0 ) {
if ( devList . count ( ) = = 0 ) {
std : : cout < < " No wireless interfaces found. Exiting. " < < std : : endl ;
std : : cout < < " No wireless interfaces found. Exiting. " < < std : : endl ;
KMessageBox : : error ( 0 , i18n ( " No usable wireless devices found. \n Wireless Assistant will now quit. " ) ) ;
KMessageBox : : error ( 0 , i18n ( " No usable wireless devices found. \n Wireless Assistant will now quit. " ) ) ;
@ -174,7 +174,7 @@ void WirelessAssistant::init()
//////////////////////////////////
//////////////////////////////////
///// CHECK FILE PERMISSIONS /////
///// CHECK FILE PERMISSIONS /////
if ( ! ( " /etc/resolv.conf " ) . isWritable ( ) ) {
if ( ! T QFileInfo( " /etc/resolv.conf " ) . isWritable ( ) ) {
std : : cout < < " warning: /etc/resolv.conf not writable " < < std : : endl ;
std : : cout < < " warning: /etc/resolv.conf not writable " < < std : : endl ;
KMessageBox : : information ( 0 , i18n ( " <qt><p>You might have insufficient permissions for Wireless Assistant to function properly.</p><p>Did you run it using '<tt>sudo</tt>'?</p></qt> " ) ) ;
KMessageBox : : information ( 0 , i18n ( " <qt><p>You might have insufficient permissions for Wireless Assistant to function properly.</p><p>Did you run it using '<tt>sudo</tt>'?</p></qt> " ) ) ;
}
}
@ -188,16 +188,16 @@ void WirelessAssistant::init()
///// INITIALIZE GLOBAL VARIABLES /////
///// INITIALIZE GLOBAL VARIABLES /////
wpaAvailable = ( ! ( Commands . wpa_supplicant . isEmpty ( ) | | Commands . wpa_cli . isEmpty ( ) ) ) ;
wpaAvailable = ( ! ( Commands . wpa_supplicant . isEmpty ( ) | | Commands . wpa_cli . isEmpty ( ) ) ) ;
connectedItem = 0 ;
connectedItem = 0 ;
timerGui = new ( ) ;
timerGui = new T QTimer( ) ;
timerConnectionCheck = new ( ) ;
timerConnectionCheck = new T QTimer( ) ;
connect ( timerGui , ( timeout ( ) ) , ( updateConnectedItem ( ) ) ) ;
connect ( timerGui , TQT_ SIGNAL( timeout ( ) ) , TQT_ SLOT( updateConnectedItem ( ) ) ) ;
connect ( timerConnectionCheck , ( timeout ( ) ) , ( checkConnection Status( ) ) ) ;
connect ( timerConnectionCheck , TQT_ SIGNAL( timeout ( ) ) , TQT_ SLOT( checkConnection tq Status( ) ) ) ;
////////////////////////
////////////////////////
///// DETECT & SET PATHS /////
///// DETECT & SET PATHS /////
if ( ! Commands . allFound ) { //all ok or ONLY dhcpcd not found (i.e. dhclient present).
if ( ! Commands . allFound ) { //all ok or ONLY dhcpcd not found (i.e. dhclient present).
std : : cout < < " Missing executables ( " < < Commands . notFound . join ( " ', ' " ) < < " ). Exiting. " < < std : : endl ;
std : : cout < < " Missing executables ( " < < Commands . notFound . join ( " ', ' " ) < < " ). Exiting. " < < std : : endl ;
KMessageBox : : error ( 0 , i18n ( " Executable(s) '%1' could not be found. \n Wireless Assistant will now quit. " ) . ( Commands . notFound . join ( " ', ' " ) ) ) ;
KMessageBox : : error ( 0 , i18n ( " Executable(s) '%1' could not be found. \n Wireless Assistant will now quit. " ) . tq arg( Commands . notFound . join ( " ', ' " ) ) ) ;
close ( ) ;
close ( ) ;
return ;
return ;
}
}
@ -208,14 +208,14 @@ void WirelessAssistant::init()
///////////////////////////////////////
///////////////////////////////////////
///// SCAN FOR AVAILABLE NETWORKS /////
///// SCAN FOR AVAILABLE NETWORKS /////
if ( autoConnect )
if ( autoConnect )
: : singleShot ( 0 , this , ( netAutoConnect ( ) ) ) ;
T QTimer: : singleShot ( 0 , this , TQT_ SLOT( netAutoConnect ( ) ) ) ;
else
else
: : singleShot ( 0 , this , ( netScan ( ) ) ) ;
T QTimer: : singleShot ( 0 , this , TQT_ SLOT( netScan ( ) ) ) ;
} }
void WirelessAssistant : : checkConnection Status( ) void WirelessAssistant : : checkConnection tq Status( )
{ {
* lvi ;
T QListViewItem* lvi ;
if ( groupAPs ) lvi = getItemByEssid ( WATools : : essid ( NetParams . iface ) ) ;
if ( groupAPs ) lvi = getItemByEssid ( WATools : : essid ( NetParams . iface ) ) ;
else lvi = getItemByAp ( WATools : : ap ( NetParams . iface ) ) ;
else lvi = getItemByAp ( WATools : : ap ( NetParams . iface ) ) ;
bool needsKey ;
bool needsKey ;
@ -235,7 +235,7 @@ void WirelessAssistant::checkConnectionStatus()
} else if ( connectedItem ) { //connection LOST
} else if ( connectedItem ) { //connection LOST
setConnectedItem ( 0 ) ;
setConnectedItem ( 0 ) ;
timerConnectionCheck - > stop ( ) ;
timerConnectionCheck - > stop ( ) ;
if ( autoReconnect | | KMessageBox : : questionYesNo ( 0 , i18n ( " Connection to '%1' has been lost! \n Would you like to reconnect? " ) . ( NetParams . essid ) , i18n ( " Connection Lost " ) , KStdGuiItem : : yes ( ) , KStdGuiItem : : no ( ) ) = = KMessageBox : : Yes ) {
if ( autoReconnect | | KMessageBox : : questionYesNo ( 0 , i18n ( " Connection to '%1' has been lost! \n Would you like to reconnect? " ) . tq arg( NetParams . essid ) , i18n ( " Connection Lost " ) , KStdGuiItem : : yes ( ) , KStdGuiItem : : no ( ) ) = = KMessageBox : : Yes ) {
netDisconnect ( true ) ;
netDisconnect ( true ) ;
netConnect ( ) ;
netConnect ( ) ;
}
}
@ -246,10 +246,10 @@ void WirelessAssistant::checkConnectionStatus()
void WirelessAssistant : : removeNetParams ( ) void WirelessAssistant : : removeNetParams ( )
{ {
NetListViewItem * nvi = static_cast < NetListViewItem * > ( netList - > selectedItem ( ) ) ;
NetListViewItem * nvi = static_cast < NetListViewItem * > ( netList - > selectedItem ( ) ) ;
ap = nvi - > ap ( ) ; essid = nvi - > essid ( ) ;
T QString ap = nvi - > ap ( ) ; T QString essid = nvi - > essid ( ) ;
for ( : : Iterator nps = NetParamsList . begin ( ) ; nps ! = NetParamsList . end ( ) ; nps + + ) {
for ( T QStringList: : Iterator nps = NetParamsList . begin ( ) ; nps ! = NetParamsList . end ( ) ; nps + + ) {
if ( ( * nps ) . section ( " , " , 2 , 2 ) = = ap & & ( * nps ) . section ( " , " , 1 , 1 ) = = essid ) {
if ( ( * nps ) . section ( " , " , 2 , 2 ) = = ap & & ( * nps ) . section ( " , " , 1 , 1 ) = = essid ) {
if ( KMessageBox : : warningContinueCancel ( 0 , i18n ( " <qt><p>Settings for network '<b>%1</b>' are about to be deleted.</p><p>Would you like to continue?</p></qt> " ) . ( essid ) ) = = KMessageBox : : Continue ) {
if ( KMessageBox : : warningContinueCancel ( 0 , i18n ( " <qt><p>Settings for network '<b>%1</b>' are about to be deleted.</p><p>Would you like to continue?</p></qt> " ) . tq arg( essid ) ) = = KMessageBox : : Continue ) {
if ( nvi - > hidden ( ) ) // hiddenEssid = 1
if ( nvi - > hidden ( ) ) // hiddenEssid = 1
nvi - > setEssid ( " <hidden> " ) ;
nvi - > setEssid ( " <hidden> " ) ;
NetParamsList . remove ( nps ) ;
NetParamsList . remove ( nps ) ;
@ -264,25 +264,25 @@ void WirelessAssistant::removeNetParams()
void WirelessAssistant : : setDNS ( const WANetParams & np ) void WirelessAssistant : : setDNS ( const WANetParams & np )
{ {
f ( " /etc/resolv.conf " ) ;
T QFile f ( " /etc/resolv.conf " ) ;
if ( f . open ( IO_WriteOnly | IO_Truncate ) ) {
if ( f . open ( IO_WriteOnly | IO_Truncate ) ) {
s ( & f ) ;
T QTextStream s ( & f ) ;
if ( ! np . domain . isEmpty ( ) ) {
if ( ! np . domain . isEmpty ( ) ) {
s < < ( " domain " + np . domain + " \n " ) ;
s < < T QString( " domain " + np . domain + " \n " ) ;
std : : cout < < " resolv.conf: domain " < < np . domain < < std : : endl ;
std : : cout < < " resolv.conf: domain " < < np . domain < < std : : endl ;
}
}
if ( ! np . dns1 . isEmpty ( ) ) {
if ( ! np . dns1 . isEmpty ( ) ) {
s < < ( " nameserver " + np . dns1 + " \n " ) ;
s < < T QString( " nameserver " + np . dns1 + " \n " ) ;
std : : cout < < " resolv.conf: nameserver " < < np . dns1 < < std : : endl ;
std : : cout < < " resolv.conf: nameserver " < < np . dns1 < < std : : endl ;
}
}
if ( ! np . dns2 . isEmpty ( ) ) {
if ( ! np . dns2 . isEmpty ( ) ) {
s < < ( " nameserver " + np . dns2 + " \n " ) ;
s < < T QString( " nameserver " + np . dns2 + " \n " ) ;
std : : cout < < " resolv.conf: nameserver " < < np . dns2 < < std : : endl ;
std : : cout < < " resolv.conf: nameserver " < < np . dns2 < < std : : endl ;
}
}
f . close ( ) ;
f . close ( ) ;
} else {
} else {
std : : cout < < " dns setup error: " < < f . name ( ) < < " is not writeable. " < < std : : endl ;
std : : cout < < " dns setup error: " < < f . name ( ) < < " is not writeable. " < < std : : endl ;
KMessageBox : : error ( 0 , i18n ( " <qt><p>File '<i>%1</i>' could not be opened for writing.</p><p>Nameserver(s) and/or domain are not set.</p></qt> " ) . ( f . name ( ) ) ) ;
KMessageBox : : error ( 0 , i18n ( " <qt><p>File '<i>%1</i>' could not be opened for writing.</p><p>Nameserver(s) and/or domain are not set.</p></qt> " ) . tq arg( f . name ( ) ) ) ;
}
}
} }
@ -291,7 +291,7 @@ void WirelessAssistant::netScan()
timerConnectionCheck - > stop ( ) ; //stop while scanning.
timerConnectionCheck - > stop ( ) ; //stop while scanning.
netScan ( NetParams ) ;
netScan ( NetParams ) ;
if ( netList - > childCount ( ) > 0 ) {
if ( netList - > childCount ( ) > 0 ) {
: : singleShot ( 0 , this , ( checkConnection Status( ) ) ) ;
T QTimer: : singleShot ( 0 , this , TQT_ SLOT( checkConnection tq Status( ) ) ) ;
timerConnectionCheck - > start ( WA_CONNECTION_CHECK_INTERVAL ) ;
timerConnectionCheck - > start ( WA_CONNECTION_CHECK_INTERVAL ) ;
}
}
} }
@ -314,30 +314,30 @@ void WirelessAssistant::netScan( const WANetParams & np )
}
}
if ( ! WATools : : isUp ( np . iface ) ) {
if ( ! WATools : : isUp ( np . iface ) ) {
statusLabel - > setText ( i18n ( " Bringing interface %1 up... " ) . ( np . iface ) ) ;
statusLabel - > setText ( i18n ( " Bringing interface %1 up... " ) . tq arg( np . iface ) ) ;
//runCommand( Commands.cmd("ifup",np) );
//runCommand( Commands.cmd("ifup",np) );
WATools : : setUp ( true , np . iface ) ;
WATools : : setUp ( true , np . iface ) ;
if ( DelayBeforeScanning > 0 ) {
if ( DelayBeforeScanning > 0 ) {
statusLabel - > setText ( i18n ( " Waiting before scanning... " ) ) ;
statusLabel - > setText ( i18n ( " Waiting before scanning... " ) ) ;
statusLabel - > ( ) ;
statusLabel - > tq repaint( ) ;
KApplication : : eventLoop ( ) - > processEvents ( : : ExcludeUserInput ) ;
KApplication : : eventLoop ( ) - > processEvents ( T QEventLoop: : ExcludeUserInput ) ;
usleep ( DelayBeforeScanning * 1000000 ) ; // delay * 1000ms
usleep ( DelayBeforeScanning * 1000000 ) ; // delay * 1000ms
}
}
}
}
statusLabel - > setText ( i18n ( " Scanning... " ) ) ;
statusLabel - > setText ( i18n ( " Scanning... " ) ) ;
statusLabel - > ( ) ;
statusLabel - > tq repaint( ) ;
netList - > clear ( ) ;
netList - > clear ( ) ;
result ;
T QString result ;
statusLabel - > setText ( i18n ( " Scanning... " ) ) ;
statusLabel - > setText ( i18n ( " Scanning... " ) ) ;
result = runCommand ( Commands . cmd ( " scan " , np ) ) ;
result = runCommand ( Commands . cmd ( " scan " , np ) ) ;
parseScan ( result ) ;
parseScan ( result ) ;
if ( netList - > childCount ( ) > 0 ) {
if ( netList - > childCount ( ) > 0 ) {
std : : cout < < " Networks found: " < < : : number ( netList - > childCount ( ) ) < < std : : endl ;
std : : cout < < " Networks found: " < < T QString: : number ( netList - > childCount ( ) ) < < std : : endl ;
if ( wasConnected )
if ( wasConnected )
groupAPs ? setConnectedItem ( WATools : : essid ( ) ) : setConnectedItem ( WATools : : ap ( ) ) ; //mark item as connected.
groupAPs ? setConnectedItem ( WATools : : essid ( ) ) : setConnectedItem ( WATools : : ap ( ) ) ; //mark item as connected.
statusLabel - > setText ( i18n ( " Done. " ) ) ;
statusLabel - > setText ( i18n ( " Done. " ) ) ;
@ -346,7 +346,7 @@ void WirelessAssistant::netScan( const WANetParams & np )
//runCommand( Commands.cmd("ifdown", NetParams) ); //Commented out b/c it seems to cause more problems than it solves. (like no scan results)
//runCommand( Commands.cmd("ifdown", NetParams) ); //Commented out b/c it seems to cause more problems than it solves. (like no scan results)
std : : cout < < " No networks found! " < < std : : endl ;
std : : cout < < " No networks found! " < < std : : endl ;
statusLabel - > setText ( i18n ( " No networks found. " ) ) ;
statusLabel - > setText ( i18n ( " No networks found. " ) ) ;
if ( result . ( " Resource temporarily unavailable " ) > - 1 ) {
if ( result . tq find( " Resource temporarily unavailable " ) > - 1 ) {
std : : cout < < " Radio switch seems to be off. " < < std : : endl ;
std : : cout < < " Radio switch seems to be off. " < < std : : endl ;
KMessageBox : : information ( 0 , i18n ( " Radio of your wireless card seems to be turned off using an external switch on your computer. \n You need turn it on to be able to use wireless networks. " ) ) ;
KMessageBox : : information ( 0 , i18n ( " Radio of your wireless card seems to be turned off using an external switch on your computer. \n You need turn it on to be able to use wireless networks. " ) ) ;
}
}
@ -354,25 +354,25 @@ void WirelessAssistant::netScan( const WANetParams & np )
setNetListColumns ( ) ;
setNetListColumns ( ) ;
} }
void WirelessAssistant : : parseScan ( const & output ) void WirelessAssistant : : parseScan ( const T QString & output )
{ {
essid ;
T QString essid ;
essidList ;
T QStringList essidList ;
channel ;
T QString channel ;
mode ;
T QString mode ;
int qualInt ;
int qualInt ;
bool enc ; //default to false
bool enc ; //default to false
bool hidden ; //default to false
bool hidden ; //default to false
ap ;
T QString ap ;
// security parameters
// security parameters
bool wpa ;
bool wpa ;
wpaSettings ;
T QStringList wpaSettings ;
// QString wpaVersion, wpaGroupCipher, wpaPairwiseCipher, wpaAuthenticationSuite;
// T QString wpaVersion, wpaGroupCipher, wpaPairwiseCipher, wpaAuthenticationSuite;
bool ok_channel = true ; //does iwlist return channel?
bool ok_channel = true ; //does iwlist return channel?
section ;
T QString section ;
netList - > setUpdatesEnabled ( false ) ; //do not redraw while adding items to avoid flicker.
netList - > setUpdatesEnabled ( false ) ; //do not redraw while adding items to avoid flicker.
@ -410,7 +410,7 @@ void WirelessAssistant::parseScan( const QString & output )
} else
} else
hidden = false ;
hidden = false ;
// GET QUALITY
// GET T QUALITY
int wsignal ;
int wsignal ;
//check if driver reports quality directly
//check if driver reports quality directly
qualInt = getVal ( section , " Quality \\ D+( \\ d+) " ) . toInt ( ) ;
qualInt = getVal ( section , " Quality \\ D+( \\ d+) " ) . toInt ( ) ;
@ -429,8 +429,8 @@ void WirelessAssistant::parseScan( const QString & output )
enc = true ;
enc = true ;
wpaSettings . clear ( ) ;
wpaSettings . clear ( ) ;
if ( section . ( " WPA2 Version " ) ) wpaSettings < < " WPA2 " ; //prefer WPA2 over WPA
if ( section . tq contains( " WPA2 Version " ) ) wpaSettings < < " WPA2 " ; //prefer WPA2 over WPA
else if ( section . ( " WPA Version " ) ) wpaSettings < < " WPA " ;
else if ( section . tq contains( " WPA Version " ) ) wpaSettings < < " WPA " ;
wpa = ( ! wpaSettings . isEmpty ( ) ) ;
wpa = ( ! wpaSettings . isEmpty ( ) ) ;
if ( wpa ) {
if ( wpa ) {
@ -442,7 +442,7 @@ void WirelessAssistant::parseScan( const QString & output )
// CHECK IF SAME ESSID ALREADY FOUND, if necessary
// CHECK IF SAME ESSID ALREADY FOUND, if necessary
if ( groupAPs ) {
if ( groupAPs ) {
if ( ! hidden & & essidList . ( essid ) ) {
if ( ! hidden & & essidList . tq contains( essid ) ) {
NetListViewItem * sameEssid = static_cast < NetListViewItem * > ( getItemByEssid ( essid ) ) ;
NetListViewItem * sameEssid = static_cast < NetListViewItem * > ( getItemByEssid ( essid ) ) ;
sameEssid - > setAp ( " any " ) ;
sameEssid - > setAp ( " any " ) ;
if ( sameEssid - > quality ( ) < qualInt ) {
if ( sameEssid - > quality ( ) < qualInt ) {
@ -485,7 +485,7 @@ bool WirelessAssistant::radioEnabled()
return r ;
return r ;
} }
void WirelessAssistant : : setNetParamsFromList ( * lvi ) void WirelessAssistant : : setNetParamsFromList ( T QListViewItem* lvi )
{ {
NetListViewItem * nvi = static_cast < NetListViewItem * > ( lvi ) ;
NetListViewItem * nvi = static_cast < NetListViewItem * > ( lvi ) ;
NetParams . essid = nvi - > essid ( ) ;
NetParams . essid = nvi - > essid ( ) ;
@ -498,12 +498,12 @@ void WirelessAssistant::setNetParamsFromList( QListViewItem* lvi )
NetParams . wpa = ( nvi - > enc ( ) & & ! NetParams . wpaSettings . isEmpty ( ) ) ;
NetParams . wpa = ( nvi - > enc ( ) & & ! NetParams . wpaSettings . isEmpty ( ) ) ;
} }
bool WirelessAssistant : : setNetParamsFromConfig ( const & s ) bool WirelessAssistant : : setNetParamsFromConfig ( const T QString & s )
{ {
for ( : : Iterator nps = NetParamsList . begin ( ) ; nps ! = NetParamsList . end ( ) ; nps + + ) {
for ( T QStringList: : Iterator nps = NetParamsList . begin ( ) ; nps ! = NetParamsList . end ( ) ; nps + + ) {
if ( ( * nps ) . section ( " , " , 2 , 2 ) = = s | | ( ( * nps ) . section ( " , " , 1 , 1 ) = = s & & ( * nps ) . section ( " , " , 2 , 2 ) = = " any " ) ) {
if ( ( * nps ) . section ( " , " , 2 , 2 ) = = s | | ( ( * nps ) . section ( " , " , 1 , 1 ) = = s & & ( * nps ) . section ( " , " , 2 , 2 ) = = " any " ) ) {
NetParams . loadNetParamsString ( * nps ) ;
NetParams . loadNetParamsString ( * nps ) ;
if ( ! s . ( " : " ) ) NetParams . ap = " any " ; //if searched by essid
if ( ! s . tq contains( " : " ) ) NetParams . ap = " any " ; //if searched by essid
return 1 ;
return 1 ;
}
}
}
}
@ -512,7 +512,7 @@ bool WirelessAssistant::setNetParamsFromConfig( const QString & s )
void WirelessAssistant : : itemAction ( ) void WirelessAssistant : : itemAction ( )
{ {
* lvi = netList - > selectedItem ( ) ;
T QListViewItem* lvi = netList - > selectedItem ( ) ;
if ( ! lvi )
if ( ! lvi )
return ;
return ;
@ -539,7 +539,7 @@ void WirelessAssistant::netAutoConnect()
int bestQuality = 0 ;
int bestQuality = 0 ;
for ( int i = 0 ; i < netList - > childCount ( ) ; i + + ) {
for ( int i = 0 ; i < netList - > childCount ( ) ; i + + ) {
NetListViewItem * nvi = static_cast < NetListViewItem * > ( netList - > itemAtIndex ( i ) ) ;
NetListViewItem * nvi = static_cast < NetListViewItem * > ( netList - > itemAtIndex ( i ) ) ;
search = nvi - > ap ( ) ;
T QString search = nvi - > ap ( ) ;
if ( search = = " any " ) search = nvi - > essid ( ) ;
if ( search = = " any " ) search = nvi - > essid ( ) ;
if ( setNetParamsFromConfig ( search ) ) {
if ( setNetParamsFromConfig ( search ) ) {
if ( nvi - > quality ( ) > bestQuality ) {
if ( nvi - > quality ( ) > bestQuality ) {
@ -552,7 +552,7 @@ void WirelessAssistant::netAutoConnect()
if ( bestItem ! = - 1 ) {
if ( bestItem ! = - 1 ) {
NetListViewItem * nvi = static_cast < NetListViewItem * > ( netList - > itemAtIndex ( bestItem ) ) ;
NetListViewItem * nvi = static_cast < NetListViewItem * > ( netList - > itemAtIndex ( bestItem ) ) ;
setNetParamsFromList ( nvi ) ;
setNetParamsFromList ( nvi ) ;
search = nvi - > ap ( ) ;
T QString search = nvi - > ap ( ) ;
if ( search = = " any " ) search = nvi - > essid ( ) ;
if ( search = = " any " ) search = nvi - > essid ( ) ;
setNetParamsFromConfig ( search ) ;
setNetParamsFromConfig ( search ) ;
timerConnectionCheck - > stop ( ) ;
timerConnectionCheck - > stop ( ) ;
@ -570,21 +570,21 @@ void WirelessAssistant::netConnect()
setNetParamsFromList ( netList - > selectedItem ( ) ) ;
setNetParamsFromList ( netList - > selectedItem ( ) ) ;
//can't connect if WPA needed, and wpa_supplicant and wpa_cli not available
//can't connect if WPA needed, and wpa_supplicant and wpa_cli not available
if ( NetParams . wpa & & ! wpaAvailable ) {
if ( NetParams . wpa & & ! wpaAvailable ) {
KMessageBox : : error ( 0 , i18n ( " <qt><p><b>Can not connect to network '%1'.<b></p><p>The network you are trying to connect to requires WPA authentication. The necessary executables <i>wpa_supplicant</i> and <i>wpa_cli</i> could not be found. Install <i>wpa_supplicant</i> and restart Wireless Assistant to connect.</p></qt> " ) . ( NetParams . essid ) ) ;
KMessageBox : : error ( 0 , i18n ( " <qt><p><b>Can not connect to network '%1'.<b></p><p>The network you are trying to connect to requires WPA authentication. The necessary executables <i>wpa_supplicant</i> and <i>wpa_cli</i> could not be found. Install <i>wpa_supplicant</i> and restart Wireless Assistant to connect.</p></qt> " ) . tq arg( NetParams . essid ) ) ;
timerConnectionCheck - > start ( WA_CONNECTION_CHECK_INTERVAL ) ; //resume connection checking
timerConnectionCheck - > start ( WA_CONNECTION_CHECK_INTERVAL ) ; //resume connection checking
return ;
return ;
}
}
search = NetParams . ap ;
T QString search = NetParams . ap ;
if ( search = = " any " ) search = NetParams . essid ;
if ( search = = " any " ) search = NetParams . essid ;
if ( ( NetParams . essid = = " <hidden> " ) | | ( ! setNetParamsFromConfig ( search ) ) ) {
if ( ( NetParams . essid = = " <hidden> " ) | | ( ! setNetParamsFromConfig ( search ) ) ) {
ui_NetParamsWizard * netwiz = new ui_NetParamsWizard ;
ui_NetParamsWizard * netwiz = new ui_NetParamsWizard ;
if ( ! NetParams . hiddenEssid )
if ( ! NetParams . hiddenEssid )
netwiz - > setCaption ( i18n ( " %1 - First Connection Wizard " ) . ( NetParams . essid ) ) ;
netwiz - > setCaption ( i18n ( " %1 - First Connection Wizard " ) . tq arg( NetParams . essid ) ) ;
netwiz - > setEssidEnabled ( NetParams . hiddenEssid ) ;
netwiz - > setEssidEnabled ( NetParams . hiddenEssid ) ;
netwiz - > setWepEnabled ( NetParams . wep ) ;
netwiz - > setWepEnabled ( NetParams . wep ) ;
netwiz - > setWpaEnabled ( NetParams . wpa , NetParams . wpaSettings ) ;
netwiz - > setWpaEnabled ( NetParams . wpa , NetParams . wpaSettings ) ;
netwiz - > exec ( ) ;
netwiz - > exec ( ) ;
if ( netwiz - > result ( ) = = : : Rejected ) {
if ( netwiz - > result ( ) = = T QDialog: : Rejected ) {
delete netwiz ;
delete netwiz ;
timerConnectionCheck - > start ( WA_CONNECTION_CHECK_INTERVAL ) ; //resume connection checking
timerConnectionCheck - > start ( WA_CONNECTION_CHECK_INTERVAL ) ; //resume connection checking
return ;
return ;
@ -609,9 +609,9 @@ void WirelessAssistant::netConnect()
void WirelessAssistant : : updateNetParams ( ) void WirelessAssistant : : updateNetParams ( )
{ {
for ( : : Iterator nps = NetParamsList . begin ( ) ; nps ! = NetParamsList . end ( ) ; nps + + ) {
for ( T QStringList: : Iterator nps = NetParamsList . begin ( ) ; nps ! = NetParamsList . end ( ) ; nps + + ) {
if ( ( * nps ) . section ( " , " , 2 , 2 ) = = NetParams . ap ) {
if ( ( * nps ) . section ( " , " , 2 , 2 ) = = NetParams . ap ) {
newNps = NetParams . netParamsString ( ) ;
T QString newNps = NetParams . netParamsString ( ) ;
if ( newNps ! = ( * nps ) ) {
if ( newNps ! = ( * nps ) ) {
( * nps ) = newNps ;
( * nps ) = newNps ;
WAConfig : : self ( ) - > writeConfig ( ) ;
WAConfig : : self ( ) - > writeConfig ( ) ;
@ -623,9 +623,9 @@ void WirelessAssistant::updateNetParams()
}
}
} }
WirelessAssistant : : matchEssidForAp ( const & ap ) T QString WirelessAssistant : : matchEssidForAp ( const T QString & ap )
{ {
for ( : : Iterator nps = NetParamsList . begin ( ) ; nps ! = NetParamsList . end ( ) ; nps + + ) {
for ( T QStringList: : Iterator nps = NetParamsList . begin ( ) ; nps ! = NetParamsList . end ( ) ; nps + + ) {
if ( ( * nps ) . section ( " , " , 2 , 2 ) = = ap ) {
if ( ( * nps ) . section ( " , " , 2 , 2 ) = = ap ) {
return ( * nps ) . section ( " , " , 1 , 1 ) ; //essid
return ( * nps ) . section ( " , " , 1 , 1 ) ; //essid
}
}
@ -645,16 +645,16 @@ void WirelessAssistant::netConnect( const WANetParams & np )
if ( ! np . preConnectionCommand . isEmpty ( ) ) {
if ( ! np . preConnectionCommand . isEmpty ( ) ) {
std : : cout < < " Running pre-connection command: " < < np . preConnectionCommand < < std : : endl ;
std : : cout < < " Running pre-connection command: " < < np . preConnectionCommand < < std : : endl ;
statusLabel - > setText ( i18n ( " Running pre-connection command... " ) ) ;
statusLabel - > setText ( i18n ( " Running pre-connection command... " ) ) ;
runCommand ( : : split ( " " , np . preConnectionCommand ) , np . preConnectionTimeout , np . preConnectionDetached ) ;
runCommand ( T QStringList: : split ( " " , np . preConnectionCommand ) , np . preConnectionTimeout , np . preConnectionDetached ) ;
} else
} else
std : : cout < < " No pre-connection command specified. " < < std : : endl ;
std : : cout < < " No pre-connection command specified. " < < std : : endl ;
statusLabel - > setText ( i18n ( " Connecting to '%1'... " ) . ( np . essid ) ) ;
statusLabel - > setText ( i18n ( " Connecting to '%1'... " ) . tq arg( np . essid ) ) ;
statusLabel - > ( ) ;
statusLabel - > tq repaint( ) ;
if ( ! WATools : : isUp ( np . iface ) ) WATools : : setUp ( true , np . iface ) ;
if ( ! WATools : : isUp ( np . iface ) ) WATools : : setUp ( true , np . iface ) ;
//runCommand( Commands.cmd("ifup", np) );
//runCommand( Commands.cmd("ifup", np) );
if ( runCommand ( Commands . cmd ( " iwconfig_set " , np ) ) . ( " 8B04 " ) > - 1 ) { // error 8B04 - Request 'Set Frequency' not supported.
if ( runCommand ( Commands . cmd ( " iwconfig_set " , np ) ) . tq find( " 8B04 " ) > - 1 ) { // error 8B04 - Request 'Set Frequency' not supported.
WANetParams np2 = np ;
WANetParams np2 = np ;
np2 . channel = " 0 " ;
np2 . channel = " 0 " ;
runCommand ( Commands . cmd ( " iwconfig_set " , np2 ) ) ;
runCommand ( Commands . cmd ( " iwconfig_set " , np2 ) ) ;
@ -679,8 +679,8 @@ void WirelessAssistant::netConnect( const WANetParams & np )
////////////////////////
////////////////////////
///// CONFIGURE IP ADDRESS etc.
///// CONFIGURE IP ADDRESS etc.
if ( np . dhcp ) { //DHCP config
if ( np . dhcp ) { //DHCP config
dhcp_out = runCommand ( Commands . cmd ( " ifconfig_dhcp " , np ) , DhcpTimeout ) ;
T QString dhcp_out = runCommand ( Commands . cmd ( " ifconfig_dhcp " , np ) , DhcpTimeout ) ;
if ( dhcp_out . ( " ::ERR:: " ) & & ! dhcp_out . ( " bound to " ) ) { // 'bound to' is a check for dhclient, which gives some output to stderr even when succeeded
if ( dhcp_out . tq contains( " ::ERR:: " ) & & ! dhcp_out . tq contains( " bound to " ) ) { // 'bound to' is a check for dhclient, which gives some output to stderr even when succeeded
if ( dhcpClientRunning ( ) )
if ( dhcpClientRunning ( ) )
runCommand ( Commands . cmd ( " kill_dhcp " , np ) ) ; //kill any stale DHCP client running (seems it's dhclient only)
runCommand ( Commands . cmd ( " kill_dhcp " , np ) ) ; //kill any stale DHCP client running (seems it's dhclient only)
setUi ( 1 ) ;
setUi ( 1 ) ;
@ -698,7 +698,7 @@ void WirelessAssistant::netConnect( const WANetParams & np )
if ( ! np . postConnectionCommand . isEmpty ( ) ) {
if ( ! np . postConnectionCommand . isEmpty ( ) ) {
std : : cout < < " Running post-connection command: " < < np . postConnectionCommand < < std : : endl ;
std : : cout < < " Running post-connection command: " < < np . postConnectionCommand < < std : : endl ;
statusLabel - > setText ( i18n ( " Running post-connection command... " ) ) ;
statusLabel - > setText ( i18n ( " Running post-connection command... " ) ) ;
runCommand ( : : split ( " " , np . postConnectionCommand ) , np . postConnectionTimeout , np . postConnectionDetached ) ;
runCommand ( T QStringList: : split ( " " , np . postConnectionCommand ) , np . postConnectionTimeout , np . postConnectionDetached ) ;
} else
} else
std : : cout < < " No post-connection command specified. " < < std : : endl ;
std : : cout < < " No post-connection command specified. " < < std : : endl ;
@ -710,7 +710,7 @@ void WirelessAssistant::netConnect( const WANetParams & np )
if ( autoQuit )
if ( autoQuit )
this - > close ( ) ;
this - > close ( ) ;
groupAPs ? setConnectedItem ( np . essid ) : setConnectedItem ( np . ap ) ;
groupAPs ? setConnectedItem ( np . essid ) : setConnectedItem ( np . ap ) ;
statusLabel - > setText ( i18n ( " Successfully connected to '%1'. " ) . ( np . essid ) ) ;
statusLabel - > setText ( i18n ( " Successfully connected to '%1'. " ) . tq arg( np . essid ) ) ;
setUi ( 1 ) ;
setUi ( 1 ) ;
} else {
} else {
std : : cout < < " CONNECTION FAILED. " < < std : : endl ;
std : : cout < < " CONNECTION FAILED. " < < std : : endl ;
@ -728,7 +728,7 @@ void WirelessAssistant::updateConnectedItem()
connectedItem - > setQuality ( WATools : : quality ( ) ) ;
connectedItem - > setQuality ( WATools : : quality ( ) ) ;
} }
void WirelessAssistant : : setConnectedItem ( const & netid ) void WirelessAssistant : : setConnectedItem ( const T QString & netid )
{ {
timerConnectionCheck - > stop ( ) ; //stop timer while changing currentItem
timerConnectionCheck - > stop ( ) ; //stop timer while changing currentItem
if ( connectedItem ) {
if ( connectedItem ) {
@ -737,8 +737,8 @@ void WirelessAssistant::setConnectedItem( const QString & netid )
connectedItem = 0 ;
connectedItem = 0 ;
}
}
if ( ! netid . isEmpty ( ) ) {
if ( ! netid . isEmpty ( ) ) {
* lvi ;
T QListViewItem* lvi ;
if ( netid . ( " : " ) ) lvi = getItemByAp ( netid ) ; //netid is an AP address
if ( netid . tq contains( " : " ) ) lvi = getItemByAp ( netid ) ; //netid is an AP address
else lvi = getItemByEssid ( netid ) ;
else lvi = getItemByEssid ( netid ) ;
if ( lvi ) {
if ( lvi ) {
NetListViewItem * nvi = static_cast < NetListViewItem * > ( lvi ) ;
NetListViewItem * nvi = static_cast < NetListViewItem * > ( lvi ) ;
@ -757,29 +757,29 @@ void WirelessAssistant::setConnectedItem( const QString & netid )
void WirelessAssistant : : netDisconnect ( const bool & quiet ) void WirelessAssistant : : netDisconnect ( const bool & quiet )
{ {
if ( ( quiet ) | | ( KMessageBox : : warningContinueCancel ( 0 , i18n ( " <qt><p>You are about to disconnect from '<b>%1</b>'.</p><p>Would you like to continue?<p></qt> " ) . ( connectedItem - > essid ( ) ) ) = = KMessageBox : : Continue ) ) {
if ( ( quiet ) | | ( KMessageBox : : warningContinueCancel ( 0 , i18n ( " <qt><p>You are about to disconnect from '<b>%1</b>'.</p><p>Would you like to continue?<p></qt> " ) . tq arg( connectedItem - > essid ( ) ) ) = = KMessageBox : : Continue ) ) {
timerConnectionCheck - > stop ( ) ; //stop while disconnecting.
timerConnectionCheck - > stop ( ) ; //stop while disconnecting.
if ( ! NetParams . preDisconnectionCommand . isEmpty ( ) ) {
if ( ! NetParams . preDisconnectionCommand . isEmpty ( ) ) {
std : : cout < < " Running pre-disconnection command: " < < NetParams . preDisconnectionCommand < < std : : endl ;
std : : cout < < " Running pre-disconnection command: " < < NetParams . preDisconnectionCommand < < std : : endl ;
statusLabel - > setText ( i18n ( " Running pre-disconnection command... " ) ) ;
statusLabel - > setText ( i18n ( " Running pre-disconnection command... " ) ) ;
runCommand ( : : split ( " " , NetParams . preDisconnectionCommand ) , NetParams . preDisconnectionTimeout , NetParams . preDisconnectionDetached ) ;
runCommand ( T QStringList: : split ( " " , NetParams . preDisconnectionCommand ) , NetParams . preDisconnectionTimeout , NetParams . preDisconnectionDetached ) ;
} else
} else
std : : cout < < " No pre-disconnection command specified. " < < std : : endl ;
std : : cout < < " No pre-disconnection command specified. " < < std : : endl ;
statusLabel - > setText ( i18n ( " Disconnecting... " ) ) ;
statusLabel - > setText ( i18n ( " Disconnecting... " ) ) ;
statusLabel - > ( ) ;
statusLabel - > tq repaint( ) ;
setConnectedItem ( 0 ) ;
setConnectedItem ( 0 ) ;
if ( NetParams . dhcp ) {
if ( NetParams . dhcp ) {
if ( dhcpClientRunning ( ) ) {
if ( dhcpClientRunning ( ) ) {
runCommand ( Commands . cmd ( " kill_dhcp " , NetParams ) ) ;
runCommand ( Commands . cmd ( " kill_dhcp " , NetParams ) ) ;
statusLabel - > setText ( i18n ( " Waiting for DHCP client to shut down... " ) ) ;
statusLabel - > setText ( i18n ( " Waiting for DHCP client to shut down... " ) ) ;
statusLabel - > ( ) ;
statusLabel - > tq repaint( ) ;
* tmr = new ( ) ;
T QTimer* tmr = new T QTimer( ) ;
tmr - > start ( 1500 , true ) ; //wait 1.5sec for dhcp client to really shutdown, single shot.
tmr - > start ( 1500 , true ) ; //wait 1.5sec for dhcp client to really shutdown, single shot.
while ( tmr - > isActive ( ) ) {
while ( tmr - > isActive ( ) ) {
KApplication : : eventLoop ( ) - > processEvents ( : : AllEvents ) ;
KApplication : : eventLoop ( ) - > processEvents ( T QEventLoop: : AllEvents ) ;
usleep ( 75 * 1000 ) ; //75msec on Linux
usleep ( 75 * 1000 ) ; //75msec on Linux
}
}
delete tmr ;
delete tmr ;
@ -798,7 +798,7 @@ void WirelessAssistant::netDisconnect( const bool & quiet )
if ( ! NetParams . postDisconnectionCommand . isEmpty ( ) ) {
if ( ! NetParams . postDisconnectionCommand . isEmpty ( ) ) {
std : : cout < < " Running post-disconnection command: " < < NetParams . postDisconnectionCommand < < std : : endl ;
std : : cout < < " Running post-disconnection command: " < < NetParams . postDisconnectionCommand < < std : : endl ;
statusLabel - > setText ( i18n ( " Running post-disconnection command... " ) ) ;
statusLabel - > setText ( i18n ( " Running post-disconnection command... " ) ) ;
runCommand ( : : split ( " " , NetParams . postDisconnectionCommand ) , NetParams . postDisconnectionTimeout , NetParams . postDisconnectionDetached ) ;
runCommand ( T QStringList: : split ( " " , NetParams . postDisconnectionCommand ) , NetParams . postDisconnectionTimeout , NetParams . postDisconnectionDetached ) ;
} else
} else
std : : cout < < " No post-disconnection command specified. " < < std : : endl ;
std : : cout < < " No post-disconnection command specified. " < < std : : endl ;
@ -810,9 +810,9 @@ void WirelessAssistant::netDisconnect( const bool & quiet )
}
}
} }
* WirelessAssistant : : getItemByAp ( const & ap ) T QListViewItem* WirelessAssistant : : getItemByAp ( const T QString & ap )
{ {
* lvi = netList - > firstChild ( ) ;
T QListViewItem* lvi = netList - > firstChild ( ) ;
while ( lvi ) {
while ( lvi ) {
if ( static_cast < NetListViewItem * > ( lvi ) - >
if ( static_cast < NetListViewItem * > ( lvi ) - >
ap ( ) = = ap ) {
ap ( ) = = ap ) {
@ -823,9 +823,9 @@ QListViewItem* WirelessAssistant::getItemByAp( const QString & ap )
return lvi ;
return lvi ;
} }
* WirelessAssistant : : getItemByEssid ( const & essid ) T QListViewItem* WirelessAssistant : : getItemByEssid ( const T QString & essid )
{ {
* lvi = netList - > firstChild ( ) ;
T QListViewItem* lvi = netList - > firstChild ( ) ;
while ( lvi ) {
while ( lvi ) {
if ( static_cast < NetListViewItem * > ( lvi ) - >
if ( static_cast < NetListViewItem * > ( lvi ) - >
essid ( ) = = essid ) {
essid ( ) = = essid ) {
@ -858,7 +858,7 @@ void WirelessAssistant::togglePage(bool options)
buttonScan - > setDisabled ( options ) ;
buttonScan - > setDisabled ( options ) ;
buttonConnect - > setDisabled ( options ) ;
buttonConnect - > setDisabled ( options ) ;
if ( options ) {
if ( options ) {
if ( WAConfig : : self ( ) - > config ( ) - > groupList ( ) . ( " Notification Messages " ) > 0 )
if ( WAConfig : : self ( ) - > config ( ) - > groupList ( ) . tq contains( " Notification Messages " ) > 0 )
buttonEnableAllMessages - > setEnabled ( true ) ;
buttonEnableAllMessages - > setEnabled ( true ) ;
else
else
buttonEnableAllMessages - > setEnabled ( false ) ;
buttonEnableAllMessages - > setEnabled ( false ) ;
@ -878,43 +878,43 @@ void WirelessAssistant::enableAllMessages()
void WirelessAssistant : : setMouseBehaviour ( ) void WirelessAssistant : : setMouseBehaviour ( )
{ {
if ( KGlobalSettings : : singleClick ( ) ) {
if ( KGlobalSettings : : singleClick ( ) ) {
disconnect ( netList , ( selectionChanged ( * ) ) ,
disconnect ( netList , TQT_ SIGNAL( selectionChanged ( T QListViewItem* ) ) ,
this , ( updateConnectButton ( * ) ) ) ;
this , TQT_ SLOT( updateConnectButton ( T QListViewItem* ) ) ) ;
disconnect ( netList , ( doubleClicked ( * , const & , int ) ) ,
disconnect ( netList , TQT_ SIGNAL( doubleClicked ( T QListViewItem* , const T QPoint & , int ) ) ,
this , ( itemAction ( ) ) ) ;
this , TQT_ SLOT( itemAction ( ) ) ) ;
connect ( netList , ( clicked ( * , const & , int ) ) ,
connect ( netList , TQT_ SIGNAL( clicked ( T QListViewItem* , const T QPoint & , int ) ) ,
this , ( itemAction ( ) ) ) ;
this , TQT_ SLOT( itemAction ( ) ) ) ;
buttonConnect - > hide ( ) ;
buttonConnect - > hide ( ) ;
} else {
} else {
disconnect ( netList , ( clicked ( * , const & , int ) ) ,
disconnect ( netList , TQT_ SIGNAL( clicked ( T QListViewItem* , const T QPoint & , int ) ) ,
this , ( itemAction ( ) ) ) ;
this , TQT_ SLOT( itemAction ( ) ) ) ;
connect ( netList , ( selectionChanged ( * ) ) ,
connect ( netList , TQT_ SIGNAL( selectionChanged ( T QListViewItem* ) ) ,
this , ( updateConnectButton ( * ) ) ) ;
this , TQT_ SLOT( updateConnectButton ( T QListViewItem* ) ) ) ;
connect ( netList , ( doubleClicked ( * , const & , int ) ) ,
connect ( netList , TQT_ SIGNAL( doubleClicked ( T QListViewItem* , const T QPoint & , int ) ) ,
this , ( itemAction ( ) ) ) ;
this , TQT_ SLOT( itemAction ( ) ) ) ;
buttonConnect - > show ( ) ;
buttonConnect - > show ( ) ;
}
}
} }
void WirelessAssistant : : updateConnectButton ( * lvi ) void WirelessAssistant : : updateConnectButton ( T QListViewItem* lvi )
{ {
: : remove
T QToolTip: : remove
( buttonConnect ) ;
( buttonConnect ) ;
if ( lvi = = connectedItem ) {
if ( lvi = = connectedItem ) {
buttonConnect - > setText ( i18n ( " &Disconnect " ) ) ;
buttonConnect - > setText ( i18n ( " &Disconnect " ) ) ;
: : add
T QToolTip: : add
( buttonConnect , i18n ( " Disconnect from the selected network " ) ) ;
( buttonConnect , i18n ( " Disconnect from the selected network " ) ) ;
} else {
} else {
buttonConnect - > setText ( i18n ( " &Connect " ) ) ;
buttonConnect - > setText ( i18n ( " &Connect " ) ) ;
: : add
T QToolTip: : add
( buttonConnect , i18n ( " Connect to the selected network " ) ) ;
( buttonConnect , i18n ( " Connect to the selected network " ) ) ;
}
}
} }
void WirelessAssistant : : setDev ( const & ifname ) void WirelessAssistant : : setDev ( const T QString & ifname )
{ {
NetParams . iface = ifname ;
NetParams . iface = ifname ;
WATools : : setInterface ( ifname ) ;
WATools : : setInterface ( ifname ) ;
@ -922,67 +922,67 @@ void WirelessAssistant::setDev( const QString & ifname)
netScan ( ) ;
netScan ( ) ;
} }
WirelessAssistant : : runCommand ( const & cmd , int timeout , bool detached ) T QString WirelessAssistant : : runCommand ( const T QStringList & cmd , int timeout , bool detached )
{ {
if ( cmd . isEmpty ( ) )
if ( cmd . isEmpty ( ) )
return QString : : null ;
return TQString ( ) ;
// a very basic and easy-to-workaround attepmt to restrict using dangerous commands via custom commands setting. This *REALLY* needs a working solution.
// a very basic and easy-to-workaround attepmt to restrict using dangerous commands via custom commands setting. This *REALLY* needs a working solution.
if ( cmd [ 0 ] = = " rm " | | cmd [ 0 ] = = " mv " | | cmd [ 0 ] = = " cp " | | cmd [ 0 ] = = " ln " ) return QString: : null ;
if ( cmd [ 0 ] = = " rm " | | cmd [ 0 ] = = " mv " | | cmd [ 0 ] = = " cp " | | cmd [ 0 ] = = " ln " ) return TQString( ) ;
* p = new ( this ) ;
T QProcess* p = new T QProcess( TQT_TQOBJECT ( this ) ) ;
p - > setArguments ( cmd ) ;
p - > setArguments ( cmd ) ;
p - > start ( ) ;
p - > start ( ) ;
if ( detached ) {
if ( detached ) {
p = 0 ;
p = 0 ;
return QString : : null ;
return TQString ( ) ;
}
}
* timerProc = new ( ) ; //timeout timer
T QTimer* timerProc = new T QTimer( ) ; //timeout timer
if ( timeout > 0 & & ! detached ) {
if ( timeout > 0 & & ! detached ) {
connect ( timerProc , ( timeout ( ) ) , p , ( kill ( ) ) ) ;
connect ( timerProc , TQT_ SIGNAL( timeout ( ) ) , p , TQT_ SLOT( kill ( ) ) ) ;
timerProc - > start ( timeout * 1000 ) ; //convert sec to msec
timerProc - > start ( timeout * 1000 ) ; //convert sec to msec
}
}
connect ( buttonClose , ( clicked ( ) ) ,
connect ( buttonClose , TQT_ SIGNAL( clicked ( ) ) ,
p , ( kill ( ) ) ) ;
p , TQT_ SLOT( kill ( ) ) ) ;
int i = 0 ;
int i = 0 ;
while ( p - > isRunning ( ) ) { // PROCESS USER EVENTS
while ( p - > isRunning ( ) ) { // PROCESS USER EVENTS
KApplication : : eventLoop ( ) - > processEvents ( : : AllEvents ) ;
KApplication : : eventLoop ( ) - > processEvents ( T QEventLoop: : AllEvents ) ;
usleep ( 75 * 1000 ) ; //75msec on Linux (75000msec on Windows...)
usleep ( 75 * 1000 ) ; //75msec on Linux (75000msec on Windows...)
if ( i = = 27 ) { // ca 2sec have passed and the process is still running. Replace the 'Close' button with 'Stop'.
if ( i = = 27 ) { // ca 2sec have passed and the process is still running. Replace the 'Close' button with 'Stop'.
disconnect ( buttonClose , ( clicked ( ) ) ,
disconnect ( buttonClose , TQT_ SIGNAL( clicked ( ) ) ,
this , ( close ( ) ) ) ;
this , TQT_ SLOT( close ( ) ) ) ;
buttonClose - > setIconSet ( SmallIconSet ( " stop " ) ) ;
buttonClose - > setIconSet ( SmallIconSet ( " stop " ) ) ;
buttonClose - > setText ( i18n ( " &Stop " ) ) ;
buttonClose - > setText ( i18n ( " &Stop " ) ) ;
: : remove
T QToolTip: : remove
( buttonClose ) ;
( buttonClose ) ;
: : add
T QToolTip: : add
( buttonClose , i18n ( " Terminate current process \n (%1) " ) . ( p - > arguments ( ) . join ( " " ) ) ) ;
( buttonClose , i18n ( " Terminate current process \n (%1) " ) . tq arg( p - > arguments ( ) . join ( " " ) ) ) ;
}
}
i + + ;
i + + ;
}
}
disconnect ( buttonClose , ( clicked ( ) ) ,
disconnect ( buttonClose , TQT_ SIGNAL( clicked ( ) ) ,
p , ( kill ( ) ) ) ;
p , TQT_ SLOT( kill ( ) ) ) ;
if ( i > 27 ) { //set 'stop' back to 'close' if needed
if ( i > 27 ) { //set 'stop' back to 'close' if needed
connect ( buttonClose , ( clicked ( ) ) ,
connect ( buttonClose , TQT_ SIGNAL( clicked ( ) ) ,
this , ( close ( ) ) ) ;
this , TQT_ SLOT( close ( ) ) ) ;
buttonClose - > setIconSet ( SmallIconSet ( " fileclose " ) ) ;
buttonClose - > setIconSet ( SmallIconSet ( " fileclose " ) ) ;
buttonClose - > setText ( i18n ( " &Quit " ) ) ;
buttonClose - > setText ( i18n ( " &Quit " ) ) ;
: : remove
T QToolTip: : remove
( buttonClose ) ;
( buttonClose ) ;
: : add
T QToolTip: : add
( buttonClose , i18n ( " Quit the application " ) ) ;
( buttonClose , i18n ( " Quit the application " ) ) ;
}
}
if ( timerProc - > isActive ( ) )
if ( timerProc - > isActive ( ) )
timerProc - > stop ( ) ;
timerProc - > stop ( ) ;
delete timerProc ;
delete timerProc ;
e = ( p - > readStderr ( ) ) ;
T QString e = T QString( p - > readStderr ( ) ) ;
o = ( p - > readStdout ( ) ) ;
T QString o = T QString( p - > readStdout ( ) ) ;
if ( ! p - > normalExit ( ) ) {
if ( ! p - > normalExit ( ) ) {
o . append ( " ::ERR::killed " ) ;
o . append ( " ::ERR::killed " ) ;
//std::cout << "Process terminated (timed out)." << std::endl; //too much output when checking for internet when it's not available.
//std::cout << "Process terminated (timed out)." << std::endl; //too much output when checking for internet when it's not available.
@ -1006,7 +1006,7 @@ void WirelessAssistant::setUi(int uiState)
buttonScan - > setEnabled ( false ) ;
buttonScan - > setEnabled ( false ) ;
buttonConnect - > setEnabled ( false ) ;
buttonConnect - > setEnabled ( false ) ;
buttonOptions - > setEnabled ( false ) ;
buttonOptions - > setEnabled ( false ) ;
KApplication : : setOverrideCursor ( ( : : BusyCursor ) ) ;
KApplication : : setOverrideCursor ( T QCursor( T Qt: : BusyCursor ) ) ;
} else {
} else {
if ( devCombo - > count ( ) > 0 ) {
if ( devCombo - > count ( ) > 0 ) {
devCombo - > setEnabled ( true ) ;
devCombo - > setEnabled ( true ) ;
@ -1019,14 +1019,14 @@ void WirelessAssistant::setUi(int uiState)
}
}
} }
void WirelessAssistant : : showItemContextMenu ( * i , const & p , int c ) void WirelessAssistant : : showItemContextMenu ( T QListViewItem* i , const T QPoint& p , int c )
{ {
if ( ! i )
if ( ! i )
return ;
return ;
NetListViewItem * nvi = static_cast < NetListViewItem * > ( i ) ;
NetListViewItem * nvi = static_cast < NetListViewItem * > ( i ) ;
search = nvi - > ap ( ) ;
T QString search = nvi - > ap ( ) ;
if ( search = = " any " ) search = nvi - > essid ( ) ;
if ( search = = " any " ) search = nvi - > essid ( ) ;
bool isConfigured = setNetParamsFromConfig ( search ) ;
bool isConfigured = setNetParamsFromConfig ( search ) ;
@ -1034,21 +1034,21 @@ void WirelessAssistant::showItemContextMenu( QListViewItem* i, const QPoint& p,
icm - > insertTitle ( nvi - > essid ( ) ) ;
icm - > insertTitle ( nvi - > essid ( ) ) ;
if ( isConfigured ) {
if ( isConfigured ) {
if ( nvi - > isConnected ( ) ) {
if ( nvi - > isConnected ( ) ) {
icm - > insertItem ( SmallIcon ( " connect_no " ) , i18n ( " Disconnect... " ) , this , ( netDisconnect ( ) ) ) ;
icm - > insertItem ( SmallIcon ( " connect_no " ) , i18n ( " Disconnect... " ) , this , TQT_ SLOT( netDisconnect ( ) ) ) ;
//icm->insertItem( SmallIcon("reload"), i18n("Reconnect"), this, SLOT(netConnect()) );
//icm->insertItem( SmallIcon("reload"), i18n("Reconnect"), this, TQT_ SLOT(netConnect()) );
} else
} else
icm - > insertItem ( SmallIcon ( " connect_creating " ) , i18n ( " Connect " ) , this , ( netConnect ( ) ) ) ;
icm - > insertItem ( SmallIcon ( " connect_creating " ) , i18n ( " Connect " ) , this , TQT_ SLOT( netConnect ( ) ) ) ;
icm - > insertSeparator ( ) ;
icm - > insertSeparator ( ) ;
icm - > insertItem ( i18n ( " Forget Settings... " ) , this , ( removeNetParams ( ) ) ) ;
icm - > insertItem ( i18n ( " Forget Settings... " ) , this , TQT_ SLOT( removeNetParams ( ) ) ) ;
icm - > insertItem ( i18n ( " Edit Settings... " ) , this , ( editNetParams ( ) ) ) ;
icm - > insertItem ( i18n ( " Edit Settings... " ) , this , TQT_ SLOT( editNetParams ( ) ) ) ;
} else {
} else {
if ( nvi - > isConnected ( ) ) {
if ( nvi - > isConnected ( ) ) {
icm - > insertItem ( SmallIcon ( " connect_no " ) , i18n ( " Disconnect... " ) , this , ( netDisconnect ( ) ) ) ;
icm - > insertItem ( SmallIcon ( " connect_no " ) , i18n ( " Disconnect... " ) , this , TQT_ SLOT( netDisconnect ( ) ) ) ;
//icm->insertItem( SmallIcon("reload"), i18n("Configure and Reconnect..."), this, SLOT(netConnect()) );
//icm->insertItem( SmallIcon("reload"), i18n("Configure and Reconnect..."), this, TQT_ SLOT(netConnect()) );
} else
} else
icm - > insertItem ( SmallIcon ( " connect_creating " ) , i18n ( " Configure and Connect... " ) , this , ( netConnect ( ) ) ) ;
icm - > insertItem ( SmallIcon ( " connect_creating " ) , i18n ( " Configure and Connect... " ) , this , TQT_ SLOT( netConnect ( ) ) ) ;
}
}
icm - > exec ( : : pos ( ) ) ;
icm - > exec ( T QCursor: : pos ( ) ) ;
} }
void WirelessAssistant : : editNetParams ( ) void WirelessAssistant : : editNetParams ( )
@ -1059,9 +1059,9 @@ void WirelessAssistant::editNetParams()
ui_NetParamsEdit * netedit = new ui_NetParamsEdit ( ) ;
ui_NetParamsEdit * netedit = new ui_NetParamsEdit ( ) ;
netedit - > setValues ( NetParams ) ;
netedit - > setValues ( NetParams ) ;
netedit - > setCaption ( i18n ( " %1 Settings " ) . ( NetParams . essid ) ) ;
netedit - > setCaption ( i18n ( " %1 Settings " ) . tq arg( NetParams . essid ) ) ;
netedit - > exec ( ) ;
netedit - > exec ( ) ;
if ( netedit - > result ( ) = = : : Rejected ) {
if ( netedit - > result ( ) = = T QDialog: : Rejected ) {
delete netedit ;
delete netedit ;
return ;
return ;
} else { //accepted
} else { //accepted
@ -1081,16 +1081,16 @@ void WirelessAssistant::setNetListColumns()
bool WirelessAssistant : : dhcpClientRunning ( ) bool WirelessAssistant : : dhcpClientRunning ( )
{ {
pidPaths ;
T QStringList pidPaths ;
pidFile ;
T QString pidFile ;
pidPaths < < " /etc/ " < < " /etc/dhcpc/ " < < " /var/run/ " ;
pidPaths < < " /etc/ " < < " /etc/dhcpc/ " < < " /var/run/ " ;
if ( Commands . dhcpClient = = " dhcpcd " )
if ( Commands . dhcpClient = = " dhcpcd " )
pidFile = ( " dhcpcd-%1.pid " ) . ( NetParams . iface ) ;
pidFile = T QString( " dhcpcd-%1.pid " ) . tq arg( NetParams . iface ) ;
else
else
pidFile = ( " dhclient.pid " ) ;
pidFile = T QString( " dhclient.pid " ) ;
for ( : : Iterator it = pidPaths . begin ( ) ; it ! = pidPaths . end ( ) ; + + it ) {
for ( T QStringList: : Iterator it = pidPaths . begin ( ) ; it ! = pidPaths . end ( ) ; + + it ) {
if ( ( ( * it ) . append ( pidFile ) ) . exists ( ) ) {
if ( T QFile( T QString( * it ) . append ( pidFile ) ) . exists ( ) ) {
std : : cout < < " Running DHCP client found. " < < std : : endl ;
std : : cout < < " Running DHCP client found. " < < std : : endl ;
return true ;
return true ;
}
}
@ -1099,13 +1099,13 @@ bool WirelessAssistant::dhcpClientRunning()
return false ;
return false ;
} }
WirelessAssistant : : interfaceList ( ) T QStringList WirelessAssistant : : interfaceList ( )
{ {
d ( " /sys/class/net " ) ;
T QDir d ( " /sys/class/net " ) ;
ifList = d . entryList ( : : Dirs ) ;
T QStringList ifList = d . entryList ( T QDir: : Dirs ) ;
ifList . remove ( " . " ) ; ifList . remove ( " .. " ) ; ifList . remove ( " lo " ) ;
ifList . remove ( " . " ) ; ifList . remove ( " .. " ) ; ifList . remove ( " lo " ) ;
std : : cout < < " All interfaces: " < < ifList . join ( " , " ) < < std : : endl ;
std : : cout < < " All interfaces: " < < ifList . join ( " , " ) < < std : : endl ;
for ( : : Iterator nps = ifList . begin ( ) ; nps ! = ifList . end ( ) ; nps + + ) {
for ( T QStringList: : Iterator nps = ifList . begin ( ) ; nps ! = ifList . end ( ) ; nps + + ) {
const char * i = * nps ;
const char * i = * nps ;
bool w = WATools : : isWireless ( i ) ;
bool w = WATools : : isWireless ( i ) ;
if ( ! WATools : : isWireless ( ( const char * ) * nps ) ) {
if ( ! WATools : : isWireless ( ( const char * ) * nps ) ) {
@ -1115,18 +1115,18 @@ QStringList WirelessAssistant::interfaceList()
return ifList ;
return ifList ;
} }
WirelessAssistant : : getVal ( const & str , const & rxs ) T QString WirelessAssistant : : getVal ( const T QString & str , const T QString & rxs )
{ {
rx ( rxs ) ;
T QRegExp rx ( rxs ) ;
rx . search ( str ) ;
rx . search ( str ) ;
return rx . cap ( 1 ) . stripWhiteSpace ( ) ;
return rx . cap ( 1 ) . stripWhiteSpace ( ) ;
} }
bool WirelessAssistant : : generateWpaConfigFile ( const & essid , const & wpaSettings , const & wpaKey ) bool WirelessAssistant : : generateWpaConfigFile ( const T QString& essid , const T QStringList& wpaSettings , const T QString& wpaKey )
{ {
// 0 WPA version (1 or 2), 1 group, 2 pairwise, 3 suite
// 0 WPA version (1 or 2), 1 group, 2 pairwise, 3 suite
if ( wpaSettings . isEmpty ( ) ) return ( ) ;
if ( wpaSettings . isEmpty ( ) ) return T QString( ) ;
c = " ctrl_interface=/var/run/wpa_supplicant \n network={ \n scan_ssid=0 \n ssid= \" " ; //fast_reauth=1\n
T QString c = " ctrl_interface=/var/run/wpa_supplicant \n network={ \n scan_ssid=0 \n ssid= \" " ; //fast_reauth=1\n
c . append ( essid ) . append ( " \" \n " ) ;
c . append ( essid ) . append ( " \" \n " ) ;
// WPA version
// WPA version
@ -1134,8 +1134,8 @@ bool WirelessAssistant::generateWpaConfigFile( const QString& essid, const QStri
//WPA authentication suite
//WPA authentication suite
c . append ( " key_mgmt= " ) ;
c . append ( " key_mgmt= " ) ;
if ( wpaSettings [ 3 ] . ( " PSK " ) ) c . append ( " WPA-PSK \n " ) ;
if ( wpaSettings [ 3 ] . tq contains( " PSK " ) ) c . append ( " WPA-PSK \n " ) ;
else return ( ) ; // not supported
else return T QString( ) ; // not supported
//WPA pairwise cipher
//WPA pairwise cipher
c . append ( " pairwise= " ) ;
c . append ( " pairwise= " ) ;
@ -1146,7 +1146,7 @@ bool WirelessAssistant::generateWpaConfigFile( const QString& essid, const QStri
c . append ( wpaSettings [ 1 ] ) . append ( " \n " ) ;
c . append ( wpaSettings [ 1 ] ) . append ( " \n " ) ;
//WPA key
//WPA key
k = ( ) ;
T QString k = T QString( ) ;
if ( wpaKey . left ( 2 ) = = " s: " ) { // PASSPHRASE
if ( wpaKey . left ( 2 ) = = " s: " ) { // PASSPHRASE
k . append ( " \" " ) ;
k . append ( " \" " ) ;
k . append ( wpaKey . right ( wpaKey . length ( ) - 2 ) ) ;
k . append ( wpaKey . right ( wpaKey . length ( ) - 2 ) ) ;
@ -1170,10 +1170,10 @@ bool WirelessAssistant::generateWpaConfigFile( const QString& essid, const QStri
// psk=your_psk_here
// psk=your_psk_here
// }
// }
file ( wpaConfigFile ) ;
T QFile file ( wpaConfigFile ) ;
if ( file . exists ( ) ) file . remove ( ) ;
if ( file . exists ( ) ) file . remove ( ) ;
if ( file . open ( IO_WriteOnly ) ) {
if ( file . open ( IO_WriteOnly ) ) {
stream ( & file ) ;
T QTextStream stream ( & file ) ;
stream < < c ;
stream < < c ;
file . close ( ) ;
file . close ( ) ;
//std::cout << "Wrote WPA config: " << wpaConfigFile << std::endl;
//std::cout << "Wrote WPA config: " << wpaConfigFile << std::endl;
@ -1182,42 +1182,42 @@ bool WirelessAssistant::generateWpaConfigFile( const QString& essid, const QStri
return 0 ;
return 0 ;
} }
bool WirelessAssistant : : setWpaClientEnabled ( bool e , const & iface , driver ) bool WirelessAssistant : : setWpaClientEnabled ( bool e , const T QString& iface , T QString driver )
{ {
if ( ! e ) {
if ( ! e ) {
if ( runCommand ( ( Commands . wpa_cli ) < < ( " -i%1 " ) . ( NetParams . iface ) < < " terminate " ) . ( " OK " ) ) {
if ( runCommand ( T QStringList( Commands . wpa_cli ) < < T QString( " -i%1 " ) . tq arg( NetParams . iface ) < < " terminate " ) . tq contains( " OK " ) ) {
( wpaConfigFile ) . remove ( ) ;
T QFile( wpaConfigFile ) . remove ( ) ;
return 1 ;
return 1 ;
} else
} else
return 0 ; // wpa client was not running.
return 0 ; // wpa client was not running.
}
}
if ( ! runCommand ( ( Commands . wpa_cli ) < < ( " -i%1 " ) . ( NetParams . iface ) < < " status " ) . ( " Failed to connect " ) ) {
if ( ! runCommand ( T QStringList( Commands . wpa_cli ) < < T QString( " -i%1 " ) . tq arg( NetParams . iface ) < < " status " ) . tq contains( " Failed to connect " ) ) {
std : : cout < < " WPA client already running. Reconfiguring... " < < std : : endl ;
std : : cout < < " WPA client already running. Reconfiguring... " < < std : : endl ;
runCommand ( ( Commands . wpa_cli ) < < " reconfigure " ) ;
runCommand ( T QStringList( Commands . wpa_cli ) < < " reconfigure " ) ;
} else {
} else {
if ( driver . isEmpty ( ) ) { //detect needed driver
if ( driver . isEmpty ( ) ) { //detect needed driver
k = WATools : : kernelModule ( iface ) ;
T QString k = WATools : : kernelModule ( iface ) ;
if ( k . ( " hermes " ) ) driver = " hermes " ;
if ( k . tq contains( " hermes " ) ) driver = " hermes " ;
else if ( k . ( " atmel " ) ) driver = " atmel " ;
else if ( k . tq contains( " atmel " ) ) driver = " atmel " ;
# if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 13) # if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 13)
else if ( k . ( " ipw " ) ) driver = " ipw " ; //wext should be used for kernels newer than 2.6.12
else if ( k . tq contains( " ipw " ) ) driver = " ipw " ; //wext should be used for kernels newer than 2.6.12
# endif # endif
//Commented out, because ndiswrapper newer than 1.13 works with wext driver.
//Commented out, because ndiswrapper newer than 1.13 works with wext driver.
//else if ( k. contains("ndiswrapper") ) driver = "ndiswrapper";
//else if ( k. tq contains("ndiswrapper") ) driver = "ndiswrapper";
//Commented out, because madwifi-ng works with wext driver.
//Commented out, because madwifi-ng works with wext driver.
//else if ( k. contains("ath") ) driver = "madwifi";
//else if ( k. tq contains("ath") ) driver = "madwifi";
else driver = " wext " ;
else driver = " wext " ;
std : : cout < < " Using wpa_supplicant driver: " < < driver < < std : : endl ;
std : : cout < < " Using wpa_supplicant driver: " < < driver < < std : : endl ;
}
}
* wp = new ( this ) ;
T QProcess* wp = new T QProcess( TQT_TQOBJECT ( this ) ) ;
wp - > clearArguments ( ) ;
wp - > clearArguments ( ) ;
wp - > addArgument ( Commands . wpa_supplicant ) ;
wp - > addArgument ( Commands . wpa_supplicant ) ;
wp - > addArgument ( " -W " ) ; //wait for control interface
wp - > addArgument ( " -W " ) ; //wait for control interface
wp - > addArgument ( ( " -D%1 " ) . ( driver ) ) ;
wp - > addArgument ( T QString( " -D%1 " ) . tq arg( driver ) ) ;
wp - > addArgument ( ( " -i%1 " ) . ( iface ) ) ;
wp - > addArgument ( T QString( " -i%1 " ) . tq arg( iface ) ) ;
wp - > addArgument ( ( " -c%1 " ) . ( wpaConfigFile ) ) ;
wp - > addArgument ( T QString( " -c%1 " ) . tq arg( wpaConfigFile ) ) ;
//std::cout << "Starting WPA client: " << wp->arguments().join(" ") << std::endl;
//std::cout << "Starting WPA client: " << wp->arguments().join(" ") << std::endl;
if ( ! wp - > start ( ) ) {
if ( ! wp - > start ( ) ) {
std : : cout < < " Failed to start WPA client. " < < std : : endl ;
std : : cout < < " Failed to start WPA client. " < < std : : endl ;
@ -1229,19 +1229,19 @@ bool WirelessAssistant::setWpaClientEnabled( bool e, const QString& iface, QStri
usleep ( 200 * 1000 ) ; //200msec for wpa_supplicant to initiate
usleep ( 200 * 1000 ) ; //200msec for wpa_supplicant to initiate
o ;
T QString o ;
int i = 0 ;
int i = 0 ;
while ( ! ( o = runCommand ( ( Commands . wpa_cli ) < < ( " -i%1 " ) . ( NetParams . iface ) < < " status " ) ) . ( " Failed to connect " ) ) {
while ( ! ( o = runCommand ( T QStringList( Commands . wpa_cli ) < < T QString( " -i%1 " ) . tq arg( NetParams . iface ) < < " status " ) ) . tq contains( " Failed to connect " ) ) {
for ( int c = 0 ; c < 15 ; c + + ) {
for ( int c = 0 ; c < 15 ; c + + ) {
usleep ( 75 * 1000 ) ; //75msec
usleep ( 75 * 1000 ) ; //75msec
KApplication : : eventLoop ( ) - > processEvents ( : : AllEvents ) ;
KApplication : : eventLoop ( ) - > processEvents ( T QEventLoop: : AllEvents ) ;
i + + ;
i + + ;
}
}
if ( i > 400 ) { //more than 30sec have passed
if ( i > 400 ) { //more than 30sec have passed
runCommand ( ( Commands . wpa_cli ) < < ( " -i%1 " ) . ( NetParams . iface ) < < " terminate " ) ;
runCommand ( T QStringList( Commands . wpa_cli ) < < T QString( " -i%1 " ) . tq arg( NetParams . iface ) < < " terminate " ) ;
return 0 ;
return 0 ;
}
}
if ( o . ( " wpa_state=COMPLETED " ) ) {
if ( o . tq contains( " wpa_state=COMPLETED " ) ) {
std : : cout < < " WPA Authorisation successful. " < < std : : endl ;
std : : cout < < " WPA Authorisation successful. " < < std : : endl ;
return 1 ;
return 1 ;
}
}
@ -1257,7 +1257,7 @@ bool WirelessAssistant::close()
std : : cout < < " Application options saved. " < < std : : endl ;
std : : cout < < " Application options saved. " < < std : : endl ;
WATools : : cleanup ( ) ;
WATools : : cleanup ( ) ;
std : : cout < < " Kernel socket closed. " < < std : : endl ;
std : : cout < < " Kernel socket closed. " < < std : : endl ;
return : : close ( ) ;
return T QWidget: : close ( ) ;
} }
tpearson
13 years ago