reliable strategy to see if we're in monitor mode by looking at the MAC address family

2 files changed, 24 insertions, 33 deletions

diff --git a/libopie2/opienet/onetwork.cpp b/libopie2/opienet/onetwork.cpp
index 789e8ca..6a363d7 100644
--- a/libopie2/opienet/onetwork.cpp
+++ b/libopie2/opienet/onetwork.cpp
@@ -43,44 +43,46 @@
 /* UNIX */
 
 #include <arpa/inet.h>
 #include <cerrno>
 #include <cstring>
 #include <cstdlib>
 #include <math.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <unistd.h>
 #include <linux/sockios.h>
+#include <net/if_arp.h>
 #include <stdarg.h>
 
 using namespace std;
 
 /*======================================================================================
  * ONetwork
  *======================================================================================*/
 
 ONetwork* ONetwork::_instance = 0;
 
 ONetwork::ONetwork()
 {
     qDebug( "ONetwork::ONetwork()" );
     synchronize();
 }
 
 void ONetwork::synchronize()
 {
     // gather available interfaces by inspecting /proc/net/dev
-    // we could use SIOCGIFCONF here, but we aren't interested in virtual (e.g. eth0:0) devices
+    //FIXME: we could use SIOCGIFCONF here, but we aren't interested in virtual (e.g. eth0:0) devices
+    //FIXME: Use SIOCGIFCONF anway, because we can disable listing of aliased devices
 
     _interfaces.clear();
     QString str;
     QFile f( "/proc/net/dev" );
     bool hasFile = f.open( IO_ReadOnly );
     if ( !hasFile )
     {
         qDebug( "ONetwork: /proc/net/dev not existing. No network devices available" );
         return;
     }
     QTextStream s( &f );
     s.readLine();
@@ -123,29 +125,25 @@ ONetwork::InterfaceIterator ONetwork::iterator() const
 {
     return ONetwork::InterfaceIterator( _interfaces );
 }
 
 
 bool ONetwork::isWirelessInterface( const char* name ) const
 {
     int sfd = socket( AF_INET, SOCK_STREAM, 0 );
     struct iwreq iwr;
     memset( &iwr, 0, sizeof( struct iwreq ) );
     strcpy( (char*) &iwr.ifr_name, name );
     int result = ::ioctl( sfd, SIOCGIWNAME, &iwr );
-    if ( result == -1 )
-        qDebug( "ONetwork::ioctl(): SIOCGIWNAME failed: %d (%s)", result, strerror( errno ) );
-    else
-        qDebug( "ONetwork::ioctl(): SIOCGIWNAME ok." );
-    return ( result != -1 );
+    return result != -1;
 }
 
 /*======================================================================================
  * ONetworkInterface
  *======================================================================================*/
 
 ONetworkInterface::ONetworkInterface( QObject* parent, const char* name )
                  :QObject( parent, name ),
                  _sfd( socket( AF_INET, SOCK_DGRAM, 0 ) ), _mon( 0 )
 {
     qDebug( "ONetworkInterface::ONetworkInterface()" );
     init();
@@ -230,24 +228,37 @@ OMacAddress ONetworkInterface::macAddress() const
 {
     if ( ioctl( SIOCGIFHWADDR ) )
     {
         return OMacAddress( _ifr );
     }
     else
     {
         return OMacAddress::unknown;
     }
 }
 
 
+int ONetworkInterface::dataLinkType() const
+{
+    if ( ioctl( SIOCGIFHWADDR ) )
+    {
+        return _ifr.ifr_hwaddr.sa_family;
+    }
+    else
+    {
+        return -1;
+    }
+}
+
+
 void ONetworkInterface::setMonitoring( OMonitoringInterface* m )
 {
     _mon = m;
     qDebug( "ONetwork::setMonitoring(): Installed monitoring driver '%s' on interface '%s'", (const char*) m->name(), name() );
 }
 
 
 OMonitoringInterface* ONetworkInterface::monitoring() const
 {
     return _mon;
 }
 
@@ -576,25 +587,26 @@ int OWirelessNetworkInterface::channelHopping() const
 
 void OWirelessNetworkInterface::setMonitorMode( bool b )
 {
     if ( _mon )
         _mon->setEnabled( b );
     else
         qDebug( "ONetwork(): can't switch monitor mode without installed monitoring interface" );
 }
 
 
 bool OWirelessNetworkInterface::monitorMode() const
 {
-    return _mon ? _mon->enabled() : false;
+    qDebug( "dataLinkType = %d", dataLinkType() );
+    return dataLinkType() == ARPHRD_IEEE80211;
 }
 
 
 QString OWirelessNetworkInterface::nickName() const
 {
     char str[IW_ESSID_MAX_SIZE];
     _iwr.u.data.pointer = &str[0];
     _iwr.u.data.length = IW_ESSID_MAX_SIZE;
     if ( !wioctl( SIOCGIWNICKN ) )
     {
         return "<unknown>";
     }
@@ -676,67 +688,55 @@ 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 )
-                      :_enabled( false ), _if( static_cast<OWirelessNetworkInterface*>( iface ) )
+                      :_if( static_cast<OWirelessNetworkInterface*>( iface ) )
 {
 }
 
 
 OMonitoringInterface::~OMonitoringInterface()
 {
 }
 
 
 void OMonitoringInterface::setChannel( int c )
 {
     // use standard WE channel switching protocol
     memset( &_if->_iwr, 0, sizeof( struct iwreq ) );
     _if->_iwr.u.freq.m = c;
     _if->_iwr.u.freq.e = 0;
     _if->wioctl( SIOCSIWFREQ );
 }
 
 
 bool OMonitoringInterface::enabled() const
 {
-    return _enabled;
+    return _if->monitorMode();
 }
 
+
 void OMonitoringInterface::setEnabled( bool b )
 {
-    // open a packet capturer here or leave this to
-    // the client code?
-
-    /*
-
-    if ( b )
-    {
-        OPacketCapturer* opcap = new OPacketCapturer();
-        opcap->open( _if->name() );
-    }
-    */
-
-    _enabled = b;
-
 }
 
+
 /*======================================================================================
  * OCiscoMonitoringInterface
  *======================================================================================*/
 
 OCiscoMonitoringInterface::OCiscoMonitoringInterface( ONetworkInterface* iface )
                            :OMonitoringInterface( iface )
 {
     iface->setMonitoring( this );
 }
 
 
 OCiscoMonitoringInterface::~OCiscoMonitoringInterface()
@@ -748,27 +748,24 @@ void OCiscoMonitoringInterface::setEnabled( bool b )
 {
     QString fname;
     fname.sprintf( "/proc/driver/aironet/%s", (const char*) _if->name() );
     QFile f( fname );
     if ( !f.exists() ) return;
 
     if ( f.open( IO_WriteOnly ) )
     {
         QTextStream s( &f );
         s << "Mode: r";
         s << "Mode: y";
         s << "XmitPower: 1";
-
-        OMonitoringInterface::setEnabled( b );
-
     }
 
     // flushing and closing will be done automatically when f goes out of scope
 }
 
 
 QString OCiscoMonitoringInterface::name() const
 {
     return "cisco";
 }
 
 
@@ -794,26 +791,24 @@ OWlanNGMonitoringInterface::~OWlanNGMonitoringInterface()
 {
 }
 
 
 void OWlanNGMonitoringInterface::setEnabled( bool b )
 {
     //FIXME: do nothing if its already in the same mode
 
     QString enable = b ? "true" : "false";
     QString cmd;
     cmd.sprintf( "$(which wlanctl-ng) %s lnxreq_wlansniff channel=%d enable=%s", (const char*) _if->name(), 1, (const char*) enable );
     system( cmd );
-
-    OMonitoringInterface::setEnabled( b );
 }
 
 
 QString OWlanNGMonitoringInterface::name() const
 {
     return "wlan-ng";
 }
 
 
 void OWlanNGMonitoringInterface::setChannel( int )
 {
     // wlan-ng devices automatically switch channels when in monitor mode
@@ -854,26 +849,24 @@ void OHostAPMonitoringInterface::setEnabled( bool b )
     else
     {
         #if WIRELESS_EXT > 14
         _if->_iwr.u.mode = IW_MODE_INFRA;
         _if->wioctl( SIOCSIWMODE );
         #else
         int* args = (int*) &_if->_iwr.u.name;
         args[0] = 0;
         args[1] = 0;
         _if->wioctl( SIOCDEVPRIVATE );
         #endif
     }
-
-    OMonitoringInterface::setEnabled( b );
 }
 
 
 QString OHostAPMonitoringInterface::name() const
 {
     return "hostap";
 }
 
 
 /*======================================================================================
  * OOrinocoNetworkInterface
  *======================================================================================*/
@@ -905,21 +898,19 @@ void OOrinocoMonitoringInterface::setEnabled( bool b )
     if ( b )
     {
         setChannel( 1 );
     }
     else
     {
         // call iwpriv <device> monitor 0 0
         int* args = (int*) &_if->_iwr.u.name;
         args[0] = 0;
         args[1] = 0;
         _if->wioctl( SIOCIWFIRSTPRIV + 0x8 );
     }
-
-    OMonitoringInterface::setEnabled( b );
 }
 
 
 QString OOrinocoMonitoringInterface::name() const
 {
     return "orinoco";
 }
diff --git a/libopie2/opienet/onetwork.h b/libopie2/opienet/onetwork.h
index 509c3db..4cadbeb 100644
--- a/libopie2/opienet/onetwork.h
+++ b/libopie2/opienet/onetwork.h
@@ -117,24 +117,25 @@ class ONetworkInterface : public QObject
     virtual ~ONetworkInterface();
 
     void setMonitoring( OMonitoringInterface* );
     OMonitoringInterface* monitoring() const;
     bool setPromiscuousMode( bool );
     bool promiscuousMode() const;
     bool setUp( bool );
     bool isUp() const;
     bool isLoopback() const;
     bool isWireless() const;
     QString ipV4Address() const;
     OMacAddress macAddress() const;
+    int dataLinkType() const;
 
   protected:
     const int _sfd;
     mutable ifreq _ifr;
     OMonitoringInterface* _mon;
 
   protected:
     struct ifreq& ifr() const;
     virtual void init();
     bool ioctl( int call ) const;
     bool ioctl( int call, struct ifreq& ) const;
 };
@@ -239,25 +240,24 @@ class OMonitoringInterface
     OMonitoringInterface();
     OMonitoringInterface( ONetworkInterface* );
     virtual ~OMonitoringInterface();
 
   public:
     virtual void setEnabled( bool );
     virtual bool enabled() const;
     virtual void setChannel( int );
 
     virtual QString name() const = 0;
 
   protected:
-    bool _enabled;
     const OWirelessNetworkInterface* _if;
 
 };
 
 
 /*======================================================================================
  * OCiscoMonitoring
  *======================================================================================*/
 
 
 class OCiscoMonitoringInterface : public OMonitoringInterface
 {