-rw-r--r-- | libopie2/opienet/802_11_user.h | 1 | ||||
-rw-r--r-- | libopie2/opienet/dhcp.h | 2 | ||||
-rw-r--r-- | libopie2/opienet/odebugmapper.cpp | 10 | ||||
-rw-r--r-- | libopie2/opienet/odebugmapper.h | 10 | ||||
-rw-r--r-- | libopie2/opienet/omanufacturerdb.cpp | 7 | ||||
-rw-r--r-- | libopie2/opienet/omanufacturerdb.h | 8 | ||||
-rw-r--r-- | libopie2/opienet/onetutils.cpp | 9 | ||||
-rw-r--r-- | libopie2/opienet/onetutils.h | 15 | ||||
-rw-r--r-- | libopie2/opienet/onetwork.cpp | 9 | ||||
-rw-r--r-- | libopie2/opienet/onetwork.h | 31 | ||||
-rw-r--r-- | libopie2/opienet/opcap.cpp | 8 | ||||
-rw-r--r-- | libopie2/opienet/opcap.h | 52 | ||||
-rw-r--r-- | libopie2/opienet/ostation.cpp | 8 | ||||
-rw-r--r-- | libopie2/opienet/ostation.h | 9 |
14 files changed, 176 insertions, 3 deletions
diff --git a/libopie2/opienet/802_11_user.h b/libopie2/opienet/802_11_user.h index 7ae27c5..1a9a7a0 100644 --- a/libopie2/opienet/802_11_user.h +++ b/libopie2/opienet/802_11_user.h @@ -457,2 +457,3 @@ struct ctrl_end_ack_t { + #endif diff --git a/libopie2/opienet/dhcp.h b/libopie2/opienet/dhcp.h index 368e375..6ba4c53 100644 --- a/libopie2/opienet/dhcp.h +++ b/libopie2/opienet/dhcp.h @@ -44,2 +44,3 @@ + #define DHCP_UDP_OVERHEAD (14 + /* Ethernet header */ \ @@ -199,2 +200,3 @@ struct dhcp_packet { + #endif diff --git a/libopie2/opienet/odebugmapper.cpp b/libopie2/opienet/odebugmapper.cpp index 7e4ab2b..f679afb 100644 --- a/libopie2/opienet/odebugmapper.cpp +++ b/libopie2/opienet/odebugmapper.cpp @@ -9,2 +9,8 @@ +using namespace Opie::Core; + +namespace Opie { +namespace Net { +namespace Private { + DebugMapper::DebugMapper() @@ -214,2 +220,4 @@ const QString& DebugMapper::map( int value ) const - +} +} +} diff --git a/libopie2/opienet/odebugmapper.h b/libopie2/opienet/odebugmapper.h index 66b331d..f47db47 100644 --- a/libopie2/opienet/odebugmapper.h +++ b/libopie2/opienet/odebugmapper.h @@ -11,2 +11,6 @@ +namespace Opie { +namespace Net { +namespace Private { + typedef QIntDict<QString> IntStringMap; @@ -22,4 +26,10 @@ class DebugMapper IntStringMap _map; + class Private; + Private *d; }; +} +} +} + #endif diff --git a/libopie2/opienet/omanufacturerdb.cpp b/libopie2/opienet/omanufacturerdb.cpp index b93b752..209ec94 100644 --- a/libopie2/opienet/omanufacturerdb.cpp +++ b/libopie2/opienet/omanufacturerdb.cpp @@ -45,2 +45,6 @@ +using namespace Opie::Core; +namespace Opie { +namespace Net { + OManufacturerDB* OManufacturerDB::_instance = 0; @@ -135 +139,4 @@ const QString& OManufacturerDB::lookupExt( const QString& macaddr ) const +} +} + diff --git a/libopie2/opienet/omanufacturerdb.h b/libopie2/opienet/omanufacturerdb.h index c2712e5..5c1940e 100644 --- a/libopie2/opienet/omanufacturerdb.h +++ b/libopie2/opienet/omanufacturerdb.h @@ -35,2 +35,5 @@ +namespace Opie { +namespace Net { + /** @@ -65,4 +68,9 @@ class OManufacturerDB static OManufacturerDB* _instance; + class Private; + Private *d; }; +} +} + #endif diff --git a/libopie2/opienet/onetutils.cpp b/libopie2/opienet/onetutils.cpp index 48cfa43..7794334 100644 --- a/libopie2/opienet/onetutils.cpp +++ b/libopie2/opienet/onetutils.cpp @@ -39,2 +39,5 @@ +namespace Opie { +namespace Net { + /*====================================================================================== @@ -187,2 +190,5 @@ void OPrivateIOCTL::setParameter( int num, u_int32_t value ) + + +namespace Private { /*====================================================================================== @@ -232 +238,4 @@ QString modeToString( int mode ) } +} +} +} diff --git a/libopie2/opienet/onetutils.h b/libopie2/opienet/onetutils.h index bddfab9..ca6815d 100644 --- a/libopie2/opienet/onetutils.h +++ b/libopie2/opienet/onetutils.h @@ -43,2 +43,6 @@ struct ifreq; + +namespace Opie { +namespace Net { + class OWirelessNetworkInterface; @@ -74,2 +78,4 @@ class OMacAddress friend bool operator==( const OMacAddress &m1, const OMacAddress &m2 ); + class Private; + Private *d; @@ -90,2 +96,5 @@ class OHostAddress : public QHostAddress */ + private: + class Private; + Private *d; }; @@ -117,2 +126,4 @@ class OPrivateIOCTL : public QObject + class Private; + Private *d; }; @@ -123,2 +134,3 @@ class OPrivateIOCTL : public QObject +namespace Private { void dumpBytes( const unsigned char* data, int num ); @@ -126,2 +138,5 @@ QString modeToString( int ); int stringToMode( const QString& ); +} +} +} diff --git a/libopie2/opienet/onetwork.cpp b/libopie2/opienet/onetwork.cpp index e5b091f..ab3e77f 100644 --- a/libopie2/opienet/onetwork.cpp +++ b/libopie2/opienet/onetwork.cpp @@ -59,2 +59,6 @@ #include <opie2/odebugmapper.h>
+ + +using namespace Opie::Core; +using namespace Opie::Net::Private; DebugMapper* debugmapper = new DebugMapper();
@@ -66,2 +70,4 @@ DebugMapper* debugmapper = new DebugMapper(); +namespace Opie { +namespace Net { ONetwork* ONetwork::_instance = 0;
@@ -1239 +1245,4 @@ QString OOrinocoMonitoringInterface::name() const }
+ +} +} diff --git a/libopie2/opienet/onetwork.h b/libopie2/opienet/onetwork.h index 93b129f..a953296 100644 --- a/libopie2/opienet/onetwork.h +++ b/libopie2/opienet/onetwork.h @@ -58,2 +58,5 @@ +namespace Opie { +namespace Net { + class ONetworkInterface; @@ -125,2 +128,4 @@ class ONetwork : public QObject InterfaceMap _interfaces; + class Private; + Private *d; }; @@ -236,2 +241,5 @@ class ONetworkInterface : public QObject bool ioctl( int call, struct ifreq& ) const; + private: + class Private; + Private *d; }; @@ -298,2 +306,4 @@ class OChannelHopper : public QObject QValueList<int>::Iterator _channel; + class Private; + Private *d; }; @@ -457,2 +467,4 @@ class OWirelessNetworkInterface : public ONetworkInterface OChannelHopper* _hopper; + class Private; + Private *d; }; @@ -481,2 +493,5 @@ class OMonitoringInterface bool _prismHeader; + private: + class Private; + Private *d; @@ -499,2 +514,5 @@ class OCiscoMonitoringInterface : public OMonitoringInterface virtual void setChannel( int ); + private: + class Private; + Private *d; @@ -518,2 +536,5 @@ class OWlanNGMonitoringInterface : public OMonitoringInterface virtual void setChannel( int ); + private: + class Private; + Private *d; @@ -536,2 +557,6 @@ class OHostAPMonitoringInterface : public OMonitoringInterface virtual QString name() const; + + private: + class Private; + Private *d; }; @@ -555,4 +580,10 @@ class OOrinocoMonitoringInterface : public OMonitoringInterface + private: + class Private; + Private *d; }; +} +} + #endif // ONETWORK_H diff --git a/libopie2/opienet/opcap.cpp b/libopie2/opienet/opcap.cpp index fdd519c..4081d4f 100644 --- a/libopie2/opienet/opcap.cpp +++ b/libopie2/opienet/opcap.cpp @@ -47,2 +47,7 @@ +using namespace Opie::Core; + +namespace Opie { +namespace Net { + /*====================================================================================== @@ -1346,2 +1351,3 @@ QString OPacketCapturer::version() const - +} +} diff --git a/libopie2/opienet/opcap.h b/libopie2/opienet/opcap.h index b873b49..dc609a3 100644 --- a/libopie2/opienet/opcap.h +++ b/libopie2/opienet/opcap.h @@ -66,4 +66,6 @@ typedef struct pcap_pkthdr packetheaderstruct; /* FORWARDS */ -class OPacketCapturer; class QSocketNotifier; +namespace Opie { +namespace Net { +class OPacketCapturer; @@ -143,2 +145,5 @@ class OPacket : public QObject const unsigned char* _end; // end of pcap packet data + private: + class Private; + Private *d; }; @@ -165,2 +170,5 @@ class OEthernetPacket : public QObject const struct ether_header* _ether; + private: + class Private; + Private *d; }; @@ -183,2 +191,4 @@ class OPrismHeaderPacket : public QObject const struct prism_hdr* _header; + class Private; + Private *d; }; @@ -212,2 +222,4 @@ class OWaveLanPacket : public QObject const struct ieee_802_11_header* _wlanhdr; + class Private; + Private *d; }; @@ -241,2 +253,4 @@ class OWaveLanManagementPacket : public QObject const struct ieee_802_11_mgmt_body* _body; + class Private; + Private *d; }; @@ -260,2 +274,4 @@ class OWaveLanManagementSSID : public QObject const struct ssid_t* _data; + class Private; + Private *d; }; @@ -276,2 +292,4 @@ class OWaveLanManagementRates : public QObject const struct rates_t* _data; + class Private; + Private *d; }; @@ -292,2 +310,4 @@ class OWaveLanManagementCF : public QObject const struct cf_t* _data; + class Private; + Private *d; }; @@ -308,2 +328,4 @@ class OWaveLanManagementFH : public QObject const struct fh_t* _data; + class Private; + Private *d; }; @@ -326,2 +348,4 @@ class OWaveLanManagementDS : public QObject const struct ds_t* _data; + class Private; + Private *d; }; @@ -342,2 +366,4 @@ class OWaveLanManagementTim : public QObject const struct tim_t* _data; + class Private; + Private *d; }; @@ -358,2 +384,4 @@ class OWaveLanManagementIBSS : public QObject const struct ibss_t* _data; + class Private; + Private *d; }; @@ -374,2 +402,4 @@ class OWaveLanManagementChallenge : public QObject const struct challenge_t* _data; + class Private; + Private *d; }; @@ -390,2 +420,4 @@ class OWaveLanDataPacket : public QObject const struct ieee_802_11_data_header* _header; + class Private; + Private *d; }; @@ -408,2 +440,4 @@ class OWaveLanControlPacket : public QObject const struct ieee_802_11_control_header* _header; + class Private; + Private *d; }; @@ -424,2 +458,4 @@ class OLLCPacket : public QObject const struct ieee_802_11_802_2_header* _header; + class Private; + Private *d; }; @@ -451,2 +487,4 @@ class OIPPacket : public QObject const struct iphdr* _iphdr; + class Private; + Private *d; }; @@ -475,2 +513,4 @@ class OARPPacket : public QObject const struct myarphdr* _arphdr; + class Private; + Private *d; }; @@ -496,2 +536,4 @@ class OUDPPacket : public QObject const struct udphdr* _udphdr; + class Private; + Private *d; }; @@ -524,2 +566,4 @@ class ODHCPPacket : public QObject unsigned char _type; + class Private; + Private *d; }; @@ -547,2 +591,4 @@ class OTCPPacket : public QObject const struct tcphdr* _tcphdr; + class Private; + Private *d; }; @@ -667,3 +713,7 @@ class OPacketCapturer : public QObject QMap<QString, int> _stats; // statistics; + class Private; // Private Forward declaration + Private *d; // if we need to add data }; +} +} diff --git a/libopie2/opienet/ostation.cpp b/libopie2/opienet/ostation.cpp index 8c989d8..140b924 100644 --- a/libopie2/opienet/ostation.cpp +++ b/libopie2/opienet/ostation.cpp @@ -33,2 +33,7 @@ + +using namespace Opie::Core; + +namespace Opie { +namespace Net { /*====================================================================================== @@ -64 +69,4 @@ void OStation::dump() } + +} +}
\ No newline at end of file diff --git a/libopie2/opienet/ostation.h b/libopie2/opienet/ostation.h index 1e7366d..68f1114 100644 --- a/libopie2/opienet/ostation.h +++ b/libopie2/opienet/ostation.h @@ -42,4 +42,8 @@ +namespace Opie { +namespace Net { + class OStation; + typedef QList<OStation> OStationList; @@ -68,4 +72,9 @@ class OStation bool encrypted; + private: + class Private; + Private *d; }; +} +} |