5 files changed, 6 insertions, 6 deletions

diff --git a/libopie2/opienet/odebugmapper.cpp b/libopie2/opienet/odebugmapper.cpp
index f679afb..0de1247 100644
--- a/libopie2/opienet/odebugmapper.cpp
+++ b/libopie2/opienet/odebugmapper.cpp
@@ -1,142 +1,142 @@
 
 /*
  * debug value mapper - generated by regen.py - (C) Michael 'Mickey' Lauer <mickey@vanille.de>
  */
 
 #include <opie2/odebug.h>
 
 #include "odebugmapper.h"
 
 using namespace Opie::Core;
 
 namespace Opie {
 namespace Net  {
-namespace Private {
+namespace Internal {
 
 DebugMapper::DebugMapper()
 {
     odebug << "DebugMapper::DebugMapper()" << oendl;
 
 
     _map.insert( 0x8902, new QString("SIOCSPGRP") );
     _map.insert( 0x8904, new QString("SIOCGPGRP") );
     _map.insert( 0x8905, new QString("SIOCATMARK") );
     _map.insert( 0x8906, new QString("SIOCGSTAMP") );
     _map.insert( 0x890B, new QString("SIOCADDRT") );
     _map.insert( 0x890C, new QString("SIOCDELRT") );
     _map.insert( 0x890D, new QString("SIOCRTMSG") );
     _map.insert( 0x8910, new QString("SIOCGIFNAME") );
     _map.insert( 0x8911, new QString("SIOCSIFLINK") );
     _map.insert( 0x8912, new QString("SIOCGIFCONF") );
     _map.insert( 0x8913, new QString("SIOCGIFFLAGS") );
     _map.insert( 0x8914, new QString("SIOCSIFFLAGS") );
     _map.insert( 0x8915, new QString("SIOCGIFADDR") );
     _map.insert( 0x8916, new QString("SIOCSIFADDR") );
     _map.insert( 0x8917, new QString("SIOCGIFDSTADDR") );
     _map.insert( 0x8918, new QString("SIOCSIFDSTADDR") );
     _map.insert( 0x8919, new QString("SIOCGIFBRDADDR") );
     _map.insert( 0x891a, new QString("SIOCSIFBRDADDR") );
     _map.insert( 0x891b, new QString("SIOCGIFNETMASK") );
     _map.insert( 0x891c, new QString("SIOCSIFNETMASK") );
     _map.insert( 0x891d, new QString("SIOCGIFMETRIC") );
     _map.insert( 0x891e, new QString("SIOCSIFMETRIC") );
     _map.insert( 0x891f, new QString("SIOCGIFMEM") );
     _map.insert( 0x8920, new QString("SIOCSIFMEM") );
     _map.insert( 0x8921, new QString("SIOCGIFMTU") );
     _map.insert( 0x8922, new QString("SIOCSIFMTU") );
     _map.insert( 0x8923, new QString("SIOCSIFNAME") );
     _map.insert( 0x8924, new QString("SIOCSIFHWADDR") );
     _map.insert( 0x8925, new QString("SIOCGIFENCAP") );
     _map.insert( 0x8926, new QString("SIOCSIFENCAP") );
     _map.insert( 0x8927, new QString("SIOCGIFHWADDR") );
     _map.insert( 0x8929, new QString("SIOCGIFSLAVE") );
     _map.insert( 0x8930, new QString("SIOCSIFSLAVE") );
     _map.insert( 0x8931, new QString("SIOCADDMULTI") );
     _map.insert( 0x8932, new QString("SIOCDELMULTI") );
     _map.insert( 0x8933, new QString("SIOCGIFINDEX") );
     _map.insert( 0x8934, new QString("SIOCSIFPFLAGS") );
     _map.insert( 0x8935, new QString("SIOCGIFPFLAGS") );
     _map.insert( 0x8936, new QString("SIOCDIFADDR") );
     _map.insert( 0x8937, new QString("SIOCSIFHWBROADCAST") );
     _map.insert( 0x8938, new QString("SIOCGIFCOUNT") );
     _map.insert( 0x8940, new QString("SIOCGIFBR") );
     _map.insert( 0x8941, new QString("SIOCSIFBR") );
     _map.insert( 0x8942, new QString("SIOCGIFTXQLEN") );
     _map.insert( 0x8943, new QString("SIOCSIFTXQLEN") );
     _map.insert( 0x8953, new QString("SIOCDARP") );
     _map.insert( 0x8954, new QString("SIOCGARP") );
     _map.insert( 0x8955, new QString("SIOCSARP") );
     _map.insert( 0x8960, new QString("SIOCDRARP") );
     _map.insert( 0x8961, new QString("SIOCGRARP") );
     _map.insert( 0x8962, new QString("SIOCSRARP") );
     _map.insert( 0x8970, new QString("SIOCGIFMAP") );
     _map.insert( 0x8971, new QString("SIOCSIFMAP") );
     _map.insert( 0x8980, new QString("SIOCADDDLCI") );
     _map.insert( 0x8981, new QString("SIOCDELDLCI") );
     _map.insert( 0x89F0, new QString("SIOCDEVPRIVATE") );
     _map.insert( 0x89E0, new QString("SIOCPROTOPRIVATE") );
     _map.insert( 0x1fff, new QString("SIOCPARM_MASK") );
     _map.insert( 0x00000000, new QString("SIOC_VOID") );
     _map.insert( 0x20000000, new QString("SIOC_OUT") );
     _map.insert( 0x40000000, new QString("SIOC_IN") );
     _map.insert( 0x8B00, new QString("SIOCSIWCOMMIT") );
     _map.insert( 0x8B01, new QString("SIOCGIWNAME") );
     _map.insert( 0x8B02, new QString("SIOCSIWNWID") );
     _map.insert( 0x8B03, new QString("SIOCGIWNWID") );
     _map.insert( 0x8B04, new QString("SIOCSIWFREQ") );
     _map.insert( 0x8B05, new QString("SIOCGIWFREQ") );
     _map.insert( 0x8B06, new QString("SIOCSIWMODE") );
     _map.insert( 0x8B07, new QString("SIOCGIWMODE") );
     _map.insert( 0x8B08, new QString("SIOCSIWSENS") );
     _map.insert( 0x8B09, new QString("SIOCGIWSENS") );
     _map.insert( 0x8B0A, new QString("SIOCSIWRANGE") );
     _map.insert( 0x8B0B, new QString("SIOCGIWRANGE") );
     _map.insert( 0x8B0C, new QString("SIOCSIWPRIV") );
     _map.insert( 0x8B0D, new QString("SIOCGIWPRIV") );
     _map.insert( 0x8B0E, new QString("SIOCSIWSTATS") );
     _map.insert( 0x8B0F, new QString("SIOCGIWSTATS") );
     _map.insert( 0x8B10, new QString("SIOCSIWSPY") );
     _map.insert( 0x8B11, new QString("SIOCGIWSPY") );
     _map.insert( 0x8B14, new QString("SIOCSIWAP") );
     _map.insert( 0x8B15, new QString("SIOCGIWAP") );
     _map.insert( 0x8B17, new QString("SIOCGIWAPLIST") );
     _map.insert( 0x8B18, new QString("SIOCSIWSCAN") );
     _map.insert( 0x8B19, new QString("SIOCGIWSCAN") );
     _map.insert( 0x8B1A, new QString("SIOCSIWESSID") );
     _map.insert( 0x8B1B, new QString("SIOCGIWESSID") );
     _map.insert( 0x8B1C, new QString("SIOCSIWNICKN") );
     _map.insert( 0x8B1D, new QString("SIOCGIWNICKN") );
     _map.insert( 0x8B20, new QString("SIOCSIWRATE") );
     _map.insert( 0x8B21, new QString("SIOCGIWRATE") );
     _map.insert( 0x8B22, new QString("SIOCSIWRTS") );
     _map.insert( 0x8B23, new QString("SIOCGIWRTS") );
     _map.insert( 0x8B24, new QString("SIOCSIWFRAG") );
     _map.insert( 0x8B25, new QString("SIOCGIWFRAG") );
     _map.insert( 0x8B26, new QString("SIOCSIWTXPOW") );
     _map.insert( 0x8B27, new QString("SIOCGIWTXPOW") );
     _map.insert( 0x8B28, new QString("SIOCSIWRETRY") );
     _map.insert( 0x8B29, new QString("SIOCGIWRETRY") );
     _map.insert( 0x8B2A, new QString("SIOCSIWENCODE") );
     _map.insert( 0x8B2B, new QString("SIOCGIWENCODE") );
     _map.insert( 0x8B2C, new QString("SIOCSIWPOWER") );
     _map.insert( 0x8B2D, new QString("SIOCGIWPOWER") );
     _map.insert( 0x8BE0, new QString("SIOCIWFIRSTPRIV") );
     _map.insert( 0x8BFF, new QString("SIOCIWLASTPRIV") );
     _map.insert( 0x8B00, new QString("SIOCIWFIRST") );
     _map.insert( 0x5000, new QString("SIOCGBPQETHPARAM") );
     _map.insert( 0x5001, new QString("SIOCSBPQETHPARAM") );
     _map.insert( 0x890B, new QString("SIOCADDRT") );
     _map.insert( 0x890C, new QString("SIOCDELRT") );
     _map.insert( 0x890D, new QString("SIOCRTMSG") );
     _map.insert( 0x8910, new QString("SIOCGIFNAME") );
     _map.insert( 0x8911, new QString("SIOCSIFLINK") );
     _map.insert( 0x8912, new QString("SIOCGIFCONF") );
     _map.insert( 0x8913, new QString("SIOCGIFFLAGS") );
     _map.insert( 0x8914, new QString("SIOCSIFFLAGS") );
     _map.insert( 0x8915, new QString("SIOCGIFADDR") );
     _map.insert( 0x8916, new QString("SIOCSIFADDR") );
     _map.insert( 0x8917, new QString("SIOCGIFDSTADDR") );
     _map.insert( 0x8918, new QString("SIOCSIFDSTADDR") );
     _map.insert( 0x8919, new QString("SIOCGIFBRDADDR") );
     _map.insert( 0x891a, new QString("SIOCSIFBRDADDR") );
     _map.insert( 0x891b, new QString("SIOCGIFNETMASK") );
diff --git a/libopie2/opienet/odebugmapper.h b/libopie2/opienet/odebugmapper.h
index f47db47..79fb42e 100644
--- a/libopie2/opienet/odebugmapper.h
+++ b/libopie2/opienet/odebugmapper.h
@@ -1,36 +1,36 @@
 
 /*
  * debug value mapper - generated by regen.py - (C) Michael 'Mickey' Lauer <mickey@vanille.de>
  */
 
 #ifndef DEBUGMAPPER_H
 #define DEBUGMAPPER_H
 
 #include <qstring.h>
 #include <qintdict.h>
 
 namespace Opie {
 namespace Net  {
-namespace Private {
+namespace Internal {
 
 typedef QIntDict<QString> IntStringMap;
 
 class DebugMapper
 {
   public:
     DebugMapper();
     ~DebugMapper();
 
     const QString& map( int value ) const;
   private:
     IntStringMap _map;
     class Private;
     Private *d;
 };
 
 }
 }
 }
 
 #endif
 
diff --git a/libopie2/opienet/onetutils.cpp b/libopie2/opienet/onetutils.cpp
index 7794334..c185805 100644
--- a/libopie2/opienet/onetutils.cpp
+++ b/libopie2/opienet/onetutils.cpp
@@ -65,177 +65,177 @@ OMacAddress::OMacAddress( unsigned char* p )
 
 
 OMacAddress::OMacAddress( const unsigned char* p )
 {
     memcpy( _bytes, p, 6 );
 }
 
 
 OMacAddress::OMacAddress( struct ifreq& ifr )
 {
     memcpy( _bytes, ifr.ifr_hwaddr.sa_data, 6 );
 }
 
 
 OMacAddress::~OMacAddress()
 {
 }
 
 
 //#ifdef QT_NO_DEBUG
 //inline
 //#endif
 const unsigned char* OMacAddress::native() const
 {
     return (const unsigned char*) &_bytes;
 }
 
 
 OMacAddress OMacAddress::fromString( const QString& str )
 {
     QString addr( str );
     unsigned char buf[6];
     bool ok = true;
     int index = 14;
     for ( int i = 5; i >= 0; --i )
     {
         buf[i] = addr.right( 2 ).toUShort( &ok, 16 );
         if ( !ok ) return OMacAddress::unknown;
         addr.truncate( index );
         index -= 3;
     }
     return (const unsigned char*) &buf;
 }
 
 
 QString OMacAddress::toString( bool substitute ) const
 {
     QString manu;
     manu.sprintf( "%.2X:%.2X:%.2X", _bytes[0]&0xff, _bytes[1]&0xff, _bytes[2]&0xff );
     QString serial;
     serial.sprintf( ":%.2X:%.2X:%.2X", _bytes[3]&0xff, _bytes[4]&0xff, _bytes[5]&0xff );
     if ( !substitute ) return manu+serial;
     // fallback - if no vendor is found, just use the number
     QString textmanu = OManufacturerDB::instance()->lookup( manu );
     return textmanu.isNull() ? manu+serial : textmanu+serial;
 }
 
 
 QString OMacAddress::manufacturer() const
 {
     return OManufacturerDB::instance()->lookupExt( toString() );
 }
 
 
 bool operator==( const OMacAddress &m1, const OMacAddress &m2 )
 {
     return memcmp( &m1._bytes, &m2._bytes, 6 ) == 0;
 }
 
 
 /*======================================================================================
  * OHostAddress
  *======================================================================================*/
 
 
 /*======================================================================================
  * OPrivateIOCTL
  *======================================================================================*/
 
 OPrivateIOCTL::OPrivateIOCTL( QObject* parent, const char* name, int cmd, int getargs, int setargs )
               :QObject( parent, name ), _ioctl( cmd ), _getargs( getargs ), _setargs( setargs )
 {
 }
 
 
 OPrivateIOCTL::~OPrivateIOCTL()
 {
 }
 
 
 int OPrivateIOCTL::numberGetArgs() const
 {
     return _getargs & IW_PRIV_SIZE_MASK;
 }
 
 
 int OPrivateIOCTL::typeGetArgs() const
 {
     return _getargs & IW_PRIV_TYPE_MASK >> 12;
 }
 
 
 int OPrivateIOCTL::numberSetArgs() const
 {
     return _setargs & IW_PRIV_SIZE_MASK;
 }
 
 
 int OPrivateIOCTL::typeSetArgs() const
 {
     return _setargs & IW_PRIV_TYPE_MASK >> 12;
 }
 
 
 void OPrivateIOCTL::invoke() const
 {
     ( (OWirelessNetworkInterface*) parent() )->wioctl( _ioctl );
 }
 
 
 void OPrivateIOCTL::setParameter( int num, u_int32_t value )
 {
     u_int32_t* arglist = (u_int32_t*) &( (OWirelessNetworkInterface*) parent() )->_iwr.u.name;
     arglist[num] = value;
 }
 
 
 
-namespace Private {
+namespace Internal {
 /*======================================================================================
  * assorted functions
  *======================================================================================*/
 
 void dumpBytes( const unsigned char* data, int num )
 {
     printf( "Dumping %d bytes @ %0x", num, data );
     printf( "-------------------------------------------\n" );
 
     for ( int i = 0; i < num; ++i )
     {
         printf( "%02x ", data[i] );
         if ( !((i+1) % 32) ) printf( "\n" );
     }
     printf( "\n\n" );
 }
 
 
 int stringToMode( const QString& mode )
 {
     if ( mode == "auto" )            return IW_MODE_AUTO;
     else if ( mode == "adhoc" )      return IW_MODE_ADHOC;
     else if ( mode == "managed" )    return IW_MODE_INFRA;
     else if ( mode == "master" )     return IW_MODE_MASTER;
     else if ( mode == "repeater" )   return IW_MODE_REPEAT;
     else if ( mode == "secondary" )  return IW_MODE_SECOND;
     else if ( mode == "monitor" )    return IW_MODE_MONITOR;
     else assert( 0 );
 }
 
 
 QString modeToString( int mode )
 {
     switch ( mode )
     {
         case IW_MODE_AUTO:          return "auto";
         case IW_MODE_ADHOC:         return "adhoc";
         case IW_MODE_INFRA:         return "managed";
         case IW_MODE_MASTER:        return "master";
         case IW_MODE_REPEAT:        return "repeater";
         case IW_MODE_SECOND:        return "second";
         case IW_MODE_MONITOR:       return "monitor";
         default: assert( 0 );
     }
 }
 }
 }
 }
diff --git a/libopie2/opienet/onetutils.h b/libopie2/opienet/onetutils.h
index ca6815d..4a09426 100644
--- a/libopie2/opienet/onetutils.h
+++ b/libopie2/opienet/onetutils.h
@@ -7,190 +7,190 @@
            .>+-=
  _;:,     .>    :=|.         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 ONETUTILS_H
 #define ONETUTILS_H
 
 #include <qdict.h>
 #include <qmap.h>
 #include <qstring.h>
 #include <qhostaddress.h>
 #include <qobject.h>
 
 #include <sys/types.h>
 
 struct ifreq;
 
 namespace Opie {
 namespace Net  {
 
 class OWirelessNetworkInterface;
 
 /*======================================================================================
  * OMacAddress
  *======================================================================================*/
 
 class OMacAddress
 {
   public:
     // QString c'tor? -zecke
     OMacAddress();
     OMacAddress( unsigned char* );
     OMacAddress( const unsigned char* );
     OMacAddress( struct ifreq& );
     ~OMacAddress();
 
     QString manufacturer() const;
     QString toString( bool substitute = false ) const;
     const unsigned char* native() const;
 
     // no c'tor but this one why not make it a c'tor. it could also replace the others or is this the problem?
     static OMacAddress fromString( const QString& );
 
   public:
     static const OMacAddress& broadcast; // ff:ff:ff:ff:ff:ff
     static const OMacAddress& unknown;   // 44:44:44:44:44:44
 
   private:
     unsigned char _bytes[6];
 
   friend bool operator==( const OMacAddress &m1, const OMacAddress &m2 );
   class Private;
   Private *d;
 
 };
 
 bool operator==( const OMacAddress &m1, const OMacAddress &m2 );
 
 
 /*======================================================================================
  * OHostAddress
  *======================================================================================*/
 
 class OHostAddress : public QHostAddress
 {
   /*public:
     OHostAddress();
     ~OHostAddress();
   */
   private:
   class Private;
   Private *d;
 };
 
 
 /*======================================================================================
  * OPrivateIOCTL
  *======================================================================================*/
 
 class OPrivateIOCTL : public QObject
 {
   public:
     OPrivateIOCTL( QObject* parent, const char* name, int cmd, int getargs, int setargs );
     ~OPrivateIOCTL();
 
     int numberGetArgs() const;
     int typeGetArgs() const;
     int numberSetArgs() const;
     int typeSetArgs() const;
 
     // FIXME return int? as ::ioctl does? -zecke
     void invoke() const;
     void setParameter( int, u_int32_t );
 
   private:
     u_int32_t _ioctl;
     u_int16_t _getargs;
     u_int16_t _setargs;
 
     class Private;
     Private *d;
 };
 
  /*======================================================================================
  * Miscellaneous
  *======================================================================================*/
 
-namespace Private {
+namespace Internal {
 void dumpBytes( const unsigned char* data, int num );
 QString modeToString( int );
 int stringToMode( const QString& );
 }
 }
 }
 
 #define IW_PRIV_TYPE_MASK       0x7000
 #define IW_PRIV_TYPE_NONE       0x0000
 #define IW_PRIV_TYPE_BYTE       0x1000
 #define IW_PRIV_TYPE_CHAR       0x2000
 #define IW_PRIV_TYPE_INT        0x4000
 #define IW_PRIV_TYPE_FLOAT      0x5000
 #define IW_PRIV_TYPE_ADDR       0x6000
 #define IW_PRIV_SIZE_FIXED      0x0800
 #define IW_PRIV_SIZE_MASK       0x07FF
 
 #ifndef ARPHRD_IEEE80211
 #define ARPHRD_IEEE80211 801
 #endif
 #ifndef ARPHRD_IEEE80211_PRISM
 #define ARPHRD_IEEE80211_PRISM 802
 #endif
 
 
 /* Network to host order macros */
 
 #ifdef LBL_ALIGN
 #define EXTRACT_16BITS(p) \
         ((u_int16_t)((u_int16_t)*((const u_int8_t *)(p) + 0) << 8 | \
                      (u_int16_t)*((const u_int8_t *)(p) + 1)))
 #define EXTRACT_32BITS(p) \
         ((u_int32_t)((u_int32_t)*((const u_int8_t *)(p) + 0) << 24 | \
                      (u_int32_t)*((const u_int8_t *)(p) + 1) << 16 | \
                      (u_int32_t)*((const u_int8_t *)(p) + 2) << 8 | \
                      (u_int32_t)*((const u_int8_t *)(p) + 3)))
 #else
 #define EXTRACT_16BITS(p) \
         ((u_int16_t)ntohs(*(const u_int16_t *)(p)))
 #define EXTRACT_32BITS(p) \
         ((u_int32_t)ntohl(*(const u_int32_t *)(p)))
 #endif
 
 #define EXTRACT_24BITS(p) \
         ((u_int32_t)((u_int32_t)*((const u_int8_t *)(p) + 0) << 16 | \
                      (u_int32_t)*((const u_int8_t *)(p) + 1) << 8 | \
                      (u_int32_t)*((const u_int8_t *)(p) + 2)))
 
 /* Little endian protocol host order macros */
 #define EXTRACT_LE_8BITS(p) (*(p))
 #define EXTRACT_LE_16BITS(p) \
         ((u_int16_t)((u_int16_t)*((const u_int8_t *)(p) + 1) << 8 | \
                      (u_int16_t)*((const u_int8_t *)(p) + 0)))
 #define EXTRACT_LE_32BITS(p) \
         ((u_int32_t)((u_int32_t)*((const u_int8_t *)(p) + 3) << 24 | \
                      (u_int32_t)*((const u_int8_t *)(p) + 2) << 16 | \
                      (u_int32_t)*((const u_int8_t *)(p) + 1) << 8 | \
                      (u_int32_t)*((const u_int8_t *)(p) + 0)))
 
 #endif // ONETUTILS_H
 
diff --git a/libopie2/opienet/onetwork.cpp b/libopie2/opienet/onetwork.cpp
index 26a6c81..b6c9876 100644
--- a/libopie2/opienet/onetwork.cpp
+++ b/libopie2/opienet/onetwork.cpp
@@ -1,234 +1,234 @@
 /*

                              This file is part of the Opie Project

                              Copyright (C) 2003-2004 by Michael 'Mickey' Lauer

               =.             <mickey@Vanille.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>

 #include <opie2/ostation.h>

 #include <opie2/odebug.h>

 

 /* QT */

 

 #include <qfile.h>

 #include <qtextstream.h>

 

 /* UNIX */

 

 #include <assert.h>

 #include <arpa/inet.h>

 #include <errno.h>

 #include <string.h>

 #include <stdlib.h>

 #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>

 

 #ifndef NODEBUG

 #include <opie2/odebugmapper.h>

 

 

 using namespace Opie::Core;

-using namespace Opie::Net::Private;

+using namespace Opie::Net::Internal;

 DebugMapper* debugmapper = new DebugMapper();

 #endif

 

 /*======================================================================================

  * ONetwork

  *======================================================================================*/

 

 namespace Opie {

 namespace Net  {

 ONetwork* ONetwork::_instance = 0;

 

 ONetwork::ONetwork()

 {

     odebug << "ONetwork::ONetwork()" << oendl;

     odebug << "ONetwork: This code has been compiled against Wireless Extensions V" << WIRELESS_EXT << oendl;

     synchronize();

 }

 

 void ONetwork::synchronize()

 {

     // gather available interfaces by inspecting /proc/net/dev

     //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

     //FIXME: Best is use SIOCGIFCONF and if this doesn't work (result=-1), then fallback to parsing /proc/net/dev

 

     _interfaces.clear();

     QString str;

     QFile f( "/proc/net/dev" );

     bool hasFile = f.open( IO_ReadOnly );

     if ( !hasFile )

     {

         odebug << "ONetwork: /proc/net/dev not existing. No network devices available" << oendl;

         return;

     }

     QTextStream s( &f );

     s.readLine();

     s.readLine();

     while ( !s.atEnd() )

     {

         s >> str;

         str.truncate( str.find( ':' ) );

         odebug << "ONetwork: found interface '" << str << "'" << oendl;

-        ONetworkInterface* iface;

+        ONetworkInterface* iface = 0;

         if ( isWirelessInterface( str ) )

         {

             iface = new OWirelessNetworkInterface( this, (const char*) str );

             odebug << "ONetwork: interface '" << str << "' has Wireless Extensions" << oendl;

         }

         else

         {

             iface = new ONetworkInterface( this, (const char*) str );

         }

         _interfaces.insert( str, iface );

         s.readLine();

     }

 }

 

 

 short ONetwork::wirelessExtensionVersion()

 {

     return WIRELESS_EXT;

 }

 

 

 int ONetwork::count() const

 {

     return _interfaces.count();

 }

 

 

 ONetworkInterface* ONetwork::interface( const 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::isPresent( const char* name ) const

 {

     int sfd = socket( AF_INET, SOCK_STREAM, 0 );

     struct ifreq ifr;

     memset( &ifr, 0, sizeof( struct ifreq ) );

     strcpy( (char*) &ifr.ifr_name, name );

     int result = ::ioctl( sfd, SIOCGIFFLAGS, &ifr );

     return result != -1;

 }

 

 

 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 );

     return result != -1;

 }

 

 /*======================================================================================

  * ONetworkInterface

  *======================================================================================*/

 

 ONetworkInterface::ONetworkInterface( QObject* parent, const char* name )

                  :QObject( parent, name ),

                  _sfd( socket( AF_INET, SOCK_DGRAM, 0 ) ), _mon( 0 )

 {

     odebug << "ONetworkInterface::ONetworkInterface()" << oendl;

     init();

 }

 

 

 struct ifreq& ONetworkInterface::ifr() const

 {

     return _ifr;

 }

 

 

 void ONetworkInterface::init()

 {

     odebug << "ONetworkInterface::init()" << oendl;

 

     memset( &_ifr, 0, sizeof( struct ifreq ) );

 

     if ( _sfd == -1 )

     {

         odebug << "ONetworkInterface::init(): Warning - can't get socket for device '" << name() << "'" << oendl;

         return;

     }

 }

 

 

 bool ONetworkInterface::ioctl( int call, struct ifreq& ifreq ) const

 {

     #ifndef NODEBUG

     int result = ::ioctl( _sfd, call, &ifreq );

     if ( result == -1 )

         odebug << "ONetworkInterface::ioctl (" << name() << ") call '" << debugmapper->map( call )

                << "' FAILED! " << result << " (" << strerror( errno ) << ")" << oendl;

     else

         odebug << "ONetworkInterface::ioctl (" << name() << ") call '" << debugmapper->map( call )

                << "' - Status: Ok." << oendl;

     return ( result != -1 );

     #else

     return ::ioctl( _sfd, call, &ifreq ) != -1;

     #endif

 }

 

 

 bool ONetworkInterface::ioctl( int call ) const

 {

     strcpy( _ifr.ifr_name, name() );

     return ioctl( call, _ifr );

 }

 

 

 bool ONetworkInterface::isLoopback() const

 {

     ioctl( SIOCGIFFLAGS );

     return _ifr.ifr_flags & IFF_LOOPBACK;