change license.

10 files changed, 20 insertions, 20 deletions

diff --git a/libopie2/opienet/omanufacturerdb.cpp b/libopie2/opienet/omanufacturerdb.cpp
index 7e185a2..123aee8 100644
--- a/libopie2/opienet/omanufacturerdb.cpp
+++ b/libopie2/opienet/omanufacturerdb.cpp
@@ -1,107 +1,107 @@
 /*
                              This file is part of the Opie Project
               =.             (C) 2003-2004 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.
+ - .   .-<_>     .<>         Foundation; version 2 of the License.
+     ._= =}       :           
     .%`+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.
 */
 
 #include "omanufacturerdb.h"
 
 #define OPIE_IMPROVE_GUI_LATENCY 1
 
 /* OPIE */
 #include <opie2/odebug.h>
 #include <qpe/qpeapplication.h>
 #ifdef OPIE_IMPROVE_GUI_LATENCY
 #include <qpe/global.h>
 #endif
 
 
 
 /* QT */
 #include <qapplication.h>
 #include <qfile.h>
 #include <qtextstream.h>
 
 using namespace Opie::Core;
 namespace Opie {
 namespace Net  {
 
 OManufacturerDB* OManufacturerDB::_instance = 0;
 
 OManufacturerDB* OManufacturerDB::instance()
 {
     if ( !OManufacturerDB::_instance )
     {
         odebug << "OManufacturerDB::instance(): creating OManufacturerDB..." << oendl;
        _instance = new OManufacturerDB();
     }
     return _instance;
 }
 
 
 OManufacturerDB::OManufacturerDB()
 {
     #ifdef OPIE_IMPROVE_GUI_LATENCY
     Global::statusMessage( "Reading Manufacturers..." );
     #endif
     QString filename( "/etc/manufacturers" );
     odebug << "OManufacturerDB: trying to read " << filename << oendl;
     if ( !QFile::exists( filename ) )
     {
         filename = QPEApplication::qpeDir()+"etc/manufacturers";
         odebug << "OManufacturerDB: trying to read " << filename << oendl;
         if ( !QFile::exists( filename ) )
         {
             filename = "/usr/share/wellenreiter/manufacturers";
             odebug << "OManufacturerDB: trying to read " << filename << oendl;
         }
     }
 
     QFile file( filename );
     bool hasFile = file.open( IO_ReadOnly );
     if (!hasFile)
     {
         owarn << "OManufacturerDB: no valid manufacturer list found." << oendl;
     }
     else
     {
         odebug << "OManufacturerDB: found manufacturer list in " << filename << oendl;
         QTextStream s( &file );
         QString addr;
         QString manu;
         QString extManu;
         #ifdef OPIE_IMPROVE_GUI_LATENCY
         int counter = 0;
         #endif
         while (!s.atEnd())
         {
             s >> addr;
             s >> manu;
             s >> extManu;
 
             manufacturers.insert( addr, manu );
             manufacturersExt.insert( addr, extManu );
             // odebug << "OmanufacturerDB: parse '" << addr << "' as '" << manu << "' (" << extManu << ")" << oendl;
             #ifdef OPIE_IMPROVE_GUI_LATENCY
diff --git a/libopie2/opienet/omanufacturerdb.h b/libopie2/opienet/omanufacturerdb.h
index c667e20..2b3b7ed 100644
--- a/libopie2/opienet/omanufacturerdb.h
+++ b/libopie2/opienet/omanufacturerdb.h
@@ -1,75 +1,75 @@
 /*
                              This file is part of the Opie Project
               =.             (C) 2003-2004 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.
+ - .   .-<_>     .<>         Foundation; version 2 of the License.
+     ._= =}       :           
     .%`+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 OMANUFACTURERDB_H
 #define OMANUFACTURERDB_H
 
 #include <qmap.h>
 
 namespace Opie {
 namespace Net {
 
 /**
  * @brief A Ethernet card vendor database.
  *
  * This class encapsulates the lookup of Ethernet vendor given a
  * certain Mac Address. Only the first three bytes define the vendor.
  */
 class OManufacturerDB
 {
   public:
     /**
      * @returns the one-and-only @ref OManufacturerDB instance.
      */
     static OManufacturerDB* instance();
     /**
      * @returns the short manufacturer string given a @a macaddr.
      */
     const QString& lookup( const QString& macaddr ) const;
     /**
      * @returns the enhanced manufacturer string given a @a macaddr.
      */
     const QString& lookupExt( const QString& macaddr ) const;
 
   protected:
     OManufacturerDB();
     virtual ~OManufacturerDB();
 
   private:
     QMap<QString, QString> manufacturers;
     QMap<QString, QString> manufacturersExt;
     static OManufacturerDB* _instance;
     class Private;
     Private *d;
 };
 
 }
 }
 
 #endif
 
diff --git a/libopie2/opienet/onetutils.cpp b/libopie2/opienet/onetutils.cpp
index 047a704..c8c494a 100644
--- a/libopie2/opienet/onetutils.cpp
+++ b/libopie2/opienet/onetutils.cpp
@@ -1,109 +1,109 @@
 /*
                              This file is part of the Opie Project
 
                              (C) 2003 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.
+ - .   .-<_>     .<>         Foundation; version 2 of the License.
+     ._= =}       :           
     .%`+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.
 
 */
 
 #include <opie2/onetutils.h>
 #include <opie2/onetwork.h>
 #include <opie2/omanufacturerdb.h>
 
 #include <net/if.h>
 #include <assert.h>
 #include <stdio.h>
 
 namespace Opie {
 namespace Net  {
 
 /*======================================================================================
  * OMacAddress
  *======================================================================================*/
 
 // static initializer for broadcast and unknown MAC Adresses
 const unsigned char __broadcast[6] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
 const OMacAddress& OMacAddress::broadcast = OMacAddress( __broadcast );
 const unsigned char __unknown[6] = { 0x44, 0x44, 0x44, 0x44, 0x44, 0x44 };
 const OMacAddress& OMacAddress::unknown = OMacAddress( __unknown );
 
 //TODO: Incorporate Ethernet Manufacturer database here! (inline or so)
 
 OMacAddress::OMacAddress()
 {
     memcpy( _bytes, __unknown, 6 );
 }
 
 
 OMacAddress::OMacAddress( unsigned char* p )
 {
     memcpy( _bytes, p, 6 );
 }
 
 
 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;
 }
 
 
diff --git a/libopie2/opienet/onetutils.h b/libopie2/opienet/onetutils.h
index 4a09426..f1d34a0 100644
--- a/libopie2/opienet/onetutils.h
+++ b/libopie2/opienet/onetutils.h
@@ -1,109 +1,109 @@
 /*
                              This file is part of the Opie Project
 
                              (C) 2003 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.
+ - .   .-<_>     .<>         Foundation; version 2 of the License.
+     ._= =}       :           
     .%`+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:
diff --git a/libopie2/opienet/onetwork.cpp b/libopie2/opienet/onetwork.cpp
index 591681c..ae1865d 100644
--- a/libopie2/opienet/onetwork.cpp
+++ b/libopie2/opienet/onetwork.cpp
@@ -1,108 +1,108 @@
 /*
                              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.
+ - .   .-<_>     .<>         Foundation; version 2 of the License.
+     ._= =}       :           
     .%`+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::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 = 0;
         if ( isWirelessInterface( str ) )
         {
diff --git a/libopie2/opienet/onetwork.h b/libopie2/opienet/onetwork.h
index 057b1a0..be4bb46 100644
--- a/libopie2/opienet/onetwork.h
+++ b/libopie2/opienet/onetwork.h
@@ -1,108 +1,108 @@
 /*
                              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.
+ - .   .-<_>     .<>         Foundation; version 2 of the License.
+     ._= =}       :           
     .%`+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
 
 /* OPIE */
 #include <opie2/onetutils.h>
 #include <opie2/ostation.h>
 
 /* QT */
 #include <qvaluelist.h>
 #include <qdict.h>
 #include <qmap.h>
 #include <qobject.h>
 #include <qhostaddress.h>
 
 /* STD */
 // hacky workaround until we have a user space wireless.h
 #include <net/if.h>
 #define _LINUX_IF_H
 #include <linux/wireless.h>
 #ifndef IW_MAX_PRIV_DEF
 #define IW_MAX_PRIV_DEF        128
 #endif
 
 namespace Opie {
 namespace Net  {
 class ONetworkInterface;
 class OWirelessNetworkInterface;
 class OChannelHopper;
 class OMonitoringInterface;
 
 /*======================================================================================
  * ONetwork
  *======================================================================================*/
 
 /**
  * @brief A container class for all network interfaces
  *
  * This class provides access to all available network interfaces of your computer.
  *
  * @author Michael 'Mickey' Lauer <mickey@vanille.de>
  */
 class ONetwork : public QObject
 {
   Q_OBJECT
 
   public:
     typedef QDict<ONetworkInterface> InterfaceMap;
     typedef QDictIterator<ONetworkInterface> InterfaceIterator;
 
   public:
     /**
      * @returns the number of available interfaces
      */
     int count() const;
     /**
      * @returns a pointer to the (one and only) @ref ONetwork instance.
      */
     static ONetwork* instance();
     /**
      * @returns an iterator usable for iterating through all network interfaces.
      */
     InterfaceIterator iterator() const;
     /**
      * @returns true, if the @a interface is present.
      */
     bool isPresent( const char* interface ) const;
     /**
      * @returns true, if the @a interface supports the wireless extension protocol.
      */
     bool isWirelessInterface( const char* interface ) const;
     /**
      * @returns a pointer to the @ref ONetworkInterface object for the specified @a interface or 0, if not found.
      * @see ONetworkInterface
      */
     ONetworkInterface* interface( const QString& interface ) const;
     /**
      * @internal Rebuild the internal interface database
      * @note Sometimes it might be useful to call this from client code,
diff --git a/libopie2/opienet/opcap.cpp b/libopie2/opienet/opcap.cpp
index 25ac09b..eafbeea 100644
--- a/libopie2/opienet/opcap.cpp
+++ b/libopie2/opienet/opcap.cpp
@@ -1,108 +1,108 @@
 /*
                              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.
+ - .   .-<_>     .<>         Foundation; version 2 of the License.
+     ._= =}       :           
     .%`+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.
 
 */
 
 #include "udp_ports.h"
 #include "opcap.h"
 
 /* OPIE */
 #include <opie2/odebug.h>
 using namespace Opie::Core;
 
 /* QT */
 #include <qapplication.h> // don't use oapplication here (will decrease reusability in other projects)
 #include <qsocketnotifier.h>
 #include <qobjectlist.h>
 
 /* STD */
 #include <sys/time.h>
 #include <sys/types.h>
 #include <assert.h>
 #include <unistd.h>
 #include <string.h>
 
 namespace Opie {
 namespace Net  {
 
 /*======================================================================================
  * OPacket
  *======================================================================================*/
 
 OPacket::OPacket( int datalink, packetheaderstruct header, const unsigned char* data, QObject* parent )
         :QObject( parent, "Generic" ), _hdr( header ), _data( 0 )
 {
 
     _data = new unsigned char[ header.len ];
     assert( _data );
     memcpy( const_cast<unsigned char*>(_data), data, header.len );
     // We have to copy the data structure here, because the 'data' pointer handed by libpcap
     // points to an internal region which is reused by lipcap.
     odebug << "OPacket: Length = " << header.len << ", Caplen = " << header.caplen << oendl;
     _end = (unsigned char*) _data + header.len;
 
     switch ( datalink )
     {
         case DLT_EN10MB:
             odebug << "OPacket::OPacket(): Received Packet. Datalink = ETHERNET" << oendl;
             new OEthernetPacket( _end, (const struct ether_header*) _data, this );
             break;
 
         case DLT_IEEE802_11:
             odebug << "OPacket::OPacket(): Received Packet. Datalink = IEEE802.11" << oendl;
             new OWaveLanPacket( _end, (const struct ieee_802_11_header*) _data, this );
             break;
 
         case DLT_PRISM_HEADER:
             odebug << "OPacket::OPacket(): Received Packet. Datalink = PRISM_HEADER" << oendl;
             new OPrismHeaderPacket( _end, (const struct prism_hdr*) (unsigned char*) _data, this );
             break;
 
         default:
             owarn << "OPacket::OPacket(): Received Packet over unsupported datalink, type " << datalink << "!" << oendl;
     }
 }
 
 
 OPacket::~OPacket()
 {
     odebug << "~OPacket( " << name() << " )" << oendl;
     delete [] _data;
 }
 
 
 timevalstruct OPacket::timeval() const
 {
     return _hdr.ts;
 }
 
 
 int OPacket::caplen() const
 {
     return _hdr.caplen;
 }
diff --git a/libopie2/opienet/opcap.h b/libopie2/opienet/opcap.h
index 9e718d5..149e573 100644
--- a/libopie2/opienet/opcap.h
+++ b/libopie2/opienet/opcap.h
@@ -1,108 +1,108 @@
 /*
                              This file is part of the Opie Project
                              Copyright (C) 2003 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.
+ - .   .-<_>     .<>         Foundation; version 2 of the License.
+     ._= =}       :           
     .%`+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 OPCAP_H
 #define OPCAP_H
 
 /* OPIE */
 #include <opie2/onetutils.h>
 
 /* QT */
 #include <qevent.h>
 #include <qfile.h>
 #include <qhostaddress.h>
 #include <qobject.h>
 #include <qstring.h>
 #include <qtextstream.h>
 #include <qmap.h>
 
 /* STD */
 extern "C"  // work around a bpf/pcap conflict in recent headers
 {
     #include <pcap.h>
 }
 #include <netinet/ether.h>
 #include <netinet/ip.h>
 #include <netinet/udp.h>
 #include <netinet/tcp.h>
 #include <time.h>
 
 /* Custom Network Includes (must go here, don't reorder!) */
 #include "802_11_user.h"
 #include "dhcp.h"
 
 
 /* TYPEDEFS */
 typedef struct timeval timevalstruct;
 typedef struct pcap_pkthdr packetheaderstruct;
 
 /* FORWARDS */
 class QSocketNotifier;
 namespace Opie {
 namespace Net  {
 class OPacketCapturer;
 
 /*======================================================================================
  * OPacket - A frame on the wire
  *======================================================================================*/
 
 /** @brief A class representing a data frame on the wire.
  *
  * The whole family of the packet classes are used when capturing frames from a network.
  * Most standard network protocols in use share a common architecture, which mostly is
  * a packet header and then the packet payload. In layered architectures, each lower layer
  * encapsulates data from its upper layer - that is it
  * treats the data from its upper layer as payload and prepends an own header to the packet,
  * which - again - is treated as the payload for the layer below. The figure below is an
  * example for how such a data frame is composed out of packets, e.g. when sending a mail.
  *
  * <pre>
  *                                                       | User Data |     == Mail Data
  *                                         | SMTP Header | User Data |     == SMTP
  *                           | TCP Header  | SMTP Header | User Data |     == TCP
  *               | IP Header | TCP Header  | SMTP Header | User Data |     == IP
  *  | MAC Header | IP Header | TCP Header  | SMTP Header | User Data |     == MAC
  *
  * </pre>
  *
  * The example is trimmed for simplicity, because the MAC (Medium Access Control) layer
  * also contains a few more levels of encapsulation.
  * Since the type of the payload is more or less independent from the encapsulating protocol,
  * the header must be inspected before attempting to decode the payload. Hence, the
  * encapsulation level varies and can't be deduced without actually looking into the packets.
  *
  * For actually working with captured frames, it's useful to identify the packets via names and
  * insert them into a parent/child - relationship based on the encapsulation. This is why
  * all packet classes derive from QObject. The amount of overhead caused by the QObject is
  * not a problem in this case, because we're talking about a theoratical maximum of about
  * 10 packets per captured frame. We need to stuff them into a searchable list anyway and the
  * QObject also cares about destroying the sub-, (child-) packets.
  *
  * This enables us to perform a simple look for packets of a certain type:
diff --git a/libopie2/opienet/ostation.cpp b/libopie2/opienet/ostation.cpp
index b5ac325..88ad808 100644
--- a/libopie2/opienet/ostation.cpp
+++ b/libopie2/opienet/ostation.cpp
@@ -1,72 +1,72 @@
 /*
                              This file is part of the Opie Project
                              Copyright (C) 2003 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.
+ - .   .-<_>     .<>         Foundation; version 2 of the License.
+     ._= =}       :           
     .%`+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.
 
 */
 
 #include <opie2/ostation.h>
 #include <opie2/odebug.h>
 
 
 using namespace Opie::Core;
 
 namespace Opie {
 namespace Net {
 /*======================================================================================
  * OStation
  *======================================================================================*/
 
 OStation::OStation()
 {
     odebug << "OStation::OStation()" << oendl;
 
     type = "<unknown>";
     macAddress = OMacAddress::unknown;
     ssid = "<unknown>";
     channel = 0;
     apAddress = OMacAddress::unknown;
 
 }
 
 
 OStation::~OStation()
 {
     odebug << "OStation::~OStation()" << oendl;
 }
 
 
 void OStation::dump()
 {
     odebug << "------- OStation::dump() ------------" << oendl;
     odebug << "type: " <<  type << "" << oendl; 
     odebug << "mac:  " <<  macAddress.toString() << "" << oendl; 
     odebug << "ap:   " <<  apAddress.toString() << "" << oendl; 
     odebug << "ip:   " <<  ipAddress.toString() << "" << oendl; 
 }
 
 }
 }
diff --git a/libopie2/opienet/ostation.h b/libopie2/opienet/ostation.h
index 68f1114..bdc653f 100644
--- a/libopie2/opienet/ostation.h
+++ b/libopie2/opienet/ostation.h
@@ -1,82 +1,82 @@
 /*
                              This file is part of the Opie Project
                              Copyright (C) 2003 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.
+ - .   .-<_>     .<>         Foundation; version 2 of the License.
+     ._= =}       :           
     .%`+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 OSTATION_H
 #define OSTATION_H
 
 #include <opie2/onetutils.h>
 
 #include <qlist.h>
 #include <qstring.h>
 #include <qhostaddress.h>
 #include <qobject.h>
 
 #include <sys/types.h>
 
 namespace Opie {
 namespace Net  {
 
 class OStation;
 
 
 typedef QList<OStation> OStationList;
 
 /*======================================================================================
  * OStation
  *======================================================================================*/
 
 class OStation
 {
   public:
     OStation();
     ~OStation();
 
     void dump();
 
     /* Ethernet */
     QString type;
     OMacAddress macAddress;
     QHostAddress ipAddress;
 
     /* WaveLan */
     QString ssid;
     OMacAddress apAddress;
     int channel;
     bool encrypted;
   private:
     class Private;
     Private *d;
 };
 
 }
 }
 
 #endif // OSTATION_H