-rw-r--r-- | libopie2/opienet/dhcp.h | 3 | ||||
-rw-r--r-- | libopie2/opienet/libopienet2.control | 4 | ||||
-rw-r--r-- | libopie2/opienet/odebugmapper.cpp | 8 | ||||
-rw-r--r-- | libopie2/opienet/omanufacturerdb.cpp | 67 | ||||
-rw-r--r-- | libopie2/opienet/omanufacturerdb.h | 43 | ||||
-rw-r--r-- | libopie2/opienet/onetutils.cpp | 2 | ||||
-rw-r--r-- | libopie2/opienet/onetwork.cpp | 6 | ||||
-rw-r--r-- | libopie2/opienet/onetwork.h | 5 | ||||
-rw-r--r-- | libopie2/opienet/opcap.cpp | 5 | ||||
-rw-r--r-- | libopie2/opienet/opcap.h | 5 | ||||
-rw-r--r-- | libopie2/opienet/opienet.pro | 2 | ||||
-rw-r--r-- | libopie2/opienet/ostation.cpp | 3 | ||||
-rw-r--r-- | libopie2/opienet/ostation.h | 3 | ||||
-rw-r--r-- | libopie2/opienet/udp_ports.h | 2 |
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 | |||
@@ -199,2 +199,3 @@ struct dhcp_packet { | |||
199 | 199 | ||
200 | #endif \ No newline at end of file | 200 | #endif |
201 | |||
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 | |||
@@ -6,4 +6,4 @@ Maintainer: Opie Team <opie@handhelds.org> | |||
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: 1.8.1-$SUB_VERSION.2 | 7 | Version: 1.8.2-$SUB_VERSION.2 |
8 | Depends: libqpe1, libopiecore2 (1.8.1) | 8 | Depends: libopiecore2 (1.8.2) |
9 | Provides: libopienet2 | 9 | Provides: libopienet2 |
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 | |||
@@ -5,2 +5,4 @@ | |||
5 | 5 | ||
6 | #include <opie2/odebug.h> | ||
7 | |||
6 | #include "odebugmapper.h" | 8 | #include "odebugmapper.h" |
@@ -9,3 +11,3 @@ DebugMapper::DebugMapper() | |||
9 | { | 11 | { |
10 | qDebug( "DebugMapper::DebugMapper()" ); | 12 | odebug << "DebugMapper::DebugMapper()" << oendl; |
11 | 13 | ||
@@ -193,3 +195,3 @@ DebugMapper::~DebugMapper() | |||
193 | { | 195 | { |
194 | qDebug( "DebugMapper::~DebugMapper()" ); | 196 | odebug << "DebugMapper::~DebugMapper()" << oendl; |
195 | } | 197 | } |
@@ -203,3 +205,3 @@ const QString& DebugMapper::map( int value ) const | |||
203 | { | 205 | { |
204 | qDebug( "DebugMapper::map() - value not found." ); | 206 | owarn << "DebugMapper::map() - value " << value << " is not found." << oendl; |
205 | return QString::null; | 207 | return QString::null; |
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,15 +1,30 @@ | |||
1 | /********************************************************************** | 1 | /* |
2 | ** Copyright (C) 2002 Michael 'Mickey' Lauer. All rights reserved. | 2 | This file is part of the Opie Project |
3 | ** | 3 | (C) 2003 Michael 'Mickey' Lauer <mickey@Vanille.de> |
4 | ** This file is part of Opie Environment. | 4 | =. |
5 | ** | 5 | .=l. |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | .>+-= |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | _;:, .> :=|. This program is free software; you can |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | .> <`_, > . <= redistribute it and/or modify it under |
9 | ** packaging of this file. | 9 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public |
10 | ** | 10 | .="- .-=="i, .._ License as published by the Free Software |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | - . .-<_> .<> Foundation; either version 2 of the License, |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ._= =} : or (at your option) any later version. |
13 | ** | 13 | .%`+i> _;_. |
14 | **********************************************************************/ | 14 | .i_,=:_. -<s. This program is distributed in the hope that |
15 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | ||
16 | : .. .:, . . . without even the implied warranty of | ||
17 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | ||
18 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | ||
19 | ..}^=.= = ; Library General Public License for more | ||
20 | ++= -. .` .: details. | ||
21 | : = ...= . :.=- | ||
22 | -. .:....=;==+<; You should have received a copy of the GNU | ||
23 | -_. . . )=. = Library General Public License along with | ||
24 | -- :-=` this library; see the file COPYING.LIB. | ||
25 | If not, write to the Free Software Foundation, | ||
26 | Inc., 59 Temple Place - Suite 330, | ||
27 | Boston, MA 02111-1307, USA. | ||
28 | |||
29 | */ | ||
15 | 30 | ||
@@ -17,2 +32,5 @@ | |||
17 | 32 | ||
33 | /* OPIE CORE */ | ||
34 | #include <opie2/odebug.h> | ||
35 | |||
18 | /* QT */ | 36 | /* QT */ |
@@ -28,3 +46,3 @@ OManufacturerDB* OManufacturerDB::instance() | |||
28 | { | 46 | { |
29 | qDebug( "OManufacturerDB::instance(): creating OManufacturerDB..." ); | 47 | odebug << "OManufacturerDB::instance(): creating OManufacturerDB..." << oendl; |
30 | _instance = new OManufacturerDB(); | 48 | _instance = new OManufacturerDB(); |
@@ -38,3 +56,3 @@ OManufacturerDB::OManufacturerDB() | |||
38 | QString filename( "/etc/manufacturers" ); | 56 | QString filename( "/etc/manufacturers" ); |
39 | qDebug( "OManufacturerDB: trying to read '%s'...", (const char*) filename ); | 57 | odebug << "OManufacturerDB: trying to read " << filename << oendl; |
40 | if ( !QFile::exists( filename ) ) | 58 | if ( !QFile::exists( filename ) ) |
@@ -42,3 +60,3 @@ OManufacturerDB::OManufacturerDB() | |||
42 | filename = "/opt/QtPalmtop/etc/manufacturers"; | 60 | filename = "/opt/QtPalmtop/etc/manufacturers"; |
43 | qDebug( "OManufacturerDB: trying to read '%s'...", (const char*) filename ); | 61 | odebug << "OManufacturerDB: trying to read " << filename << oendl; |
44 | if ( !QFile::exists( filename ) ) | 62 | if ( !QFile::exists( filename ) ) |
@@ -46,3 +64,3 @@ OManufacturerDB::OManufacturerDB() | |||
46 | filename = "/usr/share/wellenreiter/manufacturers"; | 64 | filename = "/usr/share/wellenreiter/manufacturers"; |
47 | qDebug( "OManufacturerDB: trying to read '%s'...", (const char*) filename ); | 65 | odebug << "OManufacturerDB: trying to read " << filename << oendl; |
48 | } | 66 | } |
@@ -54,3 +72,3 @@ OManufacturerDB::OManufacturerDB() | |||
54 | { | 72 | { |
55 | qWarning( "OManufacturerDB: no valid manufacturer list found.", (const char*) filename ); | 73 | owarn << "OManufacturerDB: no valid manufacturer list found." << oendl; |
56 | } | 74 | } |
@@ -58,3 +76,3 @@ OManufacturerDB::OManufacturerDB() | |||
58 | { | 76 | { |
59 | qDebug( "OManufacturerDB: found manufacturer list in '%s'...", (const char*) filename ); | 77 | odebug << "OManufacturerDB: found manufacturer list in " << filename << oendl; |
60 | QTextStream s( &file ); | 78 | QTextStream s( &file ); |
@@ -83,5 +101,3 @@ OManufacturerDB::OManufacturerDB() | |||
83 | extManu = s.readLine(); | 101 | extManu = s.readLine(); |
84 | #ifdef DEBUG | 102 | odebug << "OManufacturerDB: read " << extManu << " as extended manufacturer string" << oendl; |
85 | qDebug( "OManufacturerDB: read '%s' as extended manufacturer string", (const char*) extManu ); | ||
86 | #endif | ||
87 | manufacturersExt.insert( addr, extManu ); | 103 | manufacturersExt.insert( addr, extManu ); |
@@ -90,7 +106,4 @@ OManufacturerDB::OManufacturerDB() | |||
90 | s.readLine(); | 106 | s.readLine(); |
91 | #ifdef DEBUG | 107 | odebug << "OManufacturerDB: read tuple " << addr << ", " << manu << oendl; |
92 | qDebug( "ManufacturerDB: read tuple %s, %s", (const char*) addr, (const char*) manu ); | ||
93 | #endif | ||
94 | manufacturers.insert( addr, manu ); | 108 | manufacturers.insert( addr, manu ); |
95 | |||
96 | } | 109 | } |
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,15 +1,30 @@ | |||
1 | /********************************************************************** | 1 | /* |
2 | ** Copyright (C) 2002 Michael 'Mickey' Lauer. All rights reserved. | 2 | This file is part of the Opie Project |
3 | ** | 3 | (C) 2003 Michael 'Mickey' Lauer <mickey@Vanille.de> |
4 | ** This file is part of Opie Environment. | 4 | =. |
5 | ** | 5 | .=l. |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | .>+-= |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | _;:, .> :=|. This program is free software; you can |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | .> <`_, > . <= redistribute it and/or modify it under |
9 | ** packaging of this file. | 9 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public |
10 | ** | 10 | .="- .-=="i, .._ License as published by the Free Software |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | - . .-<_> .<> Foundation; either version 2 of the License, |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ._= =} : or (at your option) any later version. |
13 | ** | 13 | .%`+i> _;_. |
14 | **********************************************************************/ | 14 | .i_,=:_. -<s. This program is distributed in the hope that |
15 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | ||
16 | : .. .:, . . . without even the implied warranty of | ||
17 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | ||
18 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | ||
19 | ..}^=.= = ; Library General Public License for more | ||
20 | ++= -. .` .: details. | ||
21 | : = ...= . :.=- | ||
22 | -. .:....=;==+<; You should have received a copy of the GNU | ||
23 | -_. . . )=. = Library General Public License along with | ||
24 | -- :-=` this library; see the file COPYING.LIB. | ||
25 | If not, write to the Free Software Foundation, | ||
26 | Inc., 59 Temple Place - Suite 330, | ||
27 | Boston, MA 02111-1307, USA. | ||
28 | |||
29 | */ | ||
15 | 30 | ||
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 | |||
@@ -3,3 +3,3 @@ | |||
3 | 3 | ||
4 | (C) 2003 Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de> | 4 | (C) 2003 Michael 'Mickey' Lauer <mickey@Vanille.de> |
5 | =. | 5 | =. |
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 | |||
@@ -2,6 +2,3 @@ | |||
2 | This file is part of the Opie Project | 2 | This file is part of the Opie Project |
3 | Copyright (C) 2003 by the Wellenreiter team: | 3 | Copyright (C) 2003 by Michael 'Mickey' Lauer <mickey@Vanille.de> |
4 | Martin J. Muench <mjm@remote-exploit.org> | ||
5 | Max Moser <mmo@remote-exploit.org | ||
6 | Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de> | ||
7 | =. | 4 | =. |
@@ -952,2 +949,3 @@ OStationList* OWirelessNetworkInterface::scanNetwork() | |||
952 | } | 949 | } |
950 | return stations; | ||
953 | 951 | ||
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 | |||
@@ -2,6 +2,3 @@ | |||
2 | This file is part of the Opie Project | 2 | This file is part of the Opie Project |
3 | Copyright (C) 2003 by the Wellenreiter team: | 3 | Copyright (C) 2003 by Michael 'Mickey' Lauer <mickey@Vanille.de> |
4 | Martin J. Muench <mjm@remote-exploit.org> | ||
5 | Max Moser <mmo@remote-exploit.org | ||
6 | Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de> | ||
7 | =. | 4 | =. |
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 | |||
@@ -2,6 +2,3 @@ | |||
2 | This file is part of the Opie Project | 2 | This file is part of the Opie Project |
3 | Copyright (C) 2003 by the Wellenreiter team: | 3 | Copyright (C) 2003 by Michael 'Mickey' Lauer <mickey@Vanille.de> |
4 | Martin J. Muench <mjm@remote-exploit.org> | ||
5 | Max Moser <mmo@remote-exploit.org | ||
6 | Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de> | ||
7 | =. | 4 | =. |
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 | |||
@@ -2,6 +2,3 @@ | |||
2 | This file is part of the Opie Project | 2 | This file is part of the Opie Project |
3 | Copyright (C) 2003 by the Wellenreiter team: | 3 | Copyright (C) 2003 by Michael 'Mickey' Lauer <mickey@Vanille.de> |
4 | Martin J. Muench <mjm@remote-exploit.org> | ||
5 | Max Moser <mmo@remote-exploit.org | ||
6 | Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de> | ||
7 | =. | 4 | =. |
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 | |||
@@ -21,3 +21,3 @@ INTERFACES = | |||
21 | TARGET = opienet2 | 21 | TARGET = opienet2 |
22 | VERSION = 1.8.1 | 22 | VERSION = 1.8.2 |
23 | INCLUDEPATH += $(OPIEDIR)/include | 23 | INCLUDEPATH += $(OPIEDIR)/include |
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 | |||
@@ -2,4 +2,3 @@ | |||
2 | This file is part of the Opie Project | 2 | This file is part of the Opie Project |
3 | 3 | Copyright (C) 2003 by Michael 'Mickey' Lauer <mickey@Vanille.de> | |
4 | (C) 2003 Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de> | ||
5 | =. | 4 | =. |
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 | |||
@@ -2,4 +2,3 @@ | |||
2 | This file is part of the Opie Project | 2 | This file is part of the Opie Project |
3 | 3 | Copyright (C) 2003 by Michael 'Mickey' Lauer <mickey@Vanille.de> | |
4 | (C) 2003 Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de> | ||
5 | =. | 4 | =. |
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 | |||
@@ -4,3 +4,3 @@ | |||
4 | * in the root directory of Ethereal 0.9.15. Cudos to the Ethereal Team. | 4 | * in the root directory of Ethereal 0.9.15. Cudos to the Ethereal Team. |
5 | * -- Michael 'Mickey' Lauer <mickeyl@handhelds.org> | 5 | * -- Michael 'Mickey' Lauer <mickey@Vanille.de> |
6 | */ | 6 | */ |