-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 | |||
@@ -192,9 +192,10 @@ struct dhcp_packet { | |||
192 | #define FQDN_ENCODED 3 | 192 | #define FQDN_ENCODED 3 |
193 | #define FQDN_RCODE1 4 | 193 | #define FQDN_RCODE1 4 |
194 | #define FQDN_RCODE2 5 | 194 | #define FQDN_RCODE2 5 |
195 | #define FQDN_HOSTNAME 6 | 195 | #define FQDN_HOSTNAME 6 |
196 | #define FQDN_DOMAINNAME 7 | 196 | #define FQDN_DOMAINNAME 7 |
197 | #define FQDN_FQDN 8 | 197 | #define FQDN_FQDN 8 |
198 | #define FQDN_SUBOPTION_COUNT 8 | 198 | #define FQDN_SUBOPTION_COUNT 8 |
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 | |||
@@ -1,11 +1,11 @@ | |||
1 | Package: libopienet2 | 1 | Package: libopienet2 |
2 | Files: $OPIEDIR/lib/libopienet2.so.* $OPIEDIR/etc/manufacturers | 2 | Files: $OPIEDIR/lib/libopienet2.so.* $OPIEDIR/etc/manufacturers |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/system | 4 | Section: opie/system |
5 | Maintainer: Opie Team <opie@handhelds.org> | 5 | 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 |
10 | Description: Opie library 2.0 NET | 10 | Description: Opie library 2.0 NET |
11 | 11 | ||
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,18 +1,20 @@ | |||
1 | 1 | ||
2 | /* | 2 | /* |
3 | * debug value mapper - generated by regen.py - (C) Michael 'Mickey' Lauer <mickey@vanille.de> | 3 | * debug value mapper - generated by regen.py - (C) Michael 'Mickey' Lauer <mickey@vanille.de> |
4 | */ | 4 | */ |
5 | 5 | ||
6 | #include <opie2/odebug.h> | ||
7 | |||
6 | #include "odebugmapper.h" | 8 | #include "odebugmapper.h" |
7 | 9 | ||
8 | DebugMapper::DebugMapper() | 10 | DebugMapper::DebugMapper() |
9 | { | 11 | { |
10 | qDebug( "DebugMapper::DebugMapper()" ); | 12 | odebug << "DebugMapper::DebugMapper()" << oendl; |
11 | 13 | ||
12 | 14 | ||
13 | _map.insert( 0x8902, new QString("SIOCSPGRP") ); | 15 | _map.insert( 0x8902, new QString("SIOCSPGRP") ); |
14 | _map.insert( 0x8904, new QString("SIOCGPGRP") ); | 16 | _map.insert( 0x8904, new QString("SIOCGPGRP") ); |
15 | _map.insert( 0x8905, new QString("SIOCATMARK") ); | 17 | _map.insert( 0x8905, new QString("SIOCATMARK") ); |
16 | _map.insert( 0x8906, new QString("SIOCGSTAMP") ); | 18 | _map.insert( 0x8906, new QString("SIOCGSTAMP") ); |
17 | _map.insert( 0x890B, new QString("SIOCADDRT") ); | 19 | _map.insert( 0x890B, new QString("SIOCADDRT") ); |
18 | _map.insert( 0x890C, new QString("SIOCDELRT") ); | 20 | _map.insert( 0x890C, new QString("SIOCDELRT") ); |
@@ -186,27 +188,27 @@ DebugMapper::DebugMapper() | |||
186 | _map.insert( 0x89F0, new QString("SIOCDEVPRIVATE") ); | 188 | _map.insert( 0x89F0, new QString("SIOCDEVPRIVATE") ); |
187 | _map.insert( 0x89E0, new QString("SIOCPROTOPRIVATE") ); | 189 | _map.insert( 0x89E0, new QString("SIOCPROTOPRIVATE") ); |
188 | 190 | ||
189 | }; | 191 | }; |
190 | 192 | ||
191 | 193 | ||
192 | DebugMapper::~DebugMapper() | 194 | DebugMapper::~DebugMapper() |
193 | { | 195 | { |
194 | qDebug( "DebugMapper::~DebugMapper()" ); | 196 | odebug << "DebugMapper::~DebugMapper()" << oendl; |
195 | } | 197 | } |
196 | 198 | ||
197 | 199 | ||
198 | const QString& DebugMapper::map( int value ) const | 200 | const QString& DebugMapper::map( int value ) const |
199 | { | 201 | { |
200 | QString* result = _map[ value ]; | 202 | QString* result = _map[ value ]; |
201 | 203 | ||
202 | if ( !result ) | 204 | if ( !result ) |
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; |
206 | } | 208 | } |
207 | else | 209 | else |
208 | { | 210 | { |
209 | return *result; | 211 | return *result; |
210 | } | 212 | } |
211 | } | 213 | } |
212 | 214 | ||
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,67 +1,85 @@ | |||
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 | ||
16 | #include "omanufacturerdb.h" | 31 | #include "omanufacturerdb.h" |
17 | 32 | ||
33 | /* OPIE CORE */ | ||
34 | #include <opie2/odebug.h> | ||
35 | |||
18 | /* QT */ | 36 | /* QT */ |
19 | #include <qstring.h> | 37 | #include <qstring.h> |
20 | #include <qfile.h> | 38 | #include <qfile.h> |
21 | #include <qtextstream.h> | 39 | #include <qtextstream.h> |
22 | 40 | ||
23 | OManufacturerDB* OManufacturerDB::_instance = 0; | 41 | OManufacturerDB* OManufacturerDB::_instance = 0; |
24 | 42 | ||
25 | OManufacturerDB* OManufacturerDB::instance() | 43 | OManufacturerDB* OManufacturerDB::instance() |
26 | { | 44 | { |
27 | if ( !OManufacturerDB::_instance ) | 45 | if ( !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(); |
31 | } | 49 | } |
32 | return _instance; | 50 | return _instance; |
33 | } | 51 | } |
34 | 52 | ||
35 | 53 | ||
36 | OManufacturerDB::OManufacturerDB() | 54 | OManufacturerDB::OManufacturerDB() |
37 | { | 55 | { |
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 ) ) |
41 | { | 59 | { |
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 ) ) |
45 | { | 63 | { |
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 | } |
49 | } | 67 | } |
50 | 68 | ||
51 | QFile file( filename ); | 69 | QFile file( filename ); |
52 | bool hasFile = file.open( IO_ReadOnly ); | 70 | bool hasFile = file.open( IO_ReadOnly ); |
53 | if (!hasFile) | 71 | if (!hasFile) |
54 | { | 72 | { |
55 | qWarning( "OManufacturerDB: no valid manufacturer list found.", (const char*) filename ); | 73 | owarn << "OManufacturerDB: no valid manufacturer list found." << oendl; |
56 | } | 74 | } |
57 | else | 75 | else |
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 ); |
61 | QString addr; | 79 | QString addr; |
62 | QString manu; | 80 | QString manu; |
63 | QString extManu; | 81 | QString extManu; |
64 | while (!s.atEnd()) | 82 | while (!s.atEnd()) |
65 | { | 83 | { |
66 | s >> addr; | 84 | s >> addr; |
67 | if ( !addr ) // read nothing!? | 85 | if ( !addr ) // read nothing!? |
@@ -76,28 +94,23 @@ OManufacturerDB::OManufacturerDB() | |||
76 | s.skipWhiteSpace(); | 94 | s.skipWhiteSpace(); |
77 | s >> manu; | 95 | s >> manu; |
78 | s.skipWhiteSpace(); | 96 | s.skipWhiteSpace(); |
79 | s >> extManu; | 97 | s >> extManu; |
80 | if ( extManu[0] == '#' ) // we have an extended manufacturer | 98 | if ( extManu[0] == '#' ) // we have an extended manufacturer |
81 | { | 99 | { |
82 | s.skipWhiteSpace(); | 100 | s.skipWhiteSpace(); |
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 ); |
88 | } | 104 | } |
89 | else | 105 | else |
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 | } |
97 | } | 110 | } |
98 | 111 | ||
99 | } | 112 | } |
100 | 113 | ||
101 | 114 | ||
102 | OManufacturerDB::~OManufacturerDB() | 115 | OManufacturerDB::~OManufacturerDB() |
103 | { | 116 | { |
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,22 +1,37 @@ | |||
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 | ||
16 | #ifndef OMANUFACTURERDB_H | 31 | #ifndef OMANUFACTURERDB_H |
17 | #define OMANUFACTURERDB_H | 32 | #define OMANUFACTURERDB_H |
18 | 33 | ||
19 | #include <qmap.h> | 34 | #include <qmap.h> |
20 | 35 | ||
21 | /** | 36 | /** |
22 | * @brief A Ethernet card vendor database. | 37 | * @brief A Ethernet card vendor database. |
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,12 +1,12 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of the Opie Project | 2 | This file is part of the Opie Project |
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 | =. |
6 | .=l. | 6 | .=l. |
7 | .>+-= | 7 | .>+-= |
8 | _;:, .> :=|. This program is free software; you can | 8 | _;:, .> :=|. This program is free software; you can |
9 | .> <`_, > . <= redistribute it and/or modify it under | 9 | .> <`_, > . <= redistribute it and/or modify it under |
10 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public | 10 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public |
11 | .="- .-=="i, .._ License as published by the Free Software | 11 | .="- .-=="i, .._ License as published by the Free Software |
12 | - . .-<_> .<> Foundation; either version 2 of the License, | 12 | - . .-<_> .<> Foundation; either version 2 of the License, |
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,14 +1,11 @@ | |||
1 | /* | 1 | /* |
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 | =. |
8 | .=l. | 5 | .=l. |
9 | .>+-= | 6 | .>+-= |
10 | _;:, .> :=|. This program is free software; you can | 7 | _;:, .> :=|. This program is free software; you can |
11 | .> <`_, > . <= redistribute it and/or modify it under | 8 | .> <`_, > . <= redistribute it and/or modify it under |
12 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public | 9 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public |
13 | .="- .-=="i, .._ License as published by the Free Software | 10 | .="- .-=="i, .._ License as published by the Free Software |
14 | - . .-<_> .<> Foundation; either version 2 of the License, | 11 | - . .-<_> .<> Foundation; either version 2 of the License, |
@@ -945,16 +942,17 @@ OStationList* OWirelessNetworkInterface::scanNetwork() | |||
945 | case IWEVREGISTERED: qDebug( "IWEVREGISTERED" ); break; /* Discovered a new node (AP mode) */ | 942 | case IWEVREGISTERED: qDebug( "IWEVREGISTERED" ); break; /* Discovered a new node (AP mode) */ |
946 | case IWEVEXPIRED: qDebug( "IWEVEXPIRED" ); break; /* Expired a node (AP mode) */ | 943 | case IWEVEXPIRED: qDebug( "IWEVEXPIRED" ); break; /* Expired a node (AP mode) */ |
947 | default: qDebug( "unhandled event" ); | 944 | default: qDebug( "unhandled event" ); |
948 | } | 945 | } |
949 | 946 | ||
950 | offset += we->len; | 947 | offset += we->len; |
951 | we = (struct iw_event*) &buffer[offset]; | 948 | we = (struct iw_event*) &buffer[offset]; |
952 | } | 949 | } |
950 | return stations; | ||
953 | 951 | ||
954 | return stations; | 952 | return stations; |
955 | 953 | ||
956 | } | 954 | } |
957 | else | 955 | else |
958 | { | 956 | { |
959 | qDebug( " - no results (timeout) :(" ); | 957 | qDebug( " - no results (timeout) :(" ); |
960 | return stations; | 958 | return stations; |
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,14 +1,11 @@ | |||
1 | /* | 1 | /* |
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 | =. |
8 | .=l. | 5 | .=l. |
9 | .>+-= | 6 | .>+-= |
10 | _;:, .> :=|. This program is free software; you can | 7 | _;:, .> :=|. This program is free software; you can |
11 | .> <`_, > . <= redistribute it and/or modify it under | 8 | .> <`_, > . <= redistribute it and/or modify it under |
12 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public | 9 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public |
13 | .="- .-=="i, .._ License as published by the Free Software | 10 | .="- .-=="i, .._ License as published by the Free Software |
14 | - . .-<_> .<> Foundation; either version 2 of the License, | 11 | - . .-<_> .<> Foundation; either version 2 of the License, |
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,14 +1,11 @@ | |||
1 | /* | 1 | /* |
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 | =. |
8 | .=l. | 5 | .=l. |
9 | .>+-= | 6 | .>+-= |
10 | _;:, .> :=|. This program is free software; you can | 7 | _;:, .> :=|. This program is free software; you can |
11 | .> <`_, > . <= redistribute it and/or modify it under | 8 | .> <`_, > . <= redistribute it and/or modify it under |
12 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public | 9 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public |
13 | .="- .-=="i, .._ License as published by the Free Software | 10 | .="- .-=="i, .._ License as published by the Free Software |
14 | - . .-<_> .<> Foundation; either version 2 of the License, | 11 | - . .-<_> .<> Foundation; either version 2 of the License, |
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,14 +1,11 @@ | |||
1 | /* | 1 | /* |
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 | =. |
8 | .=l. | 5 | .=l. |
9 | .>+-= | 6 | .>+-= |
10 | _;:, .> :=|. This program is free software; you can | 7 | _;:, .> :=|. This program is free software; you can |
11 | .> <`_, > . <= redistribute it and/or modify it under | 8 | .> <`_, > . <= redistribute it and/or modify it under |
12 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public | 9 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public |
13 | .="- .-=="i, .._ License as published by the Free Software | 10 | .="- .-=="i, .._ License as published by the Free Software |
14 | - . .-<_> .<> Foundation; either version 2 of the License, | 11 | - . .-<_> .<> Foundation; either version 2 of the License, |
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 | |||
@@ -14,17 +14,17 @@ HEADERS = 802_11_user.h \ | |||
14 | SOURCES = odebugmapper.cpp \ | 14 | SOURCES = odebugmapper.cpp \ |
15 | omanufacturerdb.cpp \ | 15 | omanufacturerdb.cpp \ |
16 | onetutils.cpp \ | 16 | onetutils.cpp \ |
17 | onetwork.cpp \ | 17 | onetwork.cpp \ |
18 | opcap.cpp \ | 18 | opcap.cpp \ |
19 | ostation.cpp | 19 | ostation.cpp |
20 | INTERFACES = | 20 | 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 |
24 | DEPENDPATH += $(OPIEDIR)/include | 24 | DEPENDPATH += $(OPIEDIR)/include |
25 | LIBS += -lpcap | 25 | LIBS += -lpcap |
26 | 26 | ||
27 | 27 | ||
28 | !contains( platform, x11 ) { | 28 | !contains( platform, x11 ) { |
29 | include ( $(OPIEDIR)/include.pro ) | 29 | include ( $(OPIEDIR)/include.pro ) |
30 | } | 30 | } |
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,12 +1,11 @@ | |||
1 | /* | 1 | /* |
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 | =. |
6 | .=l. | 5 | .=l. |
7 | .>+-= | 6 | .>+-= |
8 | _;:, .> :=|. This program is free software; you can | 7 | _;:, .> :=|. This program is free software; you can |
9 | .> <`_, > . <= redistribute it and/or modify it under | 8 | .> <`_, > . <= redistribute it and/or modify it under |
10 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public | 9 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public |
11 | .="- .-=="i, .._ License as published by the Free Software | 10 | .="- .-=="i, .._ License as published by the Free Software |
12 | - . .-<_> .<> Foundation; either version 2 of the License, | 11 | - . .-<_> .<> Foundation; either version 2 of the License, |
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,12 +1,11 @@ | |||
1 | /* | 1 | /* |
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 | =. |
6 | .=l. | 5 | .=l. |
7 | .>+-= | 6 | .>+-= |
8 | _;:, .> :=|. This program is free software; you can | 7 | _;:, .> :=|. This program is free software; you can |
9 | .> <`_, > . <= redistribute it and/or modify it under | 8 | .> <`_, > . <= redistribute it and/or modify it under |
10 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public | 9 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public |
11 | .="- .-=="i, .._ License as published by the Free Software | 10 | .="- .-=="i, .._ License as published by the Free Software |
12 | - . .-<_> .<> Foundation; either version 2 of the License, | 11 | - . .-<_> .<> Foundation; either version 2 of the License, |
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,13 +1,13 @@ | |||
1 | /* | 1 | /* |
2 | * This file has been generated by doing | 2 | * This file has been generated by doing |
3 | * find . -name "*"|xargs grep -h '#define UDP_PORT' > udp_ports.h | 3 | * find . -name "*"|xargs grep -h '#define UDP_PORT' > udp_ports.h |
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 | */ |
7 | 7 | ||
8 | #define UDP_PORT_AODV654 | 8 | #define UDP_PORT_AODV654 |
9 | #define UDP_PORT_LENGTH 2 | 9 | #define UDP_PORT_LENGTH 2 |
10 | #define UDP_PORT_OFFSET PARAMETER_VALUE_OFFSET | 10 | #define UDP_PORT_OFFSET PARAMETER_VALUE_OFFSET |
11 | #define UDP_PORT_RAS1 1718 | 11 | #define UDP_PORT_RAS1 1718 |
12 | #define UDP_PORT_RAS2 1719 | 12 | #define UDP_PORT_RAS2 1719 |
13 | #define UDP_PORT_CPHA8116 | 13 | #define UDP_PORT_CPHA8116 |