1 files changed, 51 insertions, 1 deletions

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
@@ -63,10 +63,12 @@ extern "C"  // work around a bpf/pcap conflict in recent headers
 typedef struct timeval timevalstruct;
 typedef struct pcap_pkthdr packetheaderstruct;
 
 /* FORWARDS */
-class OPacketCapturer;
 class QSocketNotifier;
+namespace Opie {
+namespace Net  {
+class OPacketCapturer;
 
 /*======================================================================================
  * OPacket - A frame on the wire
  *======================================================================================*/
@@ -140,8 +142,11 @@ class OPacket : public QObject
   private:
     const packetheaderstruct _hdr;  // pcap packet header
     const unsigned char* _data;     // pcap packet data
     const unsigned char* _end;      // end of pcap packet data
+  private:
+    class Private;
+    Private *d;
 };
 
 QTextStream& operator<<( QTextStream& s, const OPacket& p );
 
@@ -162,8 +167,11 @@ class OEthernetPacket : public QObject
     int type() const;
 
   private:
     const struct ether_header* _ether;
+  private:
+    class Private;
+    Private *d;
 };
 
 /*======================================================================================
  * OPrismHeaderPacket - DLT_PRISM_HEADER frame
@@ -180,8 +188,10 @@ class OPrismHeaderPacket : public QObject
     unsigned int signalStrength() const;
 
   private:
     const struct prism_hdr* _header;
+    class Private;
+    Private *d;
 };
 
 /*======================================================================================
  * OWaveLanPacket - DLT_IEEE802_11 frame
@@ -209,8 +219,10 @@ class OWaveLanPacket : public QObject
     bool usesWep() const;
 
   private:
     const struct ieee_802_11_header* _wlanhdr;
+    class Private;
+    Private *d;
 };
 
 
 /*======================================================================================
@@ -238,8 +250,10 @@ class OWaveLanManagementPacket : public QObject
 
   private:
     const struct ieee_802_11_mgmt_header* _header;
     const struct ieee_802_11_mgmt_body* _body;
+    class Private;
+    Private *d;
 };
 
 
 /*======================================================================================
@@ -257,8 +271,10 @@ class OWaveLanManagementSSID : public QObject
     QString ID( bool decloak = false ) const;
 
   private:
     const struct ssid_t* _data;
+    class Private;
+    Private *d;
 };
 
 /*======================================================================================
  * OWaveLanManagementRates
@@ -273,8 +289,10 @@ class OWaveLanManagementRates : public QObject
     virtual ~OWaveLanManagementRates();
 
   private:
     const struct rates_t* _data;
+    class Private;
+    Private *d;
 };
 
 /*======================================================================================
  * OWaveLanManagementCF
@@ -289,8 +307,10 @@ class OWaveLanManagementCF : public QObject
     virtual ~OWaveLanManagementCF();
 
   private:
     const struct cf_t* _data;
+    class Private;
+    Private *d;
 };
 
 /*======================================================================================
  * OWaveLanManagementFH
@@ -305,8 +325,10 @@ class OWaveLanManagementFH : public QObject
     virtual ~OWaveLanManagementFH();
 
   private:
     const struct fh_t* _data;
+    class Private;
+    Private *d;
 };
 
 /*======================================================================================
  * OWaveLanManagementDS
@@ -323,8 +345,10 @@ class OWaveLanManagementDS : public QObject
     int channel() const;
 
   private:
     const struct ds_t* _data;
+    class Private;
+    Private *d;
 };
 
 /*======================================================================================
  * OWaveLanManagementTim
@@ -339,8 +363,10 @@ class OWaveLanManagementTim : public QObject
     virtual ~OWaveLanManagementTim();
 
   private:
     const struct tim_t* _data;
+    class Private;
+    Private *d;
 };
 
 /*======================================================================================
  * OWaveLanManagementIBSS
@@ -355,8 +381,10 @@ class OWaveLanManagementIBSS : public QObject
     virtual ~OWaveLanManagementIBSS();
 
   private:
     const struct ibss_t* _data;
+    class Private;
+    Private *d;
 };
 
 /*======================================================================================
  * OWaveLanManagementChallenge
@@ -371,8 +399,10 @@ class OWaveLanManagementChallenge : public QObject
     virtual ~OWaveLanManagementChallenge();
 
   private:
     const struct challenge_t* _data;
+    class Private;
+    Private *d;
 };
 
 /*======================================================================================
  * OWaveLanDataPacket - type: data (T_DATA)
@@ -387,8 +417,10 @@ class OWaveLanDataPacket : public QObject
     virtual ~OWaveLanDataPacket();
 
   private:
     const struct ieee_802_11_data_header* _header;
+    class Private;
+    Private *d;
 };
 
 /*======================================================================================
  * OWaveLanControlPacket - type: control (T_CTRL)
@@ -405,8 +437,10 @@ class OWaveLanControlPacket : public QObject
     QString controlType() const;
 
   private:
     const struct ieee_802_11_control_header* _header;
+    class Private;
+    Private *d;
 };
 
 /*======================================================================================
  * OLLCPacket - IEEE 802.2 Link Level Control
@@ -421,8 +455,10 @@ class OLLCPacket : public QObject
     virtual ~OLLCPacket();
 
   private:
     const struct ieee_802_11_802_2_header* _header;
+    class Private;
+    Private *d;
 };
 
 /*======================================================================================
  * OIPPacket
@@ -448,8 +484,10 @@ class OIPPacket : public QObject
     int checksum() const;
 
   private:
     const struct iphdr* _iphdr;
+    class Private;
+    Private *d;
 };
 
 /*======================================================================================
  * OARPPacket
@@ -472,8 +510,10 @@ class OARPPacket : public QObject
     QString type() const;
 
   private:
     const struct myarphdr* _arphdr;
+    class Private;
+    Private *d;
 };
 
 /*======================================================================================
  * OUDPPacket
@@ -493,8 +533,10 @@ class OUDPPacket : public QObject
     int checksum() const;
 
   private:
     const struct udphdr* _udphdr;
+    class Private;
+    Private *d;
 };
 
 /*======================================================================================
  * ODHCPPacket
@@ -521,8 +563,10 @@ class ODHCPPacket : public QObject
 
   private:
     const struct dhcp_packet* _dhcphdr;
     unsigned char _type;
+    class Private;
+    Private *d;
 };
 
 /*======================================================================================
  * OTCPPacket
@@ -544,8 +588,10 @@ class OTCPPacket : public QObject
     int checksum() const;
 
   private:
     const struct tcphdr* _tcphdr;
+    class Private;
+    Private *d;
 };
 
 
 /*======================================================================================
@@ -664,8 +710,12 @@ class OPacketCapturer : public QObject
     pcap_dumper_t* _pcd;                            // pcap dumper handle
     QSocketNotifier* _sn;                           // socket notifier for main loop
     mutable char _errbuf[PCAP_ERRBUF_SIZE];         // holds error strings from libpcap
     QMap<QString, int> _stats;                      // statistics;
+            class Private;                             // Private Forward declaration
+            Private *d;                                     // if we need to add data
 };
+}
+}
 
 #endif // OPCAP_H