author | mickeyl <mickeyl> | 2003-04-05 23:08:46 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-04-05 23:08:46 (UTC) |
commit | b7682f160fafe69bfd47dcfb1c88f2ac2b1afaf5 (patch) (unidiff) | |
tree | 68c5a0c5da88fff94582d2e6a072d8e9bbeaaf30 /noncore/net | |
parent | 6a949f685bd3fb50f810ad603eaafdb57720077c (diff) | |
download | opie-b7682f160fafe69bfd47dcfb1c88f2ac2b1afaf5.zip opie-b7682f160fafe69bfd47dcfb1c88f2ac2b1afaf5.tar.gz opie-b7682f160fafe69bfd47dcfb1c88f2ac2b1afaf5.tar.bz2 |
- correct beacon bug (off-by-one)
- display hex dump per packet in hex window
- allow saving hex window contents
-rw-r--r-- | noncore/net/wellenreiter/gui/hexwindow.cpp | 10 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/hexwindow.h | 1 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/mainwindow.cpp | 23 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/mainwindow.h | 1 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/scanlist.cpp | 4 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/wellenreiter.cpp | 5 |
6 files changed, 38 insertions, 6 deletions
diff --git a/noncore/net/wellenreiter/gui/hexwindow.cpp b/noncore/net/wellenreiter/gui/hexwindow.cpp index a3022f4..8b17285 100644 --- a/noncore/net/wellenreiter/gui/hexwindow.cpp +++ b/noncore/net/wellenreiter/gui/hexwindow.cpp | |||
@@ -20,9 +20,10 @@ MHexWindow::MHexWindow( QWidget * parent, const char * name, WFlags f ) | |||
20 | :QVBox( parent, name, f ) | 20 | :QVBox( parent, name, f ) |
21 | { | 21 | { |
22 | ledit = new QMultiLineEdit( this ); | 22 | ledit = new QMultiLineEdit( this ); |
23 | 23 | ledit->setFont( QFont( "fixed", 10 ) ); | |
24 | |||
24 | // FIXME: Set properties( font, read-only, etc...) | 25 | // FIXME: Set properties( font, read-only, etc...) |
25 | 26 | ||
26 | }; | 27 | }; |
27 | 28 | ||
28 | void MHexWindow::log( QString text ) | 29 | void MHexWindow::log( QString text ) |
@@ -32,6 +33,11 @@ void MHexWindow::log( QString text ) | |||
32 | 33 | ||
33 | }; | 34 | }; |
34 | 35 | ||
36 | const QString MHexWindow::getLog() const | ||
37 | { | ||
38 | return ledit->text(); | ||
39 | } | ||
40 | |||
35 | void MHexWindow::clear() | 41 | void MHexWindow::clear() |
36 | { | 42 | { |
37 | ledit->clear(); | 43 | ledit->clear(); |
diff --git a/noncore/net/wellenreiter/gui/hexwindow.h b/noncore/net/wellenreiter/gui/hexwindow.h index 2618b8c..f2f870c 100644 --- a/noncore/net/wellenreiter/gui/hexwindow.h +++ b/noncore/net/wellenreiter/gui/hexwindow.h | |||
@@ -28,6 +28,7 @@ class MHexWindow: public QVBox | |||
28 | MHexWindow( QWidget * parent = 0, const char * name = "MHexWindow", WFlags f = 0 ); | 28 | MHexWindow( QWidget * parent = 0, const char * name = "MHexWindow", WFlags f = 0 ); |
29 | 29 | ||
30 | void log( QString text ); | 30 | void log( QString text ); |
31 | const QString getLog() const; | ||
31 | void clear(); | 32 | void clear(); |
32 | 33 | ||
33 | protected: | 34 | protected: |
diff --git a/noncore/net/wellenreiter/gui/mainwindow.cpp b/noncore/net/wellenreiter/gui/mainwindow.cpp index 8e0164f..69d2b3a 100644 --- a/noncore/net/wellenreiter/gui/mainwindow.cpp +++ b/noncore/net/wellenreiter/gui/mainwindow.cpp | |||
@@ -107,7 +107,8 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n | |||
107 | 107 | ||
108 | QPopupMenu* fileSave = new QPopupMenu( mb ); | 108 | QPopupMenu* fileSave = new QPopupMenu( mb ); |
109 | fileSave->insertItem( "&Session...", this, SLOT( fileSaveSession() ) ); | 109 | fileSave->insertItem( "&Session...", this, SLOT( fileSaveSession() ) ); |
110 | fileSave->insertItem( "&Log...", this, SLOT( fileSaveLog() ) ); | 110 | fileSave->insertItem( "&Text Log...", this, SLOT( fileSaveLog() ) ); |
111 | fileSave->insertItem( "&Hex Log...", this, SLOT( fileSaveHex() ) ); | ||
111 | 112 | ||
112 | QPopupMenu* fileLoad = new QPopupMenu( mb ); | 113 | QPopupMenu* fileLoad = new QPopupMenu( mb ); |
113 | fileLoad->insertItem( "&Session...", this, SLOT( fileLoadSession() ) ); | 114 | fileLoad->insertItem( "&Session...", this, SLOT( fileLoadSession() ) ); |
@@ -280,6 +281,26 @@ void WellenreiterMainWindow::fileSaveSession() | |||
280 | } | 281 | } |
281 | } | 282 | } |
282 | 283 | ||
284 | void WellenreiterMainWindow::fileSaveHex() | ||
285 | { | ||
286 | QString fname = getFileName( true ); | ||
287 | if ( !fname.isEmpty() ) | ||
288 | { | ||
289 | QFile f( fname ); | ||
290 | if ( f.open(IO_WriteOnly) ) | ||
291 | { | ||
292 | QTextStream t( &f ); | ||
293 | t << mw->hexWindow()->getLog(); | ||
294 | f.close(); | ||
295 | qDebug( "Saved hex log to file '%s'", (const char*) fname ); | ||
296 | } | ||
297 | else | ||
298 | { | ||
299 | qDebug( "Problem saving hex log to file '%s'", (const char*) fname ); | ||
300 | } | ||
301 | } | ||
302 | } | ||
303 | |||
283 | void WellenreiterMainWindow::fileLoadSession() | 304 | void WellenreiterMainWindow::fileLoadSession() |
284 | { | 305 | { |
285 | QString fname = getFileName( false ); | 306 | QString fname = getFileName( false ); |
diff --git a/noncore/net/wellenreiter/gui/mainwindow.h b/noncore/net/wellenreiter/gui/mainwindow.h index e06a60c..1b08c5b 100644 --- a/noncore/net/wellenreiter/gui/mainwindow.h +++ b/noncore/net/wellenreiter/gui/mainwindow.h | |||
@@ -53,6 +53,7 @@ class WellenreiterMainWindow: public QMainWindow | |||
53 | void showConfigure(); | 53 | void showConfigure(); |
54 | void demoAddStations(); | 54 | void demoAddStations(); |
55 | void fileSaveLog(); | 55 | void fileSaveLog(); |
56 | void fileSaveHex(); | ||
56 | void fileSaveSession(); | 57 | void fileSaveSession(); |
57 | void fileLoadSession(); | 58 | void fileLoadSession(); |
58 | void fileNew(); | 59 | void fileNew(); |
diff --git a/noncore/net/wellenreiter/gui/scanlist.cpp b/noncore/net/wellenreiter/gui/scanlist.cpp index a006a3c..34c69f5 100644 --- a/noncore/net/wellenreiter/gui/scanlist.cpp +++ b/noncore/net/wellenreiter/gui/scanlist.cpp | |||
@@ -194,7 +194,7 @@ MScanListItem::MScanListItem( QListView* parent, QString type, QString essid, QS | |||
194 | bool wep, int channel, int signal ) | 194 | bool wep, int channel, int signal ) |
195 | :OListViewItem( parent, essid, QString::null, macaddr, QString::null, QString::null ), | 195 | :OListViewItem( parent, essid, QString::null, macaddr, QString::null, QString::null ), |
196 | _type( type ), _essid( essid ), _macaddr( macaddr ), _wep( wep ), | 196 | _type( type ), _essid( essid ), _macaddr( macaddr ), _wep( wep ), |
197 | _channel( channel ), _signal( signal ), _beacons( 0 ) | 197 | _channel( channel ), _signal( signal ), _beacons( 1 ) |
198 | { | 198 | { |
199 | qDebug( "creating scanlist item" ); | 199 | qDebug( "creating scanlist item" ); |
200 | if ( WellenreiterConfigWindow::instance() && type == "networks" ) | 200 | if ( WellenreiterConfigWindow::instance() && type == "networks" ) |
@@ -274,7 +274,7 @@ void MScanListItem::decorateItem( QString type, QString essid, QString macaddr, | |||
274 | _essid = essid; | 274 | _essid = essid; |
275 | _macaddr = macaddr; | 275 | _macaddr = macaddr; |
276 | _channel = channel; | 276 | _channel = channel; |
277 | _beacons = 0; | 277 | _beacons = 1; |
278 | _signal = 0; | 278 | _signal = 0; |
279 | } | 279 | } |
280 | 280 | ||
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp index d80a6e6..aa33158 100644 --- a/noncore/net/wellenreiter/gui/wellenreiter.cpp +++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp | |||
@@ -110,6 +110,8 @@ void Wellenreiter::setConfigWindow( WellenreiterConfigWindow* cw ) | |||
110 | 110 | ||
111 | void Wellenreiter::receivePacket(OPacket* p) | 111 | void Wellenreiter::receivePacket(OPacket* p) |
112 | { | 112 | { |
113 | hexWindow()->log( p->dump( 8 ) ); | ||
114 | |||
113 | // check if we received a beacon frame | 115 | // check if we received a beacon frame |
114 | // static_cast is justified here | 116 | // static_cast is justified here |
115 | OWaveLanManagementPacket* beacon = static_cast<OWaveLanManagementPacket*>( p->child( "802.11 Management" ) ); | 117 | OWaveLanManagementPacket* beacon = static_cast<OWaveLanManagementPacket*>( p->child( "802.11 Management" ) ); |
@@ -161,6 +163,7 @@ void Wellenreiter::startStopClicked() | |||
161 | iface->setPromiscuousMode( false ); | 163 | iface->setPromiscuousMode( false ); |
162 | 164 | ||
163 | system( "cardctl reset; sleep 1" ); //FIXME: Use OProcess | 165 | system( "cardctl reset; sleep 1" ); //FIXME: Use OProcess |
166 | logwindow->log( "(i) Stopped Scanning." ); | ||
164 | 167 | ||
165 | // message the user | 168 | // message the user |
166 | QMessageBox::information( this, "Wellenreiter II", "Your wireless card\nshould now be usable again." ); | 169 | QMessageBox::information( this, "Wellenreiter II", "Your wireless card\nshould now be usable again." ); |
@@ -222,7 +225,7 @@ void Wellenreiter::startStopClicked() | |||
222 | // connect | 225 | // connect |
223 | connect( pcap, SIGNAL( receivedPacket(OPacket*) ), this, SLOT( receivePacket(OPacket*) ) ); | 226 | connect( pcap, SIGNAL( receivedPacket(OPacket*) ), this, SLOT( receivePacket(OPacket*) ) ); |
224 | 227 | ||
225 | logwindow->log( "(i) Daemon has been started." ); | 228 | logwindow->log( "(i) Started Scanning." ); |
226 | #ifdef QWS | 229 | #ifdef QWS |
227 | oApp->setTitle( "Scanning ..." ); | 230 | oApp->setTitle( "Scanning ..." ); |
228 | #else | 231 | #else |