summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/net/wellenreiter/README27
-rw-r--r--noncore/net/wellenreiter/gui/wellenreiter.cpp26
2 files changed, 41 insertions, 12 deletions
diff --git a/noncore/net/wellenreiter/README b/noncore/net/wellenreiter/README
index c04d30c..af2e611 100644
--- a/noncore/net/wellenreiter/README
+++ b/noncore/net/wellenreiter/README
@@ -2,11 +2,11 @@
2/* W e l l e n r e i t e r I I */ 2/* W e l l e n r e i t e r I I */
3/* =============================== */ 3/* =============================== */
4/* */ 4/* */
5/* Version: Opie-ALPHA */ 5 /* Version: Opie-ALPHA-January */
6/*************************************************************************/ 6/*************************************************************************/
7 7
8-------------------------------------------------- 8--------------------------------------------------
9Release Notes for Opie-ALPHA Version December 2002 9Release Notes for Opie-ALPHA Version January 2002
10-------------------------------------------------- 10--------------------------------------------------
11 11
12===================== 12=====================
@@ -15,9 +15,6 @@ Release Notes for Opie-ALPHA Version December 2002
15 15
16* low-level orinoco_cs-based (including prism2 and spectrum_cs) 16* low-level orinoco_cs-based (including prism2 and spectrum_cs)
17 17
18* Supported Interfaces: wlan0 (yes, I know this is hardcoded and
19 lame, but we're in a hurry and this can be configured soon...)
20
21===================== 18=====================
22= Build = 19= Build =
23===================== 20=====================
@@ -32,24 +29,40 @@ noncore/net/wellenreiter/gui
32 29
33./configure and rebuild. Note that you need libpcap in your toolchain. 30./configure and rebuild. Note that you need libpcap in your toolchain.
34 31
32To compile Wellenreiter within the OZ build environment, add the
33following lines to $OPIEDIR/packages
34CONFIG_WELLENREITER noncore/net/wellenreiter/libwellenreiter libwellenreiter.pro
35CONFIG_WELLENREITER noncore/net/wellenreiter/daemon daemon.pro
36CONFIG_WELLENREITER noncore/net/wellenreiter/gui gui.pro
37CONFIG_WELLENREITER noncore/net/wellenreiter/contrib/orinoco_hopper orinoco_hopper.pro
38
39make -f Makefile.test clean-configs
40cd <BUILDROOT>
41make SUBDIRS=packages/opie package
42
35===================== 43=====================
36= Install = 44= Install =
37===================== 45=====================
38 46
39Alternatively, you can use our precompiled ipk. Get it from 47Alternatively, you can use our precompiled ipk. Get it from
40http://opie.net.wox.org/elan/current. You will also need libpcap. 48http://opie.net.wox.org/wellenreiter/current/. This also includes a recent libpcap.
41 49
42===================== 50=====================
43= Run = 51= Run =
44===================== 52=====================
45 53
54There are two possible modes: <Manual> and <Automatic>. I suggest, you
55start with the <Automatic> Mode. This works just using the "Start"
56and "Stop" Pushbuttons in the Wellenreiter GUI. If this doesn't work,
57then use the following strategy:
58
461. Place card in monitor mode. This is device dependent. 591. Place card in monitor mode. This is device dependent.
47 60
48 Caution: Don't do this while you're logged in via ssh 61 Caution: Don't do this while you're logged in via ssh
49 or otherwise using the wireless interface - your connection 62 or otherwise using the wireless interface - your connection
50 will freeze: The card can't be used normally when sniffing! 63 will freeze: The card can't be used normally when sniffing!
51 64
52 For most orinoco-based cards this can be done using 65 For most orinoco-based cards this can be done using either
53 'iwpriv <interface> 2' or 'iwpriv <interface> 2 1'. 66 'iwpriv <interface> 2' or 'iwpriv <interface> 2 1'.
54 67
55 You can check if this works, by calling 'ifconfig <interface>'. 68 You can check if this works, by calling 'ifconfig <interface>'.
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp
index b22c5cc..4ee9a35 100644
--- a/noncore/net/wellenreiter/gui/wellenreiter.cpp
+++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp
@@ -112,7 +112,7 @@ Wellenreiter::Wellenreiter( QWidget* parent, const char* name, WFlags fl )
112 // setup GUI 112 // setup GUI
113 113
114 connect( button, SIGNAL( clicked() ), this, SLOT( buttonClicked() ) ); 114 connect( button, SIGNAL( clicked() ), this, SLOT( buttonClicked() ) );
115 button->setEnabled( false ); 115 // button->setEnabled( false );
116 netview->setColumnWidthMode( 1, QListView::Manual ); 116 netview->setColumnWidthMode( 1, QListView::Manual );
117 117
118 if ( manufacturerdb ) 118 if ( manufacturerdb )
@@ -235,11 +235,28 @@ void Wellenreiter::buttonClicked()
235 system( "killall orinoco_hopper" ); 235 system( "killall orinoco_hopper" );
236 system( "killall wellenreiterd" ); 236 system( "killall wellenreiterd" );
237 237
238 // FIXME: reset the card trying to get into a usable state again 238 // get configuration from config window
239 239
240 // for now, just message the user 240 const QString& interface = configwindow->interfaceName->currentText();
241 const QString& cardtype = configwindow->deviceType->currentText();
242 const QString& interval = configwindow->hopInterval->cleanText();
241 243
242 QMessageBox::information( this, "Wellenreiter/Opie", "You should reset your\ndevice before using it again." ); 244 // reset the card trying to get into a usable state again
245
246 QString cmdline;
247 cmdline.sprintf( "iwpriv %s monitor 1", (const char*) interface );
248 system( cmdline );
249 cmdline.sprintf( "iwpriv %s monitor 1 6", (const char*) interface );
250 system( cmdline );
251 cmdline.sprintf( "ifconfig %s -promisc", (const char*) interface );
252 system( cmdline );
253 cmdline.sprintf( "killall -14 dhcpcd" );
254 system( cmdline );
255 cmdline.sprintf( "killall -10 udhcpc" );
256
257 // message the user
258
259 QMessageBox::information( this, "Wellenreiter/Opie", "Your wireless card\nshould now be usable again." );
243 } 260 }
244 261
245 else 262 else
@@ -265,7 +282,6 @@ void Wellenreiter::buttonClicked()
265 /* Global::Execute definitely does not work very well with non-gui stuff! :( */ 282 /* Global::Execute definitely does not work very well with non-gui stuff! :( */
266 283
267 QString cmdline; 284 QString cmdline;
268
269 cmdline.sprintf( "iwpriv %s monitor 2", (const char*) interface ); 285 cmdline.sprintf( "iwpriv %s monitor 2", (const char*) interface );
270 system( cmdline ); 286 system( cmdline );
271 cmdline.sprintf( "iwpriv %s monitor 2 1", (const char*) interface ); 287 cmdline.sprintf( "iwpriv %s monitor 2 1", (const char*) interface );