36 files changed, 158 insertions, 111 deletions
diff --git a/libopie2/examples/opiecore/odebugdemo/odebugdemo.cpp b/libopie2/examples/opiecore/odebugdemo/odebugdemo.cpp index 74886fa..e8bf04f 100644 --- a/libopie2/examples/opiecore/odebugdemo/odebugdemo.cpp +++ b/libopie2/examples/opiecore/odebugdemo/odebugdemo.cpp | |||
@@ -71,54 +71,56 @@ public: | |||
71 | QPushButton* tb = new QPushButton( "Emit a Fatal Backtrace!", vbox ); | 71 | QPushButton* tb = new QPushButton( "Emit a Fatal Backtrace!", vbox ); |
72 | connect( tb, SIGNAL( clicked() ), this, SLOT( emitTBOutput() ) ); | 72 | connect( tb, SIGNAL( clicked() ), this, SLOT( emitTBOutput() ) ); |
73 | 73 | ||
74 | info->show(); | 74 | info->show(); |
75 | warn->show(); | 75 | warn->show(); |
76 | error->show(); | 76 | error->show(); |
77 | fatal->show(); | 77 | fatal->show(); |
78 | tb->show(); | 78 | tb->show(); |
79 | g->show(); | 79 | g->show(); |
80 | hbox->show(); | 80 | hbox->show(); |
81 | e->show(); | 81 | e->show(); |
82 | vbox->show(); | 82 | vbox->show(); |
83 | showMainWidget( vbox ); | 83 | showMainWidget( vbox ); |
84 | } | 84 | } |
85 | 85 | ||
86 | public slots: | 86 | public slots: |
87 | void chooseMethod(int method) | 87 | void chooseMethod(int method) |
88 | { | 88 | { |
89 | m = method; | 89 | m = method; |
90 | qDebug( "choosing method: %d", method ); | 90 | qDebug( "choosing method: %d", method ); |
91 | OConfig* g = OGlobal::config(); | 91 | OConfig* g = OGlobal::config(); |
92 | g->setGroup( "General" ); | 92 | g->setGroup( "General" ); |
93 | g->writeEntry( "debugMode", m ); | 93 | g->writeEntry( "debugMode", m ); |
94 | e->setText( OGlobalSettings::debugOutput() ); | 94 | e->setText( OGlobalSettings::debugOutput() ); |
95 | g->write(); | ||
95 | } | 96 | } |
96 | void updateDebugOutput() | 97 | void updateDebugOutput() |
97 | { | 98 | { |
98 | OConfig* g = OGlobal::config(); | 99 | OConfig* g = OGlobal::config(); |
99 | g->setGroup( "General" ); | 100 | g->setGroup( "General" ); |
100 | g->writeEntry( "debugOutput"+QString::number(OGlobalSettings::debugMode()), e->text() ); | 101 | g->writeEntry( "debugOutput"+QString::number(OGlobalSettings::debugMode()), e->text() ); |
102 | g->write(); | ||
101 | } | 103 | } |
102 | void emitInfoOutput() | 104 | void emitInfoOutput() |
103 | { | 105 | { |
104 | odebug << "This is a debug message" << oendl; | 106 | odebug << "This is a debug message" << oendl; |
105 | } | 107 | } |
106 | void emitWarningOutput() | 108 | void emitWarningOutput() |
107 | { | 109 | { |
108 | owarn << "This is a warning message" << oendl; | 110 | owarn << "This is a warning message" << oendl; |
109 | } | 111 | } |
110 | void emitErrorOutput() | 112 | void emitErrorOutput() |
111 | { | 113 | { |
112 | oerr << "This is an errror message" << oendl; | 114 | oerr << "This is an errror message" << oendl; |
113 | } | 115 | } |
114 | void emitFatalOutput() | 116 | void emitFatalOutput() |
115 | { | 117 | { |
116 | ofatal << "This is a fatal message" << oendl; | 118 | ofatal << "This is a fatal message" << oendl; |
117 | } | 119 | } |
118 | void emitTBOutput() | 120 | void emitTBOutput() |
119 | { | 121 | { |
120 | ofatal << "This is a fatal message + backtrace\n" + odBacktrace(); // odBacktrace includes \n | 122 | ofatal << "This is a fatal message + backtrace\n" + odBacktrace(); // odBacktrace includes \n |
121 | } | 123 | } |
122 | 124 | ||
123 | private: | 125 | private: |
124 | QButtonGroup* g; | 126 | QButtonGroup* g; |
diff --git a/libopie2/examples/opienet/miniwellenreiter/miniwellenreiter.cpp b/libopie2/examples/opienet/miniwellenreiter/miniwellenreiter.cpp index c49daa0..eb2e8e8 100644 --- a/libopie2/examples/opienet/miniwellenreiter/miniwellenreiter.cpp +++ b/libopie2/examples/opienet/miniwellenreiter/miniwellenreiter.cpp | |||
@@ -10,154 +10,168 @@ | |||
10 | #include <cstring> | 10 | #include <cstring> |
11 | 11 | ||
12 | //======================== Station help class =============================== | 12 | //======================== Station help class =============================== |
13 | 13 | ||
14 | class Station | 14 | class Station |
15 | { | 15 | { |
16 | public: | 16 | public: |
17 | Station( QString t, int c, bool w ) : type(t), channel(c), wep(w), beacons(1) {}; | 17 | Station( QString t, int c, bool w ) : type(t), channel(c), wep(w), beacons(1) {}; |
18 | ~Station() {}; | 18 | ~Station() {}; |
19 | 19 | ||
20 | QString type; | 20 | QString type; |
21 | int channel; | 21 | int channel; |
22 | bool wep; | 22 | bool wep; |
23 | int beacons; | 23 | int beacons; |
24 | }; | 24 | }; |
25 | 25 | ||
26 | QDict<Station> stations; | 26 | QDict<Station> stations; |
27 | 27 | ||
28 | //======================== Application class =============================== | 28 | //======================== Application class =============================== |
29 | 29 | ||
30 | class Wellenreiter : public QApplication | 30 | class Wellenreiter : public QApplication |
31 | { | 31 | { |
32 | Q_OBJECT | 32 | Q_OBJECT |
33 | public: | 33 | public: |
34 | Wellenreiter( int argc, char** argv ) : QApplication( argc, argv ) | 34 | Wellenreiter( int argc, char** argv ) : QApplication( argc, argv ), channel( 1 ) |
35 | { | 35 | { |
36 | 36 | ||
37 | ONetwork* net = ONetwork::instance(); | 37 | ONetwork* net = ONetwork::instance(); |
38 | 38 | ||
39 | if ( argc < 3 ) | 39 | if ( argc < 3 ) |
40 | { | 40 | { |
41 | printf( "Usage: ./%s <interface> <driver> <interval>\n", argv[0] ); | 41 | printf( "Usage: ./%s <interface> <driver> <interval>\n", argv[0] ); |
42 | printf( "\n" ); | 42 | printf( "\n" ); |
43 | printf( "Valid wireless interfaces (detected) are:\n" ); | 43 | printf( "Valid wireless interfaces (detected) are:\n" ); |
44 | 44 | ||
45 | ONetwork::InterfaceIterator it = net->iterator(); | 45 | ONetwork::InterfaceIterator it = net->iterator(); |
46 | while ( it.current() ) | 46 | while ( it.current() ) |
47 | { | 47 | { |
48 | if ( it.current()->isWireless() ) | 48 | if ( it.current()->isWireless() ) |
49 | { | 49 | { |
50 | printf( " - '%s' (MAC=%s) (IPv4=%s)\n", (const char*) it.current()->name(), | 50 | printf( " - '%s' (MAC=%s) (IPv4=%s)\n", (const char*) it.current()->name(), |
51 | (const char*) it.current()->macAddress().toString(), | 51 | (const char*) it.current()->macAddress().toString(), |
52 | (const char*) it.current()->ipV4Address() ); | 52 | (const char*) it.current()->ipV4Address() ); |
53 | } | 53 | } |
54 | ++it; | 54 | ++it; |
55 | } | 55 | } |
56 | exit( -1 ); | 56 | exit( -1 ); |
57 | } | 57 | } |
58 | 58 | ||
59 | printf( "****************************************************\n" ); | 59 | printf( "*******************************************************************\n" ); |
60 | printf( "* Wellenreiter mini edition 1.0 (C) 2003 M-M-M *\n" ); | 60 | printf( "* Wellenreiter mini edition 1.0.0 (C) 2003 Michael 'Mickey' Lauer *\n" ); |
61 | printf( "****************************************************\n" ); | 61 | printf( "*******************************************************************\n" ); |
62 | printf( "\n\n" ); | 62 | printf( "\n\n" ); |
63 | 63 | ||
64 | QString interface( argv[1] ); | 64 | QString interface( argv[1] ); |
65 | QString driver( argv[2] ); | 65 | QString driver( argv[2] ); |
66 | 66 | ||
67 | printf( "Trying to use '%s' as %s-controlled device...\n", (const char*) interface, (const char*) driver ); | 67 | printf( "Trying to use '%s' as %s-controlled device...\n", (const char*) interface, (const char*) driver ); |
68 | 68 | ||
69 | // sanity checks before downcasting | 69 | // sanity checks before downcasting |
70 | ONetworkInterface* iface = net->interface( interface ); | 70 | ONetworkInterface* iface = net->interface( interface ); |
71 | if ( !iface ) | 71 | if ( !iface ) |
72 | { | 72 | { |
73 | printf( "Interface '%s' doesn't exist. Exiting.\n", (const char*) interface ); | 73 | printf( "Interface '%s' doesn't exist. Exiting.\n", (const char*) interface ); |
74 | exit( -1 ); | 74 | exit( -1 ); |
75 | } | 75 | } |
76 | if ( !iface->isWireless() ) | 76 | if ( !iface->isWireless() ) |
77 | { | 77 | { |
78 | printf( "Interface '%s' doesn't support wireless extensions. Exiting.\n", (const char*) interface ); | 78 | printf( "Interface '%s' doesn't support wireless extensions. Exiting.\n", (const char*) interface ); |
79 | exit( -1 ); | 79 | exit( -1 ); |
80 | } | 80 | } |
81 | 81 | ||
82 | // downcast should be safe now | 82 | // downcast should be safe now |
83 | wiface = (OWirelessNetworkInterface*) iface; | 83 | wiface = (OWirelessNetworkInterface*) iface; |
84 | printf( "Using wireless interface '%s' for scanning (current SSID is '%s')...\n", (const char*) interface, (const char*) wiface->SSID() ); | 84 | printf( "Using wireless interface '%s' for scanning (current SSID is '%s')...\n", (const char*) interface, (const char*) wiface->SSID() ); |
85 | 85 | ||
86 | // ifconfig +promisc the interface to receive all packets | 86 | // ifconfig +promisc the interface to receive all packets |
87 | if ( !wiface->promiscuousMode() ) | 87 | if ( !wiface->promiscuousMode() ) |
88 | { | 88 | { |
89 | printf( "Interface status is not promisc... switching to promisc... " ); | 89 | printf( "Interface status is not promisc... switching to promisc... " ); |
90 | wiface->setPromiscuousMode( true ); | 90 | wiface->setPromiscuousMode( true ); |
91 | if ( !wiface->promiscuousMode() ) | 91 | if ( !wiface->promiscuousMode() ) |
92 | { | 92 | { |
93 | printf( "failed (%s). Exiting.\n", strerror( errno ) ); | 93 | printf( "failed (%s). Exiting.\n", strerror( errno ) ); |
94 | exit( -1 ); | 94 | exit( -1 ); |
95 | } | 95 | } |
96 | else | 96 | else |
97 | { | 97 | { |
98 | printf( "ok.\n" ); | 98 | printf( "ok.\n" ); |
99 | } | 99 | } |
100 | } | 100 | } |
101 | else | 101 | else |
102 | printf( "Interface status is already promisc - good.\n" ); | 102 | printf( "Interface status is already promisc - good.\n" ); |
103 | 103 | ||
104 | // connect a monitoring strategy to the interface | 104 | // connect a monitoring strategy to the interface |
105 | if ( driver == "orinoco" ) | 105 | if ( driver == "orinoco" ) |
106 | new OOrinocoMonitoringInterface( wiface, false ); | 106 | new OOrinocoMonitoringInterface( wiface, false ); |
107 | else | 107 | else |
108 | if ( driver == "hostap" ) | ||
109 | new OHostAPMonitoringInterface( wiface, false ); | ||
110 | else | ||
111 | if ( driver == "wlan-ng" ) | ||
112 | new OWlanNGMonitoringInterface( wiface, false ); | ||
113 | else | ||
108 | { | 114 | { |
109 | printf( "Unknown driver. Exiting\n" ); | 115 | printf( "Unknown driver. Exiting\n" ); |
110 | exit( -1 ); | 116 | exit( -1 ); |
111 | } | 117 | } |
112 | 118 | ||
113 | // enable monitoring mode | 119 | // enable monitoring mode |
114 | printf( "Enabling monitor mode...\n" ); | 120 | printf( "Enabling monitor mode...\n" ); |
115 | //wiface->setMonitorMode( true ); | 121 | wiface->setMode( "monitor" ); |
116 | 122 | ||
117 | // open a packet capturer | 123 | // open a packet capturer |
118 | cap = new OPacketCapturer(); | 124 | cap = new OPacketCapturer(); |
119 | cap->open( interface ); | 125 | cap->open( interface ); |
120 | if ( !cap->isOpen() ) | 126 | if ( !cap->isOpen() ) |
121 | { | 127 | { |
122 | printf( "Unable to open libpcap (%s). Exiting.\n", strerror( errno ) ); | 128 | printf( "Unable to open libpcap (%s). Exiting.\n", strerror( errno ) ); |
123 | exit( -1 ); | 129 | exit( -1 ); |
124 | } | 130 | } |
125 | 131 | ||
126 | // set capturer to non-blocking mode | 132 | // set capturer to non-blocking mode |
127 | cap->setBlocking( false ); | 133 | cap->setBlocking( false ); |
128 | 134 | ||
129 | // start channel hopper | 135 | // start channel hopper |
130 | //wiface->setChannelHopping( 1000 ); | 136 | //wiface->setChannelHopping( 1000 ); |
131 | 137 | ||
132 | // connect | 138 | // connect |
133 | connect( cap, SIGNAL( receivedPacket(OPacket*) ), this, SLOT( receivePacket(OPacket*) ) ); | 139 | connect( cap, SIGNAL( receivedPacket(OPacket*) ), this, SLOT( receivePacket(OPacket*) ) ); |
140 | // timer | ||
141 | startTimer( 1000 ); | ||
134 | 142 | ||
135 | } | 143 | } |
136 | 144 | ||
137 | ~Wellenreiter() {}; | 145 | ~Wellenreiter() {}; |
138 | 146 | ||
139 | public slots: | 147 | public slots: |
148 | virtual void timerEvent(QTimerEvent* e) | ||
149 | { | ||
150 | wiface->setChannel( channel++ ); | ||
151 | if ( channel == 14 ) channel = 1; | ||
152 | } | ||
153 | |||
140 | void receivePacket(OPacket* p) | 154 | void receivePacket(OPacket* p) |
141 | { | 155 | { |
142 | if (!p) | 156 | if (!p) |
143 | { | 157 | { |
144 | printf( "(empty packet received)\n" ); | 158 | printf( "(empty packet received)\n" ); |
145 | return; | 159 | return; |
146 | } | 160 | } |
147 | 161 | ||
148 | OWaveLanManagementPacket* beacon = (OWaveLanManagementPacket*) p->child( "802.11 Management" ); | 162 | OWaveLanManagementPacket* beacon = (OWaveLanManagementPacket*) p->child( "802.11 Management" ); |
149 | if ( beacon ) | 163 | if ( beacon ) |
150 | { | 164 | { |
151 | OWaveLanManagementSSID* ssid = static_cast<OWaveLanManagementSSID*>( p->child( "802.11 SSID" ) ); | 165 | OWaveLanManagementSSID* ssid = static_cast<OWaveLanManagementSSID*>( p->child( "802.11 SSID" ) ); |
152 | QString essid = ssid ? ssid->ID() : "<unknown>"; | 166 | QString essid = ssid ? ssid->ID() : "<unknown>"; |
153 | 167 | ||
154 | if ( stations.find( essid ) ) | 168 | if ( stations.find( essid ) ) |
155 | stations[essid]->beacons++; | 169 | stations[essid]->beacons++; |
156 | else | 170 | else |
157 | { | 171 | { |
158 | printf( "found new network @ channel %d, SSID = '%s'\n", wiface->channel(), (const char*) essid ); | 172 | printf( "found new network @ channel %d, SSID = '%s'\n", wiface->channel(), (const char*) essid ); |
159 | stations.insert( essid, new Station( "unknown", wiface->channel(), | 173 | stations.insert( essid, new Station( "unknown", wiface->channel(), |
160 | ((OWaveLanPacket*) beacon->parent())->usesWep() ) ); | 174 | ((OWaveLanPacket*) beacon->parent())->usesWep() ) ); |
161 | } | 175 | } |
162 | return; | 176 | return; |
163 | } | 177 | } |
@@ -182,36 +196,37 @@ public slots: | |||
182 | (const char*) wlan->macAddress1().toString(true) ); | 196 | (const char*) wlan->macAddress1().toString(true) ); |
183 | } | 197 | } |
184 | else | 198 | else |
185 | if ( wlan->fromDS() && wlan->toDS() ) | 199 | if ( wlan->fromDS() && wlan->toDS() ) |
186 | { | 200 | { |
187 | printf( "WSD(bridge): '%s' -> '%s' via '%s' and '%s'\n", | 201 | printf( "WSD(bridge): '%s' -> '%s' via '%s' and '%s'\n", |
188 | (const char*) wlan->macAddress4().toString(true), | 202 | (const char*) wlan->macAddress4().toString(true), |
189 | (const char*) wlan->macAddress3().toString(true), | 203 | (const char*) wlan->macAddress3().toString(true), |
190 | (const char*) wlan->macAddress1().toString(true), | 204 | (const char*) wlan->macAddress1().toString(true), |
191 | (const char*) wlan->macAddress2().toString(true) ); | 205 | (const char*) wlan->macAddress2().toString(true) ); |
192 | } | 206 | } |
193 | else | 207 | else |
194 | { | 208 | { |
195 | printf( "IBSS(AdHoc): '%s' -> '%s' (Cell: '%s')'\n", | 209 | printf( "IBSS(AdHoc): '%s' -> '%s' (Cell: '%s')'\n", |
196 | (const char*) wlan->macAddress2().toString(true), | 210 | (const char*) wlan->macAddress2().toString(true), |
197 | (const char*) wlan->macAddress1().toString(true), | 211 | (const char*) wlan->macAddress1().toString(true), |
198 | (const char*) wlan->macAddress3().toString(true) ); | 212 | (const char*) wlan->macAddress3().toString(true) ); |
199 | } | 213 | } |
200 | return; | 214 | return; |
201 | } | 215 | } |
202 | } | 216 | } |
203 | private: | 217 | private: |
204 | OPacketCapturer* cap; | 218 | OPacketCapturer* cap; |
205 | OWirelessNetworkInterface* wiface; | 219 | OWirelessNetworkInterface* wiface; |
220 | int channel; | ||
206 | }; | 221 | }; |
207 | 222 | ||
208 | 223 | ||
209 | int main( int argc, char** argv ) | 224 | int main( int argc, char** argv ) |
210 | { | 225 | { |
211 | Wellenreiter w( argc, argv ); | 226 | Wellenreiter w( argc, argv ); |
212 | w.exec(); | 227 | w.exec(); |
213 | return 0; | 228 | return 0; |
214 | } | 229 | } |
215 | 230 | ||
216 | #include "miniwellenreiter.moc" | 231 | #include "miniwellenreiter.moc" |
217 | 232 | ||
diff --git a/libopie2/examples/opienet/miniwellenreiter/miniwellenreiter.pro b/libopie2/examples/opienet/miniwellenreiter/miniwellenreiter.pro index 7ce535c..b2c5c14 100644 --- a/libopie2/examples/opienet/miniwellenreiter/miniwellenreiter.pro +++ b/libopie2/examples/opienet/miniwellenreiter/miniwellenreiter.pro | |||
diff --git a/libopie2/examples/opienet/onetworkdemo/onetworkdemo.cpp b/libopie2/examples/opienet/onetworkdemo/onetworkdemo.cpp index 06b8b19..4763316 100644 --- a/libopie2/examples/opienet/onetworkdemo/onetworkdemo.cpp +++ b/libopie2/examples/opienet/onetworkdemo/onetworkdemo.cpp | |||
@@ -89,54 +89,55 @@ int main( int argc, char** argv ) | |||
89 | 89 | ||
90 | /* | 90 | /* |
91 | 91 | ||
92 | // first some wrong calls to check if this is working | 92 | // first some wrong calls to check if this is working |
93 | iface->setPrivate( "seppel", 10 ); | 93 | iface->setPrivate( "seppel", 10 ); |
94 | iface->setPrivate( "monitor", 0 ); | 94 | iface->setPrivate( "monitor", 0 ); |
95 | 95 | ||
96 | // now the real deal | 96 | // now the real deal |
97 | iface->setPrivate( "monitor", 2, 2, 3 ); | 97 | iface->setPrivate( "monitor", 2, 2, 3 ); |
98 | 98 | ||
99 | // trying to set hw address to 12:34:56:AB:CD:EF | 99 | // trying to set hw address to 12:34:56:AB:CD:EF |
100 | 100 | ||
101 | /* | 101 | /* |
102 | 102 | ||
103 | OMacAddress addr = OMacAddress::fromString( "12:34:56:AB:CD:EF" ); | 103 | OMacAddress addr = OMacAddress::fromString( "12:34:56:AB:CD:EF" ); |
104 | iface->setUp( false ); | 104 | iface->setUp( false ); |
105 | iface->setMacAddress( addr ); | 105 | iface->setMacAddress( addr ); |
106 | iface->setUp( true ); | 106 | iface->setUp( true ); |
107 | qDebug( "DEMO: MAC Address now is '%s'", (const char*) iface->macAddress().toString() ); | 107 | qDebug( "DEMO: MAC Address now is '%s'", (const char*) iface->macAddress().toString() ); |
108 | 108 | ||
109 | */ | 109 | */ |
110 | 110 | ||
111 | // monitor test | 111 | // monitor test |
112 | 112 | ||
113 | /* | 113 | |
114 | 114 | ||
115 | qDebug( "DEMO: current interface mode is '%s'", (const char*) iface->mode() ); | 115 | qDebug( "DEMO: current interface mode is '%s'", (const char*) iface->mode() ); |
116 | iface->setMode( "monitor" ); | 116 | iface->setMode( "monitor" ); |
117 | qDebug( "DEMO: current interface mode is '%s'", (const char*) iface->mode() ); | 117 | qDebug( "DEMO: current interface mode is '%s'", (const char*) iface->mode() ); |
118 | 118 | ||
119 | sleep( 1 ); */ | 119 | sleep( 1 ); |
120 | 120 | ||
121 | iface->setMode( "master" ); | 121 | iface->setChannel( 1 ); |
122 | iface->setMode( "managed" ); | ||
122 | 123 | ||
123 | //sleep( 1 ); | 124 | //sleep( 1 ); |
124 | qDebug( "DEMO: current interface mode is '%s'", (const char*) iface->mode() ); | 125 | qDebug( "DEMO: current interface mode is '%s'", (const char*) iface->mode() ); |
125 | 126 | ||
126 | /*iface->setMode( "adhoc" ); | 127 | /*iface->setMode( "adhoc" ); |
127 | sleep( 1 ); | 128 | sleep( 1 ); |
128 | qDebug( "DEMO: current interface mode is '%s'", (const char*) iface->mode() ); | 129 | qDebug( "DEMO: current interface mode is '%s'", (const char*) iface->mode() ); |
129 | iface->setMode( "managed" ); | 130 | iface->setMode( "managed" ); |
130 | sleep( 1 ); | 131 | sleep( 1 ); |
131 | qDebug( "DEMO: current interface mode is '%s'", (const char*) iface->mode() ); | 132 | qDebug( "DEMO: current interface mode is '%s'", (const char*) iface->mode() ); |
132 | iface->setMode( "master" ); | 133 | iface->setMode( "master" ); |
133 | sleep( 1 ); | 134 | sleep( 1 ); |
134 | qDebug( "DEMO: current interface mode is '%s'", (const char*) iface->mode() );*/ | 135 | qDebug( "DEMO: current interface mode is '%s'", (const char*) iface->mode() );*/ |
135 | 136 | ||
136 | } | 137 | } |
137 | ++it; | 138 | ++it; |
138 | } | 139 | } |
139 | 140 | ||
140 | return 0; | 141 | return 0; |
141 | 142 | ||
142 | } | 143 | } |
diff --git a/libopie2/libopie2.control b/libopie2/libopie2.control index 6e11cbf..f54efd8 100644 --- a/libopie2/libopie2.control +++ b/libopie2/libopie2.control | |||
@@ -1,11 +1,11 @@ | |||
1 | Package: libopie2 | 1 | Package: libopie2 |
2 | Files: | 2 | Files: |
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: libopiecore2 (1.8.1), libopiedb2 (1.8.1), libopiemm2 (1.8.1), libopienet2 (1.8.1), libopiepim2 (1.8.1), libopieui2 (1.8.1) | 8 | Depends: libopiecore2 (1.8.2), libopiedb2 (1.8.2), libopiemm2 (1.8.2), libopienet2 (1.8.2), libopiepim2 (1.8.2), libopieui2 (1.8.2) |
9 | Provides: libopie2 | 9 | Provides: libopie2 |
10 | Description: Opie library 2.0 | 10 | Description: Opie library 2.0 |
11 | 11 | ||
diff --git a/libopie2/opiecore/libopiecore2.control b/libopie2/opiecore/libopiecore2.control index 7dec1b9..956d24f 100644 --- a/libopie2/opiecore/libopiecore2.control +++ b/libopie2/opiecore/libopiecore2.control | |||
@@ -1,11 +1,11 @@ | |||
1 | Package: libopiecore2 | 1 | Package: libopiecore2 |
2 | Files: $OPIEDIR/lib/libopiecore2.so.* | 2 | Files: $OPIEDIR/lib/libopiecore2.so.* |
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 | 8 | Depends: libqpe1 |
9 | Provides: libopiecore2 | 9 | Provides: libopiecore2 |
10 | Description: Opie library 2.0 CORE | 10 | Description: Opie library 2.0 CORE |
11 | 11 | ||
diff --git a/libopie2/opiecore/oconfig.cpp b/libopie2/opiecore/oconfig.cpp index dc4d0b3..fb5eabb 100644 --- a/libopie2/opiecore/oconfig.cpp +++ b/libopie2/opiecore/oconfig.cpp | |||
@@ -18,54 +18,56 @@ | |||
18 | : .. .:, . . . without even the implied warranty of | 18 | : .. .:, . . . without even the implied warranty of |
19 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 19 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
20 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | 20 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU |
21 | ..}^=.= = ; Library General Public License for more | 21 | ..}^=.= = ; Library General Public License for more |
22 | ++= -. .` .: details. | 22 | ++= -. .` .: details. |
23 | : = ...= . :.=- | 23 | : = ...= . :.=- |
24 | -. .:....=;==+<; You should have received a copy of the GNU | 24 | -. .:....=;==+<; You should have received a copy of the GNU |
25 | -_. . . )=. = Library General Public License along with | 25 | -_. . . )=. = Library General Public License along with |
26 | -- :-=` this library; see the file COPYING.LIB. | 26 | -- :-=` this library; see the file COPYING.LIB. |
27 | If not, write to the Free Software Foundation, | 27 | If not, write to the Free Software Foundation, |
28 | Inc., 59 Temple Place - Suite 330, | 28 | Inc., 59 Temple Place - Suite 330, |
29 | Boston, MA 02111-1307, USA. | 29 | Boston, MA 02111-1307, USA. |
30 | */ | 30 | */ |
31 | 31 | ||
32 | /* QT */ | 32 | /* QT */ |
33 | 33 | ||
34 | #include <qfont.h> | 34 | #include <qfont.h> |
35 | #include <qcolor.h> | 35 | #include <qcolor.h> |
36 | 36 | ||
37 | /* OPIE */ | 37 | /* OPIE */ |
38 | 38 | ||
39 | #include <opie2/oconfig.h> | 39 | #include <opie2/oconfig.h> |
40 | 40 | ||
41 | OConfig::OConfig( const QString &name, Domain domain ) | 41 | OConfig::OConfig( const QString &name, Domain domain ) |
42 | :OpieConfig( name, domain ) | 42 | :Config( name, domain ) |
43 | { | 43 | { |
44 | qDebug( "OConfig::OConfig()" ); | ||
44 | } | 45 | } |
45 | 46 | ||
46 | OConfig::~OConfig() | 47 | OConfig::~OConfig() |
47 | { | 48 | { |
49 | qDebug( "OConfig::~OConfig()" ); | ||
48 | } | 50 | } |
49 | 51 | ||
50 | QColor OConfig::readColorEntry( const QString& key, const QColor* pDefault ) const | 52 | QColor OConfig::readColorEntry( const QString& key, const QColor* pDefault ) const |
51 | { | 53 | { |
52 | QColor aRetColor; | 54 | QColor aRetColor; |
53 | int nRed = 0, nGreen = 0, nBlue = 0; | 55 | int nRed = 0, nGreen = 0, nBlue = 0; |
54 | 56 | ||
55 | QString aValue = readEntry( key ); | 57 | QString aValue = readEntry( key ); |
56 | if( !aValue.isEmpty() ) | 58 | if( !aValue.isEmpty() ) |
57 | { | 59 | { |
58 | if ( aValue.at(0) == '#' ) | 60 | if ( aValue.at(0) == '#' ) |
59 | { | 61 | { |
60 | aRetColor.setNamedColor(aValue); | 62 | aRetColor.setNamedColor(aValue); |
61 | } | 63 | } |
62 | else | 64 | else |
63 | { | 65 | { |
64 | bool bOK; | 66 | bool bOK; |
65 | 67 | ||
66 | // find first part (red) | 68 | // find first part (red) |
67 | int nIndex = aValue.find( ',' ); | 69 | int nIndex = aValue.find( ',' ); |
68 | 70 | ||
69 | if( nIndex == -1 ) | 71 | if( nIndex == -1 ) |
70 | { | 72 | { |
71 | // return a sensible default -- Bernd | 73 | // return a sensible default -- Bernd |
diff --git a/libopie2/opiecore/oconfig.h b/libopie2/opiecore/oconfig.h index 75aa170..444d280 100644 --- a/libopie2/opiecore/oconfig.h +++ b/libopie2/opiecore/oconfig.h | |||
@@ -14,77 +14,77 @@ | |||
14 | ._= =} : or (at your option) any later version. | 14 | ._= =} : or (at your option) any later version. |
15 | .%`+i> _;_. | 15 | .%`+i> _;_. |
16 | .i_,=:_. -<s. This program is distributed in the hope that | 16 | .i_,=:_. -<s. This program is distributed in the hope that |
17 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 17 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
18 | : .. .:, . . . without even the implied warranty of | 18 | : .. .:, . . . without even the implied warranty of |
19 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 19 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
20 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | 20 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU |
21 | ..}^=.= = ; Library General Public License for more | 21 | ..}^=.= = ; Library General Public License for more |
22 | ++= -. .` .: details. | 22 | ++= -. .` .: details. |
23 | : = ...= . :.=- | 23 | : = ...= . :.=- |
24 | -. .:....=;==+<; You should have received a copy of the GNU | 24 | -. .:....=;==+<; You should have received a copy of the GNU |
25 | -_. . . )=. = Library General Public License along with | 25 | -_. . . )=. = Library General Public License along with |
26 | -- :-=` this library; see the file COPYING.LIB. | 26 | -- :-=` this library; see the file COPYING.LIB. |
27 | If not, write to the Free Software Foundation, | 27 | If not, write to the Free Software Foundation, |
28 | Inc., 59 Temple Place - Suite 330, | 28 | Inc., 59 Temple Place - Suite 330, |
29 | Boston, MA 02111-1307, USA. | 29 | Boston, MA 02111-1307, USA. |
30 | */ | 30 | */ |
31 | 31 | ||
32 | #ifndef OCONFIG_H | 32 | #ifndef OCONFIG_H |
33 | #define OCONFIG_H | 33 | #define OCONFIG_H |
34 | 34 | ||
35 | //FIXME: Implement for X11 or reuse libqpe/Config there also? | 35 | //FIXME: Implement for X11 or reuse libqpe/Config there also? |
36 | //FIXME: Or rather use QSettings also for libqpe? | 36 | //FIXME: Or rather use QSettings also for libqpe? |
37 | 37 | ||
38 | #include "opieconfig.h" | 38 | #include <qpe/config.h> |
39 | 39 | ||
40 | class QColor; | 40 | class QColor; |
41 | class QFont; | 41 | class QFont; |
42 | 42 | ||
43 | /** | 43 | /** |
44 | * A Configuration class based on the Qtopia @ref Config class | 44 | * A Configuration class based on the Qtopia @ref Config class |
45 | * featuring additional handling of color and font entries | 45 | * featuring additional handling of color and font entries |
46 | */ | 46 | */ |
47 | 47 | ||
48 | class OConfig : public OpieConfig | 48 | class OConfig : public Config |
49 | { | 49 | { |
50 | public: | 50 | public: |
51 | /** | 51 | /** |
52 | * Constructs a OConfig object with a @a name. | 52 | * Constructs a OConfig object with a @a name. |
53 | */ | 53 | */ |
54 | OConfig( const QString &name, Domain domain = User ); | 54 | OConfig( const QString &name, Domain domain = User ); |
55 | /** | 55 | /** |
56 | * Destructs the OConfig object. | 56 | * Destructs the OConfig object. |
57 | * | 57 | * |
58 | * Writes back any dirty configuration entries, and destroys | 58 | * Writes back any dirty configuration entries, and destroys |
59 | * dynamically created objects. | 59 | * dynamically created objects. |
60 | */ | 60 | */ |
61 | virtual ~OConfig(); | 61 | virtual ~OConfig(); |
62 | /** | 62 | /** |
63 | * @returns the name of the current group. | 63 | * @returns the name of the current group. |
64 | * The current group is used for searching keys and accessing entries. | 64 | * The current group is used for searching keys and accessing entries. |
65 | */ | 65 | */ |
66 | const QString& group() { return OpieConfig::group(); }; | 66 | const QString& group() { return git.key(); }; |
67 | /** | 67 | /** |
68 | * @returns a @ref QColor entry or a @a default value if the key is not found. | 68 | * @returns a @ref QColor entry or a @a default value if the key is not found. |
69 | */ | 69 | */ |
70 | QColor readColorEntry( const QString& key, const QColor* pDefault ) const; | 70 | QColor readColorEntry( const QString& key, const QColor* pDefault ) const; |
71 | /** | 71 | /** |
72 | * @returns a @ref QFont value or a @a default value if the key is not found. | 72 | * @returns a @ref QFont value or a @a default value if the key is not found. |
73 | */ | 73 | */ |
74 | QFont readFontEntry( const QString& key, const QFont* pDefault ) const; | 74 | QFont readFontEntry( const QString& key, const QFont* pDefault ) const; |
75 | }; | 75 | }; |
76 | 76 | ||
77 | /** | 77 | /** |
78 | * @brief Helper class for easier use of OConfig groups. | 78 | * @brief Helper class for easier use of OConfig groups. |
79 | * | 79 | * |
80 | * Careful programmers always set the group of a | 80 | * Careful programmers always set the group of a |
81 | * @ref OConfig object to the group they want to read from | 81 | * @ref OConfig object to the group they want to read from |
82 | * and set it back to the old one of afterwards. This is usually | 82 | * and set it back to the old one of afterwards. This is usually |
83 | * written as: | 83 | * written as: |
84 | * <pre> | 84 | * <pre> |
85 | * | 85 | * |
86 | * QString oldgroup config()->group(); | 86 | * QString oldgroup config()->group(); |
87 | * config()->setGroup( "TheGroupThatIWant" ); | 87 | * config()->setGroup( "TheGroupThatIWant" ); |
88 | * ... | 88 | * ... |
89 | * config()->writeEntry( "Blah", "Blubb" ); | 89 | * config()->writeEntry( "Blah", "Blubb" ); |
90 | * | 90 | * |
diff --git a/libopie2/opiecore/odebug.cpp b/libopie2/opiecore/odebug.cpp index b2a37bc..4505ce7 100644 --- a/libopie2/opiecore/odebug.cpp +++ b/libopie2/opiecore/odebug.cpp | |||
@@ -1,30 +1,29 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of the Opie Project | 2 | This file is part of the Opie Project |
3 | (C) 2003 Michael 'Mickey' Lauer (mickey@tm.informatik.uni-frankfurt.de) | 3 | (C) 2003 Michael 'Mickey' Lauer (mickey@tm.informatik.uni-frankfurt.de) |
4 | Inspired by the KDE debug classes, which are | ||
5 | (C) 1997 Matthias Kalle Dalheimer (kalle@kde.org) | ||
6 | (C) 2002 Holger Freyther (freyther@kde.org) | 4 | (C) 2002 Holger Freyther (freyther@kde.org) |
5 | (C) 1997 Matthias Kalle Dalheimer (kalle@kde.org) | ||
7 | =. | 6 | =. |
8 | .=l. | 7 | .=l. |
9 | .>+-= | 8 | .>+-= |
10 | _;:, .> :=|. This program is free software; you can | 9 | _;:, .> :=|. This program is free software; you can |
11 | .> <`_, > . <= redistribute it and/or modify it under | 10 | .> <`_, > . <= redistribute it and/or modify it under |
12 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public | 11 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public |
13 | .="- .-=="i, .._ License as published by the Free Software | 12 | .="- .-=="i, .._ License as published by the Free Software |
14 | - . .-<_> .<> Foundation; either version 2 of the License, | 13 | - . .-<_> .<> Foundation; either version 2 of the License, |
15 | ._= =} : or (at your option) any later version. | 14 | ._= =} : or (at your option) any later version. |
16 | .%`+i> _;_. | 15 | .%`+i> _;_. |
17 | .i_,=:_. -<s. This program is distributed in the hope that | 16 | .i_,=:_. -<s. This program is distributed in the hope that |
18 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 17 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
19 | : .. .:, . . . without even the implied warranty of | 18 | : .. .:, . . . without even the implied warranty of |
20 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 19 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
21 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | 20 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU |
22 | ..}^=.= = ; Library General Public License for more | 21 | ..}^=.= = ; Library General Public License for more |
23 | ++= -. .` .: details. | 22 | ++= -. .` .: details. |
24 | : = ...= . :.=- | 23 | : = ...= . :.=- |
25 | -. .:....=;==+<; You should have received a copy of the GNU | 24 | -. .:....=;==+<; You should have received a copy of the GNU |
26 | -_. . . )=. = Library General Public License along with | 25 | -_. . . )=. = Library General Public License along with |
27 | -- :-=` this library; see the file COPYING.LIB. | 26 | -- :-=` this library; see the file COPYING.LIB. |
28 | If not, write to the Free Software Foundation, | 27 | If not, write to the Free Software Foundation, |
29 | Inc., 59 Temple Place - Suite 330, | 28 | Inc., 59 Temple Place - Suite 330, |
30 | Boston, MA 02111-1307, USA. | 29 | Boston, MA 02111-1307, USA. |
diff --git a/libopie2/opiecore/oglobal.cpp b/libopie2/opiecore/oglobal.cpp index f6071be..ae2fcb6 100644 --- a/libopie2/opiecore/oglobal.cpp +++ b/libopie2/opiecore/oglobal.cpp | |||
@@ -9,28 +9,35 @@ | |||
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, |
13 | ._= =} : or (at your option) any later version. | 13 | ._= =} : or (at your option) any later version. |
14 | .%`+i> _;_. | 14 | .%`+i> _;_. |
15 | .i_,=:_. -<s. This program is distributed in the hope that | 15 | .i_,=:_. -<s. This program is distributed in the hope that |
16 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 16 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
17 | : .. .:, . . . without even the implied warranty of | 17 | : .. .:, . . . without even the implied warranty of |
18 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 18 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
19 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | 19 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU |
20 | ..}^=.= = ; Library General Public License for more | 20 | ..}^=.= = ; Library General Public License for more |
21 | ++= -. .` .: details. | 21 | ++= -. .` .: details. |
22 | : = ...= . :.=- | 22 | : = ...= . :.=- |
23 | -. .:....=;==+<; You should have received a copy of the GNU | 23 | -. .:....=;==+<; You should have received a copy of the GNU |
24 | -_. . . )=. = Library General Public License along with | 24 | -_. . . )=. = Library General Public License along with |
25 | -- :-=` this library; see the file COPYING.LIB. | 25 | -- :-=` this library; see the file COPYING.LIB. |
26 | If not, write to the Free Software Foundation, | 26 | If not, write to the Free Software Foundation, |
27 | Inc., 59 Temple Place - Suite 330, | 27 | Inc., 59 Temple Place - Suite 330, |
28 | Boston, MA 02111-1307, USA. | 28 | Boston, MA 02111-1307, USA. |
29 | */ | 29 | */ |
30 | 30 | ||
31 | #include <opie2/oglobal.h> | 31 | #include <opie2/oglobal.h> |
32 | 32 | ||
33 | OConfig* OGlobal::_config = 0; | ||
34 | |||
33 | OConfig* OGlobal::config() | 35 | OConfig* OGlobal::config() |
34 | { | 36 | { |
35 | return globalconfig; | 37 | if ( !OGlobal::_config ) |
38 | { | ||
39 | qDebug( "OGlobal::creating global configuration instance." ); | ||
40 | OGlobal::_config = new OConfig( "global" ); | ||
41 | } | ||
42 | return OGlobal::_config; | ||
36 | } | 43 | } |
diff --git a/libopie2/opiecore/oglobal.h b/libopie2/opiecore/oglobal.h index 23cedde..2dc4f9e 100644 --- a/libopie2/opiecore/oglobal.h +++ b/libopie2/opiecore/oglobal.h | |||
@@ -1,49 +1,49 @@ | |||
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 Michael 'Mickey' Lauer <mickey@Vanille.de> | |
4 | Copyright (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, |
13 | ._= =} : or (at your option) any later version. | 12 | ._= =} : or (at your option) any later version. |
14 | .%`+i> _;_. | 13 | .%`+i> _;_. |
15 | .i_,=:_. -<s. This program is distributed in the hope that | 14 | .i_,=:_. -<s. This program is distributed in the hope that |
16 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 15 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
17 | : .. .:, . . . without even the implied warranty of | 16 | : .. .:, . . . without even the implied warranty of |
18 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 17 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
19 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | 18 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU |
20 | ..}^=.= = ; Library General Public License for more | 19 | ..}^=.= = ; Library General Public License for more |
21 | ++= -. .` .: details. | 20 | ++= -. .` .: details. |
22 | : = ...= . :.=- | 21 | : = ...= . :.=- |
23 | -. .:....=;==+<; You should have received a copy of the GNU | 22 | -. .:....=;==+<; You should have received a copy of the GNU |
24 | -_. . . )=. = Library General Public License along with | 23 | -_. . . )=. = Library General Public License along with |
25 | -- :-=` this library; see the file COPYING.LIB. | 24 | -- :-=` this library; see the file COPYING.LIB. |
26 | If not, write to the Free Software Foundation, | 25 | If not, write to the Free Software Foundation, |
27 | Inc., 59 Temple Place - Suite 330, | 26 | Inc., 59 Temple Place - Suite 330, |
28 | Boston, MA 02111-1307, USA. | 27 | Boston, MA 02111-1307, USA. |
29 | */ | 28 | */ |
30 | 29 | ||
31 | #ifndef OGLOBAL_H | 30 | #ifndef OGLOBAL_H |
32 | #define OGLOBAL_H | 31 | #define OGLOBAL_H |
33 | 32 | ||
34 | #include <qpe/global.h> | ||
35 | #include <opie2/oconfig.h> | 33 | #include <opie2/oconfig.h> |
36 | 34 | ||
37 | static OConfig *globalconfig = new OConfig( "global" ); | 35 | //FIXME Is it wise or even necessary to inherit OGlobal from Global? |
38 | |||
39 | //FIXME: Is it wise or even necessary to inherit OGlobal from Global? | ||
40 | // once we totally skip libqpe it should ideally swallow Global -zecke | 36 | // once we totally skip libqpe it should ideally swallow Global -zecke |
37 | // You're right. I deleted global as the base class. -mickeyl | ||
41 | 38 | ||
42 | class OGlobal : public Global | 39 | class OGlobal |
43 | { | 40 | { |
44 | public: | 41 | public: |
45 | // do we want to put that into OApplication as in KApplication -zecke | 42 | //FIXME Do we want to put that into OApplication as in KApplication? -zecke |
43 | // We already have a per-application config in OApplication | ||
44 | // ( accessed through oApp->config() ), but this one is the global one! -mickeyl | ||
46 | static OConfig* config(); | 45 | static OConfig* config(); |
46 | static OConfig* _config; | ||
47 | }; | 47 | }; |
48 | 48 | ||
49 | #endif // OGLOBAL_H | 49 | #endif // OGLOBAL_H |
diff --git a/libopie2/opiecore/oglobalsettings.cpp b/libopie2/opiecore/oglobalsettings.cpp index 1799529..66adbd0 100644 --- a/libopie2/opiecore/oglobalsettings.cpp +++ b/libopie2/opiecore/oglobalsettings.cpp | |||
@@ -17,48 +17,49 @@ | |||
17 | .i_,=:_. -<s. This program is distributed in the hope that | 17 | .i_,=:_. -<s. This program is distributed in the hope that |
18 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 18 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
19 | : .. .:, . . . without even the implied warranty of | 19 | : .. .:, . . . without even the implied warranty of |
20 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 20 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
21 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | 21 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU |
22 | ..}^=.= = ; Library General Public License for more | 22 | ..}^=.= = ; Library General Public License for more |
23 | ++= -. .` .: details. | 23 | ++= -. .` .: details. |
24 | : = ...= . :.=- | 24 | : = ...= . :.=- |
25 | -. .:....=;==+<; You should have received a copy of the GNU | 25 | -. .:....=;==+<; You should have received a copy of the GNU |
26 | -_. . . )=. = Library General Public License along with | 26 | -_. . . )=. = Library General Public License along with |
27 | -- :-=` this library; see the file COPYING.LIB. | 27 | -- :-=` this library; see the file COPYING.LIB. |
28 | If not, write to the Free Software Foundation, | 28 | If not, write to the Free Software Foundation, |
29 | Inc., 59 Temple Place - Suite 330, | 29 | Inc., 59 Temple Place - Suite 330, |
30 | Boston, MA 02111-1307, USA. | 30 | Boston, MA 02111-1307, USA. |
31 | */ | 31 | */ |
32 | 32 | ||
33 | /* OPIE */ | 33 | /* OPIE */ |
34 | 34 | ||
35 | #include <opie2/oglobalsettings.h> | 35 | #include <opie2/oglobalsettings.h> |
36 | #include <opie2/oconfig.h> | 36 | #include <opie2/oconfig.h> |
37 | #include <opie2/oglobal.h> | 37 | #include <opie2/oglobal.h> |
38 | 38 | ||
39 | /* QT */ | 39 | /* QT */ |
40 | 40 | ||
41 | #include <qobject.h> | ||
41 | #include <qdir.h> | 42 | #include <qdir.h> |
42 | #include <qpixmap.h> | 43 | #include <qpixmap.h> |
43 | #include <qfontinfo.h> | 44 | #include <qfontinfo.h> |
44 | 45 | ||
45 | /* UNIX */ | 46 | /* UNIX */ |
46 | 47 | ||
47 | #include <stdlib.h> | 48 | #include <stdlib.h> |
48 | 49 | ||
49 | QString* OGlobalSettings::s_desktopPath = 0; | 50 | QString* OGlobalSettings::s_desktopPath = 0; |
50 | QString* OGlobalSettings::s_autostartPath = 0; | 51 | QString* OGlobalSettings::s_autostartPath = 0; |
51 | QString* OGlobalSettings::s_trashPath = 0; | 52 | QString* OGlobalSettings::s_trashPath = 0; |
52 | QString* OGlobalSettings::s_documentPath = 0; | 53 | QString* OGlobalSettings::s_documentPath = 0; |
53 | QFont *OGlobalSettings::_generalFont = 0; | 54 | QFont *OGlobalSettings::_generalFont = 0; |
54 | QFont *OGlobalSettings::_fixedFont = 0; | 55 | QFont *OGlobalSettings::_fixedFont = 0; |
55 | QFont *OGlobalSettings::_toolBarFont = 0; | 56 | QFont *OGlobalSettings::_toolBarFont = 0; |
56 | QFont *OGlobalSettings::_menuFont = 0; | 57 | QFont *OGlobalSettings::_menuFont = 0; |
57 | QFont *OGlobalSettings::_windowTitleFont = 0; | 58 | QFont *OGlobalSettings::_windowTitleFont = 0; |
58 | QFont *OGlobalSettings::_taskbarFont = 0; | 59 | QFont *OGlobalSettings::_taskbarFont = 0; |
59 | 60 | ||
60 | QColor *OGlobalSettings::OpieGray = 0; | 61 | QColor *OGlobalSettings::OpieGray = 0; |
61 | QColor *OGlobalSettings::OpieHighlight = 0; | 62 | QColor *OGlobalSettings::OpieHighlight = 0; |
62 | QColor *OGlobalSettings::OpieAlternate = 0; | 63 | QColor *OGlobalSettings::OpieAlternate = 0; |
63 | 64 | ||
64 | OGlobalSettings::OMouseSettings *OGlobalSettings::s_mouseSettings = 0; | 65 | OGlobalSettings::OMouseSettings *OGlobalSettings::s_mouseSettings = 0; |
diff --git a/libopie2/opiecore/opiecore.pro b/libopie2/opiecore/opiecore.pro index fe5800e..5d630ea 100644 --- a/libopie2/opiecore/opiecore.pro +++ b/libopie2/opiecore/opiecore.pro | |||
@@ -4,40 +4,40 @@ DESTDIR = $(OPIEDIR)/lib | |||
4 | HEADERS = oapplication.h \ | 4 | HEADERS = oapplication.h \ |
5 | opieapplication.h \ | 5 | opieapplication.h \ |
6 | oconfig.h \ | 6 | oconfig.h \ |
7 | opieconfig.h \ | 7 | opieconfig.h \ |
8 | ocompletionbase.h \ | 8 | ocompletionbase.h \ |
9 | ocompletion.h \ | 9 | ocompletion.h \ |
10 | odebug.h \ | 10 | odebug.h \ |
11 | oglobal.h \ | 11 | oglobal.h \ |
12 | oglobalsettings.h \ | 12 | oglobalsettings.h \ |
13 | osortablevaluelist.h | 13 | osortablevaluelist.h |
14 | 14 | ||
15 | 15 | ||
16 | SOURCES = oapplication.cpp \ | 16 | SOURCES = oapplication.cpp \ |
17 | opieapplication.cpp \ | 17 | opieapplication.cpp \ |
18 | oconfig.cpp \ | 18 | oconfig.cpp \ |
19 | opieconfig.cpp \ | 19 | opieconfig.cpp \ |
20 | ocompletionbase.cpp \ | 20 | ocompletionbase.cpp \ |
21 | ocompletion.cpp \ | 21 | ocompletion.cpp \ |
22 | odebug.cpp \ | 22 | odebug.cpp \ |
23 | oglobal.cpp \ | 23 | oglobal.cpp \ |
24 | oglobalsettings.cpp | 24 | oglobalsettings.cpp |
25 | 25 | ||
26 | INTERFACES = | 26 | INTERFACES = |
27 | TARGET = opiecore2 | 27 | TARGET = opiecore2 |
28 | VERSION = 1.8.1 | 28 | VERSION = 1.8.2 |
29 | INCLUDEPATH += $(OPIEDIR)/include | 29 | INCLUDEPATH += $(OPIEDIR)/include |
30 | DEPENDPATH += $(OPIEDIR)/include | 30 | DEPENDPATH += $(OPIEDIR)/include |
31 | MOC_DIR = moc | 31 | MOC_DIR = moc |
32 | OBJECTS_DIR = obj | 32 | OBJECTS_DIR = obj |
33 | 33 | ||
34 | 34 | ||
35 | !contains( platform, x11 ) { | 35 | !contains( platform, x11 ) { |
36 | LIBS = -lqpe | 36 | LIBS = -lqpe |
37 | include ( $(OPIEDIR)/include.pro ) | 37 | include ( $(OPIEDIR)/include.pro ) |
38 | } | 38 | } |
39 | 39 | ||
40 | contains( platform, x11 ) { | 40 | contains( platform, x11 ) { |
41 | LIBS = -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib | 41 | LIBS = -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib |
42 | } | 42 | } |
43 | 43 | ||
diff --git a/libopie2/opiedb/libopiedb2.control b/libopie2/opiedb/libopiedb2.control index 3fe3820..5500dc8 100644 --- a/libopie2/opiedb/libopiedb2.control +++ b/libopie2/opiedb/libopiedb2.control | |||
@@ -1,11 +1,11 @@ | |||
1 | Package: libopiedb2 | 1 | Package: libopiedb2 |
2 | Files: $OPIEDIR/lib/libopiedb2.so* | 2 | Files: $OPIEDIR/lib/libopiedb2.so* |
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: libqpe1, libopiecore2 (1.8.2) |
9 | Provides: libopiedb2 | 9 | Provides: libopiedb2 |
10 | Description: Opie library 2.0 DB | 10 | Description: Opie library 2.0 DB |
11 | 11 | ||
diff --git a/libopie2/opiedb/opiedb.pro b/libopie2/opiedb/opiedb.pro index 6a4e8f1..d869e6f 100644 --- a/libopie2/opiedb/opiedb.pro +++ b/libopie2/opiedb/opiedb.pro | |||
@@ -1,41 +1,41 @@ | |||
1 | TEMPLATE = lib | 1 | TEMPLATE = lib |
2 | #CONFIG += qt warn_on debug | 2 | #CONFIG += qt warn_on debug |
3 | CONFIG += qt warn_on release | 3 | CONFIG += qt warn_on release |
4 | DESTDIR = $(OPIEDIR)/lib | 4 | DESTDIR = $(OPIEDIR)/lib |
5 | HEADERS = osqlbackend.h \ | 5 | HEADERS = osqlbackend.h \ |
6 | osqldriver.h \ | 6 | osqldriver.h \ |
7 | osqlerror.h \ | 7 | osqlerror.h \ |
8 | osqlmanager.h \ | 8 | osqlmanager.h \ |
9 | osqlquery.h \ | 9 | osqlquery.h \ |
10 | osqlresult.h \ | 10 | osqlresult.h \ |
11 | osqltable.h \ | 11 | osqltable.h \ |
12 | osqlbackendmanager.h \ | 12 | osqlbackendmanager.h \ |
13 | osqlitedriver.h | 13 | osqlitedriver.h |
14 | SOURCES = osqlbackend.cpp \ | 14 | SOURCES = osqlbackend.cpp \ |
15 | osqldriver.cpp \ | 15 | osqldriver.cpp \ |
16 | osqlerror.cpp \ | 16 | osqlerror.cpp \ |
17 | osqlmanager.cpp \ | 17 | osqlmanager.cpp \ |
18 | osqlquery.cpp \ | 18 | osqlquery.cpp \ |
19 | osqlresult.cpp \ | 19 | osqlresult.cpp \ |
20 | osqltable.cpp \ | 20 | osqltable.cpp \ |
21 | osqlbackendmanager.cpp \ | 21 | osqlbackendmanager.cpp \ |
22 | osqlitedriver.cpp | 22 | osqlitedriver.cpp |
23 | INTERFACES = | 23 | INTERFACES = |
24 | TARGET = opiedb2 | 24 | TARGET = opiedb2 |
25 | VERSION = 1.8.1 | 25 | VERSION = 1.8.2 |
26 | INCLUDEPATH += $(OPIEDIR)/include | 26 | INCLUDEPATH += $(OPIEDIR)/include |
27 | DEPENDPATH += $(OPIEDIR)/include | 27 | DEPENDPATH += $(OPIEDIR)/include |
28 | 28 | ||
29 | MOC_DIR = moc | 29 | MOC_DIR = moc |
30 | OBJECTS_DIR = obj | 30 | OBJECTS_DIR = obj |
31 | 31 | ||
32 | LIBS += -lsqlite -lqpe | 32 | LIBS += -lsqlite -lqpe |
33 | 33 | ||
34 | !contains( platform, x11 ) { | 34 | !contains( platform, x11 ) { |
35 | include ( $(OPIEDIR)/include.pro ) | 35 | include ( $(OPIEDIR)/include.pro ) |
36 | } | 36 | } |
37 | 37 | ||
38 | contains( platform, x11 ) { | 38 | contains( platform, x11 ) { |
39 | LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib | 39 | LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib |
40 | } | 40 | } |
41 | 41 | ||
diff --git a/libopie2/opiemm/libopiemm2.control b/libopie2/opiemm/libopiemm2.control index 7fbadef..f528969 100644 --- a/libopie2/opiemm/libopiemm2.control +++ b/libopie2/opiemm/libopiemm2.control | |||
@@ -1,11 +1,11 @@ | |||
1 | Package: libopiemm2 | 1 | Package: libopiemm2 |
2 | Files: $OPIEDIR/lib/libopiemm2.so.* | 2 | Files: $OPIEDIR/lib/libopiemm2.so.* |
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: libqpe1, libopiecore2 (1.8.2) |
9 | Provides: libopiemm2 | 9 | Provides: libopiemm2 |
10 | Description: Opie library 2.0 MM | 10 | Description: Opie library 2.0 MM |
11 | 11 | ||
diff --git a/libopie2/opiemm/opiemm.pro b/libopie2/opiemm/opiemm.pro index d3ce8f7..d5c8238 100644 --- a/libopie2/opiemm/opiemm.pro +++ b/libopie2/opiemm/opiemm.pro | |||
@@ -1,22 +1,22 @@ | |||
1 | TEMPLATE = lib | 1 | TEMPLATE = lib |
2 | CONFIG += qt warn_on debug | 2 | CONFIG += qt warn_on debug |
3 | DESTDIR = $(OPIEDIR)/lib | 3 | DESTDIR = $(OPIEDIR)/lib |
4 | HEADERS = osoundsystem.h | 4 | HEADERS = osoundsystem.h |
5 | SOURCES = osoundsystem.cpp | 5 | SOURCES = osoundsystem.cpp |
6 | INTERFACES = | 6 | INTERFACES = |
7 | TARGET = opiemm2 | 7 | TARGET = opiemm2 |
8 | VERSION = 1.8.1 | 8 | VERSION = 1.8.2 |
9 | INCLUDEPATH += $(OPIEDIR)/include | 9 | INCLUDEPATH += $(OPIEDIR)/include |
10 | DEPENDPATH += $(OPIEDIR)/include | 10 | DEPENDPATH += $(OPIEDIR)/include |
11 | LIBS += | 11 | LIBS += |
12 | MOC_DIR = moc | 12 | MOC_DIR = moc |
13 | OBJECTS_DIR = obj | 13 | OBJECTS_DIR = obj |
14 | 14 | ||
15 | 15 | ||
16 | !contains( platform, x11 ) { | 16 | !contains( platform, x11 ) { |
17 | include ( $(OPIEDIR)/include.pro ) | 17 | include ( $(OPIEDIR)/include.pro ) |
18 | } | 18 | } |
19 | 19 | ||
20 | contains( platform, x11 ) { | 20 | contains( platform, x11 ) { |
21 | LIBS = -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib | 21 | LIBS = -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib |
22 | } | 22 | } |
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 | |||
@@ -177,24 +177,25 @@ struct dhcp_packet { | |||
177 | #define DHCPREQUEST3 | 177 | #define DHCPREQUEST3 |
178 | #define DHCPDECLINE4 | 178 | #define DHCPDECLINE4 |
179 | #define DHCPACK 5 | 179 | #define DHCPACK 5 |
180 | #define DHCPNAK 6 | 180 | #define DHCPNAK 6 |
181 | #define DHCPRELEASE7 | 181 | #define DHCPRELEASE7 |
182 | #define DHCPINFORM8 | 182 | #define DHCPINFORM8 |
183 | 183 | ||
184 | /* Relay Agent Information option subtypes: */ | 184 | /* Relay Agent Information option subtypes: */ |
185 | #define RAI_CIRCUIT_ID1 | 185 | #define RAI_CIRCUIT_ID1 |
186 | #define RAI_REMOTE_ID2 | 186 | #define RAI_REMOTE_ID2 |
187 | #define RAI_AGENT_ID3 | 187 | #define RAI_AGENT_ID3 |
188 | 188 | ||
189 | /* FQDN suboptions: */ | 189 | /* FQDN suboptions: */ |
190 | #define FQDN_NO_CLIENT_UPDATE 1 | 190 | #define FQDN_NO_CLIENT_UPDATE 1 |
191 | #define FQDN_SERVER_UPDATE 2 | 191 | #define FQDN_SERVER_UPDATE 2 |
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 \ No newline at end of file |
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,34 +1,36 @@ | |||
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") ); |
19 | _map.insert( 0x890D, new QString("SIOCRTMSG") ); | 21 | _map.insert( 0x890D, new QString("SIOCRTMSG") ); |
20 | _map.insert( 0x8910, new QString("SIOCGIFNAME") ); | 22 | _map.insert( 0x8910, new QString("SIOCGIFNAME") ); |
21 | _map.insert( 0x8911, new QString("SIOCSIFLINK") ); | 23 | _map.insert( 0x8911, new QString("SIOCSIFLINK") ); |
22 | _map.insert( 0x8912, new QString("SIOCGIFCONF") ); | 24 | _map.insert( 0x8912, new QString("SIOCGIFCONF") ); |
23 | _map.insert( 0x8913, new QString("SIOCGIFFLAGS") ); | 25 | _map.insert( 0x8913, new QString("SIOCGIFFLAGS") ); |
24 | _map.insert( 0x8914, new QString("SIOCSIFFLAGS") ); | 26 | _map.insert( 0x8914, new QString("SIOCSIFFLAGS") ); |
25 | _map.insert( 0x8915, new QString("SIOCGIFADDR") ); | 27 | _map.insert( 0x8915, new QString("SIOCGIFADDR") ); |
26 | _map.insert( 0x8916, new QString("SIOCSIFADDR") ); | 28 | _map.insert( 0x8916, new QString("SIOCSIFADDR") ); |
27 | _map.insert( 0x8917, new QString("SIOCGIFDSTADDR") ); | 29 | _map.insert( 0x8917, new QString("SIOCGIFDSTADDR") ); |
28 | _map.insert( 0x8918, new QString("SIOCSIFDSTADDR") ); | 30 | _map.insert( 0x8918, new QString("SIOCSIFDSTADDR") ); |
29 | _map.insert( 0x8919, new QString("SIOCGIFBRDADDR") ); | 31 | _map.insert( 0x8919, new QString("SIOCGIFBRDADDR") ); |
30 | _map.insert( 0x891a, new QString("SIOCSIFBRDADDR") ); | 32 | _map.insert( 0x891a, new QString("SIOCSIFBRDADDR") ); |
31 | _map.insert( 0x891b, new QString("SIOCGIFNETMASK") ); | 33 | _map.insert( 0x891b, new QString("SIOCGIFNETMASK") ); |
32 | _map.insert( 0x891c, new QString("SIOCSIFNETMASK") ); | 34 | _map.insert( 0x891c, new QString("SIOCSIFNETMASK") ); |
33 | _map.insert( 0x891d, new QString("SIOCGIFMETRIC") ); | 35 | _map.insert( 0x891d, new QString("SIOCGIFMETRIC") ); |
34 | _map.insert( 0x891e, new QString("SIOCSIFMETRIC") ); | 36 | _map.insert( 0x891e, new QString("SIOCSIFMETRIC") ); |
@@ -170,44 +172,44 @@ DebugMapper::DebugMapper() | |||
170 | _map.insert( 0x8955, new QString("SIOCSARP") ); | 172 | _map.insert( 0x8955, new QString("SIOCSARP") ); |
171 | _map.insert( 0x8960, new QString("SIOCDRARP") ); | 173 | _map.insert( 0x8960, new QString("SIOCDRARP") ); |
172 | _map.insert( 0x8961, new QString("SIOCGRARP") ); | 174 | _map.insert( 0x8961, new QString("SIOCGRARP") ); |
173 | _map.insert( 0x8962, new QString("SIOCSRARP") ); | 175 | _map.insert( 0x8962, new QString("SIOCSRARP") ); |
174 | _map.insert( 0x8970, new QString("SIOCGIFMAP") ); | 176 | _map.insert( 0x8970, new QString("SIOCGIFMAP") ); |
175 | _map.insert( 0x8971, new QString("SIOCSIFMAP") ); | 177 | _map.insert( 0x8971, new QString("SIOCSIFMAP") ); |
176 | _map.insert( 0x8980, new QString("SIOCADDDLCI") ); | 178 | _map.insert( 0x8980, new QString("SIOCADDDLCI") ); |
177 | _map.insert( 0x8981, new QString("SIOCDELDLCI") ); | 179 | _map.insert( 0x8981, new QString("SIOCDELDLCI") ); |
178 | _map.insert( 0x8982, new QString("SIOCGIFVLAN") ); | 180 | _map.insert( 0x8982, new QString("SIOCGIFVLAN") ); |
179 | _map.insert( 0x8983, new QString("SIOCSIFVLAN") ); | 181 | _map.insert( 0x8983, new QString("SIOCSIFVLAN") ); |
180 | _map.insert( 0x8990, new QString("SIOCBONDENSLAVE") ); | 182 | _map.insert( 0x8990, new QString("SIOCBONDENSLAVE") ); |
181 | _map.insert( 0x8991, new QString("SIOCBONDRELEASE") ); | 183 | _map.insert( 0x8991, new QString("SIOCBONDRELEASE") ); |
182 | _map.insert( 0x8992, new QString("SIOCBONDSETHWADDR") ); | 184 | _map.insert( 0x8992, new QString("SIOCBONDSETHWADDR") ); |
183 | _map.insert( 0x8993, new QString("SIOCBONDSLAVEINFOQUERY") ); | 185 | _map.insert( 0x8993, new QString("SIOCBONDSLAVEINFOQUERY") ); |
184 | _map.insert( 0x8994, new QString("SIOCBONDINFOQUERY") ); | 186 | _map.insert( 0x8994, new QString("SIOCBONDINFOQUERY") ); |
185 | _map.insert( 0x8995, new QString("SIOCBONDCHANGEACTIVE") ); | 187 | _map.insert( 0x8995, new QString("SIOCBONDCHANGEACTIVE") ); |
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 | ||
213 | 215 | ||
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,118 +1,131 @@ | |||
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!? |
68 | { | 86 | { |
69 | continue; | 87 | continue; |
70 | } | 88 | } |
71 | else | 89 | else |
72 | if ( addr[0] == '#' ) | 90 | if ( addr[0] == '#' ) |
73 | { | 91 | { |
74 | continue; | 92 | continue; |
75 | } | 93 | } |
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 | { |
104 | } | 117 | } |
105 | 118 | ||
106 | 119 | ||
107 | const QString& OManufacturerDB::lookup( const QString& macaddr ) const | 120 | const QString& OManufacturerDB::lookup( const QString& macaddr ) const |
108 | { | 121 | { |
109 | return manufacturers[macaddr.upper().left(8)]; | 122 | return manufacturers[macaddr.upper().left(8)]; |
110 | } | 123 | } |
111 | 124 | ||
112 | 125 | ||
113 | const QString& OManufacturerDB::lookupExt( const QString& macaddr ) const | 126 | const QString& OManufacturerDB::lookupExt( const QString& macaddr ) const |
114 | { | 127 | { |
115 | QMap<QString,QString>::ConstIterator it = manufacturersExt.find( macaddr.upper().left(8) ); | 128 | QMap<QString,QString>::ConstIterator it = manufacturersExt.find( macaddr.upper().left(8) ); |
116 | return it == manufacturersExt.end() ? lookup( macaddr ) : *it; | 129 | return it == manufacturersExt.end() ? lookup( macaddr ) : *it; |
117 | } | 130 | } |
118 | 131 | ||
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,38 +1,53 @@ | |||
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. |
23 | * | 38 | * |
24 | * This class encapsulates the lookup of Ethernet vendor given a | 39 | * This class encapsulates the lookup of Ethernet vendor given a |
25 | * certain Mac Address. Only the first three bytes define the vendor. | 40 | * certain Mac Address. Only the first three bytes define the vendor. |
26 | */ | 41 | */ |
27 | class OManufacturerDB | 42 | class OManufacturerDB |
28 | { | 43 | { |
29 | public: | 44 | public: |
30 | /** | 45 | /** |
31 | * @returns the one-and-only @ref OManufacturerDB instance. | 46 | * @returns the one-and-only @ref OManufacturerDB instance. |
32 | */ | 47 | */ |
33 | static OManufacturerDB* instance(); | 48 | static OManufacturerDB* instance(); |
34 | /** | 49 | /** |
35 | * @returns the short manufacturer string given a @a macaddr. | 50 | * @returns the short manufacturer string given a @a macaddr. |
36 | */ | 51 | */ |
37 | const QString& lookup( const QString& macaddr ) const; | 52 | const QString& lookup( const QString& macaddr ) const; |
38 | /** | 53 | /** |
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,28 +1,28 @@ | |||
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, |
13 | ._= =} : or (at your option) any later version. | 13 | ._= =} : or (at your option) any later version. |
14 | .%`+i> _;_. | 14 | .%`+i> _;_. |
15 | .i_,=:_. -<s. This program is distributed in the hope that | 15 | .i_,=:_. -<s. This program is distributed in the hope that |
16 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 16 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
17 | : .. .:, . . . without even the implied warranty of | 17 | : .. .:, . . . without even the implied warranty of |
18 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 18 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
19 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | 19 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU |
20 | ..}^=.= = ; Library General Public License for more | 20 | ..}^=.= = ; Library General Public License for more |
21 | ++= -. .` .: details. | 21 | ++= -. .` .: details. |
22 | : = ...= . :.=- | 22 | : = ...= . :.=- |
23 | -. .:....=;==+<; You should have received a copy of the GNU | 23 | -. .:....=;==+<; You should have received a copy of the GNU |
24 | -_. . . )=. = Library General Public License along with | 24 | -_. . . )=. = Library General Public License along with |
25 | -- :-=` this library; see the file COPYING.LIB. | 25 | -- :-=` this library; see the file COPYING.LIB. |
26 | If not, write to the Free Software Foundation, | 26 | If not, write to the Free Software Foundation, |
27 | Inc., 59 Temple Place - Suite 330, | 27 | Inc., 59 Temple Place - Suite 330, |
28 | Boston, MA 02111-1307, USA. | 28 | Boston, MA 02111-1307, USA. |
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,30 +1,27 @@ | |||
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, |
15 | ._= =} : or (at your option) any later version. | 12 | ._= =} : or (at your option) any later version. |
16 | .%`+i> _;_. | 13 | .%`+i> _;_. |
17 | .i_,=:_. -<s. This program is distributed in the hope that | 14 | .i_,=:_. -<s. This program is distributed in the hope that |
18 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 15 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
19 | : .. .:, . . . without even the implied warranty of | 16 | : .. .:, . . . without even the implied warranty of |
20 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 17 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
21 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | 18 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU |
22 | ..}^=.= = ; Library General Public License for more | 19 | ..}^=.= = ; Library General Public License for more |
23 | ++= -. .` .: details. | 20 | ++= -. .` .: details. |
24 | : = ...= . :.=- | 21 | : = ...= . :.=- |
25 | -. .:....=;==+<; You should have received a copy of the GNU | 22 | -. .:....=;==+<; You should have received a copy of the GNU |
26 | -_. . . )=. = Library General Public License along with | 23 | -_. . . )=. = Library General Public License along with |
27 | -- :-=` this library; see the file COPYING.LIB. | 24 | -- :-=` this library; see the file COPYING.LIB. |
28 | If not, write to the Free Software Foundation, | 25 | If not, write to the Free Software Foundation, |
29 | Inc., 59 Temple Place - Suite 330, | 26 | Inc., 59 Temple Place - Suite 330, |
30 | Boston, MA 02111-1307, USA. | 27 | Boston, MA 02111-1307, USA. |
@@ -929,48 +926,49 @@ OStationList* OWirelessNetworkInterface::scanNetwork() | |||
929 | { | 926 | { |
930 | qDebug( "SIOCGIWFREQ" ); | 927 | qDebug( "SIOCGIWFREQ" ); |
931 | stations->last()->channel = _channels[ static_cast<int>(double( we->u.freq.m ) * pow( 10.0, we->u.freq.e ) / 1000000) ]; | 928 | stations->last()->channel = _channels[ static_cast<int>(double( we->u.freq.m ) * pow( 10.0, we->u.freq.e ) / 1000000) ]; |
932 | break; | 929 | break; |
933 | } | 930 | } |
934 | case SIOCGIWESSID: | 931 | case SIOCGIWESSID: |
935 | { | 932 | { |
936 | qDebug( "SIOCGIWESSID" ); | 933 | qDebug( "SIOCGIWESSID" ); |
937 | stations->last()->ssid = we->u.essid.pointer; | 934 | stations->last()->ssid = we->u.essid.pointer; |
938 | break; | 935 | break; |
939 | } | 936 | } |
940 | case SIOCGIWSENS: qDebug( "SIOCGIWSENS" ); break; | 937 | case SIOCGIWSENS: qDebug( "SIOCGIWSENS" ); break; |
941 | case SIOCGIWENCODE: qDebug( "SIOCGIWENCODE" ); break; | 938 | case SIOCGIWENCODE: qDebug( "SIOCGIWENCODE" ); break; |
942 | case IWEVTXDROP: qDebug( "IWEVTXDROP" ); break; /* Packet dropped to excessive retry */ | 939 | case IWEVTXDROP: qDebug( "IWEVTXDROP" ); break; /* Packet dropped to excessive retry */ |
943 | case IWEVQUAL: qDebug( "IWEVQUAL" ); break; /* Quality part of statistics (scan) */ | 940 | case IWEVQUAL: qDebug( "IWEVQUAL" ); break; /* Quality part of statistics (scan) */ |
944 | case IWEVCUSTOM: qDebug( "IWEVCUSTOM" ); break; /* Driver specific ascii string */ | 941 | case IWEVCUSTOM: qDebug( "IWEVCUSTOM" ); break; /* Driver specific ascii string */ |
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; |
961 | } | 959 | } |
962 | } | 960 | } |
963 | 961 | ||
964 | 962 | ||
965 | bool OWirelessNetworkInterface::wioctl( int call, struct iwreq& iwreq ) const | 963 | bool OWirelessNetworkInterface::wioctl( int call, struct iwreq& iwreq ) const |
966 | { | 964 | { |
967 | #ifndef NODEBUG | 965 | #ifndef NODEBUG |
968 | int result = ::ioctl( _sfd, call, &iwreq ); | 966 | int result = ::ioctl( _sfd, call, &iwreq ); |
969 | if ( result == -1 ) | 967 | if ( result == -1 ) |
970 | qDebug( "ONetworkInterface::wioctl (%s) call %s (0x%04X) - Status: Failed: %d (%s)", name(), (const char*) debugmapper->map( call ), call, result, strerror( errno ) ); | 968 | qDebug( "ONetworkInterface::wioctl (%s) call %s (0x%04X) - Status: Failed: %d (%s)", name(), (const char*) debugmapper->map( call ), call, result, strerror( errno ) ); |
971 | else | 969 | else |
972 | qDebug( "ONetworkInterface::wioctl (%s) call %s (0x%04X) - Status: Ok.", name(), (const char*) debugmapper->map( call ), call ); | 970 | qDebug( "ONetworkInterface::wioctl (%s) call %s (0x%04X) - Status: Ok.", name(), (const char*) debugmapper->map( call ), call ); |
973 | return ( result != -1 ); | 971 | return ( result != -1 ); |
974 | #else | 972 | #else |
975 | return ::ioctl( _sfd, call, &iwreq ) != -1; | 973 | return ::ioctl( _sfd, call, &iwreq ) != -1; |
976 | #endif | 974 | #endif |
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,30 +1,27 @@ | |||
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, |
15 | ._= =} : or (at your option) any later version. | 12 | ._= =} : or (at your option) any later version. |
16 | .%`+i> _;_. | 13 | .%`+i> _;_. |
17 | .i_,=:_. -<s. This program is distributed in the hope that | 14 | .i_,=:_. -<s. This program is distributed in the hope that |
18 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 15 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
19 | : .. .:, . . . without even the implied warranty of | 16 | : .. .:, . . . without even the implied warranty of |
20 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 17 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
21 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | 18 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU |
22 | ..}^=.= = ; Library General Public License for more | 19 | ..}^=.= = ; Library General Public License for more |
23 | ++= -. .` .: details. | 20 | ++= -. .` .: details. |
24 | : = ...= . :.=- | 21 | : = ...= . :.=- |
25 | -. .:....=;==+<; You should have received a copy of the GNU | 22 | -. .:....=;==+<; You should have received a copy of the GNU |
26 | -_. . . )=. = Library General Public License along with | 23 | -_. . . )=. = Library General Public License along with |
27 | -- :-=` this library; see the file COPYING.LIB. | 24 | -- :-=` this library; see the file COPYING.LIB. |
28 | If not, write to the Free Software Foundation, | 25 | If not, write to the Free Software Foundation, |
29 | Inc., 59 Temple Place - Suite 330, | 26 | Inc., 59 Temple Place - Suite 330, |
30 | Boston, MA 02111-1307, USA. | 27 | Boston, MA 02111-1307, USA. |
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,30 +1,27 @@ | |||
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, |
15 | ._= =} : or (at your option) any later version. | 12 | ._= =} : or (at your option) any later version. |
16 | .%`+i> _;_. | 13 | .%`+i> _;_. |
17 | .i_,=:_. -<s. This program is distributed in the hope that | 14 | .i_,=:_. -<s. This program is distributed in the hope that |
18 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 15 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
19 | : .. .:, . . . without even the implied warranty of | 16 | : .. .:, . . . without even the implied warranty of |
20 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 17 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
21 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | 18 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU |
22 | ..}^=.= = ; Library General Public License for more | 19 | ..}^=.= = ; Library General Public License for more |
23 | ++= -. .` .: details. | 20 | ++= -. .` .: details. |
24 | : = ...= . :.=- | 21 | : = ...= . :.=- |
25 | -. .:....=;==+<; You should have received a copy of the GNU | 22 | -. .:....=;==+<; You should have received a copy of the GNU |
26 | -_. . . )=. = Library General Public License along with | 23 | -_. . . )=. = Library General Public License along with |
27 | -- :-=` this library; see the file COPYING.LIB. | 24 | -- :-=` this library; see the file COPYING.LIB. |
28 | If not, write to the Free Software Foundation, | 25 | If not, write to the Free Software Foundation, |
29 | Inc., 59 Temple Place - Suite 330, | 26 | Inc., 59 Temple Place - Suite 330, |
30 | Boston, MA 02111-1307, USA. | 27 | Boston, MA 02111-1307, USA. |
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,30 +1,27 @@ | |||
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, |
15 | ._= =} : or (at your option) any later version. | 12 | ._= =} : or (at your option) any later version. |
16 | .%`+i> _;_. | 13 | .%`+i> _;_. |
17 | .i_,=:_. -<s. This program is distributed in the hope that | 14 | .i_,=:_. -<s. This program is distributed in the hope that |
18 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 15 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
19 | : .. .:, . . . without even the implied warranty of | 16 | : .. .:, . . . without even the implied warranty of |
20 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 17 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
21 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | 18 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU |
22 | ..}^=.= = ; Library General Public License for more | 19 | ..}^=.= = ; Library General Public License for more |
23 | ++= -. .` .: details. | 20 | ++= -. .` .: details. |
24 | : = ...= . :.=- | 21 | : = ...= . :.=- |
25 | -. .:....=;==+<; You should have received a copy of the GNU | 22 | -. .:....=;==+<; You should have received a copy of the GNU |
26 | -_. . . )=. = Library General Public License along with | 23 | -_. . . )=. = Library General Public License along with |
27 | -- :-=` this library; see the file COPYING.LIB. | 24 | -- :-=` this library; see the file COPYING.LIB. |
28 | If not, write to the Free Software Foundation, | 25 | If not, write to the Free Software Foundation, |
29 | Inc., 59 Temple Place - Suite 330, | 26 | Inc., 59 Temple Place - Suite 330, |
30 | Boston, MA 02111-1307, USA. | 27 | Boston, MA 02111-1307, USA. |
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 | |||
@@ -1,34 +1,34 @@ | |||
1 | TEMPLATE = lib | 1 | TEMPLATE = lib |
2 | CONFIG += qt warn_on debug | 2 | CONFIG += qt warn_on debug |
3 | DESTDIR = $(OPIEDIR)/lib | 3 | DESTDIR = $(OPIEDIR)/lib |
4 | HEADERS = 802_11_user.h \ | 4 | HEADERS = 802_11_user.h \ |
5 | dhcp.h \ | 5 | dhcp.h \ |
6 | udp_ports.h \ | 6 | udp_ports.h \ |
7 | wireless.h \ | 7 | wireless.h \ |
8 | odebugmapper.h \ | 8 | odebugmapper.h \ |
9 | omanufacturerdb.h \ | 9 | omanufacturerdb.h \ |
10 | onetutils.h \ | 10 | onetutils.h \ |
11 | onetwork.h \ | 11 | onetwork.h \ |
12 | opcap.h \ | 12 | opcap.h \ |
13 | ostation.h | 13 | ostation.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 | } |
31 | 31 | ||
32 | contains( platform, x11 ) { | 32 | contains( platform, x11 ) { |
33 | LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib | 33 | LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib |
34 | } | 34 | } |
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,28 +1,27 @@ | |||
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, |
13 | ._= =} : or (at your option) any later version. | 12 | ._= =} : or (at your option) any later version. |
14 | .%`+i> _;_. | 13 | .%`+i> _;_. |
15 | .i_,=:_. -<s. This program is distributed in the hope that | 14 | .i_,=:_. -<s. This program is distributed in the hope that |
16 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 15 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
17 | : .. .:, . . . without even the implied warranty of | 16 | : .. .:, . . . without even the implied warranty of |
18 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 17 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
19 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | 18 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU |
20 | ..}^=.= = ; Library General Public License for more | 19 | ..}^=.= = ; Library General Public License for more |
21 | ++= -. .` .: details. | 20 | ++= -. .` .: details. |
22 | : = ...= . :.=- | 21 | : = ...= . :.=- |
23 | -. .:....=;==+<; You should have received a copy of the GNU | 22 | -. .:....=;==+<; You should have received a copy of the GNU |
24 | -_. . . )=. = Library General Public License along with | 23 | -_. . . )=. = Library General Public License along with |
25 | -- :-=` this library; see the file COPYING.LIB. | 24 | -- :-=` this library; see the file COPYING.LIB. |
26 | If not, write to the Free Software Foundation, | 25 | If not, write to the Free Software Foundation, |
27 | Inc., 59 Temple Place - Suite 330, | 26 | Inc., 59 Temple Place - Suite 330, |
28 | Boston, MA 02111-1307, USA. | 27 | Boston, MA 02111-1307, USA. |
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,28 +1,27 @@ | |||
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, |
13 | ._= =} : or (at your option) any later version. | 12 | ._= =} : or (at your option) any later version. |
14 | .%`+i> _;_. | 13 | .%`+i> _;_. |
15 | .i_,=:_. -<s. This program is distributed in the hope that | 14 | .i_,=:_. -<s. This program is distributed in the hope that |
16 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 15 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
17 | : .. .:, . . . without even the implied warranty of | 16 | : .. .:, . . . without even the implied warranty of |
18 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 17 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
19 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | 18 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU |
20 | ..}^=.= = ; Library General Public License for more | 19 | ..}^=.= = ; Library General Public License for more |
21 | ++= -. .` .: details. | 20 | ++= -. .` .: details. |
22 | : = ...= . :.=- | 21 | : = ...= . :.=- |
23 | -. .:....=;==+<; You should have received a copy of the GNU | 22 | -. .:....=;==+<; You should have received a copy of the GNU |
24 | -_. . . )=. = Library General Public License along with | 23 | -_. . . )=. = Library General Public License along with |
25 | -- :-=` this library; see the file COPYING.LIB. | 24 | -- :-=` this library; see the file COPYING.LIB. |
26 | If not, write to the Free Software Foundation, | 25 | If not, write to the Free Software Foundation, |
27 | Inc., 59 Temple Place - Suite 330, | 26 | Inc., 59 Temple Place - Suite 330, |
28 | Boston, MA 02111-1307, USA. | 27 | Boston, MA 02111-1307, USA. |
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,29 +1,29 @@ | |||
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 |
14 | #define UDP_PORT_DDTP1052 | 14 | #define UDP_PORT_DDTP1052 |
15 | #define UDP_PORT_CUPS631 | 15 | #define UDP_PORT_CUPS631 |
16 | #define UDP_PORT_DLSW 2067 | 16 | #define UDP_PORT_DLSW 2067 |
17 | #define UDP_PORT_ISAKMP500 | 17 | #define UDP_PORT_ISAKMP500 |
18 | #define UDP_PORT_L2TP 1701 | 18 | #define UDP_PORT_L2TP 1701 |
19 | #define UDP_PORT_IAPP 2313 | 19 | #define UDP_PORT_IAPP 2313 |
20 | #define UDP_PORT_HSRP 1985 | 20 | #define UDP_PORT_HSRP 1985 |
21 | #define UDP_PORT_SSDP 1900 | 21 | #define UDP_PORT_SSDP 1900 |
22 | #define UDP_PORT_TACACS49 | 22 | #define UDP_PORT_TACACS49 |
23 | #define UDP_PORT_CLDAP 389 | 23 | #define UDP_PORT_CLDAP 389 |
24 | #define UDP_PORT_VINES573 | 24 | #define UDP_PORT_VINES573 |
25 | #define UDP_PORT_NBNS137 | 25 | #define UDP_PORT_NBNS137 |
26 | #define UDP_PORT_NBDGM138 | 26 | #define UDP_PORT_NBDGM138 |
27 | #define UDP_PORT_XYPLEX 173 | 27 | #define UDP_PORT_XYPLEX 173 |
28 | #define UDP_PORT_PIM_RP_DISC 496 | 28 | #define UDP_PORT_PIM_RP_DISC 496 |
29 | #define UDP_PORT_SLIMP3_V1 1069 | 29 | #define UDP_PORT_SLIMP3_V1 1069 |
diff --git a/libopie2/opiepim/libopiepim2.control b/libopie2/opiepim/libopiepim2.control index 5cfa453..ac8e13c 100644 --- a/libopie2/opiepim/libopiepim2.control +++ b/libopie2/opiepim/libopiepim2.control | |||
@@ -1,11 +1,11 @@ | |||
1 | Package: libopiepim2 | 1 | Package: libopiepim2 |
2 | Files: $OPIEDIR/lib/libopiepim2.so.* | 2 | Files: $OPIEDIR/lib/libopiepim2.so.* |
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: libqpe1, libopiecore2 (1.8.2) |
9 | Provides: libopiepim2 | 9 | Provides: libopiepim2 |
10 | Description: Opie library 2.0 PIM | 10 | Description: Opie library 2.0 PIM |
11 | 11 | ||
diff --git a/libopie2/opiepim/opiepim.pro b/libopie2/opiepim/opiepim.pro index cc6ee90..3972c3f 100644 --- a/libopie2/opiepim/opiepim.pro +++ b/libopie2/opiepim/opiepim.pro | |||
@@ -1,24 +1,24 @@ | |||
1 | TEMPLATE = lib | 1 | TEMPLATE = lib |
2 | CONFIG += qt warn_on debug | 2 | CONFIG += qt warn_on debug |
3 | DESTDIR = $(OPIEDIR)/lib | 3 | DESTDIR = $(OPIEDIR)/lib |
4 | HEADERS = | 4 | HEADERS = |
5 | 5 | ||
6 | SOURCES = | 6 | SOURCES = |
7 | INTERFACES = | 7 | INTERFACES = |
8 | TARGET = opiepim2 | 8 | TARGET = opiepim2 |
9 | VERSION = 1.8.1 | 9 | VERSION = 1.8.2 |
10 | INCLUDEPATH += $(OPIEDIR)/include | 10 | INCLUDEPATH += $(OPIEDIR)/include |
11 | DEPENDPATH += $(OPIEDIR)/include | 11 | DEPENDPATH += $(OPIEDIR)/include |
12 | 12 | ||
13 | MOC_DIR = moc | 13 | MOC_DIR = moc |
14 | OBJECTS_DIR = obj | 14 | OBJECTS_DIR = obj |
15 | 15 | ||
16 | 16 | ||
17 | !contains( platform, x11 ) { | 17 | !contains( platform, x11 ) { |
18 | include ( $(OPIEDIR)/include.pro ) | 18 | include ( $(OPIEDIR)/include.pro ) |
19 | } | 19 | } |
20 | 20 | ||
21 | contains( platform, x11 ) { | 21 | contains( platform, x11 ) { |
22 | LIBS = -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib | 22 | LIBS = -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib |
23 | } | 23 | } |
24 | 24 | ||
diff --git a/libopie2/opieui/libopieui2.control b/libopie2/opieui/libopieui2.control index 6900fd6..71e6358 100644 --- a/libopie2/opieui/libopieui2.control +++ b/libopie2/opieui/libopieui2.control | |||
@@ -1,11 +1,11 @@ | |||
1 | Package: libopieui2 | 1 | Package: libopieui2 |
2 | Files: $OPIEDIR/lib/libopieui2.so.* | 2 | Files: $OPIEDIR/lib/libopieui2.so.* |
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: libqpe1, libopiecore2 (1.8.2) |
9 | Provides: libopieui2 | 9 | Provides: libopieui2 |
10 | Description: Opie library 2.0 UI | 10 | Description: Opie library 2.0 UI |
11 | 11 | ||
diff --git a/libopie2/opieui/opieui.pro b/libopie2/opieui/opieui.pro index 68a5c5f..4c15181 100644 --- a/libopie2/opieui/opieui.pro +++ b/libopie2/opieui/opieui.pro | |||
@@ -25,43 +25,43 @@ HEADERS = ocompletionbox.h \ | |||
25 | 25 | ||
26 | SOURCES = ocompletionbox.cpp \ | 26 | SOURCES = ocompletionbox.cpp \ |
27 | ocombobox.cpp \ | 27 | ocombobox.cpp \ |
28 | oeditlistbox.cpp \ | 28 | oeditlistbox.cpp \ |
29 | olineedit.cpp \ | 29 | olineedit.cpp \ |
30 | olistview.cpp \ | 30 | olistview.cpp \ |
31 | oimageeffect.cpp \ | 31 | oimageeffect.cpp \ |
32 | opixmapeffect.cpp \ | 32 | opixmapeffect.cpp \ |
33 | opopupmenu.cpp \ | 33 | opopupmenu.cpp \ |
34 | opixmapprovider.cpp \ | 34 | opixmapprovider.cpp \ |
35 | oselector.cpp \ | 35 | oselector.cpp \ |
36 | oversatileview.cpp \ | 36 | oversatileview.cpp \ |
37 | oversatileviewitem.cpp \ | 37 | oversatileviewitem.cpp \ |
38 | #ojanuswidget.cpp \ | 38 | #ojanuswidget.cpp \ |
39 | odialog.cpp \ | 39 | odialog.cpp \ |
40 | omenubar.cpp \ | 40 | omenubar.cpp \ |
41 | opiemenubar.cpp \ | 41 | opiemenubar.cpp \ |
42 | oresource.cpp \ | 42 | oresource.cpp \ |
43 | otoolbar.cpp \ | 43 | otoolbar.cpp \ |
44 | oseparator.cpp #\ | 44 | oseparator.cpp #\ |
45 | # otaskbarapplet.cpp | 45 | # otaskbarapplet.cpp |
46 | 46 | ||
47 | INTERFACES = | 47 | INTERFACES = |
48 | TARGET = opieui2 | 48 | TARGET = opieui2 |
49 | VERSION = 1.8.1 | 49 | VERSION = 1.8.2 |
50 | INCLUDEPATH += $(OPIEDIR)/include | 50 | INCLUDEPATH += $(OPIEDIR)/include |
51 | DEPENDPATH += $(OPIEDIR)/include | 51 | DEPENDPATH += $(OPIEDIR)/include |
52 | LIBS += -lopiecore2 | 52 | LIBS += -lopiecore2 |
53 | MOC_DIR = moc | 53 | MOC_DIR = moc |
54 | OBJECTS_DIR = obj | 54 | OBJECTS_DIR = obj |
55 | 55 | ||
56 | 56 | ||
57 | !contains( platform, x11 ) { | 57 | !contains( platform, x11 ) { |
58 | include ( $(OPIEDIR)/include.pro ) | 58 | include ( $(OPIEDIR)/include.pro ) |
59 | HEADERS += otaskbarapplet.h | 59 | HEADERS += otaskbarapplet.h |
60 | SOURCES += otaskbarapplet.cpp | 60 | SOURCES += otaskbarapplet.cpp |
61 | } | 61 | } |
62 | 62 | ||
63 | contains( platform, x11 ) { | 63 | contains( platform, x11 ) { |
64 | LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib | 64 | LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib |
65 | message( Warning: NO otaskbarapplet ATM ) | 65 | message( Warning: NO otaskbarapplet ATM ) |
66 | } | 66 | } |
67 | 67 | ||
diff --git a/libopie2/tools/regen.py b/libopie2/tools/regen.py index 9ad5352..3779896 100755 --- a/libopie2/tools/regen.py +++ b/libopie2/tools/regen.py | |||
@@ -29,66 +29,68 @@ print >>tablehfile,""" | |||
29 | #include <qstring.h> | 29 | #include <qstring.h> |
30 | #include <qintdict.h> | 30 | #include <qintdict.h> |
31 | 31 | ||
32 | typedef QIntDict<QString> IntStringMap; | 32 | typedef QIntDict<QString> IntStringMap; |
33 | 33 | ||
34 | class DebugMapper | 34 | class DebugMapper |
35 | { | 35 | { |
36 | public: | 36 | public: |
37 | DebugMapper(); | 37 | DebugMapper(); |
38 | ~DebugMapper(); | 38 | ~DebugMapper(); |
39 | 39 | ||
40 | const QString& map( int value ) const; | 40 | const QString& map( int value ) const; |
41 | private: | 41 | private: |
42 | IntStringMap _map; | 42 | IntStringMap _map; |
43 | }; | 43 | }; |
44 | 44 | ||
45 | #endif | 45 | #endif |
46 | """ | 46 | """ |
47 | 47 | ||
48 | print >>tablecfile,""" | 48 | print >>tablecfile,""" |
49 | /* | 49 | /* |
50 | * debug value mapper - generated by regen.py - (C) Michael 'Mickey' Lauer <mickey@vanille.de> | 50 | * debug value mapper - generated by regen.py - (C) Michael 'Mickey' Lauer <mickey@vanille.de> |
51 | */ | 51 | */ |
52 | 52 | ||
53 | #include <opie2/odebug.h> | ||
54 | |||
53 | #include "%s" | 55 | #include "%s" |
54 | 56 | ||
55 | DebugMapper::DebugMapper() | 57 | DebugMapper::DebugMapper() |
56 | { | 58 | { |
57 | qDebug( "DebugMapper::DebugMapper()" ); | 59 | odebug << "DebugMapper::DebugMapper()" << oendl; |
58 | 60 | ||
59 | """ % (tablehfile.name) | 61 | """ % (tablehfile.name) |
60 | 62 | ||
61 | for line in result: | 63 | for line in result: |
62 | l = line.split() | 64 | l = line.split() |
63 | if not l[0].startswith( "#define" ) or not l[2].startswith( "0x" ): | 65 | if not l[0].startswith( "#define" ) or not l[2].startswith( "0x" ): |
64 | print >>sys.stderr, "can't parse line: %s" % l | 66 | print >>sys.stderr, "can't parse line: %s" % l |
65 | continue | 67 | continue |
66 | print >>tablecfile, " _map.insert( %s, new QString(\"%s\") );" % ( l[2], l[1] ) | 68 | print >>tablecfile, " _map.insert( %s, new QString(\"%s\") );" % ( l[2], l[1] ) |
67 | 69 | ||
68 | 70 | ||
69 | print >>tablecfile,""" | 71 | print >>tablecfile,""" |
70 | }; | 72 | }; |
71 | 73 | ||
72 | 74 | ||
73 | DebugMapper::~DebugMapper() | 75 | DebugMapper::~DebugMapper() |
74 | { | 76 | { |
75 | qDebug( "DebugMapper::~DebugMapper()" ); | 77 | odebug << "DebugMapper::~DebugMapper()" << oendl; |
76 | } | 78 | } |
77 | 79 | ||
78 | 80 | ||
79 | const QString& DebugMapper::map( int value ) const | 81 | const QString& DebugMapper::map( int value ) const |
80 | { | 82 | { |
81 | QString* result = _map[ value ]; | 83 | QString* result = _map[ value ]; |
82 | 84 | ||
83 | if ( !result ) | 85 | if ( !result ) |
84 | { | 86 | { |
85 | qDebug( "DebugMapper::map() - value not found." ); | 87 | owarn << "DebugMapper::map() - value " << value << " is not found." << oendl; |
86 | return QString::null; | 88 | return QString::null; |
87 | } | 89 | } |
88 | else | 90 | else |
89 | { | 91 | { |
90 | return *result; | 92 | return *result; |
91 | } | 93 | } |
92 | } | 94 | } |
93 | 95 | ||
94 | """ | 96 | """ |