yet more fixes for gcc 2.9x and for our ancient wireless extensions on the Z... *sigh*

3 files changed, 13 insertions, 4 deletions

diff --git a/libopie2/opiecore/oglobalsettings.cpp b/libopie2/opiecore/oglobalsettings.cpp
index 184ee69..1799529 100644
--- a/libopie2/opiecore/oglobalsettings.cpp
+++ b/libopie2/opiecore/oglobalsettings.cpp
@@ -283,265 +283,265 @@ QColor OGlobalSettings::calculateAlternateBackgroundColor(const QColor& base)
             return base.dark(106);
         else if (base != Qt::black)
             return base.light(110);
 
         return QColor(32,32,32);
     }
 }
 
 QColor OGlobalSettings::linkColor()
 {
     initColors();
     OConfig *c = OGlobal::config();
     OConfigGroupSaver cgs( c, QString::fromLatin1("Appearance") );
     return c->readColorEntry( "linkColor", OpieGray );
 }
 
 QColor OGlobalSettings::visitedLinkColor()
 {
     OConfig *c = OGlobal::config();
     OConfigGroupSaver cgs( c, QString::fromLatin1("Appearance") );
     return c->readColorEntry( "visitedLinkColor", &Qt::magenta );
 }
 
 // FIXME: font stuff currently uses a different format in OPIE, so the
 // functions below are not yet applicable. The whole font stuff for OPIE
 // has to be revised anyway
 
 QFont OGlobalSettings::generalFont()
 {
     if (_generalFont)
         return *_generalFont;
 
     _generalFont = new QFont("helvetica", 10);
     _generalFont->setPixelSize(10);
     _generalFont->setStyleHint(QFont::SansSerif);
 
     OConfig *c = OGlobal::config();
     OConfigGroupSaver cgs( c, QString::fromLatin1("Appearance") );
     *_generalFont = c->readFontEntry("font", _generalFont);
 
     return *_generalFont;
 }
 
 QFont OGlobalSettings::fixedFont()
 {
     if (_fixedFont)
         return *_fixedFont;
 
     _fixedFont = new QFont("courier", 12);
     _fixedFont->setPixelSize(12);
     _fixedFont->setStyleHint(QFont::TypeWriter);
 
     OConfig *c = OGlobal::config();
     OConfigGroupSaver cgs( c, QString::fromLatin1("General") );
     *_fixedFont = c->readFontEntry("fixed", _fixedFont);
 
     return *_fixedFont;
 }
 
 QFont OGlobalSettings::toolBarFont()
 {
     if(_toolBarFont)
         return *_toolBarFont;
 
     _toolBarFont = new QFont("helvetica", 10);
     _toolBarFont->setPixelSize(10);
     _toolBarFont->setStyleHint(QFont::SansSerif);
 
     OConfig *c = OGlobal::config();
     OConfigGroupSaver cgs( c, QString::fromLatin1("General") );
     *_toolBarFont = c->readFontEntry("toolBarFont", _toolBarFont);
 
     return *_toolBarFont;
 }
 
 QFont OGlobalSettings::menuFont()
 {
     if(_menuFont)
         return *_menuFont;
 
     _menuFont = new QFont("helvetica", 12);
     _menuFont->setPixelSize(12);
     _menuFont->setStyleHint(QFont::SansSerif);
 
     OConfig *c = OGlobal::config();
     OConfigGroupSaver cgs( c, QString::fromLatin1("General") );
     *_menuFont = c->readFontEntry("menuFont", _menuFont);
 
     return *_menuFont;
 }
 
 QFont OGlobalSettings::windowTitleFont()
 {
     if(_windowTitleFont)
         return *_windowTitleFont;
 
     _windowTitleFont = new QFont("helvetica", 12, QFont::Bold);
     _windowTitleFont->setPixelSize(12);
     _windowTitleFont->setStyleHint(QFont::SansSerif);
 
     OConfig *c = OGlobal::config();
     OConfigGroupSaver cgs( c, QString::fromLatin1("WM") );
     *_windowTitleFont = c->readFontEntry("activeFont", _windowTitleFont); // inconsistency
 
     return *_windowTitleFont;
 }
 
 QFont OGlobalSettings::taskbarFont()
 {
     if(_taskbarFont)
         return *_taskbarFont;
 
     _taskbarFont = new QFont("helvetica", 8);
     _taskbarFont->setPixelSize(8);
     _taskbarFont->setStyleHint(QFont::SansSerif);
 
     OConfig *c = OGlobal::config();
     OConfigGroupSaver cgs( c, QString::fromLatin1("General") );
     *_taskbarFont = c->readFontEntry("taskbarFont", _taskbarFont);
 
     return *_taskbarFont;
 }
 
 // FIXME: the whole path stuff has to be revised for OPIE
 
 void OGlobalSettings::initStatic() // should be called initPaths(). Don't put anything else here.
 {
     if ( s_desktopPath != 0 )
         return;
 
     s_desktopPath = new QString();
     s_autostartPath = new QString();
     s_trashPath = new QString();
     s_documentPath = new QString();
 
     OConfig *config = OGlobal::config();
     //bool dollarExpansion = config->isDollarExpansion();
     //config->setDollarExpansion(true);
     OConfigGroupSaver cgs( config, "Paths" );
 
     // Desktop Path
     *s_desktopPath = QDir::homeDirPath() + "/" + "Desktop" + "/";
     *s_desktopPath = config->readEntry( "Desktop", *s_desktopPath);
     if ( (*s_desktopPath)[0] != '/' )
       s_desktopPath->prepend( QDir::homeDirPath() + "/" );
     *s_desktopPath = QDir::cleanDirPath( *s_desktopPath );
     if ( s_desktopPath->right(1) != "/")
         *s_desktopPath += "/";
 
     // Trash Path
     *s_trashPath = *s_desktopPath + QObject::tr("Trash") + "/";
     *s_trashPath = config->readEntry( "Trash" , *s_trashPath);
     if ( (*s_trashPath)[0] != '/' )
       s_trashPath->prepend( QDir::homeDirPath() + "/" );
     *s_trashPath = QDir::cleanDirPath( *s_trashPath );
     if ( s_trashPath->right(1) != "/")
         *s_trashPath += "/";
     // We need to save it in any case, in case the language changes later on,
     if ( !config->hasKey( "Trash" ) )
     {
       //config->writePathEntry( "Trash", *s_trashPath, true, true );
       config->writeEntry( "Trash", *s_trashPath );
       //config->sync();
     }
 
 /*    // Autostart Path
     *s_autostartPath = OGlobal::dirs()->localkdedir() + "Autostart" + "/";
     *s_autostartPath = config->readEntry( "Autostart" , *s_autostartPath);
     if ( (*s_autostartPath)[0] != '/' )
       s_autostartPath->prepend( QDir::homeDirPath() + "/" );
     *s_autostartPath = QDir::cleanDirPath( *s_autostartPath );
     if ( s_autostartPath->right(1) != "/")
         *s_autostartPath += "/";
 */
     // Document Path
     *s_documentPath = QString::null;
     *s_documentPath = config->readEntry( "Documents" , *s_documentPath);
     if ( (*s_documentPath)[0] != '/' )
       s_documentPath->prepend( QDir::homeDirPath() + "/" );
     *s_documentPath = QDir::cleanDirPath( *s_documentPath );
     if ( s_documentPath->right(1) != "/")
         *s_documentPath += "/";
 
     //config->setDollarExpansion(dollarExpansion);
 
     // Make sure this app gets the notifications about those paths
     //if (kapp)
         //kapp->addKipcEventMask(KIPC::SettingsChanged);
 }
 
 void OGlobalSettings::initColors()
 {
-    if ( not OpieHighlight ) OpieHighlight = new QColor( 156, 118, 32 );
-    if ( not OpieAlternate ) OpieAlternate = new QColor( 238, 246, 255 );
-    if ( not OpieGray ) OpieGray = new QColor( 220, 210, 215 );
+    if ( !OpieHighlight ) OpieHighlight = new QColor( 156, 118, 32 );
+    if ( !OpieAlternate ) OpieAlternate = new QColor( 238, 246, 255 );
+    if ( !OpieGray ) OpieGray = new QColor( 220, 210, 215 );
 }
 
 void OGlobalSettings::rereadFontSettings()
 {
     delete _generalFont;
     _generalFont = 0L;
     delete _fixedFont;
     _fixedFont = 0L;
     delete _menuFont;
     _menuFont = 0L;
     delete _toolBarFont;
     _toolBarFont = 0L;
     delete _windowTitleFont;
     _windowTitleFont = 0L;
     delete _taskbarFont;
     _taskbarFont = 0L;
 }
 
 void OGlobalSettings::rereadPathSettings()
 {
     qDebug( "OGlobalSettings::rereadPathSettings" );
     delete s_autostartPath;
     s_autostartPath = 0L;
     delete s_trashPath;
     s_trashPath = 0L;
     delete s_desktopPath;
     s_desktopPath = 0L;
     delete s_documentPath;
     s_documentPath = 0L;
 }
 
 OGlobalSettings::OMouseSettings & OGlobalSettings::mouseSettings()
 {
     if ( ! s_mouseSettings )
     {
         s_mouseSettings = new OMouseSettings;
         OMouseSettings & s = *s_mouseSettings; // for convenience
 
         OConfigGroupSaver cgs( OGlobal::config(), "Mouse" );
         QString setting = OGlobal::config()->readEntry("MouseButtonMapping");
         if (setting == "RightHanded")
             s.handed = OMouseSettings::RightHanded;
         else if (setting == "LeftHanded")
             s.handed = OMouseSettings::LeftHanded;
         else
         {
 
             // FIXME: Implement for Opie / Qt Embedded
 
         }
     }
     return *s_mouseSettings;
 }
 
 void OGlobalSettings::rereadMouseSettings()
 {
     delete s_mouseSettings;
     s_mouseSettings = 0L;
 }
 
 // FIXME: This won't be necessary, or will it? :-D
 
 bool OGlobalSettings::isMultiHead()
 {
     QCString multiHead = getenv("OPIE_MULTIHEAD");
     if (!multiHead.isEmpty()) {
         return (multiHead.lower() == "true");
     }
     return false;
 }
diff --git a/libopie2/opienet/onetwork.cpp b/libopie2/opienet/onetwork.cpp
index 25c70e0..998b50e 100644
--- a/libopie2/opienet/onetwork.cpp
+++ b/libopie2/opienet/onetwork.cpp
@@ -1,245 +1,246 @@
 /*
                              This file is part of the Opie Project
                              Copyright (C) 2003 by the Wellenreiter team:
                              Martin J. Muench <mjm@remote-exploit.org>
                              Max Moser <mmo@remote-exploit.org
                              Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de>
               =.
             .=l.
            .>+-=
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 /* OPIE */
 
 #include <opie2/onetwork.h>
 
 /* QT */
 
 #include <qfile.h>
 #include <qtextstream.h>
 
 /* 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 <linux/wireless.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
 
     _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();
     s.readLine();
     while ( !s.atEnd() )
     {
         s >> str;
         str.truncate( str.find( ':' ) );
         qDebug( "ONetwork: found interface '%s'", (const char*) str );
         ONetworkInterface* iface;
         if ( isWirelessInterface( str ) )
         {
             iface = new OWirelessNetworkInterface( str );
             qDebug( "ONetwork: interface '%s' has Wireless Extensions", (const char*) str );
         }
         else
         {
             iface = new ONetworkInterface( str );
         }
         _interfaces.insert( str, iface );
         s.readLine();
     }
 }
 
 
 ONetworkInterface* ONetwork::interface( QString iface ) const
 {
     return _interfaces[iface];
 }
 
 
 ONetwork* ONetwork::instance()
 {
     if ( !_instance ) _instance = new ONetwork();
     return _instance;
 }
 
 
 ONetwork::InterfaceIterator ONetwork::iterator() const
 {
     return ONetwork::InterfaceIterator( _interfaces );
 }
 
 
 bool ONetwork::isWirelessInterface( const char* name ) const
 {
     int sfd = socket( AF_INET, SOCK_DGRAM, 0 );
     iwreqstruct iwr;
     memset( &iwr, 0, sizeof( iwreqstruct ) );
     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 );
 }
 
 /*======================================================================================
  * ONetworkInterface
  *======================================================================================*/
 
 ONetworkInterface::ONetworkInterface( const QString& name )
                    :_name( name ), _sfd( socket( AF_INET, SOCK_DGRAM, 0 ) ), _mon( 0 )
 {
     qDebug( "ONetworkInterface::ONetworkInterface()" );
     init();
 }
 
 
 ifreqstruct& ONetworkInterface::ifr() const
 {
     return _ifr;
 }
 
 
 void ONetworkInterface::init()
 {
     qDebug( "ONetworkInterface::init()" );
 
     memset( &_ifr, 0, sizeof( struct ifreq ) );
 
     if ( _sfd == -1 )
     {
         qDebug( "ONetworkInterface::init(): Warning - can't get socket for device '%s'", (const char*) _name );
         return;
     }
 }
 
 
 bool ONetworkInterface::ioctl( int call, ifreqstruct& ifreq ) const
 {
     int result = ::ioctl( _sfd, call, &ifreq );
     if ( result == -1 )
         qDebug( "ONetworkInterface::ioctl(): Call %d - Status: Failed: %d (%s)", call, result, strerror( errno ) );
     else
         qDebug( "ONetworkInterface::ioctl(): Call %d - Status: Ok.", call );
     return ( result != -1 );
 }
 
 
 bool ONetworkInterface::ioctl( int call ) const
 {
     strcpy( _ifr.ifr_name, (const char*) _name );
     return ioctl( call, _ifr );
 }
 
 
 bool ONetworkInterface::isLoopback() const
 {
     ioctl( SIOCGIFFLAGS );
     return _ifr.ifr_flags & IFF_LOOPBACK;
 }
 
 
 bool ONetworkInterface::setUp( bool b )
 {
     ioctl( SIOCGIFFLAGS );
     if ( b ) _ifr.ifr_flags |= IFF_UP;
     else   _ifr.ifr_flags &= (~IFF_UP);
     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>";
 }
 
 
 OMacAddress ONetworkInterface::macAddress() const
 {
     if ( ioctl( SIOCGIFHWADDR ) )
     {
         return OMacAddress( _ifr );
     }
     else
     {
         return OMacAddress::unknown;
     }
 }
 
 
 void ONetworkInterface::setMonitoring( OMonitoringInterface* m )
 {
     _mon = m;
     qDebug( "ONetwork::setMonitoring(): Installed monitoring interface '%s'", (const char*) m->name() );
 }
 
@@ -536,257 +537,257 @@ QString OWirelessNetworkInterface::SSID() const
 }
 
 
 void OWirelessNetworkInterface::setSSID( const QString& ssid )
 {
     _iwr.u.essid.pointer = const_cast<char*>( (const char*) ssid );
     _iwr.u.essid.length = ssid.length();
     wioctl( SIOCSIWESSID );
 }
 
 
 bool OWirelessNetworkInterface::wioctl( int call, iwreqstruct& iwreq ) const
 {
     int result = ::ioctl( _sfd, call, &iwreq );
     if ( result == -1 )
         qDebug( "ONetworkInterface::wioctl(): Call %d - Status: Failed: %d (%s)", call, result, strerror( errno ) );
     else
         qDebug( "ONetworkInterface::wioctl(): Call %d - Status: Ok.", call );
     return ( result != -1 );
 }
 
 
 bool OWirelessNetworkInterface::wioctl( int call ) const
 {
     strcpy( _iwr.ifr_name, (const char*) _name );
     return wioctl( call, _iwr );
 }
 
 
 /*======================================================================================
  * OMonitoringInterface
  *======================================================================================*/
 
 OMonitoringInterface::OMonitoringInterface( ONetworkInterface* iface )
                       :_enabled( false ), _if( static_cast<OWirelessNetworkInterface*>( iface ) )
 {
 }
 
 
 OMonitoringInterface::~OMonitoringInterface()
 {
 }
 
 
 void OMonitoringInterface::setChannel( int c )
 {
     // use standard WE channel switching protocol
     memset( &_if->_iwr, 0, sizeof( iwreqstruct ) );
     _if->_iwr.u.freq.m = c;
     _if->_iwr.u.freq.e = 0;
     _if->wioctl( SIOCSIWFREQ );
 }
 
 
 bool OMonitoringInterface::enabled() const
 {
     return _enabled;
 }
 
 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()
 {
 }
 
 
 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";
 }
 
 
 void OCiscoMonitoringInterface::setChannel( int )
 {
     // cisco devices automatically switch channels when in monitor mode
 }
 
 
 /*======================================================================================
  * OWlanNGMonitoringInterface
  *======================================================================================*/
 
 
 OWlanNGMonitoringInterface::OWlanNGMonitoringInterface( ONetworkInterface* iface )
                            :OMonitoringInterface( iface )
 {
     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 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
 }
 
 
 /*======================================================================================
  * 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
 
     #if WIRELESS_EXT > 14
     _if->_iwr.u.mode = IW_MODE_MONITOR;
     _if->wioctl( SIOCSIWMODE );
     #else
-    int* args = (int*) &_if._iwr.u.name;
+    int* args = (int*) &_if->_iwr.u.name;
     args[0] = 2;
     args[1] = 0;
     _if->wioctl( SIOCDEVPRIVATE );
     #endif
 
     OMonitoringInterface::setEnabled( b );
 }
 
 
 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 );
 }
 
 
 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 936ac85..56da5f4 100644
--- a/libopie2/opienet/onetwork.h
+++ b/libopie2/opienet/onetwork.h
@@ -1,246 +1,254 @@
 /*
                              This file is part of the Opie Project
                              Copyright (C) 2003 by the Wellenreiter team:
                              Martin J. Muench <mjm@remote-exploit.org>
                              Max Moser <mmo@remote-exploit.org
                              Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de>
               =.
             .=l.
            .>+-=
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #ifndef ONETWORK_H
 #define ONETWORK_H
 
 /* QT */
 
 #include <qdict.h>
 #include <qmap.h>
 #include <qobject.h>
 #include <qhostaddress.h>
 
 /* OPIE */
 
 #include <opie2/onetutils.h>
 
 // ML: Yeah, I hate to include kernel headers, but it's necessary here
 // ML: Recent RedHat and MandrakePatches to the Kernel and WE broke something
 // ML: #include <net/if.h> e.g. conflicts with #include <linux/wireless.h>
+
+#ifndef IFNAMSIZ
 #define IFNAMSIZ 16
+#endif
+
 #include <linux/wireless.h>
 #include <net/if.h>
 
+#ifndef SIOCIWFIRSTPRIV
+#define SIOCIWFIRSTPRIV SIOCDEVPRIVATE
+#endif
+
 class ONetworkInterface;
 class OWirelessNetworkInterface;
 class OChannelHopper;
 class OMonitoringInterface;
 
 typedef struct ifreq ifreqstruct;
 typedef struct iwreq iwreqstruct;
 typedef struct iw_event iweventstruct;
 typedef struct iw_freq iwfreqstruct;
 typedef struct iw_priv_args iwprivargsstruct;
 typedef struct iw_range iwrangestruct;
 
 /*======================================================================================
  * ONetwork
  *======================================================================================*/
 
 class ONetwork : public QObject
 {
   Q_OBJECT
 
  public:
     typedef QDict<ONetworkInterface> InterfaceMap;
     typedef QDictIterator<ONetworkInterface> InterfaceIterator;
 
   public:
     static ONetwork* instance();
     InterfaceIterator iterator() const;
     bool isWirelessInterface( const char* ) const;
     ONetworkInterface* interface( QString ) const;
 
   protected:
     ONetwork();
     void synchronize();
 
   private:
     static ONetwork* _instance;
     InterfaceMap _interfaces;
 };
 
 
 /*======================================================================================
  * ONetworkInterface
  *======================================================================================*/
 
 class ONetworkInterface
 {
     friend class OMonitoringInterface;
     friend class OCiscoMonitoringInterface;
     friend class OWlanNGMonitoringInterface;
     friend class OHostAPMonitoringInterface;
     friend class OOrinocoMonitoringInterface;
 
   public:
     ONetworkInterface( const QString& name );
     virtual ~ONetworkInterface();
 
     const QString& name() const;
     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;
 
   protected:
     const QString _name;
     const int _sfd;
     mutable ifreqstruct _ifr;
     OMonitoringInterface* _mon;
 
   protected:
     ifreqstruct& ifr() const;
     virtual void init();
     bool ioctl( int call ) const;
     bool ioctl( int call, ifreqstruct& ) const;
 };
 
 /*======================================================================================
  * OChannelHopper
  *======================================================================================*/
 
 class OChannelHopper : public QObject
 {
   public:
     OChannelHopper( OWirelessNetworkInterface* );
     virtual ~OChannelHopper();
     bool isActive() const;
     int channel() const;
     virtual void timerEvent( QTimerEvent* );
     void setInterval( int );
     int interval() const;
 
   private:
     OWirelessNetworkInterface* _iface;
     int _interval;
     int _channel;
     int _tid;
     int _maxChannel;
 };
 
 
 /*======================================================================================
  * OWirelessNetworkInterface
  *======================================================================================*/
 
 class OWirelessNetworkInterface : public ONetworkInterface
 {
     friend class OMonitoringInterface;
     friend class OCiscoMonitoringInterface;
     friend class OWlanNGMonitoringInterface;
     friend class OHostAPMonitoringInterface;
     friend class OOrinocoMonitoringInterface;
 
   public:
     enum Mode { AdHoc, Managed, Monitor };
 
     OWirelessNetworkInterface( const QString& name );
     virtual ~OWirelessNetworkInterface();
 
     virtual void setChannel( int ) const;
     virtual int channel() const;
     virtual double frequency() const;
     virtual int channels() const;
     //virtual double frequency(int) const;
 
     virtual void setMode( Mode ) {};
     virtual bool mode() const {};
 
     virtual void setMonitorMode( bool );
     virtual bool monitorMode() const;
 
     virtual void setChannelHopping( int interval = 0 );
     virtual int channelHopping() const;
 
     virtual void setNickName( const QString& ) {};
     virtual QString nickName() const;
 
     virtual bool isAssociated() const {};
     virtual QString associatedAP() const;
 
     virtual void setSSID( const QString& );
     virtual QString SSID() const;
 
   protected:
     mutable iwreqstruct _iwr;
     QMap<int,int> _channels;
 
   protected:
     virtual void init();
     iwreqstruct& iwr() const;
     bool wioctl( int call ) const;
     bool wioctl( int call, iwreqstruct& ) const;
 
   private:
     OChannelHopper* _hopper;
 };
 
 
 /*======================================================================================
  * OMonitoringInterface
  *======================================================================================*/
 
 
 class OMonitoringInterface
 {
   public:
     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
  *======================================================================================*/