3 files changed, 25 insertions, 19 deletions

diff --git a/libopie2/opienet/onetwork.cpp b/libopie2/opienet/onetwork.cpp
index 2dfff1d..6cef5cf 100644
--- a/libopie2/opienet/onetwork.cpp
+++ b/libopie2/opienet/onetwork.cpp
@@ -800,26 +800,26 @@ bool OWirelessNetworkInterface::wioctl( int call, struct iwreq& iwreq ) const
 
 bool OWirelessNetworkInterface::wioctl( int call ) const
 {
     strcpy( _iwr.ifr_name, name() );
     return wioctl( call, _iwr );
 }
 
 
 /*======================================================================================
  * OMonitoringInterface
  *======================================================================================*/
 
-OMonitoringInterface::OMonitoringInterface( ONetworkInterface* iface )
-                      :_if( static_cast<OWirelessNetworkInterface*>( iface ) )
+OMonitoringInterface::OMonitoringInterface( ONetworkInterface* iface, bool prismHeader )
+                      :_if( static_cast<OWirelessNetworkInterface*>( iface ) ), _prismHeader( prismHeader )
 {
 }
 
 
 OMonitoringInterface::~OMonitoringInterface()
 {
 }
 
 
 void OMonitoringInterface::setChannel( int c )
 {
     // use standard WE channel switching protocol
@@ -836,26 +836,26 @@ bool OMonitoringInterface::enabled() const
 }
 
 
 void OMonitoringInterface::setEnabled( bool b )
 {
 }
 
 
 /*======================================================================================
  * OCiscoMonitoringInterface
  *======================================================================================*/
 
-OCiscoMonitoringInterface::OCiscoMonitoringInterface( ONetworkInterface* iface )
-                           :OMonitoringInterface( iface )
+OCiscoMonitoringInterface::OCiscoMonitoringInterface( ONetworkInterface* iface, bool prismHeader )
+                           :OMonitoringInterface( iface, prismHeader )
 {
     iface->setMonitoring( this );
 }
 
 
 OCiscoMonitoringInterface::~OCiscoMonitoringInterface()
 {
 }
 
 
 void OCiscoMonitoringInterface::setEnabled( bool b )
 {
@@ -884,117 +884,122 @@ QString OCiscoMonitoringInterface::name() const
 
 void OCiscoMonitoringInterface::setChannel( int )
 {
     // cisco devices automatically switch channels when in monitor mode
 }
 
 
 /*======================================================================================
  * OWlanNGMonitoringInterface
  *======================================================================================*/
 
 
-OWlanNGMonitoringInterface::OWlanNGMonitoringInterface( ONetworkInterface* iface )
-                           :OMonitoringInterface( iface )
+OWlanNGMonitoringInterface::OWlanNGMonitoringInterface( ONetworkInterface* iface, bool prismHeader )
+                           :OMonitoringInterface( iface, prismHeader )
 {
     iface->setMonitoring( this );
 }
 
 
 OWlanNGMonitoringInterface::~OWlanNGMonitoringInterface()
 {
 }
 
 
 void OWlanNGMonitoringInterface::setEnabled( bool b )
 {
     //FIXME: do nothing if its already in the same mode
 
     QString enable = b ? "true" : "false";
+    QString prism = _prismHeader ? "true" : "false";
     QString cmd;
-    cmd.sprintf( "$(which wlanctl-ng) %s lnxreq_wlansniff channel=%d enable=%s", (const char*) _if->name(), 1, (const char*) enable );
+    cmd.sprintf( "$(which wlanctl-ng) %s lnxreq_wlansniff channel=%d enable=%s prismheader=%s",
+                 (const char*) _if->name(), 1, (const char*) enable, (const char*) prism );
     system( cmd );
 }
 
 
 QString OWlanNGMonitoringInterface::name() const
 {
     return "wlan-ng";
 }
 
 
 void OWlanNGMonitoringInterface::setChannel( int )
 {
     // wlan-ng devices automatically switch channels when in monitor mode
 }
 
 
 /*======================================================================================
  * OHostAPMonitoringInterface
  *======================================================================================*/
 
-OHostAPMonitoringInterface::OHostAPMonitoringInterface( ONetworkInterface* iface )
-                           :OMonitoringInterface( iface )
+OHostAPMonitoringInterface::OHostAPMonitoringInterface( ONetworkInterface* iface, bool prismHeader )
+                           :OMonitoringInterface( iface, prismHeader )
 {
     iface->setMonitoring( this );
 }
 
 OHostAPMonitoringInterface::~OHostAPMonitoringInterface()
 {
 }
 
 void OHostAPMonitoringInterface::setEnabled( bool b )
 {
     // IW_MODE_MONITOR was introduced in Wireless Extensions Version 15
     // Wireless Extensions < Version 15 need iwpriv commandos for monitoring
 
     //TODO: check wireless extensions version on runtime and use
     //TODO: SIOCSIWMODE( IW_MODE_MONITOR ) if running on WE >= 15
 
+    int monitorCode = _prismHeader ? 1 : 2;
+
     if ( b )
     {
-        _if->setPrivate( "monitor", 1, 2 );
+        _if->setPrivate( "monitor", 1, monitorCode );
     }
     else
     {
         _if->setPrivate( "monitor", 1, 0 );
     }
 }
 
 
 QString OHostAPMonitoringInterface::name() const
 {
     return "hostap";
 }
 
 
 /*======================================================================================
  * OOrinocoNetworkInterface
  *======================================================================================*/
 
-OOrinocoMonitoringInterface::OOrinocoMonitoringInterface( ONetworkInterface* iface )
-                           :OMonitoringInterface( iface )
+OOrinocoMonitoringInterface::OOrinocoMonitoringInterface( ONetworkInterface* iface, bool prismHeader )
+                           :OMonitoringInterface( iface, prismHeader )
 {
     iface->setMonitoring( this );
 }
 
 
 OOrinocoMonitoringInterface::~OOrinocoMonitoringInterface()
 {
 }
 
 
 void OOrinocoMonitoringInterface::setChannel( int c )
 {
-    _if->setPrivate( "monitor", 2, 1, c );
+    int monitorCode = _prismHeader ? 1 : 2;
+    _if->setPrivate( "monitor", 2, monitorCode, c );
 }
 
 
 void OOrinocoMonitoringInterface::setEnabled( bool b )
 {
     if ( b )
     {
         setChannel( 1 );
     }
     else
     {
         _if->setPrivate( "monitor", 2, 0, 0 );
diff --git a/libopie2/opienet/onetwork.h b/libopie2/opienet/onetwork.h
index 1b38d02..eb9d506 100644
--- a/libopie2/opienet/onetwork.h
+++ b/libopie2/opienet/onetwork.h
@@ -443,96 +443,97 @@ class OWirelessNetworkInterface : public ONetworkInterface
 };
 
 
 /*======================================================================================
  * OMonitoringInterface
  *======================================================================================*/
 
 
 class OMonitoringInterface
 {
   public:
     OMonitoringInterface();
-    OMonitoringInterface( ONetworkInterface* );
+    OMonitoringInterface( ONetworkInterface*, bool _prismHeader );
     virtual ~OMonitoringInterface();
 
   public:
     virtual void setEnabled( bool );
     virtual bool enabled() const;
     virtual void setChannel( int );
 
     virtual QString name() const = 0;
 
   protected:
     OWirelessNetworkInterface* _if;
+    bool _prismHeader;
 
 };
 
 
 /*======================================================================================
  * OCiscoMonitoring
  *======================================================================================*/
 
 
 class OCiscoMonitoringInterface : public OMonitoringInterface
 {
   public:
-    OCiscoMonitoringInterface( ONetworkInterface* );
+    OCiscoMonitoringInterface( ONetworkInterface*, bool _prismHeader );
     virtual ~OCiscoMonitoringInterface();
 
     virtual void setEnabled( bool );
     virtual QString name() const;
     virtual void setChannel( int );
 
 };
 
 /*======================================================================================
  * OWlanNGMonitoringInterface
  *======================================================================================*/
 
 class OWlanNGMonitoringInterface : public OMonitoringInterface
 {
   public:
-    OWlanNGMonitoringInterface( ONetworkInterface* );
+    OWlanNGMonitoringInterface( ONetworkInterface*, bool _prismHeader );
     virtual ~OWlanNGMonitoringInterface();
 
   public:
     virtual void setEnabled( bool );
     virtual QString name() const;
     virtual void setChannel( int );
 
 };
 
 /*======================================================================================
  * OHostAPMonitoringInterface
  *======================================================================================*/
 
 class OHostAPMonitoringInterface : public OMonitoringInterface
 {
   public:
-    OHostAPMonitoringInterface( ONetworkInterface* );
+    OHostAPMonitoringInterface( ONetworkInterface*, bool _prismHeader );
     virtual ~OHostAPMonitoringInterface();
 
   public:
     virtual void setEnabled( bool );
     virtual QString name() const;
  };
 
 /*======================================================================================
  * OOrinocoMonitoringInterface
  *======================================================================================*/
 
 class OOrinocoMonitoringInterface : public OMonitoringInterface
 {
   public:
-    OOrinocoMonitoringInterface( ONetworkInterface* );
+    OOrinocoMonitoringInterface( ONetworkInterface*, bool _prismHeader );
     virtual ~OOrinocoMonitoringInterface();
 
    public:
     virtual void setChannel( int );
     virtual void setEnabled( bool );
     virtual QString name() const;
 
 };
 
 #endif // ONETWORK_H
 
diff --git a/libopie2/opienet/opcap.cpp b/libopie2/opienet/opcap.cpp
index e2ab6d7..f6d05ea 100644
--- a/libopie2/opienet/opcap.cpp
+++ b/libopie2/opienet/opcap.cpp
@@ -62,25 +62,25 @@ OPacket::OPacket( int datalink, packetheaderstruct header, const unsigned char*
 
         case DLT_IEEE802_11:
             qDebug( "OPacket::OPacket(): Received Packet. Datalink = IEEE802.11" );
             new OWaveLanPacket( _end, (const struct ieee_802_11_header*) data, this );
             break;
 
         case DLT_PRISM_HEADER:
             qDebug( "OPacket::OPacket(): Received Packet. Datalink = PRISM_HEADER" );
             new OPrismHeaderPacket( _end, (const struct prism_hdr*) (unsigned char*) data, this );
             break;
 
         default:
-            qWarning( "OPacket::OPacket(): Received Packet over unsupported datalink '%s'!", datalink );
+            qWarning( "OPacket::OPacket(): Received Packet over unsupported datalink (type %d)!", datalink );
     }
 }
 
 
 OPacket::~OPacket()
 {
 }
 
 
 timevalstruct OPacket::timeval() const
 {
     return _hdr.ts;