1 files changed, 9 insertions, 6 deletions
diff --git a/libopie2/opienet/onetwork.cpp b/libopie2/opienet/onetwork.cpp
index 36f409b..915814d 100644
--- a/libopie2/opienet/onetwork.cpp
+++ b/libopie2/opienet/onetwork.cpp
@@ -816,410 +816,413 @@ void OWirelessNetworkInterface::getPrivate( const QString& call )
 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 );
 }
 OStationList* OWirelessNetworkInterface::scanNetwork()
 {
    _iwr.u.param.flags = IW_SCAN_DEFAULT;
    _iwr.u.param.value = 0;
    if ( !wioctl( SIOCSIWSCAN ) )
    {
        return 0;
    }
    OStationList* stations = new OStationList();
    int timeout = 1000000;
    odebug << "ONetworkInterface::scanNetwork() - scan started." << oendl;
    bool results = false;
    struct timeval tv;
    tv.tv_sec = 0;
    tv.tv_usec = 250000; // initial timeout ~ 250ms
    char buffer[IW_SCAN_MAX_DATA];
    while ( !results && timeout > 0 )
    {
        timeout -= tv.tv_usec;
        select( 0, 0, 0, 0, &tv );
        _iwr.u.data.pointer = &buffer[0];
        _iwr.u.data.flags = 0;
        _iwr.u.data.length = sizeof buffer;
        if ( wioctl( SIOCGIWSCAN ) )
        {
            results = true;
            continue;
        }
        else if ( errno == EAGAIN)
        {
            odebug << "ONetworkInterface::scanNetwork() - scan in progress..." << oendl;
            #if 0
            if ( qApp )
            {
                qApp->processEvents( 100 );
                continue;
            }
            #endif
            tv.tv_sec = 0;
            tv.tv_usec = 100000;
            continue;
        }
    }
    odebug << "ONetworkInterface::scanNetwork() - scan finished." << oendl;
    if ( results )
    {
        odebug << " - result length = " << _iwr.u.data.length << oendl;
        if ( !_iwr.u.data.length )
        {
            odebug << " - no results (empty neighbourhood)" << oendl;
            return stations;
        }
        odebug << " - results are in!" << oendl;
        dumpBytes( (const unsigned char*) &buffer[0], _iwr.u.data.length );
        // parse results
        int offset = 0;
        struct iw_event* we = (struct iw_event*) &buffer[0];
        while ( offset < _iwr.u.data.length )
        {
            //const char* cmd = *(*_ioctlmap)[we->cmd];
            //if ( !cmd ) cmd = "<unknown>";
            odebug << " - reading next event... cmd=" << we->cmd << ", len=" << we->len << oendl;
            switch (we->cmd)
            {
                case SIOCGIWAP:
                {
                    odebug << "SIOCGIWAP" << oendl;
                    stations->append( new OStation() );
                    stations->last()->macAddress = (const unsigned char*) &we->u.ap_addr.sa_data[0];
                    break;
                }
                case SIOCGIWMODE:
                {
                    odebug << "SIOCGIWMODE" << oendl;
                    stations->last()->type = modeToString( we->u.mode );
                    break;
                }
                case SIOCGIWFREQ:
                {
                    odebug << "SIOCGIWFREQ" << oendl;
                    stations->last()->channel = _channels[ static_cast<int>(double( we->u.freq.m ) * pow( 10.0, we->u.freq.e ) / 1000000) ];
                    break;
                }
                case SIOCGIWESSID:
                {
                    odebug << "SIOCGIWESSID" << oendl;
                    stations->last()->ssid = we->u.essid.pointer;
                    break;
                }
                case SIOCGIWSENS: odebug << "SIOCGIWSENS" << oendl; break;
                case SIOCGIWENCODE: odebug << "SIOCGIWENCODE" << oendl; break;
                case IWEVTXDROP: odebug << "IWEVTXDROP" << oendl; break;         /* Packet dropped to excessive retry */
                case IWEVQUAL: odebug << "IWEVQUAL" << oendl; break;             /* Quality part of statistics (scan) */
                case IWEVCUSTOM: odebug << "IWEVCUSTOM" << oendl; break;         /* Driver specific ascii string */
                case IWEVREGISTERED: odebug << "IWEVREGISTERED" << oendl; break; /* Discovered a new node (AP mode) */
                case IWEVEXPIRED: odebug << "IWEVEXPIRED" << oendl; break;       /* Expired a node (AP mode) */
                default: odebug << "unhandled event" << oendl;
            }
            offset += we->len;
            we = (struct iw_event*) &buffer[offset];
        }
        return stations;
        return stations;
    }
    else
    {
        odebug << " - no results (timeout) :(" << oendl;
        return stations;
    }
 }
 int OWirelessNetworkInterface::signalStrength() const
 {   
    iw_statistics stat;
    ::memset( &stat, 0, sizeof stat );
    _iwr.u.data.pointer = (char*) &stat;
    _iwr.u.data.flags = 0;
    _iwr.u.data.length = sizeof stat;
    
    if ( !wioctl( SIOCGIWSTATS ) )
    {
        return -1;
    }
   
    int max = _range.max_qual.qual;
    int cur = stat.qual.qual;
    int lev = stat.qual.level; //FIXME: Do something with them?
    int noi = stat.qual.noise; //FIXME: Do something with them?
    
    return cur*100/max;
 }
 bool OWirelessNetworkInterface::wioctl( int call, struct iwreq& iwreq ) const
 {
    #ifndef NODEBUG
    int result = ::ioctl( _sfd, call, &iwreq );
    if ( result == -1 )
        odebug << "ONetworkInterface::wioctl (" << name() << ") call '"
               << debugmapper->map( call ) << "' FAILED! " << result << " (" << strerror( errno ) << ")" << oendl;
    else
        odebug << "ONetworkInterface::wioctl (" << name() << ") call '"
               << debugmapper->map( call ) << "' - Status: Ok." << oendl;
    return ( result != -1 );
    #else
    return ::ioctl( _sfd, call, &iwreq ) != -1;
    #endif
 }
 bool OWirelessNetworkInterface::wioctl( int call ) const
 {
    strcpy( _iwr.ifr_name, name() );
    return wioctl( call, _iwr );
 }
 /*======================================================================================
 * OMonitoringInterface
 *======================================================================================*/
 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
    memset( &_if->_iwr, 0, sizeof( struct iwreq ) );
    _if->_iwr.u.freq.m = c;
    _if->_iwr.u.freq.e = 0;
    _if->wioctl( SIOCSIWFREQ );
 }
 void OMonitoringInterface::setEnabled( bool b )
 {
 }
 /*======================================================================================
 * OCiscoMonitoringInterface
 *======================================================================================*/
 OCiscoMonitoringInterface::OCiscoMonitoringInterface( ONetworkInterface* iface, bool prismHeader )
                           :OMonitoringInterface( iface, prismHeader )
 {
    iface->setMonitoring( this );
 }
 OCiscoMonitoringInterface::~OCiscoMonitoringInterface()
 {
 }
 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";
    }
    // flushing and closing will be done automatically when f goes out of scope
 }
 QString OCiscoMonitoringInterface::name() const
 {
    return "cisco";
 }
 void OCiscoMonitoringInterface::setChannel( int )
 {
    // cisco devices automatically switch channels when in monitor mode
 }
 /*======================================================================================
 * OWlanNGMonitoringInterface
 *======================================================================================*/
 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 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 c )
 {
    //NOTE: Older wlan-ng drivers automatically hopped channels while lnxreq_wlansniff=true. Newer ones don't.
    QString enable = "true"; //_if->monitorMode() ? "true" : "false";
    QString prism = _prismHeader ? "true" : "false";
    QString cmd;
    cmd.sprintf( "$(which wlanctl-ng) %s lnxreq_wlansniff channel=%d enable=%s prismheader=%s",
                 (const char*) _if->name(), c, (const char*) enable, (const char*) prism );
    system( cmd );
 }
 /*======================================================================================
 * OHostAPMonitoringInterface
 *======================================================================================*/
 OHostAPMonitoringInterface::OHostAPMonitoringInterface( ONetworkInterface* iface, bool prismHeader )
                           :OMonitoringInterface( iface, prismHeader )
 {
    iface->setMonitoring( this );
 }
 OHostAPMonitoringInterface::~OHostAPMonitoringInterface()
 {
 }
 void OHostAPMonitoringInterface::setEnabled( bool b )
 {
    int monitorCode = _prismHeader ? 1 : 2;
    if ( b )
    {
        _if->setPrivate( "monitor", 1, monitorCode );
    }
    else
    {
        _if->setPrivate( "monitor", 1, 0 );
    }
 }
 QString OHostAPMonitoringInterface::name() const
 {
    return "hostap";
 }
 /*======================================================================================
 * OOrinocoNetworkInterface
 *======================================================================================*/
 OOrinocoMonitoringInterface::OOrinocoMonitoringInterface( ONetworkInterface* iface, bool prismHeader )
                           :OMonitoringInterface( iface, prismHeader )
 {
    iface->setMonitoring( this );
 }
 OOrinocoMonitoringInterface::~OOrinocoMonitoringInterface()
 {
 }
 void OOrinocoMonitoringInterface::setChannel( int c )
 {
-    int monitorCode = _prismHeader ? 1 : 2;
+    if ( !_if->hasPrivate( "monitor" ) )
-    _if->setPrivate( "monitor", 2, monitorCode, c );
+    {
+        this->OMonitoringInterface::setChannel( c );
+    }
+    else
+    {
+        int monitorCode = _prismHeader ? 1 : 2;
+        _if->setPrivate( "monitor", 2, monitorCode, c );
+    }
 }
 void OOrinocoMonitoringInterface::setEnabled( bool b )
 {
-    // IW_MODE_MONITOR was introduced in Wireless Extensions Version 15
-    // Wireless Extensions < Version 15 need iwpriv commandos for monitoring
-    // However, as of recent orinoco drivers, IW_MODE_MONITOR is still not supported
    if ( b )
    {
        setChannel( 1 );
    }
    else
    {
        _if->setPrivate( "monitor", 2, 0, 0 );
    }
 }
 QString OOrinocoMonitoringInterface::name() const
 {
    return "orinoco";
 }