summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/wellenreiter/gui/configbase.ui2
-rw-r--r--noncore/net/wellenreiter/gui/configbasenew.ui814
-rw-r--r--noncore/net/wellenreiter/gui/configwindow.cpp6
-rw-r--r--noncore/net/wellenreiter/gui/configwindow.h2
-rw-r--r--noncore/net/wellenreiter/gui/gui.pro2
-rw-r--r--noncore/net/wellenreiter/gui/protolistview.cpp0
-rw-r--r--noncore/net/wellenreiter/gui/protolistview.h0
-rw-r--r--noncore/net/wellenreiter/gui/wellenreiter.cpp10
-rw-r--r--noncore/net/wellenreiter/opie-wellenreiter.control2
9 files changed, 831 insertions, 7 deletions
diff --git a/noncore/net/wellenreiter/gui/configbase.ui b/noncore/net/wellenreiter/gui/configbase.ui
index ba4de32..a8b55bb 100644
--- a/noncore/net/wellenreiter/gui/configbase.ui
+++ b/noncore/net/wellenreiter/gui/configbase.ui
@@ -11,7 +11,7 @@
11 <rect> 11 <rect>
12 <x>0</x> 12 <x>0</x>
13 <y>0</y> 13 <y>0</y>
14 <width>236</width> 14 <width>232</width>
15 <height>342</height> 15 <height>342</height>
16 </rect> 16 </rect>
17 </property> 17 </property>
diff --git a/noncore/net/wellenreiter/gui/configbasenew.ui b/noncore/net/wellenreiter/gui/configbasenew.ui
new file mode 100644
index 0000000..1307f00
--- a/dev/null
+++ b/noncore/net/wellenreiter/gui/configbasenew.ui
@@ -0,0 +1,814 @@
1<!DOCTYPE UI><UI>
2<class>Form1</class>
3<widget>
4 <class>QDialog</class>
5 <property stdset="1">
6 <name>name</name>
7 <cstring>Form1</cstring>
8 </property>
9 <property stdset="1">
10 <name>geometry</name>
11 <rect>
12 <x>0</x>
13 <y>0</y>
14 <width>280</width>
15 <height>382</height>
16 </rect>
17 </property>
18 <property stdset="1">
19 <name>caption</name>
20 <string>Form1</string>
21 </property>
22 <property>
23 <name>layoutMargin</name>
24 </property>
25 <property>
26 <name>layoutSpacing</name>
27 </property>
28 <grid>
29 <property stdset="1">
30 <name>margin</name>
31 <number>5</number>
32 </property>
33 <property stdset="1">
34 <name>spacing</name>
35 <number>3</number>
36 </property>
37 <widget row="0" column="0" >
38 <class>QTabWidget</class>
39 <property stdset="1">
40 <name>name</name>
41 <cstring>interface</cstring>
42 </property>
43 <property>
44 <name>layoutMargin</name>
45 </property>
46 <property>
47 <name>layoutSpacing</name>
48 </property>
49 <widget>
50 <class>QWidget</class>
51 <property stdset="1">
52 <name>name</name>
53 <cstring>tab</cstring>
54 </property>
55 <attribute>
56 <name>title</name>
57 <string>Interface</string>
58 </attribute>
59 <grid>
60 <property stdset="1">
61 <name>margin</name>
62 <number>11</number>
63 </property>
64 <property stdset="1">
65 <name>spacing</name>
66 <number>6</number>
67 </property>
68 <widget row="0" column="0" >
69 <class>QLabel</class>
70 <property stdset="1">
71 <name>name</name>
72 <cstring>TextLabel1_2</cstring>
73 </property>
74 <property stdset="1">
75 <name>enabled</name>
76 <bool>true</bool>
77 </property>
78 <property stdset="1">
79 <name>text</name>
80 <string>Name:</string>
81 </property>
82 </widget>
83 <widget row="0" column="1" rowspan="1" colspan="2" >
84 <class>QComboBox</class>
85 <property stdset="1">
86 <name>name</name>
87 <cstring>name</cstring>
88 </property>
89 <property stdset="1">
90 <name>enabled</name>
91 <bool>true</bool>
92 </property>
93 <property>
94 <name>whatsThis</name>
95 <string>Choose the interface used for sniffing.</string>
96 </property>
97 </widget>
98 <widget row="1" column="0" >
99 <class>QLabel</class>
100 <property stdset="1">
101 <name>name</name>
102 <cstring>TextLabel2_3</cstring>
103 </property>
104 <property stdset="1">
105 <name>enabled</name>
106 <bool>true</bool>
107 </property>
108 <property stdset="1">
109 <name>text</name>
110 <string>Driver:</string>
111 </property>
112 </widget>
113 <widget row="1" column="1" rowspan="1" colspan="2" >
114 <class>QComboBox</class>
115 <item>
116 <property>
117 <name>text</name>
118 <string>&lt;select&gt;</string>
119 </property>
120 </item>
121 <item>
122 <property>
123 <name>text</name>
124 <string>cisco</string>
125 </property>
126 </item>
127 <item>
128 <property>
129 <name>text</name>
130 <string>wlan-ng</string>
131 </property>
132 </item>
133 <item>
134 <property>
135 <name>text</name>
136 <string>hostap</string>
137 </property>
138 </item>
139 <item>
140 <property>
141 <name>text</name>
142 <string>orinoco</string>
143 </property>
144 </item>
145 <item>
146 <property>
147 <name>text</name>
148 <string>&lt;manual&gt;</string>
149 </property>
150 </item>
151 <item>
152 <property>
153 <name>text</name>
154 <string>&lt;file&gt;</string>
155 </property>
156 </item>
157 <property stdset="1">
158 <name>name</name>
159 <cstring>driver</cstring>
160 </property>
161 <property stdset="1">
162 <name>enabled</name>
163 <bool>true</bool>
164 </property>
165 <property>
166 <name>whatsThis</name>
167 <string>Choose the type of driver used for sniffing.</string>
168 </property>
169 </widget>
170 <widget row="4" column="0" >
171 <class>QCheckBox</class>
172 <property stdset="1">
173 <name>name</name>
174 <cstring>CheckBox18</cstring>
175 </property>
176 <property stdset="1">
177 <name>text</name>
178 <string>Hop Channels</string>
179 </property>
180 <property stdset="1">
181 <name>checked</name>
182 <bool>true</bool>
183 </property>
184 </widget>
185 <widget row="4" column="1" >
186 <class>QLabel</class>
187 <property stdset="1">
188 <name>name</name>
189 <cstring>TextLabel1</cstring>
190 </property>
191 <property stdset="1">
192 <name>text</name>
193 <string>every</string>
194 </property>
195 </widget>
196 <widget row="4" column="2" >
197 <class>QSpinBox</class>
198 <property stdset="1">
199 <name>name</name>
200 <cstring>hopInterval</cstring>
201 </property>
202 <property stdset="1">
203 <name>enabled</name>
204 <bool>true</bool>
205 </property>
206 <property stdset="1">
207 <name>suffix</name>
208 <string> ms</string>
209 </property>
210 <property stdset="1">
211 <name>maxValue</name>
212 <number>2000</number>
213 </property>
214 <property stdset="1">
215 <name>minValue</name>
216 <number>100</number>
217 </property>
218 <property stdset="1">
219 <name>lineStep</name>
220 <number>100</number>
221 </property>
222 <property stdset="1">
223 <name>value</name>
224 <number>1000</number>
225 </property>
226 <property>
227 <name>whatsThis</name>
228 <string>Choose the channel hop interval.</string>
229 </property>
230 </widget>
231 <widget row="5" column="0" rowspan="1" colspan="3" >
232 <class>QGroupBox</class>
233 <property stdset="1">
234 <name>name</name>
235 <cstring>GroupBox1</cstring>
236 </property>
237 <property stdset="1">
238 <name>title</name>
239 <string>Scan on channel</string>
240 </property>
241 <grid>
242 <property stdset="1">
243 <name>margin</name>
244 <number>11</number>
245 </property>
246 <property stdset="1">
247 <name>spacing</name>
248 <number>6</number>
249 </property>
250 <widget row="1" column="1" >
251 <class>QCheckBox</class>
252 <property stdset="1">
253 <name>name</name>
254 <cstring>channel6</cstring>
255 </property>
256 <property stdset="1">
257 <name>text</name>
258 <string>6</string>
259 </property>
260 </widget>
261 <widget row="1" column="3" >
262 <class>QCheckBox</class>
263 <property stdset="1">
264 <name>name</name>
265 <cstring>channel8</cstring>
266 </property>
267 <property stdset="1">
268 <name>text</name>
269 <string>8</string>
270 </property>
271 </widget>
272 <widget row="0" column="2" >
273 <class>QCheckBox</class>
274 <property stdset="1">
275 <name>name</name>
276 <cstring>channel2</cstring>
277 </property>
278 <property stdset="1">
279 <name>text</name>
280 <string>2</string>
281 </property>
282 </widget>
283 <widget row="1" column="4" >
284 <class>QCheckBox</class>
285 <property stdset="1">
286 <name>name</name>
287 <cstring>channel9</cstring>
288 </property>
289 <property stdset="1">
290 <name>text</name>
291 <string>9</string>
292 </property>
293 </widget>
294 <widget row="0" column="1" >
295 <class>QCheckBox</class>
296 <property stdset="1">
297 <name>name</name>
298 <cstring>channel1</cstring>
299 </property>
300 <property stdset="1">
301 <name>text</name>
302 <string>1</string>
303 </property>
304 </widget>
305 <widget row="0" column="0" >
306 <class>QCheckBox</class>
307 <property stdset="1">
308 <name>name</name>
309 <cstring>channelAll</cstring>
310 </property>
311 <property stdset="1">
312 <name>text</name>
313 <string>All</string>
314 </property>
315 </widget>
316 <widget row="2" column="1" >
317 <class>QCheckBox</class>
318 <property stdset="1">
319 <name>name</name>
320 <cstring>channel11</cstring>
321 </property>
322 <property stdset="1">
323 <name>text</name>
324 <string>11</string>
325 </property>
326 </widget>
327 <widget row="2" column="0" >
328 <class>QCheckBox</class>
329 <property stdset="1">
330 <name>name</name>
331 <cstring>channel10</cstring>
332 </property>
333 <property stdset="1">
334 <name>text</name>
335 <string>10</string>
336 </property>
337 </widget>
338 <widget row="1" column="2" >
339 <class>QCheckBox</class>
340 <property stdset="1">
341 <name>name</name>
342 <cstring>channel7</cstring>
343 </property>
344 <property stdset="1">
345 <name>text</name>
346 <string>7</string>
347 </property>
348 </widget>
349 <widget row="0" column="3" >
350 <class>QCheckBox</class>
351 <property stdset="1">
352 <name>name</name>
353 <cstring>channel3</cstring>
354 </property>
355 <property stdset="1">
356 <name>text</name>
357 <string>3</string>
358 </property>
359 </widget>
360 <widget row="1" column="0" >
361 <class>QCheckBox</class>
362 <property stdset="1">
363 <name>name</name>
364 <cstring>channel5</cstring>
365 </property>
366 <property stdset="1">
367 <name>text</name>
368 <string>5</string>
369 </property>
370 </widget>
371 <widget row="0" column="4" >
372 <class>QCheckBox</class>
373 <property stdset="1">
374 <name>name</name>
375 <cstring>channel4</cstring>
376 </property>
377 <property stdset="1">
378 <name>text</name>
379 <string>4</string>
380 </property>
381 </widget>
382 <widget row="2" column="2" >
383 <class>QCheckBox</class>
384 <property stdset="1">
385 <name>name</name>
386 <cstring>channel12</cstring>
387 </property>
388 <property stdset="1">
389 <name>text</name>
390 <string>12</string>
391 </property>
392 </widget>
393 <widget row="2" column="3" >
394 <class>QCheckBox</class>
395 <property stdset="1">
396 <name>name</name>
397 <cstring>channel13</cstring>
398 </property>
399 <property stdset="1">
400 <name>text</name>
401 <string>13</string>
402 </property>
403 </widget>
404 <widget row="2" column="4" >
405 <class>QCheckBox</class>
406 <property stdset="1">
407 <name>name</name>
408 <cstring>channel14</cstring>
409 </property>
410 <property stdset="1">
411 <name>text</name>
412 <string>14</string>
413 </property>
414 </widget>
415 </grid>
416 </widget>
417 <spacer row="3" column="0" >
418 <property>
419 <name>name</name>
420 <cstring>Spacer4</cstring>
421 </property>
422 <property stdset="1">
423 <name>orientation</name>
424 <enum>Vertical</enum>
425 </property>
426 <property stdset="1">
427 <name>sizeType</name>
428 <enum>Expanding</enum>
429 </property>
430 <property>
431 <name>sizeHint</name>
432 <size>
433 <width>20</width>
434 <height>20</height>
435 </size>
436 </property>
437 </spacer>
438 <widget row="2" column="0" rowspan="1" colspan="3" >
439 <class>QCheckBox</class>
440 <property stdset="1">
441 <name>name</name>
442 <cstring>usePrismHeader</cstring>
443 </property>
444 <property stdset="1">
445 <name>text</name>
446 <string>Use additional PRISM header</string>
447 </property>
448 </widget>
449 </grid>
450 </widget>
451 <widget>
452 <class>QWidget</class>
453 <property stdset="1">
454 <name>name</name>
455 <cstring>tab</cstring>
456 </property>
457 <attribute>
458 <name>title</name>
459 <string>Capture</string>
460 </attribute>
461 <grid>
462 <property stdset="1">
463 <name>margin</name>
464 <number>5</number>
465 </property>
466 <property stdset="1">
467 <name>spacing</name>
468 <number>3</number>
469 </property>
470 <widget row="2" column="0" rowspan="1" colspan="2" >
471 <class>ProtocolListView</class>
472 <property stdset="1">
473 <name>name</name>
474 <cstring>MyCustomWidget1</cstring>
475 </property>
476 <property stdset="1">
477 <name>sizePolicy</name>
478 <sizepolicy>
479 <hsizetype>7</hsizetype>
480 <vsizetype>7</vsizetype>
481 </sizepolicy>
482 </property>
483 </widget>
484 <widget row="0" column="0" >
485 <class>QCheckBox</class>
486 <property stdset="1">
487 <name>name</name>
488 <cstring>writeCaptureFile</cstring>
489 </property>
490 <property stdset="1">
491 <name>enabled</name>
492 <bool>true</bool>
493 </property>
494 <property stdset="1">
495 <name>text</name>
496 <string>Write Capture Files To</string>
497 </property>
498 </widget>
499 <widget row="0" column="1" >
500 <class>QToolButton</class>
501 <property stdset="1">
502 <name>name</name>
503 <cstring>getCaptureFileName</cstring>
504 </property>
505 <property stdset="1">
506 <name>enabled</name>
507 <bool>false</bool>
508 </property>
509 <property stdset="1">
510 <name>text</name>
511 <string>...</string>
512 </property>
513 </widget>
514 <widget row="1" column="0" rowspan="1" colspan="2" >
515 <class>QLineEdit</class>
516 <property stdset="1">
517 <name>name</name>
518 <cstring>captureFileName</cstring>
519 </property>
520 <property stdset="1">
521 <name>enabled</name>
522 <bool>false</bool>
523 </property>
524 </widget>
525 </grid>
526 </widget>
527 <widget>
528 <class>QWidget</class>
529 <property stdset="1">
530 <name>name</name>
531 <cstring>tab</cstring>
532 </property>
533 <attribute>
534 <name>title</name>
535 <string>Parse</string>
536 </attribute>
537 <grid>
538 <property stdset="1">
539 <name>margin</name>
540 <number>5</number>
541 </property>
542 <property stdset="1">
543 <name>spacing</name>
544 <number>3</number>
545 </property>
546 <widget row="0" column="0" >
547 <class>ProtocolListView</class>
548 <property stdset="1">
549 <name>name</name>
550 <cstring>parsePackets</cstring>
551 </property>
552 <property stdset="1">
553 <name>sizePolicy</name>
554 <sizepolicy>
555 <hsizetype>7</hsizetype>
556 <vsizetype>7</vsizetype>
557 </sizepolicy>
558 </property>
559 </widget>
560 </grid>
561 </widget>
562 <widget>
563 <class>QWidget</class>
564 <property stdset="1">
565 <name>name</name>
566 <cstring>tab</cstring>
567 </property>
568 <attribute>
569 <name>title</name>
570 <string>Intrusion</string>
571 </attribute>
572 <grid>
573 <property stdset="1">
574 <name>margin</name>
575 <number>11</number>
576 </property>
577 <property stdset="1">
578 <name>spacing</name>
579 <number>6</number>
580 </property>
581 <widget row="1" column="0" >
582 <class>QGroupBox</class>
583 <property stdset="1">
584 <name>name</name>
585 <cstring>GroupBox3</cstring>
586 </property>
587 <property stdset="1">
588 <name>enabled</name>
589 <bool>false</bool>
590 </property>
591 <property stdset="1">
592 <name>title</name>
593 <string>Link Level</string>
594 </property>
595 <grid>
596 <property stdset="1">
597 <name>margin</name>
598 <number>11</number>
599 </property>
600 <property stdset="1">
601 <name>spacing</name>
602 <number>6</number>
603 </property>
604 <widget row="0" column="0" >
605 <class>QLabel</class>
606 <property stdset="1">
607 <name>name</name>
608 <cstring>TextLabel1_5</cstring>
609 </property>
610 <property stdset="1">
611 <name>text</name>
612 <string>Fake Mac:</string>
613 </property>
614 </widget>
615 <widget row="1" column="0" rowspan="1" colspan="2" >
616 <class>QCheckBox</class>
617 <property stdset="1">
618 <name>name</name>
619 <cstring>sendProbeRequests</cstring>
620 </property>
621 <property stdset="1">
622 <name>text</name>
623 <string>Send proble requests</string>
624 </property>
625 </widget>
626 <widget row="0" column="1" >
627 <class>QComboBox</class>
628 <item>
629 <property>
630 <name>text</name>
631 <string>44:44:44:44:44:44</string>
632 </property>
633 </item>
634 <item>
635 <property>
636 <name>text</name>
637 <string>&lt;automatic&gt;</string>
638 </property>
639 </item>
640 <property stdset="1">
641 <name>name</name>
642 <cstring>fakeMac</cstring>
643 </property>
644 <property stdset="1">
645 <name>sizePolicy</name>
646 <sizepolicy>
647 <hsizetype>7</hsizetype>
648 <vsizetype>0</vsizetype>
649 </sizepolicy>
650 </property>
651 <property stdset="1">
652 <name>editable</name>
653 <bool>true</bool>
654 </property>
655 <property stdset="1">
656 <name>autoCompletion</name>
657 <bool>true</bool>
658 </property>
659 </widget>
660 <widget row="2" column="0" rowspan="1" colspan="2" >
661 <class>QCheckBox</class>
662 <property stdset="1">
663 <name>name</name>
664 <cstring>tryToAuthenticate</cstring>
665 </property>
666 <property stdset="1">
667 <name>text</name>
668 <string>Try to authenticate</string>
669 </property>
670 </widget>
671 </grid>
672 </widget>
673 <widget row="0" column="0" >
674 <class>QCheckBox</class>
675 <property stdset="1">
676 <name>name</name>
677 <cstring>enableActiveScanning</cstring>
678 </property>
679 <property stdset="1">
680 <name>enabled</name>
681 <bool>false</bool>
682 </property>
683 <property stdset="1">
684 <name>text</name>
685 <string>Enable active scanning</string>
686 </property>
687 </widget>
688 <widget row="2" column="0" >
689 <class>QGroupBox</class>
690 <property stdset="1">
691 <name>name</name>
692 <cstring>GroupBox4</cstring>
693 </property>
694 <property stdset="1">
695 <name>enabled</name>
696 <bool>false</bool>
697 </property>
698 <property stdset="1">
699 <name>title</name>
700 <string>IP Level</string>
701 </property>
702 <grid>
703 <property stdset="1">
704 <name>margin</name>
705 <number>11</number>
706 </property>
707 <property stdset="1">
708 <name>spacing</name>
709 <number>6</number>
710 </property>
711 <widget row="1" column="0" rowspan="1" colspan="2" >
712 <class>QCheckBox</class>
713 <property stdset="1">
714 <name>name</name>
715 <cstring>CheckBox24</cstring>
716 </property>
717 <property stdset="1">
718 <name>text</name>
719 <string>Request DHCP Address</string>
720 </property>
721 </widget>
722 <widget row="0" column="0" >
723 <class>QLabel</class>
724 <property stdset="1">
725 <name>name</name>
726 <cstring>TextLabel1_5_2</cstring>
727 </property>
728 <property stdset="1">
729 <name>text</name>
730 <string>Fake IP:</string>
731 </property>
732 </widget>
733 <widget row="0" column="1" >
734 <class>QComboBox</class>
735 <item>
736 <property>
737 <name>text</name>
738 <string>192.168.125.1</string>
739 </property>
740 </item>
741 <item>
742 <property>
743 <name>text</name>
744 <string>&lt;automatic&gt;</string>
745 </property>
746 </item>
747 <property stdset="1">
748 <name>name</name>
749 <cstring>ComboBox10</cstring>
750 </property>
751 <property stdset="1">
752 <name>sizePolicy</name>
753 <sizepolicy>
754 <hsizetype>7</hsizetype>
755 <vsizetype>0</vsizetype>
756 </sizepolicy>
757 </property>
758 </widget>
759 </grid>
760 </widget>
761 </grid>
762 </widget>
763 </widget>
764 </grid>
765</widget>
766<customwidgets>
767 <customwidget>
768 <class>ProtocolListView</class>
769 <header location="local">protolistview.h</header>
770 <sizehint>
771 <width>100</width>
772 <height>100</height>
773 </sizehint>
774 <container>0</container>
775 <sizepolicy>
776 <hordata>3</hordata>
777 <verdata>3</verdata>
778 </sizepolicy>
779 <pixmap>image0</pixmap>
780 </customwidget>
781</customwidgets>
782<images>
783 <image>
784 <name>image0</name>
785 <data format="XPM.GZ" length="646">789c6dd2c10ac2300c00d07bbf2234b7229d1be245fc04c5a3201e4615f430059d0711ff5ddb2e6bb236ec90eed134cb5a19d8ef36602af5ecdbfeeac05dda0798d3abebde87e3faa374d3807fa0d633a52d38d8de6f679fe33fc776e196f53cd010188256a3600a292882096246517815ca99884606e18044a3a40d91824820924265a7923a2e8bcd05f33db1173e002913175f2a6be6d3294871a2d95fa00e8a94ee017b69d339d90df1e77c57ea072ede6758</data>
786 </image>
787</images>
788<connections>
789 <connection>
790 <sender>CheckBox18</sender>
791 <signal>toggled(bool)</signal>
792 <receiver>hopInterval</receiver>
793 <slot>setEnabled(bool)</slot>
794 </connection>
795 <connection>
796 <sender>CheckBox18</sender>
797 <signal>toggled(bool)</signal>
798 <receiver>TextLabel1</receiver>
799 <slot>setEnabled(bool)</slot>
800 </connection>
801 <connection>
802 <sender>enableActiveScanning</sender>
803 <signal>toggled(bool)</signal>
804 <receiver>GroupBox3</receiver>
805 <slot>setEnabled(bool)</slot>
806 </connection>
807 <connection>
808 <sender>enableActiveScanning</sender>
809 <signal>toggled(bool)</signal>
810 <receiver>GroupBox4</receiver>
811 <slot>setEnabled(bool)</slot>
812 </connection>
813</connections>
814</UI>
diff --git a/noncore/net/wellenreiter/gui/configwindow.cpp b/noncore/net/wellenreiter/gui/configwindow.cpp
index 716618e..92715b4 100644
--- a/noncore/net/wellenreiter/gui/configwindow.cpp
+++ b/noncore/net/wellenreiter/gui/configwindow.cpp
@@ -138,3 +138,9 @@ void WellenreiterConfigWindow::getCaptureFileNameClicked()
138 } 138 }
139} 139}
140 140
141
142bool WellenreiterConfigWindow::usePrismHeader()
143{
144 return true;
145 //return interface->usePrismHeader();
146}
diff --git a/noncore/net/wellenreiter/gui/configwindow.h b/noncore/net/wellenreiter/gui/configwindow.h
index c7c70a6..11ae5b8 100644
--- a/noncore/net/wellenreiter/gui/configwindow.h
+++ b/noncore/net/wellenreiter/gui/configwindow.h
@@ -43,6 +43,8 @@ class WellenreiterConfigWindow : public WellenreiterConfigBase
43 const QString soundOnBeacon() const { return beaconSound->currentText(); }; 43 const QString soundOnBeacon() const { return beaconSound->currentText(); };
44 static WellenreiterConfigWindow* instance() { return _instance; }; 44 static WellenreiterConfigWindow* instance() { return _instance; };
45 45
46 bool usePrismHeader();
47
46 public slots: 48 public slots:
47 void changedDeviceType(int); 49 void changedDeviceType(int);
48 void getCaptureFileNameClicked(); 50 void getCaptureFileNameClicked();
diff --git a/noncore/net/wellenreiter/gui/gui.pro b/noncore/net/wellenreiter/gui/gui.pro
index 62e1d9a..a11698f 100644
--- a/noncore/net/wellenreiter/gui/gui.pro
+++ b/noncore/net/wellenreiter/gui/gui.pro
@@ -29,7 +29,7 @@ SOURCES = main.cpp \
29 29
30INCLUDEPATH += $(OPIEDIR)/include 30INCLUDEPATH += $(OPIEDIR)/include
31DEPENDPATH += $(OPIEDIR)/include 31DEPENDPATH += $(OPIEDIR)/include
32INTERFACES = configbase.ui 32INTERFACES = configbase.ui #configbasenew.ui
33TARGET = wellenreiter 33TARGET = wellenreiter
34 34
35!contains( platform, x11 ) { 35!contains( platform, x11 ) {
diff --git a/noncore/net/wellenreiter/gui/protolistview.cpp b/noncore/net/wellenreiter/gui/protolistview.cpp
new file mode 100644
index 0000000..e69de29
--- a/dev/null
+++ b/noncore/net/wellenreiter/gui/protolistview.cpp
diff --git a/noncore/net/wellenreiter/gui/protolistview.h b/noncore/net/wellenreiter/gui/protolistview.h
new file mode 100644
index 0000000..e69de29
--- a/dev/null
+++ b/noncore/net/wellenreiter/gui/protolistview.h
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp
index 9e1010b..705aab6 100644
--- a/noncore/net/wellenreiter/gui/wellenreiter.cpp
+++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp
@@ -331,12 +331,14 @@ void Wellenreiter::startClicked()
331 331
332 // set monitor mode 332 // set monitor mode
333 333
334 bool usePrism = configwindow->usePrismHeader();
335
334 switch ( cardtype ) 336 switch ( cardtype )
335 { 337 {
336 case DEVTYPE_CISCO: iface->setMonitoring( new OCiscoMonitoringInterface( iface ) ); break; 338 case DEVTYPE_CISCO: iface->setMonitoring( new OCiscoMonitoringInterface( iface, usePrism ) ); break;
337 case DEVTYPE_WLAN_NG: iface->setMonitoring( new OWlanNGMonitoringInterface( iface ) ); break; 339 case DEVTYPE_WLAN_NG: iface->setMonitoring( new OWlanNGMonitoringInterface( iface, usePrism ) ); break;
338 case DEVTYPE_HOSTAP: iface->setMonitoring( new OHostAPMonitoringInterface( iface ) ); break; 340 case DEVTYPE_HOSTAP: iface->setMonitoring( new OHostAPMonitoringInterface( iface, usePrism ) ); break;
339 case DEVTYPE_ORINOCO: iface->setMonitoring( new OOrinocoMonitoringInterface( iface ) ); break; 341 case DEVTYPE_ORINOCO: iface->setMonitoring( new OOrinocoMonitoringInterface( iface, usePrism ) ); break;
340 case DEVTYPE_MANUAL: QMessageBox::information( this, "Wellenreiter II", tr( "Bring your device into\nmonitor mode now." ) ); break; 342 case DEVTYPE_MANUAL: QMessageBox::information( this, "Wellenreiter II", tr( "Bring your device into\nmonitor mode now." ) ); break;
341 case DEVTYPE_FILE: qDebug( "Wellenreiter: Capturing from file '%s'", (const char*) interface ); break; 343 case DEVTYPE_FILE: qDebug( "Wellenreiter: Capturing from file '%s'", (const char*) interface ); break;
342 default: assert( 0 ); // shouldn't reach this 344 default: assert( 0 ); // shouldn't reach this
diff --git a/noncore/net/wellenreiter/opie-wellenreiter.control b/noncore/net/wellenreiter/opie-wellenreiter.control
index 8bb5b1c..f7272e2 100644
--- a/noncore/net/wellenreiter/opie-wellenreiter.control
+++ b/noncore/net/wellenreiter/opie-wellenreiter.control
@@ -5,6 +5,6 @@ Section: opie/applications
5Maintainer: Michael 'Mickey' Lauer <mickeyl@handhelds.org> 5Maintainer: Michael 'Mickey' Lauer <mickeyl@handhelds.org>
6Architecture: arm 6Architecture: arm
7Version: 0.9.9-$SUB_VERSION 7Version: 0.9.9-$SUB_VERSION
8Depends: task-opie-minimal, libpcap0, libopie2 (1.8.1) 8Depends: task-opie-minimal, libpcap0 (0.7.2), libopie2 (1.8.1)
9Description: A WaveLAN Network Monitor 9Description: A WaveLAN Network Monitor
10 A WaveLAN Network Monitor/Sniffer for the Opie Environment. 10 A WaveLAN Network Monitor/Sniffer for the Opie Environment.