- setting the monitor mode on wireless cards via private ioctls is now much more reliable because we detect the appropriate ioctl number at runtime

- ONetworkInterface supports now the evil but handy feature to change MAC address on the fly (provided the driver supports this)

1 files changed, 22 insertions, 28 deletions

diff --git a/libopie2/opienet/onetwork.cpp b/libopie2/opienet/onetwork.cpp
index f52279a..e916c44 100644
--- a/libopie2/opienet/onetwork.cpp
+++ b/libopie2/opienet/onetwork.cpp
@@ -203,48 +203,56 @@ bool ONetworkInterface::setUp( bool b )
     return ioctl( SIOCSIFFLAGS );
 }
 
 
 bool ONetworkInterface::isUp() const
 {
     ioctl( SIOCGIFFLAGS );
     return _ifr.ifr_flags & IFF_UP;
 }
 
 
 QString ONetworkInterface::ipV4Address() const
 {
     if ( ioctl( SIOCGIFADDR ) )
     {
         struct sockaddr_in *sa = (struct sockaddr_in *) &_ifr.ifr_addr;
         //FIXME: Use QHostAddress here
         return QString( inet_ntoa( sa->sin_addr ) );
     }
     else
         return "<unknown>";
 }
 
 
+void ONetworkInterface::setMacAddress( const OMacAddress& addr )
+{
+    _ifr.ifr_hwaddr.sa_family = ARPHRD_ETHER;
+    memcpy( &_ifr.ifr_hwaddr.sa_data, addr.native(), 6 );
+    ioctl( SIOCSIFHWADDR );
+}
+
+
 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;
     }
 }
@@ -626,48 +634,55 @@ void OWirelessNetworkInterface::setPrivate( const QString& call, int numargs, ..
         qDebug( "OWirelessNetworkInterface::setPrivate(): interface '%s' does not support private ioctl '%s'", name(), (const char*) call );
         return;
     }
     if ( priv->numberSetArgs() != numargs )
     {
         qDebug( "OWirelessNetworkInterface::setPrivate(): parameter count not matching. '%s' expects %d arguments, but got %d", (const char*) call, priv->numberSetArgs(), numargs );
         return;
     }
 
     qDebug( "OWirelessNetworkInterface::setPrivate(): about to call '%s' on interface '%s'", (const char*) call, name() );
     memset( &_iwr, 0, sizeof _iwr );
     va_list argp;
     va_start( argp, numargs );
     for ( int i = 0; i < numargs; ++i )
     {
         priv->setParameter( i, va_arg( argp, int ) );
     }
     va_end( argp );
     priv->invoke();
 }
 
 
 void OWirelessNetworkInterface::getPrivate( const QString& call )
 {
+    qWarning( "OWirelessNetworkInterface::getPrivate() is not implemented yet." );
+}
+
+
+bool OWirelessNetworkInterface::hasPrivate( const QString& call )
+{
+    return child( (const char*) call );
 }
 
 
 QString OWirelessNetworkInterface::SSID() const
 {
     char str[IW_ESSID_MAX_SIZE];
     _iwr.u.essid.pointer = &str[0];
     _iwr.u.essid.length = IW_ESSID_MAX_SIZE;
     if ( !wioctl( SIOCGIWESSID ) )
     {
         return "<unknown>";
     }
     else
     {
         return str;
     }
 }
 
 
 void OWirelessNetworkInterface::setSSID( const QString& ssid )
 {
     _iwr.u.essid.pointer = const_cast<char*>( (const char*) ssid );
     _iwr.u.essid.length = ssid.length();
     wioctl( SIOCSIWESSID );
@@ -813,104 +828,83 @@ void OWlanNGMonitoringInterface::setChannel( int )
 {
     // wlan-ng devices automatically switch channels when in monitor mode
 }
 
 
 /*======================================================================================
  * OHostAPMonitoringInterface
  *======================================================================================*/
 
 OHostAPMonitoringInterface::OHostAPMonitoringInterface( ONetworkInterface* iface )
                            :OMonitoringInterface( iface )
 {
     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
+
     if ( b )
     {
-        #if WIRELESS_EXT > 14
-        _if->_iwr.u.mode = IW_MODE_MONITOR;
-        _if->wioctl( SIOCSIWMODE );
-        #else
-        int* args = (int*) &_if->_iwr.u.name;
-        args[0] = 2;
-        args[1] = 0;
-        _if->wioctl( SIOCDEVPRIVATE );
-        #endif
+        _if->setPrivate( "monitor", 1, 2 );
     }
     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
+        _if->setPrivate( "monitor", 1, 0 );
     }
 }
 
 
 QString OHostAPMonitoringInterface::name() const
 {
     return "hostap";
 }
 
 
 /*======================================================================================
  * OOrinocoNetworkInterface
  *======================================================================================*/
 
 OOrinocoMonitoringInterface::OOrinocoMonitoringInterface( ONetworkInterface* iface )
                            :OMonitoringInterface( iface )
 {
     iface->setMonitoring( this );
 }
 
 
 OOrinocoMonitoringInterface::~OOrinocoMonitoringInterface()
 {
 }
 
 
 void OOrinocoMonitoringInterface::setChannel( int c )
 {
-    // call iwpriv <device> monitor 2 <channel>
-    int* args = (int*) &_if->_iwr.u.name;
-    args[0] = 2;
-    args[1] = c;
-    _if->wioctl( SIOCIWFIRSTPRIV + 0x8 );
+    _if->setPrivate( "monitor", 2, 2, c );
 }
 
 
 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 );
+        _if->setPrivate( "monitor", 2, 0, 0 );
     }
 }
 
 
 QString OOrinocoMonitoringInterface::name() const
 {
     return "orinoco";
 }