introduce a workaround for conflicting user and kernel headers like

<linux/if.h> and <net/if.h>. I really don't like including kernel headers,
but in the case of <linux/wireless.h> there is no other option yet.

2 files changed, 8 insertions, 6 deletions

diff --git a/libopie2/opienet/onetwork.cpp b/libopie2/opienet/onetwork.cpp
index 998b50e..21fa390 100644
--- a/libopie2/opienet/onetwork.cpp
+++ b/libopie2/opienet/onetwork.cpp
@@ -1,311 +1,310 @@
 /*
                              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() );
 }
 
 
 OMonitoringInterface* ONetworkInterface::monitoring() const
 {
     return _mon;
 }
 
 
 const QString& ONetworkInterface::name() const
 {
     return _name;
 }
 
 
 ONetworkInterface::~ONetworkInterface()
 {
     qDebug( "ONetworkInterface::~ONetworkInterface()" );
     if ( _sfd != -1 ) ::close( _sfd );
 }
 
 
 bool ONetworkInterface::setPromiscuousMode( bool b )
 {
     ioctl( SIOCGIFFLAGS );
     if ( b ) _ifr.ifr_flags |= IFF_PROMISC;
     else   _ifr.ifr_flags &= (~IFF_PROMISC);
     return ioctl( SIOCSIFFLAGS );
 }
 
 
 bool ONetworkInterface::promiscuousMode() const
 {
     ioctl( SIOCGIFFLAGS );
     return _ifr.ifr_flags & IFF_PROMISC;
 }
 
 
 bool ONetworkInterface::isWireless() const
 {
     return ioctl( SIOCGIWNAME );
 }
 
 
 /*======================================================================================
  * OChannelHopper
  *======================================================================================*/
 
 OChannelHopper::OChannelHopper( OWirelessNetworkInterface* iface )
                :QObject( 0, "Mickey's funky hopper" ),
                _iface( iface ), _interval( 0 ), _channel( 1 ), _tid( 0 ),
                _maxChannel( iface->channels()+1 )
 {
 }
 
 
 OChannelHopper::~OChannelHopper()
 {
 }
 
 
 bool OChannelHopper::isActive() const
 {
     return _tid;
 }
 
 
diff --git a/libopie2/opienet/onetwork.h b/libopie2/opienet/onetwork.h
index 56da5f4..c544454 100644
--- a/libopie2/opienet/onetwork.h
+++ b/libopie2/opienet/onetwork.h
@@ -1,313 +1,316 @@
 /*
                              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>
+// ML: Yeah, I hate to include kernel headers, but it's necessary here
+// ML: Here comes an ugly hack to prevent <linux/wireless.h> including <linux/if.h>
+// ML: which conflicts with the user header <net/if.h>
+// ML: We really a user header for the Wireless Extensions, something like <net/wireless.h>
+// ML: I will drop Jean an mail on that subject
+
 #include <net/if.h>
+#define _LINUX_IF_H
+#include <linux/wireless.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
  *======================================================================================*/
 
 
 class OCiscoMonitoringInterface : public OMonitoringInterface
 {
   public:
     OCiscoMonitoringInterface( ONetworkInterface* );
     virtual ~OCiscoMonitoringInterface();
 
     virtual void setEnabled( bool );
     virtual QString name() const;
     virtual void setChannel( int );
 
 };
 
 /*======================================================================================
  * OWlanNGMonitoringInterface
  *======================================================================================*/
 
 class OWlanNGMonitoringInterface : public OMonitoringInterface
 {
   public:
     OWlanNGMonitoringInterface( ONetworkInterface* );
     virtual ~OWlanNGMonitoringInterface();
 
   public:
     virtual void setEnabled( bool );
     virtual QString name() const;
     virtual void setChannel( int );
 
 };
 
 /*======================================================================================
  * OHostAPMonitoringInterface
  *======================================================================================*/
 
 class OHostAPMonitoringInterface : public OMonitoringInterface
 {
   public:
     OHostAPMonitoringInterface( ONetworkInterface* );
     virtual ~OHostAPMonitoringInterface();
 
   public:
     virtual void setEnabled( bool );
     virtual QString name() const;
  };
 
 /*======================================================================================
  * OOrinocoMonitoringInterface
  *======================================================================================*/
 
 class OOrinocoMonitoringInterface : public OMonitoringInterface
 {
   public:
     OOrinocoMonitoringInterface( ONetworkInterface* );
     virtual ~OOrinocoMonitoringInterface();
 
    public:
     virtual void setChannel( int );
     virtual void setEnabled( bool );
     virtual QString name() const;