slowly start to refactor & cleanup libopie2 before merging it with libopie1

14 files changed, 88 insertions, 70 deletions

diff --git a/libopie2/opienet/dhcp.h b/libopie2/opienet/dhcp.h
index 3f2f775..368e375 100644
--- a/libopie2/opienet/dhcp.h
+++ b/libopie2/opienet/dhcp.h
@@ -194,7 +194,8 @@ struct dhcp_packet {
 #define FQDN_RCODE2			5
 #define FQDN_HOSTNAME			6
 #define FQDN_DOMAINNAME			7
 #define FQDN_FQDN			8
 #define FQDN_SUBOPTION_COUNT		8
 
-#endif
\ No newline at end of file
+#endif
+
diff --git a/libopie2/opienet/libopienet2.control b/libopie2/opienet/libopienet2.control
index 65d8464..8eb0704 100644
--- a/libopie2/opienet/libopienet2.control
+++ b/libopie2/opienet/libopienet2.control
@@ -1,11 +1,11 @@
 Package: libopienet2
 Files: $OPIEDIR/lib/libopienet2.so.* $OPIEDIR/etc/manufacturers
 Priority: optional
 Section: opie/system
 Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
-Version: 1.8.1-$SUB_VERSION.2
-Depends: libqpe1, libopiecore2 (1.8.1)
+Version: 1.8.2-$SUB_VERSION.2
+Depends: libopiecore2 (1.8.2)
 Provides: libopienet2
 Description: Opie library 2.0 NET
 
diff --git a/libopie2/opienet/odebugmapper.cpp b/libopie2/opienet/odebugmapper.cpp
index d62b3ba..7e4ab2b 100644
--- a/libopie2/opienet/odebugmapper.cpp
+++ b/libopie2/opienet/odebugmapper.cpp
@@ -1,16 +1,18 @@
 
 /*
  * debug value mapper - generated by regen.py - (C) Michael 'Mickey' Lauer <mickey@vanille.de>
  */
 
+#include <opie2/odebug.h>
+
 #include "odebugmapper.h"
 
 DebugMapper::DebugMapper()
 {
-    qDebug( "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") );
@@ -188,23 +190,23 @@ DebugMapper::DebugMapper()
 
 };
 
 
 DebugMapper::~DebugMapper()
 {
-    qDebug( "DebugMapper::~DebugMapper()" );
+    odebug << "DebugMapper::~DebugMapper()" << oendl;
 }
 
 
 const QString& DebugMapper::map( int value ) const
 {
     QString* result = _map[ value ];
 
     if ( !result )
     {
-        qDebug( "DebugMapper::map() - value not found." );
+        owarn << "DebugMapper::map() - value " << value << " is not found." << oendl;
         return QString::null;
     }
     else
     {
         return *result;
     }
diff --git a/libopie2/opienet/omanufacturerdb.cpp b/libopie2/opienet/omanufacturerdb.cpp
index c3c213c..bcce11f 100644
--- a/libopie2/opienet/omanufacturerdb.cpp
+++ b/libopie2/opienet/omanufacturerdb.cpp
@@ -1,65 +1,83 @@
-/**********************************************************************
-** Copyright (C) 2002 Michael 'Mickey' Lauer.  All rights reserved.
-**
-** This file is part of Opie Environment.
-**
-** This file may be distributed and/or modified under the terms of the
-** GNU General Public License version 2 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-**********************************************************************/
+/*
+                             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.
+    .%`+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"
 
+/* OPIE CORE */
+#include <opie2/odebug.h>
+
 /* QT */
 #include <qstring.h>
 #include <qfile.h>
 #include <qtextstream.h>
 
 OManufacturerDB* OManufacturerDB::_instance = 0;
 
 OManufacturerDB* OManufacturerDB::instance()
 {
     if ( !OManufacturerDB::_instance )
     {
-        qDebug( "OManufacturerDB::instance(): creating OManufacturerDB..." );
+        odebug << "OManufacturerDB::instance(): creating OManufacturerDB..." << oendl;
        _instance = new OManufacturerDB();
     }
     return _instance;
 }
 
 
 OManufacturerDB::OManufacturerDB()
 {
     QString filename( "/etc/manufacturers" );
-    qDebug( "OManufacturerDB: trying to read '%s'...", (const char*) filename );
+    odebug << "OManufacturerDB: trying to read " << filename << oendl;
     if ( !QFile::exists( filename ) )
     {
         filename = "/opt/QtPalmtop/etc/manufacturers";
-        qDebug( "OManufacturerDB: trying to read '%s'...", (const char*) filename );
+        odebug << "OManufacturerDB: trying to read " << filename << oendl;
         if ( !QFile::exists( filename ) )
         {
             filename = "/usr/share/wellenreiter/manufacturers";
-            qDebug( "OManufacturerDB: trying to read '%s'...", (const char*) filename );
+            odebug << "OManufacturerDB: trying to read " << filename << oendl;
         }
     }
 
     QFile file( filename );
     bool hasFile = file.open( IO_ReadOnly );
     if (!hasFile)
     {
-        qWarning( "OManufacturerDB: no valid manufacturer list found.", (const char*) filename );
+        owarn << "OManufacturerDB: no valid manufacturer list found." << oendl;
     }
     else
     {
-        qDebug( "OManufacturerDB: found manufacturer list in '%s'...", (const char*) filename );
+        odebug << "OManufacturerDB: found manufacturer list in " << filename << oendl;
         QTextStream s( &file );
         QString addr;
         QString manu;
         QString extManu;
         while (!s.atEnd())
         {
@@ -78,24 +96,19 @@ OManufacturerDB::OManufacturerDB()
             s.skipWhiteSpace();
             s >> extManu;
             if ( extManu[0] == '#' ) // we have an extended manufacturer
             {
                 s.skipWhiteSpace();
                 extManu = s.readLine();
-                #ifdef DEBUG
-                qDebug( "OManufacturerDB: read '%s' as extended manufacturer string", (const char*) extManu );
-                #endif
+                odebug << "OManufacturerDB: read " << extManu << " as extended manufacturer string" << oendl;
                 manufacturersExt.insert( addr, extManu );
             }
             else
                 s.readLine();
-            #ifdef DEBUG
-            qDebug( "ManufacturerDB: read tuple %s, %s", (const char*) addr, (const char*) manu );
-            #endif
+            odebug << "OManufacturerDB: read tuple " << addr << ", " << manu << oendl;
             manufacturers.insert( addr, manu );
-
         }
     }
 
 }
 
 
diff --git a/libopie2/opienet/omanufacturerdb.h b/libopie2/opienet/omanufacturerdb.h
index 651f624..c2712e5 100644
--- a/libopie2/opienet/omanufacturerdb.h
+++ b/libopie2/opienet/omanufacturerdb.h
@@ -1,20 +1,35 @@
-/**********************************************************************
-** Copyright (C) 2002 Michael 'Mickey' Lauer.  All rights reserved.
-**
-** This file is part of Opie Environment.
-**
-** This file may be distributed and/or modified under the terms of the
-** GNU General Public License version 2 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-**********************************************************************/
+/*
+                             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.
+    .%`+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>
 
diff --git a/libopie2/opienet/onetutils.cpp b/libopie2/opienet/onetutils.cpp
index e3eb327..48cfa43 100644
--- a/libopie2/opienet/onetutils.cpp
+++ b/libopie2/opienet/onetutils.cpp
@@ -1,10 +1,10 @@
 /*
                              This file is part of the Opie Project
 
-                             (C) 2003 Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de>
+                             (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
diff --git a/libopie2/opienet/onetwork.cpp b/libopie2/opienet/onetwork.cpp
index 95c813f..6a9280f 100644
--- a/libopie2/opienet/onetwork.cpp
+++ b/libopie2/opienet/onetwork.cpp
@@ -1,12 +1,9 @@
 /*
                              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>
+                             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
@@ -947,12 +944,13 @@ OStationList* OWirelessNetworkInterface::scanNetwork()
                 default: qDebug( "unhandled event" );
             }
 
             offset += we->len;
             we = (struct iw_event*) &buffer[offset];
         }
+        return stations;
 
         return stations;
 
     }
     else
     {
diff --git a/libopie2/opienet/onetwork.h b/libopie2/opienet/onetwork.h
index eb6c86e..bc9e299 100644
--- a/libopie2/opienet/onetwork.h
+++ b/libopie2/opienet/onetwork.h
@@ -1,12 +1,9 @@
 /*
                              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>
+                             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
diff --git a/libopie2/opienet/opcap.cpp b/libopie2/opienet/opcap.cpp
index 6331b2d..635224c 100644
--- a/libopie2/opienet/opcap.cpp
+++ b/libopie2/opienet/opcap.cpp
@@ -1,12 +1,9 @@
 /*
                              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>
+                             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
diff --git a/libopie2/opienet/opcap.h b/libopie2/opienet/opcap.h
index 54b256b..497fd6b 100644
--- a/libopie2/opienet/opcap.h
+++ b/libopie2/opienet/opcap.h
@@ -1,12 +1,9 @@
 /*
                              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>
+                             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
diff --git a/libopie2/opienet/opienet.pro b/libopie2/opienet/opienet.pro
index 386c2db..2027481 100644
--- a/libopie2/opienet/opienet.pro
+++ b/libopie2/opienet/opienet.pro
@@ -16,13 +16,13 @@ SOURCES     = odebugmapper.cpp       \
               onetutils.cpp       \
               onetwork.cpp        \
               opcap.cpp           \
               ostation.cpp
 INTERFACES  =
 TARGET      = opienet2
-VERSION     = 1.8.1
+VERSION     = 1.8.2
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS        += -lpcap
 
 
 !contains( platform, x11 ) {
diff --git a/libopie2/opienet/ostation.cpp b/libopie2/opienet/ostation.cpp
index ba1e4f6..c363f0c 100644
--- a/libopie2/opienet/ostation.cpp
+++ b/libopie2/opienet/ostation.cpp
@@ -1,10 +1,9 @@
 /*
                              This file is part of the Opie Project
-
-                             (C) 2003 Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de>
+                             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
diff --git a/libopie2/opienet/ostation.h b/libopie2/opienet/ostation.h
index a6956c9..1e7366d 100644
--- a/libopie2/opienet/ostation.h
+++ b/libopie2/opienet/ostation.h
@@ -1,10 +1,9 @@
 /*
                              This file is part of the Opie Project
-
-                             (C) 2003 Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de>
+                             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
diff --git a/libopie2/opienet/udp_ports.h b/libopie2/opienet/udp_ports.h
index 5e92497..3fb1c85 100644
--- a/libopie2/opienet/udp_ports.h
+++ b/libopie2/opienet/udp_ports.h
@@ -1,11 +1,11 @@
 /*
  * This file has been generated by doing
  * find . -name "*"|xargs grep -h '#define UDP_PORT' > udp_ports.h
  * in the root directory of Ethereal 0.9.15. Cudos to the Ethereal Team.
- * -- Michael 'Mickey' Lauer <mickeyl@handhelds.org>
+ * -- Michael 'Mickey' Lauer <mickey@Vanille.de>
  */
 
 #define UDP_PORT_AODV	654
 #define UDP_PORT_LENGTH     2
 #define UDP_PORT_OFFSET     PARAMETER_VALUE_OFFSET
 #define UDP_PORT_RAS1 1718