4 files changed, 26 insertions, 8 deletions
diff --git a/libopie2/examples/opiecore/odebugdemo/odebugdemo.cpp b/libopie2/examples/opiecore/odebugdemo/odebugdemo.cpp index 74886fa..e8bf04f 100644 --- a/libopie2/examples/opiecore/odebugdemo/odebugdemo.cpp +++ b/libopie2/examples/opiecore/odebugdemo/odebugdemo.cpp | |||
@@ -92,12 +92,14 @@ public slots: | |||
92 | g->setGroup( "General" ); | 92 | g->setGroup( "General" ); |
93 | g->writeEntry( "debugMode", m ); | 93 | g->writeEntry( "debugMode", m ); |
94 | e->setText( OGlobalSettings::debugOutput() ); | 94 | e->setText( OGlobalSettings::debugOutput() ); |
95 | g->write(); | ||
95 | } | 96 | } |
96 | void updateDebugOutput() | 97 | void updateDebugOutput() |
97 | { | 98 | { |
98 | OConfig* g = OGlobal::config(); | 99 | OConfig* g = OGlobal::config(); |
99 | g->setGroup( "General" ); | 100 | g->setGroup( "General" ); |
100 | g->writeEntry( "debugOutput"+QString::number(OGlobalSettings::debugMode()), e->text() ); | 101 | g->writeEntry( "debugOutput"+QString::number(OGlobalSettings::debugMode()), e->text() ); |
102 | g->write(); | ||
101 | } | 103 | } |
102 | void emitInfoOutput() | 104 | void emitInfoOutput() |
103 | { | 105 | { |
diff --git a/libopie2/examples/opienet/miniwellenreiter/miniwellenreiter.cpp b/libopie2/examples/opienet/miniwellenreiter/miniwellenreiter.cpp index c49daa0..eb2e8e8 100644 --- a/libopie2/examples/opienet/miniwellenreiter/miniwellenreiter.cpp +++ b/libopie2/examples/opienet/miniwellenreiter/miniwellenreiter.cpp | |||
@@ -31,7 +31,7 @@ class Wellenreiter : public QApplication | |||
31 | { | 31 | { |
32 | Q_OBJECT | 32 | Q_OBJECT |
33 | public: | 33 | public: |
34 | Wellenreiter( int argc, char** argv ) : QApplication( argc, argv ) | 34 | Wellenreiter( int argc, char** argv ) : QApplication( argc, argv ), channel( 1 ) |
35 | { | 35 | { |
36 | 36 | ||
37 | ONetwork* net = ONetwork::instance(); | 37 | ONetwork* net = ONetwork::instance(); |
@@ -56,9 +56,9 @@ public: | |||
56 | exit( -1 ); | 56 | exit( -1 ); |
57 | } | 57 | } |
58 | 58 | ||
59 | printf( "****************************************************\n" ); | 59 | printf( "*******************************************************************\n" ); |
60 | printf( "* Wellenreiter mini edition 1.0 (C) 2003 M-M-M *\n" ); | 60 | printf( "* Wellenreiter mini edition 1.0.0 (C) 2003 Michael 'Mickey' Lauer *\n" ); |
61 | printf( "****************************************************\n" ); | 61 | printf( "*******************************************************************\n" ); |
62 | printf( "\n\n" ); | 62 | printf( "\n\n" ); |
63 | 63 | ||
64 | QString interface( argv[1] ); | 64 | QString interface( argv[1] ); |
@@ -105,6 +105,12 @@ public: | |||
105 | if ( driver == "orinoco" ) | 105 | if ( driver == "orinoco" ) |
106 | new OOrinocoMonitoringInterface( wiface, false ); | 106 | new OOrinocoMonitoringInterface( wiface, false ); |
107 | else | 107 | else |
108 | if ( driver == "hostap" ) | ||
109 | new OHostAPMonitoringInterface( wiface, false ); | ||
110 | else | ||
111 | if ( driver == "wlan-ng" ) | ||
112 | new OWlanNGMonitoringInterface( wiface, false ); | ||
113 | else | ||
108 | { | 114 | { |
109 | printf( "Unknown driver. Exiting\n" ); | 115 | printf( "Unknown driver. Exiting\n" ); |
110 | exit( -1 ); | 116 | exit( -1 ); |
@@ -112,7 +118,7 @@ public: | |||
112 | 118 | ||
113 | // enable monitoring mode | 119 | // enable monitoring mode |
114 | printf( "Enabling monitor mode...\n" ); | 120 | printf( "Enabling monitor mode...\n" ); |
115 | //wiface->setMonitorMode( true ); | 121 | wiface->setMode( "monitor" ); |
116 | 122 | ||
117 | // open a packet capturer | 123 | // open a packet capturer |
118 | cap = new OPacketCapturer(); | 124 | cap = new OPacketCapturer(); |
@@ -131,12 +137,20 @@ public: | |||
131 | 137 | ||
132 | // connect | 138 | // connect |
133 | connect( cap, SIGNAL( receivedPacket(OPacket*) ), this, SLOT( receivePacket(OPacket*) ) ); | 139 | connect( cap, SIGNAL( receivedPacket(OPacket*) ), this, SLOT( receivePacket(OPacket*) ) ); |
140 | // timer | ||
141 | startTimer( 1000 ); | ||
134 | 142 | ||
135 | } | 143 | } |
136 | 144 | ||
137 | ~Wellenreiter() {}; | 145 | ~Wellenreiter() {}; |
138 | 146 | ||
139 | public slots: | 147 | public slots: |
148 | virtual void timerEvent(QTimerEvent* e) | ||
149 | { | ||
150 | wiface->setChannel( channel++ ); | ||
151 | if ( channel == 14 ) channel = 1; | ||
152 | } | ||
153 | |||
140 | void receivePacket(OPacket* p) | 154 | void receivePacket(OPacket* p) |
141 | { | 155 | { |
142 | if (!p) | 156 | if (!p) |
@@ -203,6 +217,7 @@ public slots: | |||
203 | private: | 217 | private: |
204 | OPacketCapturer* cap; | 218 | OPacketCapturer* cap; |
205 | OWirelessNetworkInterface* wiface; | 219 | OWirelessNetworkInterface* wiface; |
220 | int channel; | ||
206 | }; | 221 | }; |
207 | 222 | ||
208 | 223 | ||
diff --git a/libopie2/examples/opienet/miniwellenreiter/miniwellenreiter.pro b/libopie2/examples/opienet/miniwellenreiter/miniwellenreiter.pro index 7ce535c..b2c5c14 100644 --- a/libopie2/examples/opienet/miniwellenreiter/miniwellenreiter.pro +++ b/libopie2/examples/opienet/miniwellenreiter/miniwellenreiter.pro | |||
diff --git a/libopie2/examples/opienet/onetworkdemo/onetworkdemo.cpp b/libopie2/examples/opienet/onetworkdemo/onetworkdemo.cpp index 06b8b19..4763316 100644 --- a/libopie2/examples/opienet/onetworkdemo/onetworkdemo.cpp +++ b/libopie2/examples/opienet/onetworkdemo/onetworkdemo.cpp | |||
@@ -110,15 +110,16 @@ int main( int argc, char** argv ) | |||
110 | 110 | ||
111 | // monitor test | 111 | // monitor test |
112 | 112 | ||
113 | /* | 113 | |
114 | 114 | ||
115 | qDebug( "DEMO: current interface mode is '%s'", (const char*) iface->mode() ); | 115 | qDebug( "DEMO: current interface mode is '%s'", (const char*) iface->mode() ); |
116 | iface->setMode( "monitor" ); | 116 | iface->setMode( "monitor" ); |
117 | qDebug( "DEMO: current interface mode is '%s'", (const char*) iface->mode() ); | 117 | qDebug( "DEMO: current interface mode is '%s'", (const char*) iface->mode() ); |
118 | 118 | ||
119 | sleep( 1 ); */ | 119 | sleep( 1 ); |
120 | 120 | ||
121 | iface->setMode( "master" ); | 121 | iface->setChannel( 1 ); |
122 | iface->setMode( "managed" ); | ||
122 | 123 | ||
123 | //sleep( 1 ); | 124 | //sleep( 1 ); |
124 | qDebug( "DEMO: current interface mode is '%s'", (const char*) iface->mode() ); | 125 | qDebug( "DEMO: current interface mode is '%s'", (const char*) iface->mode() ); |