author | mickeyl <mickeyl> | 2003-02-19 10:40:55 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-02-19 10:40:55 (UTC) |
commit | bd6e39ba0c38070d07c76b67a98d2e3ab3f84cb8 (patch) (unidiff) | |
tree | ddb3efba1b42674d3ba892ecd611554c04540392 | |
parent | 2fdd5a12c624b5203b11d54eb9ffe529101f5470 (diff) | |
download | opie-bd6e39ba0c38070d07c76b67a98d2e3ab3f84cb8.zip opie-bd6e39ba0c38070d07c76b67a98d2e3ab3f84cb8.tar.gz opie-bd6e39ba0c38070d07c76b67a98d2e3ab3f84cb8.tar.bz2 |
minor bugfixes - major overhaul coming after public alpha
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 @@ | |||
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | **********************************************************************/ | 14 | **********************************************************************/ |
15 | 15 | ||
16 | #include "resource.h" | 16 | #include "resource.h" |
17 | 17 | ||
18 | #define PIXMAPPATH "/home/mickey/work/opie/pics" | 18 | #define PIXMAPPATH "/usr/share/wellenreiter/pics/" |
19 | 19 | ||
20 | namespace Resource | 20 | namespace Resource |
21 | { | 21 | { |
22 | 22 | ||
23 | QPixmap loadPixmap( const QString& pix ) | 23 | QPixmap loadPixmap( const QString& pix ) |
24 | { | 24 | { |
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() | |||
226 | if ( daemonRunning ) | 226 | if ( daemonRunning ) |
227 | { | 227 | { |
228 | daemonRunning = false; | 228 | daemonRunning = false; |
229 | 229 | ||
230 | logwindow->log( "(i) Daemon has been stopped." ); | 230 | logwindow->log( "(i) Daemon has been stopped." ); |
231 | button->setText( tr( "Start Scanning" ) ); | 231 | button->setText( tr( "Start Scanning" ) ); |
232 | setCaption( tr( "Scanning in progress..." ) ); | 232 | setCaption( tr( "Wellenreiter/Opie" ) ); |
233 | 233 | ||
234 | // Stop daemon - ugly for now... later better | 234 | // Stop daemon - ugly for now... later better |
235 | 235 | ||
236 | system( "killall wellenreiterd" ); | 236 | system( "killall wellenreiterd" ); |
237 | 237 | ||
238 | // get configuration from config window | 238 | // get configuration from config window |
239 | 239 | ||
240 | const QString& interface = configwindow->interfaceName->currentText(); | 240 | const QString& interface = configwindow->interfaceName->currentText(); |
241 | 241 | ||
242 | // reset the interface trying to get it into a usable state again | 242 | // reset the interface trying to get it into a usable state again |
243 | 243 | ||
244 | QString cmdline; | 244 | QString cmdline; |
245 | cmdline.sprintf( "ifdown %s; ifup %s", (const char*) interface, (const char*) interface ); | 245 | cmdline.sprintf( "iwpriv %s monitor 0; ifdown %s; ifup %s", (const char*) interface, (const char*) interface, (const char*) interface ); |
246 | system( cmdline ); | 246 | system( cmdline ); |
247 | 247 | ||
248 | // message the user | 248 | // message the user |
249 | 249 | ||
250 | QMessageBox::information( this, "Wellenreiter/Opie", "Your wireless card\nshould now be usable again." ); | 250 | QMessageBox::information( this, "Wellenreiter/Opie", "Your wireless card\nshould now be usable again." ); |
251 | } | 251 | } |
@@ -274,10 +274,10 @@ void Wellenreiter::buttonClicked() | |||
274 | system( cmdline ); | 274 | system( cmdline ); |
275 | qDebug( "done!" ); | 275 | qDebug( "done!" ); |
276 | 276 | ||
277 | logwindow->log( "(i) Daemon has been started." ); | 277 | logwindow->log( "(i) Daemon has been started." ); |
278 | daemonRunning = true; | 278 | daemonRunning = true; |
279 | button->setText( tr( "Stop Scanning" ) ); | 279 | button->setText( tr( "Stop Scanning" ) ); |
280 | setCaption( tr( "Wellenreiter/Opie" ) ); | 280 | setCaption( tr( "Scanning ..." ) ); |
281 | 281 | ||
282 | } | 282 | } |
283 | } | 283 | } |
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 @@ | |||
45 | * Constructs a WellenreiterBase which is a child of 'parent', with the | 45 | * Constructs a WellenreiterBase which is a child of 'parent', with the |
46 | * name 'name' and widget flags set to 'f' | 46 | * name 'name' and widget flags set to 'f' |
47 | */ | 47 | */ |
48 | WellenreiterBase::WellenreiterBase( QWidget* parent, const char* name, WFlags fl ) | 48 | WellenreiterBase::WellenreiterBase( QWidget* parent, const char* name, WFlags fl ) |
49 | : QWidget( parent, name, fl ) | 49 | : QWidget( parent, name, fl ) |
50 | { | 50 | { |
51 | ani1 = new QPixmap( Resource::loadPixmap( "wellenreiter/networks_rot0" ) ); | 51 | //ani1 = new QPixmap( Resource::loadPixmap( "wellenreiter/networks_rot0" ) ); |
52 | ani2 = new QPixmap( Resource::loadPixmap( "wellenreiter/networks_rot90" ) ); | 52 | //ani2 = new QPixmap( Resource::loadPixmap( "wellenreiter/networks_rot90" ) ); |
53 | ani3 = new QPixmap( Resource::loadPixmap( "wellenreiter/networks_rot180" ) ); | 53 | //ani3 = new QPixmap( Resource::loadPixmap( "wellenreiter/networks_rot180" ) ); |
54 | ani4 = new QPixmap( Resource::loadPixmap( "wellenreiter/networks_rot270" ) ); | 54 | //ani4 = new QPixmap( Resource::loadPixmap( "wellenreiter/networks_rot270" ) ); |
55 | 55 | ||
56 | if ( !name ) | 56 | if ( !name ) |
57 | setName( "WellenreiterBase" ); | 57 | setName( "WellenreiterBase" ); |
58 | resize( 191, 294 ); | 58 | resize( 191, 294 ); |
59 | setCaption( tr( "Wellenreiter" ) ); | 59 | setCaption( tr( "Wellenreiter" ) ); |
60 | WellenreiterBaseLayout = new QVBoxLayout( this ); | 60 | 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 @@ | |||
11 | #include <sys/socket.h> | 11 | #include <sys/socket.h> |
12 | #include <netinet/in.h> | 12 | #include <netinet/in.h> |
13 | #include <arpa/inet.h> | 13 | #include <arpa/inet.h> |
14 | #include <sys/ioctl.h> | 14 | #include <sys/ioctl.h> |
15 | #include <unistd.h> | 15 | #include <unistd.h> |
16 | #include <linux/if.h> | 16 | #include <linux/if.h> |
17 | |||
18 | /* Following typedefs are needed here, because linux/wireless.h | ||
19 | includes linux/ethertool.h which is using them */ | ||
20 | typedef signed char s8; | ||
21 | typedef unsigned char u8; | ||
22 | typedef signed short s16; | ||
23 | typedef unsigned short u16; | ||
24 | typedef signed int s32; | ||
25 | typedef unsigned int u32; | ||
26 | typedef signed long long s64; | ||
27 | typedef unsigned long long u64; | ||
28 | |||
17 | #include <linux/wireless.h> | 29 | #include <linux/wireless.h> |
18 | 30 | ||
19 | #ifndef SIOCIWFIRSTPRIV | 31 | #ifndef SIOCIWFIRSTPRIV |
20 | #define SIOCIWFIRSTPRIV SIOCDEVPRIVATE | 32 | #define SIOCIWFIRSTPRIV SIOCDEVPRIVATE |
21 | #endif | 33 | #endif |
22 | 34 | ||
23 | |||
24 | extern "C" | 35 | extern "C" |
25 | { | 36 | { |
26 | #include <net/bpf.h> | 37 | #include <net/bpf.h> |
27 | #include <pcap.h> | 38 | #include <pcap.h> |
28 | } | 39 | } |
29 | 40 | ||