Move XML class to internal PIM

Add namespaces!!!

Opie::Core and Opie::Core::Private
Opie::Net  and Opie::Net::Private
Opie::Ui   and Opie::Ui::Private
Opie::MM   and Opie::MM::Private
Opie::DB   and Opie::DB::Private

PIM classes are not yet converted because we will do other work
on it as well

1 files changed, 9 insertions, 0 deletions

diff --git a/libopie2/opienet/onetwork.cpp b/libopie2/opienet/onetwork.cpp
index e5b091f..ab3e77f 100644
--- a/libopie2/opienet/onetwork.cpp
+++ b/libopie2/opienet/onetwork.cpp
@@ -1,258 +1,264 @@
 /*

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

         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;

 }

 

 

 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;

 }

 

 

 void ONetworkInterface::setIPV4Address( const QHostAddress& addr )

 {

     struct sockaddr_in *sa = (struct sockaddr_in *) &_ifr.ifr_addr;

     sa->sin_family = AF_INET;

     sa->sin_port = 0;

     sa->sin_addr.s_addr = htonl( addr.ip4Addr() );

     ioctl( SIOCSIFADDR );

 }

 

 

 QString ONetworkInterface::ipV4Address() const

@@ -1048,192 +1054,195 @@ 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 )

 {

     if ( !_if->hasPrivate( "monitor" ) )

     {

         this->OMonitoringInterface::setChannel( c );

     }

     else

     {

         int monitorCode = _prismHeader ? 1 : 2;

         _if->setPrivate( "monitor", 2, monitorCode, c );

     }

 }

 

 

 void OOrinocoMonitoringInterface::setEnabled( bool b )

 {

     if ( b )

     {

         setChannel( 1 );

     }

     else

     {

         _if->setPrivate( "monitor", 2, 0, 0 );

     }

 }

 

 

 QString OOrinocoMonitoringInterface::name() const

 {

     return "orinoco";

 }

+
+}
+}