-rw-r--r-- | libopie2/opienet/omanufacturerdb.h | 1 | ||||
-rw-r--r-- | libopie2/opienet/onetutils.h | 3 | ||||
-rw-r--r-- | libopie2/opienet/onetwork.cpp | 2 | ||||
-rw-r--r-- | libopie2/opienet/onetwork.h | 4 | ||||
-rw-r--r-- | libopie2/opienet/opcap.h | 28 |
5 files changed, 27 insertions, 11 deletions
diff --git a/libopie2/opienet/omanufacturerdb.h b/libopie2/opienet/omanufacturerdb.h index 5e66c37..cb0b6c8 100644 --- a/libopie2/opienet/omanufacturerdb.h +++ b/libopie2/opienet/omanufacturerdb.h | |||
@@ -20,8 +20,9 @@ | |||
20 | 20 | ||
21 | class OManufacturerDB | 21 | class OManufacturerDB |
22 | { | 22 | { |
23 | public: | 23 | public: |
24 | //FIXME make us consistent -zecke I use self(), sandman inst() you use instance() so we need to chose one! | ||
24 | static OManufacturerDB* instance(); | 25 | static OManufacturerDB* instance(); |
25 | const QString& lookup( const QString& macaddr ) const; | 26 | const QString& lookup( const QString& macaddr ) const; |
26 | 27 | ||
27 | protected: | 28 | protected: |
diff --git a/libopie2/opienet/onetutils.h b/libopie2/opienet/onetutils.h index bedea63..9611518 100644 --- a/libopie2/opienet/onetutils.h +++ b/libopie2/opienet/onetutils.h | |||
@@ -49,8 +49,9 @@ class OWirelessNetworkInterface; | |||
49 | 49 | ||
50 | class OMacAddress | 50 | class OMacAddress |
51 | { | 51 | { |
52 | public: | 52 | public: |
53 | // QString c'tor? -zecke | ||
53 | OMacAddress( unsigned char* ); | 54 | OMacAddress( unsigned char* ); |
54 | OMacAddress( const unsigned char* ); | 55 | OMacAddress( const unsigned char* ); |
55 | OMacAddress( struct ifreq& ); | 56 | OMacAddress( struct ifreq& ); |
56 | ~OMacAddress(); | 57 | ~OMacAddress(); |
@@ -58,8 +59,9 @@ class OMacAddress | |||
58 | QString manufacturer() const; | 59 | QString manufacturer() const; |
59 | QString toString( bool substitute = false ) const; | 60 | QString toString( bool substitute = false ) const; |
60 | const unsigned char* native() const; | 61 | const unsigned char* native() const; |
61 | 62 | ||
63 | // no c'tor but this one why not make it a c'tor. it could also replace the others or is this the problem? | ||
62 | static OMacAddress fromString( const QString& ); | 64 | static OMacAddress fromString( const QString& ); |
63 | 65 | ||
64 | public: | 66 | public: |
65 | static const OMacAddress& broadcast; // ff:ff:ff:ff:ff:ff | 67 | static const OMacAddress& broadcast; // ff:ff:ff:ff:ff:ff |
@@ -101,8 +103,9 @@ class OPrivateIOCTL : public QObject | |||
101 | int typeGetArgs() const; | 103 | int typeGetArgs() const; |
102 | int numberSetArgs() const; | 104 | int numberSetArgs() const; |
103 | int typeSetArgs() const; | 105 | int typeSetArgs() const; |
104 | 106 | ||
107 | // FIXME return int? as ::ioctl does? -zecke | ||
105 | void invoke() const; | 108 | void invoke() const; |
106 | void setParameter( int, u_int32_t ); | 109 | void setParameter( int, u_int32_t ); |
107 | 110 | ||
108 | private: | 111 | private: |
diff --git a/libopie2/opienet/onetwork.cpp b/libopie2/opienet/onetwork.cpp index 73b543b..f0094c7 100644 --- a/libopie2/opienet/onetwork.cpp +++ b/libopie2/opienet/onetwork.cpp | |||
@@ -107,9 +107,9 @@ void ONetwork::synchronize() | |||
107 | } | 107 | } |
108 | } | 108 | } |
109 | 109 | ||
110 | 110 | ||
111 | ONetworkInterface* ONetwork::interface( QString iface ) const | 111 | ONetworkInterface* ONetwork::interface( const QString& iface ) const |
112 | { | 112 | { |
113 | return _interfaces[iface]; | 113 | return _interfaces[iface]; |
114 | } | 114 | } |
115 | 115 | ||
diff --git a/libopie2/opienet/onetwork.h b/libopie2/opienet/onetwork.h index d2cc25d..db8e702 100644 --- a/libopie2/opienet/onetwork.h +++ b/libopie2/opienet/onetwork.h | |||
@@ -97,14 +97,16 @@ class ONetwork : public QObject | |||
97 | InterfaceIterator iterator() const; | 97 | InterfaceIterator iterator() const; |
98 | /** | 98 | /** |
99 | * @returns true, if the @p interface supports the wireless extension protocol. | 99 | * @returns true, if the @p interface supports the wireless extension protocol. |
100 | */ | 100 | */ |
101 | // FIXME QString? -zecke | ||
101 | bool isWirelessInterface( const char* interface ) const; | 102 | bool isWirelessInterface( const char* interface ) const; |
102 | /** | 103 | /** |
103 | * @returns a pointer to the @ref ONetworkInterface object for the specified @p interface or 0, if not found | 104 | * @returns a pointer to the @ref ONetworkInterface object for the specified @p interface or 0, if not found |
104 | * @see ONetworkInterface | 105 | * @see ONetworkInterface |
105 | */ | 106 | */ |
106 | ONetworkInterface* interface( QString interface ) const; | 107 | // FIXME: const QString& is prefered over QString!!! -zecke |
108 | ONetworkInterface* interface( const QString& interface ) const; | ||
107 | 109 | ||
108 | protected: | 110 | protected: |
109 | ONetwork(); | 111 | ONetwork(); |
110 | void synchronize(); | 112 | void synchronize(); |
diff --git a/libopie2/opienet/opcap.h b/libopie2/opienet/opcap.h index 99631ba..6bf7416 100644 --- a/libopie2/opienet/opcap.h +++ b/libopie2/opienet/opcap.h | |||
@@ -67,9 +67,9 @@ class QSocketNotifier; | |||
67 | 67 | ||
68 | /*====================================================================================== | 68 | /*====================================================================================== |
69 | * OPacket - A frame on the wire | 69 | * OPacket - A frame on the wire |
70 | *======================================================================================*/ | 70 | *======================================================================================*/ |
71 | 71 | // FIXME how many OPackets do we've at a time? QObject seams to be a big for that usage | |
72 | class OPacket : public QObject | 72 | class OPacket : public QObject |
73 | { | 73 | { |
74 | Q_OBJECT | 74 | Q_OBJECT |
75 | 75 | ||
@@ -94,8 +94,9 @@ class OPacket : public QObject | |||
94 | /*====================================================================================== | 94 | /*====================================================================================== |
95 | * OEthernetPacket - DLT_EN10MB frame | 95 | * OEthernetPacket - DLT_EN10MB frame |
96 | *======================================================================================*/ | 96 | *======================================================================================*/ |
97 | 97 | ||
98 | //FIXME same critic as above -zecke | ||
98 | class OEthernetPacket : public QObject | 99 | class OEthernetPacket : public QObject |
99 | { | 100 | { |
100 | Q_OBJECT | 101 | Q_OBJECT |
101 | 102 | ||
@@ -114,9 +115,9 @@ class OEthernetPacket : public QObject | |||
114 | 115 | ||
115 | /*====================================================================================== | 116 | /*====================================================================================== |
116 | * OWaveLanPacket - DLT_IEEE802_11 frame | 117 | * OWaveLanPacket - DLT_IEEE802_11 frame |
117 | *======================================================================================*/ | 118 | *======================================================================================*/ |
118 | 119 | //FIXME same | |
119 | class OWaveLanPacket : public QObject | 120 | class OWaveLanPacket : public QObject |
120 | { | 121 | { |
121 | Q_OBJECT | 122 | Q_OBJECT |
122 | 123 | ||
@@ -144,9 +145,9 @@ class OWaveLanPacket : public QObject | |||
144 | 145 | ||
145 | /*====================================================================================== | 146 | /*====================================================================================== |
146 | * OWaveLanManagementPacket - type: management (T_MGMT) | 147 | * OWaveLanManagementPacket - type: management (T_MGMT) |
147 | *======================================================================================*/ | 148 | *======================================================================================*/ |
148 | 149 | //FIXME same as above -zecke | |
149 | class OWaveLanManagementPacket : public QObject | 150 | class OWaveLanManagementPacket : public QObject |
150 | { | 151 | { |
151 | Q_OBJECT | 152 | Q_OBJECT |
152 | 153 | ||
@@ -173,9 +174,9 @@ class OWaveLanManagementPacket : public QObject | |||
173 | 174 | ||
174 | /*====================================================================================== | 175 | /*====================================================================================== |
175 | * OWaveLanManagementSSID | 176 | * OWaveLanManagementSSID |
176 | *======================================================================================*/ | 177 | *======================================================================================*/ |
177 | 178 | //FIXME is QObject necessary? -zecke | |
178 | class OWaveLanManagementSSID : public QObject | 179 | class OWaveLanManagementSSID : public QObject |
179 | { | 180 | { |
180 | Q_OBJECT | 181 | Q_OBJECT |
181 | 182 | ||
@@ -191,9 +192,9 @@ class OWaveLanManagementSSID : public QObject | |||
191 | 192 | ||
192 | /*====================================================================================== | 193 | /*====================================================================================== |
193 | * OWaveLanManagementRates | 194 | * OWaveLanManagementRates |
194 | *======================================================================================*/ | 195 | *======================================================================================*/ |
195 | 196 | // FIXME same as above -zecke | |
196 | class OWaveLanManagementRates : public QObject | 197 | class OWaveLanManagementRates : public QObject |
197 | { | 198 | { |
198 | Q_OBJECT | 199 | Q_OBJECT |
199 | 200 | ||
@@ -208,8 +209,9 @@ class OWaveLanManagementRates : public QObject | |||
208 | /*====================================================================================== | 209 | /*====================================================================================== |
209 | * OWaveLanManagementCF | 210 | * OWaveLanManagementCF |
210 | *======================================================================================*/ | 211 | *======================================================================================*/ |
211 | 212 | ||
213 | //FIXME same.... | ||
212 | class OWaveLanManagementCF : public QObject | 214 | class OWaveLanManagementCF : public QObject |
213 | { | 215 | { |
214 | Q_OBJECT | 216 | Q_OBJECT |
215 | 217 | ||
@@ -224,8 +226,9 @@ class OWaveLanManagementCF : public QObject | |||
224 | /*====================================================================================== | 226 | /*====================================================================================== |
225 | * OWaveLanManagementFH | 227 | * OWaveLanManagementFH |
226 | *======================================================================================*/ | 228 | *======================================================================================*/ |
227 | 229 | ||
230 | //FIXME same | ||
228 | class OWaveLanManagementFH : public QObject | 231 | class OWaveLanManagementFH : public QObject |
229 | { | 232 | { |
230 | Q_OBJECT | 233 | Q_OBJECT |
231 | 234 | ||
@@ -239,9 +242,9 @@ class OWaveLanManagementFH : public QObject | |||
239 | 242 | ||
240 | /*====================================================================================== | 243 | /*====================================================================================== |
241 | * OWaveLanManagementDS | 244 | * OWaveLanManagementDS |
242 | *======================================================================================*/ | 245 | *======================================================================================*/ |
243 | 246 | //FIXME same | |
244 | class OWaveLanManagementDS : public QObject | 247 | class OWaveLanManagementDS : public QObject |
245 | { | 248 | { |
246 | Q_OBJECT | 249 | Q_OBJECT |
247 | 250 | ||
@@ -258,8 +261,9 @@ class OWaveLanManagementDS : public QObject | |||
258 | /*====================================================================================== | 261 | /*====================================================================================== |
259 | * OWaveLanManagementTim | 262 | * OWaveLanManagementTim |
260 | *======================================================================================*/ | 263 | *======================================================================================*/ |
261 | 264 | ||
265 | //FIXME guess what? | ||
262 | class OWaveLanManagementTim : public QObject | 266 | class OWaveLanManagementTim : public QObject |
263 | { | 267 | { |
264 | Q_OBJECT | 268 | Q_OBJECT |
265 | 269 | ||
@@ -274,8 +278,9 @@ class OWaveLanManagementTim : public QObject | |||
274 | /*====================================================================================== | 278 | /*====================================================================================== |
275 | * OWaveLanManagementIBSS | 279 | * OWaveLanManagementIBSS |
276 | *======================================================================================*/ | 280 | *======================================================================================*/ |
277 | 281 | ||
282 | //FIXME same as above ( Qobject ) | ||
278 | class OWaveLanManagementIBSS : public QObject | 283 | class OWaveLanManagementIBSS : public QObject |
279 | { | 284 | { |
280 | Q_OBJECT | 285 | Q_OBJECT |
281 | 286 | ||
@@ -290,8 +295,9 @@ class OWaveLanManagementIBSS : public QObject | |||
290 | /*====================================================================================== | 295 | /*====================================================================================== |
291 | * OWaveLanManagementChallenge | 296 | * OWaveLanManagementChallenge |
292 | *======================================================================================*/ | 297 | *======================================================================================*/ |
293 | 298 | ||
299 | // Qobject do we need that?? | ||
294 | class OWaveLanManagementChallenge : public QObject | 300 | class OWaveLanManagementChallenge : public QObject |
295 | { | 301 | { |
296 | Q_OBJECT | 302 | Q_OBJECT |
297 | 303 | ||
@@ -305,9 +311,9 @@ class OWaveLanManagementChallenge : public QObject | |||
305 | 311 | ||
306 | /*====================================================================================== | 312 | /*====================================================================================== |
307 | * OWaveLanDataPacket - type: data (T_DATA) | 313 | * OWaveLanDataPacket - type: data (T_DATA) |
308 | *======================================================================================*/ | 314 | *======================================================================================*/ |
309 | 315 | // Qobject? | |
310 | class OWaveLanDataPacket : public QObject | 316 | class OWaveLanDataPacket : public QObject |
311 | { | 317 | { |
312 | Q_OBJECT | 318 | Q_OBJECT |
313 | 319 | ||
@@ -321,9 +327,9 @@ class OWaveLanDataPacket : public QObject | |||
321 | 327 | ||
322 | /*====================================================================================== | 328 | /*====================================================================================== |
323 | * OWaveLanControlPacket - type: control (T_CTRL) | 329 | * OWaveLanControlPacket - type: control (T_CTRL) |
324 | *======================================================================================*/ | 330 | *======================================================================================*/ |
325 | 331 | // Qobject needed? | |
326 | class OWaveLanControlPacket : public QObject | 332 | class OWaveLanControlPacket : public QObject |
327 | { | 333 | { |
328 | Q_OBJECT | 334 | Q_OBJECT |
329 | 335 | ||
@@ -338,8 +344,9 @@ class OWaveLanControlPacket : public QObject | |||
338 | /*====================================================================================== | 344 | /*====================================================================================== |
339 | * OLLCPacket - IEEE 802.2 Link Level Control | 345 | * OLLCPacket - IEEE 802.2 Link Level Control |
340 | *======================================================================================*/ | 346 | *======================================================================================*/ |
341 | 347 | ||
348 | // QObject needed? | ||
342 | class OLLCPacket : public QObject | 349 | class OLLCPacket : public QObject |
343 | { | 350 | { |
344 | Q_OBJECT | 351 | Q_OBJECT |
345 | 352 | ||
@@ -347,15 +354,17 @@ class OLLCPacket : public QObject | |||
347 | OLLCPacket( const unsigned char*, const struct ieee_802_11_802_2_header* data, QObject* parent = 0 ); | 354 | OLLCPacket( const unsigned char*, const struct ieee_802_11_802_2_header* data, QObject* parent = 0 ); |
348 | virtual ~OLLCPacket(); | 355 | virtual ~OLLCPacket(); |
349 | 356 | ||
350 | private: | 357 | private: |
358 | //FIXME how to get that header? | ||
351 | const struct ieee_802_11_802_2_header* _header; | 359 | const struct ieee_802_11_802_2_header* _header; |
352 | }; | 360 | }; |
353 | 361 | ||
354 | /*====================================================================================== | 362 | /*====================================================================================== |
355 | * OIPPacket | 363 | * OIPPacket |
356 | *======================================================================================*/ | 364 | *======================================================================================*/ |
357 | 365 | ||
366 | // Qobject as baseclass? | ||
358 | class OIPPacket : public QObject | 367 | class OIPPacket : public QObject |
359 | { | 368 | { |
360 | Q_OBJECT | 369 | Q_OBJECT |
361 | 370 | ||
@@ -380,9 +389,9 @@ class OIPPacket : public QObject | |||
380 | 389 | ||
381 | /*====================================================================================== | 390 | /*====================================================================================== |
382 | * OUDPPacket | 391 | * OUDPPacket |
383 | *======================================================================================*/ | 392 | *======================================================================================*/ |
384 | 393 | // QObject? | |
385 | class OUDPPacket : public QObject | 394 | class OUDPPacket : public QObject |
386 | { | 395 | { |
387 | Q_OBJECT | 396 | Q_OBJECT |
388 | 397 | ||
@@ -400,8 +409,9 @@ class OUDPPacket : public QObject | |||
400 | /*====================================================================================== | 409 | /*====================================================================================== |
401 | * OTCPPacket | 410 | * OTCPPacket |
402 | *======================================================================================*/ | 411 | *======================================================================================*/ |
403 | 412 | ||
413 | // Qobect needed? | ||
404 | class OTCPPacket : public QObject | 414 | class OTCPPacket : public QObject |
405 | { | 415 | { |
406 | Q_OBJECT | 416 | Q_OBJECT |
407 | 417 | ||