summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/net/wellenreiter/gui/resource.cpp2
-rw-r--r--noncore/net/wellenreiter/gui/wellenreiter.cpp6
-rw-r--r--noncore/net/wellenreiter/gui/wellenreiterbase.cpp8
-rw-r--r--noncore/net/wellenreiter/libwellenreiter/source/cardmode.hh13
4 files changed, 20 insertions, 9 deletions
diff --git a/noncore/net/wellenreiter/gui/resource.cpp b/noncore/net/wellenreiter/gui/resource.cpp
index 58c6bed..fb0966a 100644
--- a/noncore/net/wellenreiter/gui/resource.cpp
+++ b/noncore/net/wellenreiter/gui/resource.cpp
@@ -12,13 +12,13 @@
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
**********************************************************************/
#include "resource.h"
-#define PIXMAPPATH "/home/mickey/work/opie/pics"
+#define PIXMAPPATH "/usr/share/wellenreiter/pics/"
namespace Resource
{
QPixmap loadPixmap( const QString& pix )
{
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp
index c1aae86..4c53028 100644
--- a/noncore/net/wellenreiter/gui/wellenreiter.cpp
+++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp
@@ -226,26 +226,26 @@ void Wellenreiter::buttonClicked()
if ( daemonRunning )
{
daemonRunning = false;
logwindow->log( "(i) Daemon has been stopped." );
button->setText( tr( "Start Scanning" ) );
- setCaption( tr( "Scanning in progress..." ) );
+ 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( "ifdown %s; ifup %s", (const char*) interface, (const char*) interface );
+ 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." );
}
@@ -274,10 +274,10 @@ void Wellenreiter::buttonClicked()
system( cmdline );
qDebug( "done!" );
logwindow->log( "(i) Daemon has been started." );
daemonRunning = true;
button->setText( tr( "Stop Scanning" ) );
- setCaption( tr( "Wellenreiter/Opie" ) );
+ setCaption( tr( "Scanning ..." ) );
}
}
diff --git a/noncore/net/wellenreiter/gui/wellenreiterbase.cpp b/noncore/net/wellenreiter/gui/wellenreiterbase.cpp
index a93c684..da12f2b 100644
--- a/noncore/net/wellenreiter/gui/wellenreiterbase.cpp
+++ b/noncore/net/wellenreiter/gui/wellenreiterbase.cpp
@@ -45,16 +45,16 @@
* Constructs a WellenreiterBase which is a child of 'parent', with the
* name 'name' and widget flags set to 'f'
*/
WellenreiterBase::WellenreiterBase( QWidget* parent, const char* name, WFlags fl )
: QWidget( parent, name, fl )
{
- ani1 = new QPixmap( Resource::loadPixmap( "wellenreiter/networks_rot0" ) );
- ani2 = new QPixmap( Resource::loadPixmap( "wellenreiter/networks_rot90" ) );
- ani3 = new QPixmap( Resource::loadPixmap( "wellenreiter/networks_rot180" ) );
- ani4 = new QPixmap( Resource::loadPixmap( "wellenreiter/networks_rot270" ) );
+ //ani1 = new QPixmap( Resource::loadPixmap( "wellenreiter/networks_rot0" ) );
+ //ani2 = new QPixmap( Resource::loadPixmap( "wellenreiter/networks_rot90" ) );
+ //ani3 = new QPixmap( Resource::loadPixmap( "wellenreiter/networks_rot180" ) );
+ //ani4 = new QPixmap( Resource::loadPixmap( "wellenreiter/networks_rot270" ) );
if ( !name )
setName( "WellenreiterBase" );
resize( 191, 294 );
setCaption( tr( "Wellenreiter" ) );
WellenreiterBaseLayout = new QVBoxLayout( this );
diff --git a/noncore/net/wellenreiter/libwellenreiter/source/cardmode.hh b/noncore/net/wellenreiter/libwellenreiter/source/cardmode.hh
index 652b3ed..58e99ac 100644
--- a/noncore/net/wellenreiter/libwellenreiter/source/cardmode.hh
+++ b/noncore/net/wellenreiter/libwellenreiter/source/cardmode.hh
@@ -11,19 +11,30 @@
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <sys/ioctl.h>
#include <unistd.h>
#include <linux/if.h>
+
+/* Following typedefs are needed here, because linux/wireless.h
+ includes linux/ethertool.h which is using them */
+typedef signed char s8;
+typedef unsigned char u8;
+typedef signed short s16;
+typedef unsigned short u16;
+typedef signed int s32;
+typedef unsigned int u32;
+typedef signed long long s64;
+typedef unsigned long long u64;
+
#include <linux/wireless.h>
#ifndef SIOCIWFIRSTPRIV
#define SIOCIWFIRSTPRIV SIOCDEVPRIVATE
#endif
-
extern "C"
{
#include <net/bpf.h>
#include <pcap.h>
}