7 files changed, 185 insertions, 42 deletions
diff --git a/noncore/settings/networksettings2/gprs/opie-networksettings2plugin-network.control b/noncore/settings/networksettings2/gprs/opie-networksettings2plugin-network.control index 902ebff..7e904bb 100644 --- a/noncore/settings/networksettings2/gprs/opie-networksettings2plugin-network.control +++ b/noncore/settings/networksettings2/gprs/opie-networksettings2plugin-network.control | |||
@@ -1,9 +1,9 @@ | |||
1 | Package: opie-networksettings2plugin-GPRS | 1 | Package: opie-networksettings2plugin-gprs |
2 | Files: plugins/networksettings2/libGPRS.so* | 2 | Files: plugins/networksettings2/libGPRS.so* |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/settings | 4 | Section: opie/settings |
5 | Maintainer: Wim Delvaux <wimpie@handhelds.org> | 5 | Maintainer: Wim Delvaux <wimpie@handhelds.org> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Depends: opie-networksettings2, libopiecore2, libopienet2 | 7 | Depends: opie-networksettings2, libopiecore2, libopienet2 |
8 | Description: Setup GPRS network | 8 | Description: Setup GPRS network |
9 | Version: $QPE_VERSION$EXTRAVERSION | 9 | Version: $QPE_VERSION$EXTRAVERSION |
diff --git a/noncore/settings/networksettings2/networksettings2/system.cpp b/noncore/settings/networksettings2/networksettings2/system.cpp index 141484c..9512579 100644 --- a/noncore/settings/networksettings2/networksettings2/system.cpp +++ b/noncore/settings/networksettings2/networksettings2/system.cpp | |||
@@ -1,289 +1,302 @@ | |||
1 | #include <sys/types.h> | 1 | #include <sys/types.h> |
2 | #include <sys/wait.h> | 2 | #include <sys/wait.h> |
3 | 3 | ||
4 | #include <net/if.h> | 4 | #include <net/if.h> |
5 | #include <net/if_arp.h> | 5 | #include <net/if_arp.h> |
6 | #include <netinet/in.h> | 6 | #include <netinet/in.h> |
7 | #include <arpa/inet.h> | 7 | #include <arpa/inet.h> |
8 | #include <sys/ioctl.h> | 8 | #include <sys/ioctl.h> |
9 | #include <sys/socket.h> | 9 | #include <sys/socket.h> |
10 | #include <stdlib.h> | 10 | #include <stdlib.h> |
11 | #include <stdio.h> | 11 | #include <stdio.h> |
12 | #include <fcntl.h> | 12 | #include <fcntl.h> |
13 | #include <errno.h> | 13 | #include <errno.h> |
14 | #include <unistd.h> | 14 | #include <unistd.h> |
15 | 15 | ||
16 | #include <opie2/oprocess.h> | 16 | #include <opie2/oprocess.h> |
17 | 17 | ||
18 | #include <qdir.h> | 18 | #include <qdir.h> |
19 | #include <qregexp.h> | 19 | #include <qregexp.h> |
20 | #include <qstringlist.h> | 20 | #include <qstringlist.h> |
21 | #include <qfile.h> | 21 | #include <qfile.h> |
22 | #include <qtextstream.h> | 22 | #include <qtextstream.h> |
23 | #include <qapplication.h> | 23 | #include <qapplication.h> |
24 | 24 | ||
25 | #include "resources.h" | 25 | #include "resources.h" |
26 | #include "system.h" | 26 | #include "system.h" |
27 | 27 | ||
28 | #define PROCNETDEV "/proc/net/dev" | 28 | #define PROCNETDEV "/proc/net/dev" |
29 | 29 | ||
30 | #ifndef ARPHRD_IEEE80211 | 30 | #ifndef ARPHRD_IEEE80211 |
31 | #define ARPHRD_IEEE80211 801 | 31 | #define ARPHRD_IEEE80211 801 |
32 | #endif | 32 | #endif |
33 | 33 | ||
34 | static char Dig2Hex[] = { | 34 | static char Dig2Hex[] = { |
35 | '0', '1', '2', '3', | 35 | '0', '1', '2', '3', |
36 | '4', '5', '6', '7', | 36 | '4', '5', '6', '7', |
37 | '8', '9', 'A', 'B', | 37 | '8', '9', 'A', 'B', |
38 | 'C', 'D', 'E', 'F' | 38 | 'C', 'D', 'E', 'F' |
39 | }; | 39 | }; |
40 | 40 | ||
41 | // get HIGH nibble of byte | 41 | // get HIGH nibble of byte |
42 | #define HN(x) Dig2Hex[(((x)&0xf0)>>4)] | 42 | #define HN(x) Dig2Hex[(((x)&0xf0)>>4)] |
43 | // get LOW nibble of byte | 43 | // get LOW nibble of byte |
44 | #define LN(x) Dig2Hex[((x)&0x0f)] | 44 | #define LN(x) Dig2Hex[((x)&0x0f)] |
45 | 45 | ||
46 | System::System( void ) : QObject(), ProbedInterfaces() { | 46 | System::System( void ) : QObject(), ProbedInterfaces() { |
47 | probeInterfaces(); | ||
48 | } | 47 | } |
49 | 48 | ||
50 | System::~System( void ) { | 49 | System::~System( void ) { |
51 | if( ProcDevNet ) | 50 | if( ProcDevNet ) |
52 | delete ProcDevNet; | 51 | delete ProcDevNet; |
53 | } | 52 | } |
54 | 53 | ||
55 | int System::runAsRoot( QStringList & S ) { | 54 | QDict<InterfaceInfo> & System::interfaces( void ) { |
55 | if( ProbedInterfaces.count() == 0 ) { | ||
56 | probeInterfaces(); | ||
57 | } | ||
58 | return ProbedInterfaces; | ||
59 | } | ||
60 | |||
61 | int System::runAsRoot( QStringList & S, MyProcess * Prc ) { | ||
56 | char * usr = getenv("USER"); | 62 | char * usr = getenv("USER"); |
57 | 63 | ||
58 | if( S.count() == 0 ) { | 64 | if( S.count() == 0 ) { |
59 | // loophole to start shell | 65 | // loophole to start shell |
60 | return 8888; | 66 | return 8888; |
61 | } | 67 | } |
62 | if( usr == 0 || strcmp( usr, "root" ) ) { | 68 | if( usr == 0 || strcmp( usr, "root" ) ) { |
63 | // unknown or non-root user -> use SUDO | 69 | // unknown or non-root user -> use SUDO |
64 | S.prepend( "sudo" ); | 70 | S.prepend( "sudo" ); |
65 | } | 71 | } |
66 | 72 | ||
67 | if( getenv( "NS2TESTMODE" ) ) { | 73 | if( getenv( "NS2TESTMODE" ) ) { |
68 | owarn << "TESTMODE !!! execute " | 74 | owarn << "TESTMODE !!! execute " |
69 | << S.join( " ") | 75 | << S.join( " ") |
70 | << oendl; | 76 | << oendl; |
71 | } else { | 77 | } else { |
72 | MyProcess * P = new MyProcess(); | 78 | MyProcess * P; |
73 | emit processEvent( tr("Command : ") + S.join( " " ) ); | ||
74 | 79 | ||
75 | P->process() << S; | 80 | if( Prc ) { |
76 | 81 | P = Prc; | |
77 | connect( P, | 82 | } else { |
78 | SIGNAL( stdoutLine( const QString & ) ), | 83 | P = new MyProcess(); |
79 | this, | 84 | emit processEvent( tr("Command : ") + S.join( " " ) ); |
80 | SIGNAL( stdoutLine( const QString & ) ) ); | 85 | |
81 | 86 | connect( P, | |
82 | connect( P, | 87 | SIGNAL( stdoutLine( const QString & ) ), |
83 | SIGNAL( stderrLine( const QString & ) ), | 88 | this, |
84 | this, | 89 | SIGNAL( stdoutLine( const QString & ) ) ); |
85 | SIGNAL( stderrLine( const QString & ) ) ); | 90 | |
91 | connect( P, | ||
92 | SIGNAL( stderrLine( const QString & ) ), | ||
93 | this, | ||
94 | SIGNAL( stderrLine( const QString & ) ) ); | ||
95 | |||
96 | connect( P, | ||
97 | SIGNAL(processExited(MyProcess*) ), | ||
98 | this, SLOT | ||
99 | (SLOT_ProcessExited(MyProcess*) ) ); | ||
100 | } | ||
86 | 101 | ||
87 | connect( P, | 102 | P->process() << S; |
88 | SIGNAL(processExited(MyProcess*) ), | ||
89 | this, SLOT | ||
90 | (SLOT_ProcessExited(MyProcess*) ) ); | ||
91 | 103 | ||
92 | Log(("Executing %s\n", S.join( " " ).latin1() )); | 104 | Log(("Executing %s\n", S.join( " " ).latin1() )); |
93 | 105 | ||
94 | if( ! P->process().start( OProcess::DontCare, | 106 | if( ! P->process().start( OProcess::DontCare, |
95 | OProcess::AllOutput ) ) { | 107 | OProcess::AllOutput ) ) { |
96 | owarn << "Error starting " << S << oendl; | 108 | owarn << "Error starting " << S << oendl; |
97 | delete P; | 109 | if( ! Prc ) |
110 | delete P; | ||
98 | // error starting app | 111 | // error starting app |
99 | return 1; | 112 | return 1; |
100 | } | 113 | } |
101 | owarn << "Started " << S << oendl; | 114 | owarn << "Started " << S << oendl; |
102 | } | 115 | } |
103 | 116 | ||
104 | // all is fine | 117 | // all is fine |
105 | return 0; | 118 | return 0; |
106 | } | 119 | } |
107 | 120 | ||
108 | int System::execAsUser( QStringList & SL ) { | 121 | int System::execAsUser( QStringList & SL ) { |
109 | MyProcess * P = new MyProcess(); | 122 | MyProcess * P = new MyProcess(); |
110 | CurrentQPEUser CU = NSResources->currentUser(); | 123 | CurrentQPEUser CU = NSResources->currentUser(); |
111 | char * usr = getenv("USER"); | 124 | char * usr = getenv("USER"); |
112 | 125 | ||
113 | if( strcmp( usr, "root" ) == 0 ) { | 126 | if( strcmp( usr, "root" ) == 0 ) { |
114 | // find user running qpe | 127 | // find user running qpe |
115 | if( CU.UserName.isEmpty() ) { | 128 | if( CU.UserName.isEmpty() ) { |
116 | // if we come here, the exec was not successfull | 129 | // if we come here, the exec was not successfull |
117 | Log(("User not known \n" )); | 130 | Log(("User not known \n" )); |
118 | return 0; | 131 | return 0; |
119 | } | 132 | } |
120 | } | 133 | } |
121 | 134 | ||
122 | // now we are ready to exec the requested command | 135 | // now we are ready to exec the requested command |
123 | setuid( CU.Uid ); | 136 | setuid( CU.Uid ); |
124 | setgid( CU.Gid ); | 137 | setgid( CU.Gid ); |
125 | 138 | ||
126 | for( unsigned int i = 0 ; i < CU.EnvList.count() ; i ++ ) { | 139 | for( unsigned int i = 0 ; i < CU.EnvList.count() ; i ++ ) { |
127 | QString X; | 140 | QString X; |
128 | QStringList SL; | 141 | QStringList SL; |
129 | X = CU.EnvList[i]; | 142 | X = CU.EnvList[i]; |
130 | SL = QStringList::split( "=", X ); | 143 | SL = QStringList::split( "=", X ); |
131 | P->process().setEnvironment( SL[0], SL[1] ); | 144 | P->process().setEnvironment( SL[0], SL[1] ); |
132 | } | 145 | } |
133 | 146 | ||
134 | P->process() << SL; | 147 | P->process() << SL; |
135 | 148 | ||
136 | emit processEvent( tr("Command : ") + SL.join( " " ) ); | 149 | emit processEvent( tr("Command : ") + SL.join( " " ) ); |
137 | 150 | ||
138 | Log(("Executing as user %s : %s\n", | 151 | Log(("Executing as user %s : %s\n", |
139 | CU.UserName.latin1(), | 152 | CU.UserName.latin1(), |
140 | SL.join( " " ).latin1() )); | 153 | SL.join( " " ).latin1() )); |
141 | 154 | ||
142 | int rv = ( P->process().start( OProcess::DontCare, | 155 | int rv = ( P->process().start( OProcess::DontCare, |
143 | OProcess::NoCommunication ) ); | 156 | OProcess::NoCommunication ) ); |
144 | delete P; | 157 | delete P; |
145 | 158 | ||
146 | if( rv ) { | 159 | if( rv ) { |
147 | // if we come here, the exec was not successfull | 160 | // if we come here, the exec was not successfull |
148 | Log(("Could not exec : %d\n", errno )); | 161 | Log(("Could not exec : %d\n", errno )); |
149 | } | 162 | } |
150 | 163 | ||
151 | return rv; | 164 | return rv; |
152 | } | 165 | } |
153 | 166 | ||
154 | void System::SLOT_ProcessExited( MyProcess * P ) { | 167 | void System::SLOT_ProcessExited( MyProcess * P ) { |
155 | QString R; | 168 | QString R; |
156 | 169 | ||
157 | for( QValueListConstIterator<QCString> it = P->process().args().begin(); | 170 | for( QValueListConstIterator<QCString> it = P->process().args().begin(); |
158 | it != P->process().args().end(); | 171 | it != P->process().args().end(); |
159 | ++it ) { | 172 | ++it ) { |
160 | R += (*it); | 173 | R += (*it); |
161 | R += " "; | 174 | R += " "; |
162 | } | 175 | } |
163 | 176 | ||
164 | R += "Returned with " + QString().setNum( P->process().exitStatus() ); | 177 | R += "Returned with " + QString().setNum( P->process().exitStatus() ); |
165 | emit processEvent( R ); | 178 | emit processEvent( R ); |
166 | delete P; | 179 | delete P; |
167 | } | 180 | } |
168 | 181 | ||
169 | void System::refreshStatistics( InterfaceInfo & I ) { | 182 | void System::refreshStatistics( InterfaceInfo & I ) { |
170 | if( ! ProcDevNet ) { | 183 | if( ! ProcDevNet ) { |
171 | return; | 184 | return; |
172 | } | 185 | } |
173 | // cannot seek on dev | 186 | // cannot seek on dev |
174 | ProcDevNet->close(); | 187 | ProcDevNet->close(); |
175 | ProcDevNet->open( IO_ReadOnly ); | 188 | ProcDevNet->open( IO_ReadOnly ); |
176 | 189 | ||
177 | QString line; | 190 | QString line; |
178 | QTextStream procTs(ProcDevNet); | 191 | QTextStream procTs(ProcDevNet); |
179 | QStringList SL; | 192 | QStringList SL; |
180 | int loc = -1; | 193 | int loc = -1; |
181 | int version; | 194 | int version; |
182 | 195 | ||
183 | procTs.readLine(); | 196 | procTs.readLine(); |
184 | line = procTs.readLine(); | 197 | line = procTs.readLine(); |
185 | // get version | 198 | // get version |
186 | if( line.find("compressed") ) | 199 | if( line.find("compressed") ) |
187 | version = 3; | 200 | version = 3; |
188 | else if( line.find( "bytes" ) ) | 201 | else if( line.find( "bytes" ) ) |
189 | version = 2; | 202 | version = 2; |
190 | else | 203 | else |
191 | version = 1; | 204 | version = 1; |
192 | while((line = procTs.readLine().simplifyWhiteSpace()) != QString::null) { | 205 | while((line = procTs.readLine().simplifyWhiteSpace()) != QString::null) { |
193 | if( (loc = line.find(":") ) == -1) { | 206 | if( (loc = line.find(":") ) == -1) { |
194 | continue; | 207 | continue; |
195 | } | 208 | } |
196 | 209 | ||
197 | if( I.Name != line.left(loc) ) | 210 | if( I.Name != line.left(loc) ) |
198 | continue; | 211 | continue; |
199 | 212 | ||
200 | // tokenize | 213 | // tokenize |
201 | SL = QStringList::split( ' ', line, FALSE ); | 214 | SL = QStringList::split( ' ', line, FALSE ); |
202 | 215 | ||
203 | // update data | 216 | // update data |
204 | switch( version ) { | 217 | switch( version ) { |
205 | case 1 : | 218 | case 1 : |
206 | I.RcvBytes = SL[1]; | 219 | I.RcvBytes = SL[1]; |
207 | I.RcvErrors = SL[3]; | 220 | I.RcvErrors = SL[3]; |
208 | I.RcvDropped = SL[4]; | 221 | I.RcvDropped = SL[4]; |
209 | I.SndBytes = SL[6]; | 222 | I.SndBytes = SL[6]; |
210 | I.SndErrors = SL[8]; | 223 | I.SndErrors = SL[8]; |
211 | I.SndDropped = SL[9]; | 224 | I.SndDropped = SL[9]; |
212 | I.Collisions = SL[11]; | 225 | I.Collisions = SL[11]; |
213 | break; | 226 | break; |
214 | case 2 : | 227 | case 2 : |
215 | I.RcvBytes = SL[1]; | 228 | I.RcvBytes = SL[1]; |
216 | I.RcvErrors = SL[3]; | 229 | I.RcvErrors = SL[3]; |
217 | I.RcvDropped = SL[4]; | 230 | I.RcvDropped = SL[4]; |
218 | I.SndBytes = SL[7]; | 231 | I.SndBytes = SL[7]; |
219 | I.SndErrors = SL[9]; | 232 | I.SndErrors = SL[9]; |
220 | I.SndDropped = SL[10]; | 233 | I.SndDropped = SL[10]; |
221 | I.Collisions = SL[12]; | 234 | I.Collisions = SL[12]; |
222 | break; | 235 | break; |
223 | case 3 : | 236 | case 3 : |
224 | I.RcvBytes = SL[1]; | 237 | I.RcvBytes = SL[1]; |
225 | I.RcvErrors = SL[3]; | 238 | I.RcvErrors = SL[3]; |
226 | I.RcvDropped = SL[4]; | 239 | I.RcvDropped = SL[4]; |
227 | I.SndBytes = SL[9]; | 240 | I.SndBytes = SL[9]; |
228 | I.SndErrors = SL[11]; | 241 | I.SndErrors = SL[11]; |
229 | I.SndDropped = SL[12]; | 242 | I.SndDropped = SL[12]; |
230 | I.Collisions = SL[14]; | 243 | I.Collisions = SL[14]; |
231 | break; | 244 | break; |
232 | } | 245 | } |
233 | break; | 246 | break; |
234 | } | 247 | } |
235 | } | 248 | } |
236 | 249 | ||
237 | // | 250 | // |
238 | // THIS UPDATES THE LIST -> INTERFACES ARE NOT DELETED BUT | 251 | // THIS UPDATES THE LIST -> INTERFACES ARE NOT DELETED BUT |
239 | // FLAGGED AS ! 'IsUp' IF NO LONGER PRESENT | 252 | // FLAGGED AS ! 'IsUp' IF NO LONGER PRESENT |
240 | // | 253 | // |
241 | 254 | ||
242 | void System::probeInterfaces( void ) { | 255 | void System::probeInterfaces( void ) { |
243 | 256 | ||
244 | // probe interfaces | 257 | // probe interfaces |
245 | int sockfd; | 258 | int sockfd; |
246 | // get list of all interfaces | 259 | // get list of all interfaces |
247 | struct ifreq ifrs; | 260 | struct ifreq ifrs; |
248 | InterfaceInfo * IFI; | 261 | InterfaceInfo * IFI; |
249 | 262 | ||
250 | // flag all as 'down' | 263 | // flag all as 'down' |
251 | for( QDictIterator<InterfaceInfo> it( ProbedInterfaces ); | 264 | for( QDictIterator<InterfaceInfo> it( ProbedInterfaces ); |
252 | it.current(); | 265 | it.current(); |
253 | ++it ) { | 266 | ++it ) { |
254 | it.current()->IsUp = 0; | 267 | it.current()->IsUp = 0; |
255 | } | 268 | } |
256 | 269 | ||
257 | sockfd = socket(PF_INET, SOCK_DGRAM, 0); | 270 | sockfd = socket(PF_INET, SOCK_DGRAM, 0); |
258 | if(sockfd == -1) { | 271 | if(sockfd == -1) { |
259 | owarn << "Cannot open INET socket " | 272 | owarn << "Cannot open INET socket " |
260 | << errno | 273 | << errno |
261 | << " " | 274 | << " " |
262 | << strerror( errno ) | 275 | << strerror( errno ) |
263 | << oendl; | 276 | << oendl; |
264 | return; | 277 | return; |
265 | } | 278 | } |
266 | 279 | ||
267 | // read interfaces from /proc/dev/net | 280 | // read interfaces from /proc/dev/net |
268 | // SIOCGIFCONF does not return ALL interfaces ???!? | 281 | // SIOCGIFCONF does not return ALL interfaces ???!? |
269 | ProcDevNet = new QFile(PROCNETDEV); | 282 | ProcDevNet = new QFile(PROCNETDEV); |
270 | if( ! ProcDevNet->open(IO_ReadOnly) ) { | 283 | if( ! ProcDevNet->open(IO_ReadOnly) ) { |
271 | owarn << "Cannot open " | 284 | owarn << "Cannot open " |
272 | << PROCNETDEV | 285 | << PROCNETDEV |
273 | << " " | 286 | << " " |
274 | << errno | 287 | << errno |
275 | << " " | 288 | << " " |
276 | << strerror( errno ) | 289 | << strerror( errno ) |
277 | << oendl; | 290 | << oendl; |
278 | delete ProcDevNet; | 291 | delete ProcDevNet; |
279 | ProcDevNet =0; | 292 | ProcDevNet =0; |
280 | ::close( sockfd ); | 293 | ::close( sockfd ); |
281 | return; | 294 | return; |
282 | } | 295 | } |
283 | 296 | ||
284 | QString line; | 297 | QString line; |
285 | QString NicName; | 298 | QString NicName; |
286 | QTextStream procTs(ProcDevNet); | 299 | QTextStream procTs(ProcDevNet); |
287 | int loc = -1; | 300 | int loc = -1; |
288 | 301 | ||
289 | procTs.readLine(); // eat a line | 302 | procTs.readLine(); // eat a line |
diff --git a/noncore/settings/networksettings2/networksettings2/system.h b/noncore/settings/networksettings2/networksettings2/system.h index e67d695..f7a7274 100644 --- a/noncore/settings/networksettings2/networksettings2/system.h +++ b/noncore/settings/networksettings2/networksettings2/system.h | |||
@@ -1,135 +1,134 @@ | |||
1 | #ifndef __SYSTEM__H | 1 | #ifndef __SYSTEM__H |
2 | #define __SYSTEM__H | 2 | #define __SYSTEM__H |
3 | 3 | ||
4 | #include <qstring.h> | 4 | #include <qstring.h> |
5 | 5 | ||
6 | #include <opie2/oprocess.h> | 6 | #include <opie2/oprocess.h> |
7 | 7 | ||
8 | using namespace Opie::Core; | 8 | using namespace Opie::Core; |
9 | 9 | ||
10 | // for hardware types | 10 | // for hardware types |
11 | #include <net/if_arp.h> | 11 | #include <net/if_arp.h> |
12 | #include <qdict.h> | 12 | #include <qdict.h> |
13 | #include <qobject.h> | 13 | #include <qobject.h> |
14 | #include <stdio.h> | 14 | #include <stdio.h> |
15 | 15 | ||
16 | class NodeCollection; | 16 | class NodeCollection; |
17 | class ANetNodeInstance; | 17 | class ANetNodeInstance; |
18 | class QFile; | 18 | class QFile; |
19 | 19 | ||
20 | class MyProcess : public QObject { | 20 | class MyProcess : public QObject { |
21 | 21 | ||
22 | Q_OBJECT | 22 | Q_OBJECT |
23 | 23 | ||
24 | public : | 24 | public : |
25 | 25 | ||
26 | MyProcess(); | 26 | MyProcess(); |
27 | ~MyProcess(); | 27 | ~MyProcess(); |
28 | 28 | ||
29 | inline OProcess & process() | 29 | inline OProcess & process() |
30 | { return *P; } | 30 | { return *P; } |
31 | 31 | ||
32 | public slots : | 32 | public slots : |
33 | 33 | ||
34 | void SLOT_Stdout( Opie::Core::OProcess * P, char *, int ); | 34 | void SLOT_Stdout( Opie::Core::OProcess * P, char *, int ); |
35 | void SLOT_Stderr( Opie::Core::OProcess * P, char *, int ); | 35 | void SLOT_Stderr( Opie::Core::OProcess * P, char *, int ); |
36 | void SLOT_ProcessExited( Opie::Core::OProcess * P); | 36 | void SLOT_ProcessExited( Opie::Core::OProcess * P); |
37 | 37 | ||
38 | signals : | 38 | signals : |
39 | 39 | ||
40 | void stdoutLine( const QString & ); | 40 | void stdoutLine( const QString & ); |
41 | void stderrLine( const QString & ); | 41 | void stderrLine( const QString & ); |
42 | void processExited( MyProcess * ); | 42 | void processExited( MyProcess * ); |
43 | 43 | ||
44 | private : | 44 | private : |
45 | 45 | ||
46 | QString StdoutBuffer; | 46 | QString StdoutBuffer; |
47 | QString StderrBuffer; | 47 | QString StderrBuffer; |
48 | OProcess * P; | 48 | OProcess * P; |
49 | }; | 49 | }; |
50 | 50 | ||
51 | class InterfaceInfo { | 51 | class InterfaceInfo { |
52 | 52 | ||
53 | public : | 53 | public : |
54 | 54 | ||
55 | InterfaceInfo() : | 55 | InterfaceInfo() : |
56 | Name(), | 56 | Name(), |
57 | MACAddress(), | 57 | MACAddress(), |
58 | BCastAddress(), | 58 | BCastAddress(), |
59 | Netmask(), | 59 | Netmask(), |
60 | DstAddress() { | 60 | DstAddress() { |
61 | } | 61 | } |
62 | 62 | ||
63 | NodeCollection * assignedConnection() | 63 | NodeCollection * assignedConnection() |
64 | { return Collection; } | 64 | { return Collection; } |
65 | 65 | ||
66 | void assignConnection( NodeCollection * NNI ) | 66 | void assignConnection( NodeCollection * NNI ) |
67 | { Collection = NNI; } | 67 | { Collection = NNI; } |
68 | 68 | ||
69 | NodeCollection * Collection; // connection taking care of me | 69 | NodeCollection * Collection; // connection taking care of me |
70 | QString Name; // name of interface | 70 | QString Name; // name of interface |
71 | int CardType; // type of card | 71 | int CardType; // type of card |
72 | QString MACAddress; // MAC address | 72 | QString MACAddress; // MAC address |
73 | QString Address; // IP Address | 73 | QString Address; // IP Address |
74 | QString BCastAddress; // Broadcast Address | 74 | QString BCastAddress; // Broadcast Address |
75 | QString Netmask; // Netmask | 75 | QString Netmask; // Netmask |
76 | QString DstAddress; // Peer address (if P-t-P) | 76 | QString DstAddress; // Peer address (if P-t-P) |
77 | bool IsUp; // interface is UP | 77 | bool IsUp; // interface is UP |
78 | bool HasMulticast; // Supports Multicast | 78 | bool HasMulticast; // Supports Multicast |
79 | bool IsPointToPoint; // IsPointToPoint card | 79 | bool IsPointToPoint; // IsPointToPoint card |
80 | 80 | ||
81 | QString RcvBytes; | 81 | QString RcvBytes; |
82 | QString SndBytes; | 82 | QString SndBytes; |
83 | QString RcvErrors; | 83 | QString RcvErrors; |
84 | QString SndErrors; | 84 | QString SndErrors; |
85 | QString RcvDropped; | 85 | QString RcvDropped; |
86 | QString SndDropped; | 86 | QString SndDropped; |
87 | QString Collisions; | 87 | QString Collisions; |
88 | }; | 88 | }; |
89 | 89 | ||
90 | class System : public QObject { | 90 | class System : public QObject { |
91 | 91 | ||
92 | Q_OBJECT | 92 | Q_OBJECT |
93 | 93 | ||
94 | public : | 94 | public : |
95 | 95 | ||
96 | System( void ); | 96 | System( void ); |
97 | ~System( void ); | 97 | ~System( void ); |
98 | 98 | ||
99 | QDict<InterfaceInfo> & interfaces( void ) | 99 | QDict<InterfaceInfo> & interfaces( void ); |
100 | { return ProbedInterfaces; } | ||
101 | InterfaceInfo * interface( const QString& N ) | 100 | InterfaceInfo * interface( const QString& N ) |
102 | { return ProbedInterfaces[N]; } | 101 | { return interfaces()[N]; } |
103 | 102 | ||
104 | // exec command as root | 103 | // exec command as root |
105 | int runAsRoot( QStringList & S ); | 104 | int runAsRoot( QStringList & S, MyProcess * Prc = 0 ); |
106 | 105 | ||
107 | // exec command as user | 106 | // exec command as user |
108 | int execAsUser( QStringList & Cmd ); | 107 | int execAsUser( QStringList & Cmd ); |
109 | 108 | ||
110 | // refresh stats for this interface | 109 | // refresh stats for this interface |
111 | void refreshStatistics( InterfaceInfo & ); | 110 | void refreshStatistics( InterfaceInfo & ); |
112 | 111 | ||
113 | // reloads interfaces | 112 | // reloads interfaces |
114 | void probeInterfaces( void ); | 113 | void probeInterfaces( void ); |
115 | 114 | ||
116 | InterfaceInfo * findInterface( const QString & DevName ); | 115 | InterfaceInfo * findInterface( const QString & DevName ); |
117 | 116 | ||
118 | private slots : | 117 | private slots : |
119 | 118 | ||
120 | void SLOT_ProcessExited( MyProcess * ); | 119 | void SLOT_ProcessExited( MyProcess * ); |
121 | 120 | ||
122 | signals : | 121 | signals : |
123 | 122 | ||
124 | void stdoutLine( const QString & ); | 123 | void stdoutLine( const QString & ); |
125 | void stderrLine( const QString & ); | 124 | void stderrLine( const QString & ); |
126 | void processEvent( const QString & ); | 125 | void processEvent( const QString & ); |
127 | 126 | ||
128 | private : | 127 | private : |
129 | 128 | ||
130 | QDict<InterfaceInfo> ProbedInterfaces; | 129 | QDict<InterfaceInfo> ProbedInterfaces; |
131 | FILE * OutputOfCmd; | 130 | FILE * OutputOfCmd; |
132 | QFile * ProcDevNet; | 131 | QFile * ProcDevNet; |
133 | }; | 132 | }; |
134 | 133 | ||
135 | #endif | 134 | #endif |
diff --git a/noncore/settings/networksettings2/opietooth2/Opietooth.cpp b/noncore/settings/networksettings2/opietooth2/Opietooth.cpp index 2d4885c..5a890da 100644 --- a/noncore/settings/networksettings2/opietooth2/Opietooth.cpp +++ b/noncore/settings/networksettings2/opietooth2/Opietooth.cpp | |||
@@ -1,317 +1,428 @@ | |||
1 | #include <opie2/odebug.h> | 1 | #include <opie2/odebug.h> |
2 | #include <opie2/oledbox.h> | 2 | #include <opie2/oledbox.h> |
3 | #include <opie2/ofiledialog.h> | ||
4 | |||
3 | using namespace Opie::Core; | 5 | using namespace Opie::Core; |
4 | using namespace Opie::Ui; | 6 | using namespace Opie::Ui; |
5 | 7 | ||
6 | #include <qpe/resource.h> | 8 | #include <qpe/resource.h> |
9 | #include <qapplication.h> | ||
7 | #include <qcheckbox.h> | 10 | #include <qcheckbox.h> |
11 | #include <qcombobox.h> | ||
12 | #include <qdialog.h> | ||
13 | #include <qdir.h> | ||
14 | #include <qfile.h> | ||
8 | #include <qgroupbox.h> | 15 | #include <qgroupbox.h> |
9 | #include <qlabel.h> | ||
10 | #include <qprogressbar.h> | ||
11 | #include <qheader.h> | 16 | #include <qheader.h> |
12 | #include <qmessagebox.h> | ||
13 | #include <qapplication.h> | ||
14 | #include <qlistbox.h> | ||
15 | #include <qdialog.h> | ||
16 | #include <qlayout.h> | ||
17 | #include <qcombobox.h> | ||
18 | #include <qlabel.h> | 17 | #include <qlabel.h> |
18 | #include <qlayout.h> | ||
19 | #include <qlistbox.h> | ||
19 | #include <qlistview.h> | 20 | #include <qlistview.h> |
21 | #include <qmessagebox.h> | ||
22 | #include <qprogressbar.h> | ||
20 | #include <qpushbutton.h> | 23 | #include <qpushbutton.h> |
24 | #include <qtextstream.h> | ||
21 | 25 | ||
22 | #include <Opietooth.h> | 26 | #include <Opietooth.h> |
23 | #include <OTDriver.h> | 27 | #include <OTDriver.h> |
24 | #include <OTPeer.h> | 28 | #include <OTPeer.h> |
25 | #include <OTGateway.h> | 29 | #include <OTGateway.h> |
26 | #include <OTSDPAttribute.h> | 30 | #include <OTSDPAttribute.h> |
27 | #include <OTSDPService.h> | 31 | #include <OTSDPService.h> |
28 | #include <OTInquiry.h> | 32 | #include <OTInquiry.h> |
29 | 33 | ||
34 | #include <system.h> | ||
35 | |||
30 | using namespace Opietooth2; | 36 | using namespace Opietooth2; |
31 | 37 | ||
32 | namespace Opietooth2 { | 38 | namespace Opietooth2 { |
33 | 39 | ||
34 | class PeerLVI : public QListViewItem { | 40 | class PeerLVI : public QListViewItem { |
35 | 41 | ||
36 | public : | 42 | public : |
37 | 43 | ||
38 | PeerLVI( OTPeer * P, QListView * it ) : QListViewItem (it) { | 44 | PeerLVI( OTPeer * P, QListView * it ) : QListViewItem (it) { |
39 | Peer = P; | 45 | Peer = P; |
40 | } | 46 | } |
41 | ~PeerLVI( void ) { | 47 | ~PeerLVI( void ) { |
42 | } | 48 | } |
43 | 49 | ||
44 | inline OTPeer * peer( void ) | 50 | inline OTPeer * peer( void ) |
45 | { return Peer; } | 51 | { return Peer; } |
46 | 52 | ||
47 | private : | 53 | private : |
48 | 54 | ||
49 | OTPeer * Peer; | 55 | OTPeer * Peer; |
50 | }; | 56 | }; |
51 | 57 | ||
52 | class ChannelLVI : public QListViewItem { | 58 | class ChannelLVI : public QListViewItem { |
53 | 59 | ||
54 | public : | 60 | public : |
55 | 61 | ||
56 | ChannelLVI( int Ch, QListViewItem * it ) : QListViewItem (it) { | 62 | ChannelLVI( int Ch, QListViewItem * it ) : QListViewItem (it) { |
57 | Channel = Ch; | 63 | Channel = Ch; |
58 | } | 64 | } |
59 | ~ChannelLVI( void ) { | 65 | ~ChannelLVI( void ) { |
60 | } | 66 | } |
61 | 67 | ||
62 | inline int channel( void ) | 68 | inline int channel( void ) |
63 | { return Channel; } | 69 | { return Channel; } |
64 | 70 | ||
65 | private : | 71 | private : |
66 | 72 | ||
67 | int Channel; | 73 | int Channel; |
68 | }; | 74 | }; |
69 | 75 | ||
70 | class DriverLVI : public QListViewItem { | 76 | class DriverLVI : public QListViewItem { |
71 | 77 | ||
72 | public : | 78 | public : |
73 | 79 | ||
74 | DriverLVI( OTDriver * P, QListView * it ) : QListViewItem (it) { | 80 | DriverLVI( OTDriver * P, QListView * it ) : QListViewItem (it) { |
75 | Driver = P; | 81 | Driver = P; |
76 | } | 82 | } |
77 | ~DriverLVI( void ) { | 83 | ~DriverLVI( void ) { |
78 | } | 84 | } |
79 | 85 | ||
80 | inline OTDriver * driver( void ) | 86 | inline OTDriver * driver( void ) |
81 | { return Driver; } | 87 | { return Driver; } |
82 | 88 | ||
83 | private : | 89 | private : |
84 | 90 | ||
85 | OTDriver * Driver; | 91 | OTDriver * Driver; |
86 | }; | 92 | }; |
87 | 93 | ||
88 | class LinkKeyLVI : public QListViewItem { | 94 | class LinkKeyLVI : public QListViewItem { |
89 | 95 | ||
90 | public : | 96 | public : |
91 | 97 | ||
92 | LinkKeyLVI( int Ch, QListView * it ) : QListViewItem (it) { | 98 | LinkKeyLVI( int Ch, QListView * it ) : QListViewItem (it) { |
93 | LinkKey = Ch; | 99 | LinkKey = Ch; |
94 | } | 100 | } |
95 | ~LinkKeyLVI( void ) { | 101 | ~LinkKeyLVI( void ) { |
96 | } | 102 | } |
97 | 103 | ||
98 | inline int index( void ) | 104 | inline int index( void ) |
99 | { return LinkKey; } | 105 | { return LinkKey; } |
100 | 106 | ||
101 | private : | 107 | private : |
102 | 108 | ||
103 | int LinkKey; | 109 | int LinkKey; |
104 | }; | 110 | }; |
105 | }; | 111 | }; |
106 | 112 | ||
107 | // | 113 | // |
108 | // | 114 | // |
109 | // | 115 | // |
110 | // | 116 | // |
111 | // | 117 | // |
112 | 118 | ||
113 | OTSniffing::OTSniffing( QWidget * parent ) : OTSniffGUI( parent ) { | 119 | OTSniffing::OTSniffing( QWidget * parent ) : OTSniffGUI( parent ) { |
114 | 120 | ||
115 | OT = OTGateway::getOTGateway(); | 121 | OT = OTGateway::getOTGateway(); |
116 | 122 | HciDump = 0; | |
123 | Sys = new System(); | ||
117 | } | 124 | } |
118 | 125 | ||
119 | OTSniffing::~OTSniffing() { | 126 | OTSniffing::~OTSniffing() { |
127 | printf( "CLOSE \n" ); | ||
128 | if ( HciDump ) { | ||
129 | HciDump->process().kill(); | ||
130 | delete HciDump; | ||
131 | } | ||
132 | delete Sys; | ||
120 | } | 133 | } |
121 | 134 | ||
122 | void OTSniffing::SLOT_Trace( void ) { | 135 | void OTSniffing::SLOT_Trace( bool ) { |
136 | HciDump = new MyProcess(); | ||
137 | QStringList SL; | ||
138 | |||
139 | SL << "hcidump"; | ||
140 | switch( DataFormat_CB->currentItem() ) { | ||
141 | case 0 : // Hex | ||
142 | SL << "-x"; | ||
143 | break; | ||
144 | case 1 : // Ascii | ||
145 | SL << "-a"; | ||
146 | break; | ||
147 | case 2 : // both | ||
148 | SL << "-X"; | ||
149 | break; | ||
150 | } | ||
151 | |||
152 | SL << "-i"; | ||
153 | SL << OT->scanWith()->devname(); | ||
154 | |||
155 | connect( HciDump, | ||
156 | SIGNAL( stdoutLine( const QString & ) ), | ||
157 | this, | ||
158 | SLOT( SLOT_Show( const QString & ) ) ); | ||
159 | |||
160 | connect( HciDump, | ||
161 | SIGNAL(processExited(MyProcess*) ), | ||
162 | this, | ||
163 | SLOT( SLOT_ProcessExited(MyProcess*) ) ); | ||
164 | |||
165 | if( ! Sys->runAsRoot( SL, HciDump ) ) { | ||
166 | QMessageBox::warning(0, | ||
167 | tr("Run hcidump"), | ||
168 | tr("Cannot start %1").arg(SL.join(" ")) | ||
169 | ); | ||
170 | delete HciDump; | ||
171 | HciDump = 0; | ||
172 | } | ||
173 | |||
174 | } | ||
175 | |||
176 | void OTSniffing::SLOT_Show( const QString & S ) { | ||
177 | printf( "%s\n", S.latin1() ); | ||
178 | Output_LB->insertItem( S ); | ||
179 | Output_LB->setCurrentItem( Output_LB->count()-1 ); | ||
180 | Output_LB->ensureCurrentVisible(); | ||
181 | } | ||
182 | |||
183 | void OTSniffing::SLOT_ProcessExited( MyProcess * ) { | ||
184 | printf( "Exited\n" ); | ||
185 | delete HciDump; | ||
186 | HciDump = 0; | ||
187 | } | ||
188 | |||
189 | void OTSniffing::SLOT_Save( void ) { | ||
190 | QString S = OFileDialog::getSaveFileName( | ||
191 | OFileSelector::Extended, | ||
192 | QDir::home().path(), | ||
193 | QString::null, | ||
194 | MimeTypes(), | ||
195 | this ); | ||
196 | |||
197 | if( ! S.isEmpty() ) { | ||
198 | QFile F( S ); | ||
199 | if( ! F.open( IO_WriteOnly ) ) { | ||
200 | QMessageBox::warning(0, | ||
201 | tr("Save log"), | ||
202 | tr("Cannot open %1").arg(S) | ||
203 | ); | ||
204 | return; | ||
205 | } | ||
206 | QTextStream TS( &F ); | ||
207 | TS << S << endl; | ||
208 | } | ||
209 | } | ||
210 | |||
211 | void OTSniffing::SLOT_Load( void ) { | ||
212 | QString S = OFileDialog::getOpenFileName( | ||
213 | OFileSelector::Extended, | ||
214 | QDir::home().path(), | ||
215 | QString::null, | ||
216 | MimeTypes(), | ||
217 | this ); | ||
218 | |||
219 | if( ! S.isEmpty() ) { | ||
220 | QFile F( S ); | ||
221 | if( ! F.open( IO_ReadOnly ) ) { | ||
222 | QMessageBox::warning(0, | ||
223 | tr("Save log"), | ||
224 | tr("Cannot open %1").arg(S) | ||
225 | ); | ||
226 | return; | ||
227 | } | ||
228 | QTextStream TS ( &F ); | ||
229 | SLOT_ClearLog(); | ||
230 | S = TS.read(); | ||
231 | Output_LB->insertStringList( QStringList::split( "\n", S ) ); | ||
232 | } | ||
123 | } | 233 | } |
124 | 234 | ||
125 | void OTSniffing::SLOT_ClearLog( void ) { | 235 | void OTSniffing::SLOT_ClearLog( void ) { |
236 | Output_LB->clear(); | ||
126 | } | 237 | } |
127 | 238 | ||
128 | // | 239 | // |
129 | // | 240 | // |
130 | // | 241 | // |
131 | // | 242 | // |
132 | // | 243 | // |
133 | 244 | ||
134 | OTPairing::OTPairing( QWidget * parent, OTIcons * _IC ) : | 245 | OTPairing::OTPairing( QWidget * parent, OTIcons * _IC ) : |
135 | OTPairingGUI( parent ) { | 246 | OTPairingGUI( parent ) { |
136 | 247 | ||
137 | OT = OTGateway::getOTGateway(); | 248 | OT = OTGateway::getOTGateway(); |
138 | Icons = (_IC ) ? _IC : new OTIcons(); | 249 | Icons = (_IC ) ? _IC : new OTIcons(); |
139 | MyIcons = (_IC == 0 ); | 250 | MyIcons = (_IC == 0 ); |
140 | 251 | ||
141 | // unpairing can only be done if bluetooth is disabled | 252 | // unpairing can only be done if bluetooth is disabled |
142 | Unpair_But->setEnabled( ! OT->isEnabled() ); | 253 | Unpair_But->setEnabled( ! OT->isEnabled() ); |
143 | if( ! OT->isEnabled() ) { | 254 | if( ! OT->isEnabled() ) { |
144 | Unpair_LBL->hide(); | 255 | Unpair_LBL->hide(); |
145 | } else { | 256 | } else { |
146 | Unpair_LBL->show(); | 257 | Unpair_LBL->show(); |
147 | } | 258 | } |
148 | 259 | ||
149 | // open linkkey file and load pairs | 260 | // open linkkey file and load pairs |
150 | LinkKeyArray Keys = OT->getLinkKeys(); | 261 | LinkKeyArray Keys = OT->getLinkKeys(); |
151 | LinkKeyLVI * it; | 262 | LinkKeyLVI * it; |
152 | OTPeer * P; | 263 | OTPeer * P; |
153 | OTDriver * D; | 264 | OTDriver * D; |
154 | 265 | ||
155 | for( unsigned int i = 0 ; | 266 | for( unsigned int i = 0 ; |
156 | i < Keys.count(); | 267 | i < Keys.count(); |
157 | i ++ ) { | 268 | i ++ ) { |
158 | 269 | ||
159 | it = new LinkKeyLVI( i, Pairs_LV ); | 270 | it = new LinkKeyLVI( i, Pairs_LV ); |
160 | 271 | ||
161 | P = 0; | 272 | P = 0; |
162 | D = OT->findDriver( Keys[i].from() ); | 273 | D = OT->findDriver( Keys[i].from() ); |
163 | 274 | ||
164 | if( D ) { | 275 | if( D ) { |
165 | it->setText( 0, D->devname() ); | 276 | it->setText( 0, D->devname() ); |
166 | 277 | ||
167 | // we are source | 278 | // we are source |
168 | P = OT->findPeer( Keys[i].to() ); | 279 | P = OT->findPeer( Keys[i].to() ); |
169 | 280 | ||
170 | if( P ) { | 281 | if( P ) { |
171 | // put name | 282 | // put name |
172 | it->setText( 1, P->name() ); | 283 | it->setText( 1, P->name() ); |
173 | } else { | 284 | } else { |
174 | // unknown | 285 | // unknown |
175 | it->setText( 1, Keys[i].to().toString() ); | 286 | it->setText( 1, Keys[i].to().toString() ); |
176 | } | 287 | } |
177 | 288 | ||
178 | // and put address as sub | 289 | // and put address as sub |
179 | QListViewItem * Sub = new QListViewItem( it ); | 290 | QListViewItem * Sub = new QListViewItem( it ); |
180 | Sub->setText( 0, D->address().toString() ); | 291 | Sub->setText( 0, D->address().toString() ); |
181 | Sub->setText( 1, Keys[i].to().toString() ); | 292 | Sub->setText( 1, Keys[i].to().toString() ); |
182 | } else { | 293 | } else { |
183 | // perhaps we are destination | 294 | // perhaps we are destination |
184 | D = OT->findDriver( Keys[i].to() ); | 295 | D = OT->findDriver( Keys[i].to() ); |
185 | 296 | ||
186 | if( D ) { | 297 | if( D ) { |
187 | it->setText( 1, D->devname() ); | 298 | it->setText( 1, D->devname() ); |
188 | 299 | ||
189 | // we are source | 300 | // we are source |
190 | P = OT->findPeer( Keys[i].from() ); | 301 | P = OT->findPeer( Keys[i].from() ); |
191 | 302 | ||
192 | if( P ) { | 303 | if( P ) { |
193 | // put name | 304 | // put name |
194 | it->setText( 0, P->name() ); | 305 | it->setText( 0, P->name() ); |
195 | } else { | 306 | } else { |
196 | // unknown | 307 | // unknown |
197 | it->setText( 0, Keys[i].from().toString() ); | 308 | it->setText( 0, Keys[i].from().toString() ); |
198 | } | 309 | } |
199 | 310 | ||
200 | // and put address as sub | 311 | // and put address as sub |
201 | QListViewItem * Sub = new QListViewItem( it ); | 312 | QListViewItem * Sub = new QListViewItem( it ); |
202 | Sub->setText( 0, Keys[i].from().toString() ); | 313 | Sub->setText( 0, Keys[i].from().toString() ); |
203 | Sub->setText( 1, D->address().toString() ); | 314 | Sub->setText( 1, D->address().toString() ); |
204 | } else { | 315 | } else { |
205 | // nor source nor destination -> unknown | 316 | // nor source nor destination -> unknown |
206 | it->setText( 0, Keys[i].from().toString() ); | 317 | it->setText( 0, Keys[i].from().toString() ); |
207 | it->setText( 1, Keys[i].to().toString() ); | 318 | it->setText( 1, Keys[i].to().toString() ); |
208 | } | 319 | } |
209 | } | 320 | } |
210 | } | 321 | } |
211 | } | 322 | } |
212 | 323 | ||
213 | 324 | ||
214 | OTPairing::~OTPairing() { | 325 | OTPairing::~OTPairing() { |
215 | if( MyIcons ) | 326 | if( MyIcons ) |
216 | delete Icons; | 327 | delete Icons; |
217 | OTGateway::releaseOTGateway(); | 328 | OTGateway::releaseOTGateway(); |
218 | } | 329 | } |
219 | 330 | ||
220 | void OTPairing::SLOT_Unpair( ) { | 331 | void OTPairing::SLOT_Unpair( ) { |
221 | // find selected pair | 332 | // find selected pair |
222 | 333 | ||
223 | QListViewItem * it = Pairs_LV->firstChild(); | 334 | QListViewItem * it = Pairs_LV->firstChild(); |
224 | while( it ) { | 335 | while( it ) { |
225 | if( it->isSelected() ) { | 336 | if( it->isSelected() ) { |
226 | // confirm ? | 337 | // confirm ? |
227 | if( QMessageBox::warning(0, | 338 | if( QMessageBox::warning(0, |
228 | tr("Break pairing"), | 339 | tr("Break pairing"), |
229 | tr("Sure ?"), | 340 | tr("Sure ?"), |
230 | tr("Yes, break"), | 341 | tr("Yes, break"), |
231 | tr("No, don't break") ) == 0 ) { | 342 | tr("No, don't break") ) == 0 ) { |
232 | LinkKeyLVI * KPIt = (LinkKeyLVI *)it; | 343 | LinkKeyLVI * KPIt = (LinkKeyLVI *)it; |
233 | // break | 344 | // break |
234 | OT->removeLinkKey( KPIt->index() ); | 345 | OT->removeLinkKey( KPIt->index() ); |
235 | delete KPIt; | 346 | delete KPIt; |
236 | } | 347 | } |
237 | return; | 348 | return; |
238 | } | 349 | } |
239 | it= it->nextSibling(); | 350 | it= it->nextSibling(); |
240 | } | 351 | } |
241 | } | 352 | } |
242 | 353 | ||
243 | // | 354 | // |
244 | // | 355 | // |
245 | // | 356 | // |
246 | // | 357 | // |
247 | // | 358 | // |
248 | 359 | ||
249 | OTScan::OTScan( QWidget * parent, OTIcons * _IC ) : | 360 | OTScan::OTScan( QWidget * parent, OTIcons * _IC ) : |
250 | OTScanGUI( parent ), Filter() { | 361 | OTScanGUI( parent ), Filter() { |
251 | 362 | ||
252 | OT = OTGateway::getOTGateway(); | 363 | OT = OTGateway::getOTGateway(); |
253 | Icons = (_IC ) ? _IC : new OTIcons(); | 364 | Icons = (_IC ) ? _IC : new OTIcons(); |
254 | MyIcons = (_IC == 0 ); | 365 | MyIcons = (_IC == 0 ); |
255 | DetectedPeers_LV->header()->hide(); | 366 | DetectedPeers_LV->header()->hide(); |
256 | Current = 0; | 367 | Current = 0; |
257 | SelectedPeer = 0; | 368 | SelectedPeer = 0; |
258 | SelectedChannel = 0; | 369 | SelectedChannel = 0; |
259 | 370 | ||
260 | StrengthTimer = new QTimer( this ); | 371 | StrengthTimer = new QTimer( this ); |
261 | connect( StrengthTimer, | 372 | connect( StrengthTimer, |
262 | SIGNAL( timeout()), | 373 | SIGNAL( timeout()), |
263 | this, | 374 | this, |
264 | SLOT( SLOT_UpdateStrength()) | 375 | SLOT( SLOT_UpdateStrength()) |
265 | ); | 376 | ); |
266 | 377 | ||
267 | connect( OT, | 378 | connect( OT, |
268 | SIGNAL( detectedPeer( OTPeer *, bool )), | 379 | SIGNAL( detectedPeer( OTPeer *, bool )), |
269 | this, | 380 | this, |
270 | SLOT( SLOT_NewPeer( OTPeer *, bool )) | 381 | SLOT( SLOT_NewPeer( OTPeer *, bool )) |
271 | ); | 382 | ); |
272 | connect( OT, | 383 | connect( OT, |
273 | SIGNAL( finishedDetecting()), | 384 | SIGNAL( finishedDetecting()), |
274 | this, | 385 | this, |
275 | SLOT( SLOT_FinishedDetecting()) | 386 | SLOT( SLOT_FinishedDetecting()) |
276 | ); | 387 | ); |
277 | 388 | ||
278 | // populate with peers we already know about | 389 | // populate with peers we already know about |
279 | const PeerVector & P = OT->peers(); | 390 | const PeerVector & P = OT->peers(); |
280 | for( unsigned int i = 0; | 391 | for( unsigned int i = 0; |
281 | i < P.count(); | 392 | i < P.count(); |
282 | i ++ ) { | 393 | i ++ ) { |
283 | SLOT_NewPeer( P[i], TRUE ); | 394 | SLOT_NewPeer( P[i], TRUE ); |
284 | } | 395 | } |
285 | 396 | ||
286 | // populate State fram | 397 | // populate State fram |
287 | { QHBoxLayout * H =new QHBoxLayout( State_Frm ); | 398 | { QHBoxLayout * H =new QHBoxLayout( State_Frm ); |
288 | 399 | ||
289 | Paired_Led = new OLedBox( green, State_Frm ); | 400 | Paired_Led = new OLedBox( green, State_Frm ); |
290 | QLabel * L1 = new QLabel( tr( "Paired" ), State_Frm ); | 401 | QLabel * L1 = new QLabel( tr( "Paired" ), State_Frm ); |
291 | 402 | ||
292 | H->addWidget( Paired_Led ); | 403 | H->addWidget( Paired_Led ); |
293 | H->addWidget( L1 ); | 404 | H->addWidget( L1 ); |
294 | H->addStretch( 1 ); | 405 | H->addStretch( 1 ); |
295 | } | 406 | } |
296 | } | 407 | } |
297 | 408 | ||
298 | OTScan::~OTScan() { | 409 | OTScan::~OTScan() { |
299 | if( MyIcons ) | 410 | if( MyIcons ) |
300 | delete Icons; | 411 | delete Icons; |
301 | OTGateway::releaseOTGateway(); | 412 | OTGateway::releaseOTGateway(); |
302 | 413 | ||
303 | // send all peers that we do not care about states | 414 | // send all peers that we do not care about states |
304 | QListViewItem * Lit = DetectedPeers_LV->firstChild(); | 415 | QListViewItem * Lit = DetectedPeers_LV->firstChild(); |
305 | while( Lit ) { | 416 | while( Lit ) { |
306 | ((PeerLVI *)Lit)->peer()->stopFindingOutState( ); | 417 | ((PeerLVI *)Lit)->peer()->stopFindingOutState( ); |
307 | Lit = Lit->nextSibling(); | 418 | Lit = Lit->nextSibling(); |
308 | } | 419 | } |
309 | } | 420 | } |
310 | 421 | ||
311 | // static scan dialog function | 422 | // static scan dialog function |
312 | int OTScan::getDevice( OTPeer *& Peer, | 423 | int OTScan::getDevice( OTPeer *& Peer, |
313 | int & Channel, | 424 | int & Channel, |
314 | OTGateway * OT, | 425 | OTGateway * OT, |
315 | const UUIDVector & Filter, | 426 | const UUIDVector & Filter, |
316 | QWidget* Parent ) { | 427 | QWidget* Parent ) { |
317 | bool IsUp = 0; | 428 | bool IsUp = 0; |
@@ -840,198 +951,201 @@ void OTManage::SLOT_DriverListChanged( ) { | |||
840 | if( ! First ) | 951 | if( ! First ) |
841 | First = It; | 952 | First = It; |
842 | 953 | ||
843 | It->setText( 0, D->devname() ); | 954 | It->setText( 0, D->devname() ); |
844 | It->setPixmap( 0, | 955 | It->setPixmap( 0, |
845 | Icons->loadPixmap( (D->isUp()) ? | 956 | Icons->loadPixmap( (D->isUp()) ? |
846 | "bluezon" : "bluezoff" ) ); | 957 | "bluezon" : "bluezoff" ) ); |
847 | 958 | ||
848 | Sub = new QListViewItem( It ); | 959 | Sub = new QListViewItem( It ); |
849 | Sub->setText( 0, tr( "Name" ) ); | 960 | Sub->setText( 0, tr( "Name" ) ); |
850 | Sub->setText( 1, D->name() ); | 961 | Sub->setText( 1, D->name() ); |
851 | 962 | ||
852 | Sub = new QListViewItem( It ); | 963 | Sub = new QListViewItem( It ); |
853 | Sub->setText( 0, tr( "Address" ) ); | 964 | Sub->setText( 0, tr( "Address" ) ); |
854 | Sub->setText( 1, D->address().toString() ); | 965 | Sub->setText( 1, D->address().toString() ); |
855 | 966 | ||
856 | Sub = new QListViewItem( It ); | 967 | Sub = new QListViewItem( It ); |
857 | Sub->setText( 0, tr( "Revision" ) ); | 968 | Sub->setText( 0, tr( "Revision" ) ); |
858 | Sub->setText( 1, D->revision() ); | 969 | Sub->setText( 1, D->revision() ); |
859 | 970 | ||
860 | Sub = new QListViewItem( It ); | 971 | Sub = new QListViewItem( It ); |
861 | Sub->setText( 0, tr( "Manufacturer" ) ); | 972 | Sub->setText( 0, tr( "Manufacturer" ) ); |
862 | Sub->setText( 1, D->manufacturer() ); | 973 | Sub->setText( 1, D->manufacturer() ); |
863 | 974 | ||
864 | QString Service, Device; | 975 | QString Service, Device; |
865 | D->getClass( Service, Device ); | 976 | D->getClass( Service, Device ); |
866 | 977 | ||
867 | Sub = new QListViewItem( It ); | 978 | Sub = new QListViewItem( It ); |
868 | Sub->setText( 0, tr( "Service classes" ) ); | 979 | Sub->setText( 0, tr( "Service classes" ) ); |
869 | Sub->setText( 1, Service ); | 980 | Sub->setText( 1, Service ); |
870 | Sub = new QListViewItem( It ); | 981 | Sub = new QListViewItem( It ); |
871 | Sub->setText( 0, tr( "Device class" ) ); | 982 | Sub->setText( 0, tr( "Device class" ) ); |
872 | Sub->setText( 1, Device ); | 983 | Sub->setText( 1, Device ); |
873 | } | 984 | } |
874 | 985 | ||
875 | if( DL.count() ) { | 986 | if( DL.count() ) { |
876 | AllDrivers_LV->setCurrentItem( First ); | 987 | AllDrivers_LV->setCurrentItem( First ); |
877 | DriverIsUp_CB->setEnabled( TRUE ); | 988 | DriverIsUp_CB->setEnabled( TRUE ); |
878 | } else { | 989 | } else { |
879 | DriverIsUp_CB->setChecked( FALSE ); | 990 | DriverIsUp_CB->setChecked( FALSE ); |
880 | DriverIsUp_CB->setEnabled( FALSE ); | 991 | DriverIsUp_CB->setEnabled( FALSE ); |
881 | } | 992 | } |
882 | } | 993 | } |
883 | 994 | ||
884 | void OTManage::SLOT_SetRefreshTimer( int v ) { | 995 | void OTManage::SLOT_SetRefreshTimer( int v ) { |
885 | OT->setRefreshTimer( v * 1000 ); | 996 | OT->setRefreshTimer( v * 1000 ); |
886 | } | 997 | } |
887 | 998 | ||
888 | // | 999 | // |
889 | // | 1000 | // |
890 | // | 1001 | // |
891 | // | 1002 | // |
892 | // | 1003 | // |
893 | 1004 | ||
894 | OTMain::OTMain( QWidget * parent ) : OTMainGUI( parent ) { | 1005 | OTMain::OTMain( QWidget * parent ) : OTMainGUI( parent ) { |
895 | 1006 | ||
896 | Icons = new OTIcons(); | 1007 | Icons = new OTIcons(); |
897 | SnifWindow = 0; | 1008 | SnifWindow = 0; |
898 | OT = OTGateway::getOTGateway(); | 1009 | OT = OTGateway::getOTGateway(); |
899 | 1010 | ||
900 | connect( OT, | 1011 | connect( OT, |
901 | SIGNAL( deviceEnabled( bool ) ), | 1012 | SIGNAL( deviceEnabled( bool ) ), |
902 | this, | 1013 | this, |
903 | SLOT( SLOT_DeviceIsEnabled( bool ) ) | 1014 | SLOT( SLOT_DeviceIsEnabled( bool ) ) |
904 | ); | 1015 | ); |
905 | connect( OT, | 1016 | connect( OT, |
906 | SIGNAL( driverListChanged() ), | 1017 | SIGNAL( driverListChanged() ), |
907 | this, | 1018 | this, |
908 | SLOT( SLOT_DriverListChanged() ) | 1019 | SLOT( SLOT_DriverListChanged() ) |
909 | ); | 1020 | ); |
910 | connect( OT, | 1021 | connect( OT, |
911 | SIGNAL( stateChange( OTDriver *, bool ) ), | 1022 | SIGNAL( stateChange( OTDriver *, bool ) ), |
912 | this, | 1023 | this, |
913 | SLOT( SLOT_StateChange( OTDriver *, bool ) ) | 1024 | SLOT( SLOT_StateChange( OTDriver *, bool ) ) |
914 | ); | 1025 | ); |
915 | 1026 | ||
916 | if( ! OT->needsEnabling() ) { | 1027 | if( ! OT->needsEnabling() ) { |
917 | MustBeEnabled_CB->hide(); | 1028 | MustBeEnabled_CB->hide(); |
918 | } else { | 1029 | } else { |
919 | // detect current state | 1030 | // detect current state |
920 | MustBeEnabled_CB->setChecked( | 1031 | MustBeEnabled_CB->setChecked( |
921 | OT->isEnabled() ); | 1032 | OT->isEnabled() ); |
922 | } | 1033 | } |
923 | 1034 | ||
924 | SLOT_DriverListChanged(); | 1035 | SLOT_DriverListChanged(); |
925 | } | 1036 | } |
926 | 1037 | ||
927 | OTMain::~OTMain() { | 1038 | OTMain::~OTMain() { |
928 | OTGateway::releaseOTGateway(); | 1039 | OTGateway::releaseOTGateway(); |
929 | delete Icons; | 1040 | delete Icons; |
930 | } | 1041 | } |
931 | 1042 | ||
932 | void OTMain::SLOT_DriverListChanged() { | 1043 | void OTMain::SLOT_DriverListChanged() { |
933 | OTDriver * D; | 1044 | OTDriver * D; |
934 | OTDriverList & DL = OT->getDriverList(); | 1045 | OTDriverList & DL = OT->getDriverList(); |
935 | 1046 | ||
936 | DeviceList_CB->clear(); | 1047 | DeviceList_CB->clear(); |
937 | for( unsigned int i = 0; | 1048 | for( unsigned int i = 0; |
938 | i < DL.count(); | 1049 | i < DL.count(); |
939 | i ++ ) { | 1050 | i ++ ) { |
940 | D = DL[i]; | 1051 | D = DL[i]; |
941 | DeviceList_CB->insertItem( | 1052 | DeviceList_CB->insertItem( |
942 | Icons->loadPixmap( (D->isUp()) ? | 1053 | Icons->loadPixmap( (D->isUp()) ? |
943 | "bluezon" : "bluezoff" ), | 1054 | "bluezon" : "bluezoff" ), |
944 | D->devname() ); | 1055 | D->devname() ); |
945 | if( D == OT->scanWith() ) { | 1056 | if( D == OT->scanWith() ) { |
946 | DeviceList_CB->setCurrentItem( i ); | 1057 | DeviceList_CB->setCurrentItem( i ); |
947 | } | 1058 | } |
948 | } | 1059 | } |
949 | 1060 | ||
950 | Scan_But->setEnabled( OT->getDriverList().count() > 0 ); | 1061 | Scan_But->setEnabled( OT->getDriverList().count() > 0 ); |
951 | DeviceList_CB->setEnabled( OT->getDriverList().count() > 0 ); | 1062 | DeviceList_CB->setEnabled( OT->getDriverList().count() > 0 ); |
952 | } | 1063 | } |
953 | 1064 | ||
954 | void OTMain::SLOT_EnableBluetooth( bool Up ) { | 1065 | void OTMain::SLOT_EnableBluetooth( bool Up ) { |
955 | OT->SLOT_SetEnabled( Up ); | 1066 | OT->SLOT_SetEnabled( Up ); |
956 | } | 1067 | } |
957 | 1068 | ||
958 | void OTMain::SLOT_DeviceIsEnabled( bool Up ) { | 1069 | void OTMain::SLOT_DeviceIsEnabled( bool Up ) { |
959 | MustBeEnabled_CB->blockSignals( TRUE ); | 1070 | MustBeEnabled_CB->blockSignals( TRUE ); |
960 | MustBeEnabled_CB->setChecked( Up ); | 1071 | MustBeEnabled_CB->setChecked( Up ); |
961 | MustBeEnabled_CB->blockSignals( FALSE ); | 1072 | MustBeEnabled_CB->blockSignals( FALSE ); |
962 | } | 1073 | } |
963 | 1074 | ||
964 | void OTMain::SLOT_Manage( void ) { | 1075 | void OTMain::SLOT_Manage( void ) { |
965 | QDialog * Dlg = new QDialog( this, 0, TRUE ); | 1076 | QDialog * Dlg = new QDialog( this, 0, TRUE ); |
966 | QVBoxLayout * V = new QVBoxLayout( Dlg ); | 1077 | QVBoxLayout * V = new QVBoxLayout( Dlg ); |
967 | OTManage * Mng = new OTManage( Dlg, Icons ); | 1078 | OTManage * Mng = new OTManage( Dlg, Icons ); |
968 | 1079 | ||
969 | V->addWidget( Mng ); | 1080 | V->addWidget( Mng ); |
970 | 1081 | ||
971 | Dlg->setCaption( tr("Manage local devices" ) ); | 1082 | Dlg->setCaption( tr("Manage local devices" ) ); |
972 | Dlg->showMaximized(); | 1083 | Dlg->showMaximized(); |
973 | Dlg->exec(); | 1084 | Dlg->exec(); |
974 | delete Dlg; | 1085 | delete Dlg; |
975 | } | 1086 | } |
976 | 1087 | ||
977 | void OTMain::SLOT_Scan( void ) { | 1088 | void OTMain::SLOT_Scan( void ) { |
978 | OTDriverList & DL = OT->getDriverList(); | 1089 | OTDriverList & DL = OT->getDriverList(); |
979 | for( unsigned int i = 0; | 1090 | for( unsigned int i = 0; |
980 | i < DL.count(); | 1091 | i < DL.count(); |
981 | i ++ ) { | 1092 | i ++ ) { |
982 | if( DL[i]->isUp() && | 1093 | if( DL[i]->isUp() && |
983 | DL[i]->devname() == DeviceList_CB->currentText() | 1094 | DL[i]->devname() == DeviceList_CB->currentText() |
984 | ) { | 1095 | ) { |
985 | QDialog * Dlg = new QDialog( this, 0, TRUE ); | 1096 | QDialog * Dlg = new QDialog( this, 0, TRUE ); |
986 | QVBoxLayout * V = new QVBoxLayout( Dlg ); | 1097 | QVBoxLayout * V = new QVBoxLayout( Dlg ); |
987 | OTScan * Scn = new OTScan( Dlg, Icons ); | 1098 | OTScan * Scn = new OTScan( Dlg, Icons ); |
988 | 1099 | ||
989 | OT->setScanWith( OT->driver(i) ); | 1100 | OT->setScanWith( OT->driver(i) ); |
990 | V->addWidget( Scn ); | 1101 | V->addWidget( Scn ); |
991 | Dlg->setCaption( tr("Scan Neighbourhood" ) ); | 1102 | Dlg->setCaption( tr("Scan Neighbourhood" ) ); |
992 | Dlg->showMaximized(); | 1103 | Dlg->showMaximized(); |
993 | Dlg->exec(); | 1104 | Dlg->exec(); |
994 | 1105 | ||
995 | delete Dlg; | 1106 | delete Dlg; |
996 | return; | 1107 | return; |
997 | } | 1108 | } |
998 | } | 1109 | } |
999 | 1110 | ||
1000 | } | 1111 | } |
1001 | 1112 | ||
1002 | void OTMain::SLOT_StateChange( OTDriver * D, bool Up ) { | 1113 | void OTMain::SLOT_StateChange( OTDriver * D, bool Up ) { |
1003 | for( int i = 0; | 1114 | for( int i = 0; |
1004 | i < DeviceList_CB->count(); | 1115 | i < DeviceList_CB->count(); |
1005 | i ++ ) { | 1116 | i ++ ) { |
1006 | if( DeviceList_CB->text(i) == D->devname() ) { | 1117 | if( DeviceList_CB->text(i) == D->devname() ) { |
1007 | DeviceList_CB->changeItem( | 1118 | DeviceList_CB->changeItem( |
1008 | Icons->loadPixmap( (Up) ? "bluezon" : "bluezoff" ), | 1119 | Icons->loadPixmap( (Up) ? "bluezon" : "bluezoff" ), |
1009 | D->devname(), | 1120 | D->devname(), |
1010 | i ); | 1121 | i ); |
1011 | return; | 1122 | return; |
1012 | } | 1123 | } |
1013 | } | 1124 | } |
1014 | } | 1125 | } |
1015 | 1126 | ||
1016 | void OTMain::SLOT_Pairing( void ) { | 1127 | void OTMain::SLOT_Pairing( void ) { |
1017 | QDialog * Dlg = new QDialog( this, 0, TRUE ); | 1128 | QDialog * Dlg = new QDialog( this, 0, TRUE ); |
1018 | QVBoxLayout * V = new QVBoxLayout( Dlg ); | 1129 | QVBoxLayout * V = new QVBoxLayout( Dlg ); |
1019 | OTPairing * Pair = new OTPairing( Dlg, Icons ); | 1130 | OTPairing * Pair = new OTPairing( Dlg, Icons ); |
1020 | 1131 | ||
1021 | V->addWidget( Pair ); | 1132 | V->addWidget( Pair ); |
1022 | Dlg->showMaximized(); | 1133 | Dlg->showMaximized(); |
1023 | Dlg->setCaption( tr("Manage pairing" ) ); | 1134 | Dlg->setCaption( tr("Manage pairing" ) ); |
1024 | Dlg->exec(); | 1135 | Dlg->exec(); |
1025 | 1136 | ||
1026 | delete Dlg; | 1137 | delete Dlg; |
1027 | } | 1138 | } |
1028 | 1139 | ||
1029 | void OTMain::SLOT_Sniffing( void ) { | 1140 | void OTMain::SLOT_Sniffing( void ) { |
1030 | 1141 | ||
1031 | if( SnifWindow == 0 ) { | 1142 | if( SnifWindow == 0 ) { |
1032 | SnifWindow = new OTSniffing( this ); | 1143 | SnifWindow = new QDialog( this, 0, FALSE ); |
1144 | QVBoxLayout * V = new QVBoxLayout( SnifWindow ); | ||
1145 | OTSniffing * SN = new OTSniffing( SnifWindow ); | ||
1146 | V->addWidget( SN ); | ||
1033 | } | 1147 | } |
1034 | 1148 | ||
1035 | SnifWindow->showMaximized(); | 1149 | SnifWindow->showMaximized(); |
1036 | SnifWindow->show(); | 1150 | SnifWindow->show(); |
1037 | } | 1151 | } |
diff --git a/noncore/settings/networksettings2/opietooth2/Opietooth.h b/noncore/settings/networksettings2/opietooth2/Opietooth.h index 211ae65..2b20975 100644 --- a/noncore/settings/networksettings2/opietooth2/Opietooth.h +++ b/noncore/settings/networksettings2/opietooth2/Opietooth.h | |||
@@ -1,223 +1,240 @@ | |||
1 | #ifndef OPIETOOTH_H | 1 | #ifndef OPIETOOTH_H |
2 | #define OPIETOOTH_H | 2 | #define OPIETOOTH_H |
3 | 3 | ||
4 | #include <OTIcons.h> | 4 | #include <OTIcons.h> |
5 | 5 | ||
6 | namespace Opie { namespace Ui { class OLedBox; }; }; | 6 | class MyProcess; |
7 | class System; | ||
8 | |||
9 | namespace Opie { | ||
10 | |||
11 | namespace Ui { | ||
12 | |||
13 | class OLedBox; | ||
14 | |||
15 | }; | ||
16 | |||
17 | }; | ||
7 | 18 | ||
8 | #include <OTSniffGUI.h> | 19 | #include <OTSniffGUI.h> |
9 | namespace Opietooth2 { | 20 | namespace Opietooth2 { |
10 | 21 | ||
11 | class OTGateway; | 22 | class OTGateway; |
12 | class OTDriver; | 23 | class OTDriver; |
13 | class OTInquiry; | 24 | class OTInquiry; |
14 | class OTPeer; | 25 | class OTPeer; |
15 | class PeerLVI; | 26 | class PeerLVI; |
16 | 27 | ||
17 | class OTSniffing : public OTSniffGUI { | 28 | class OTSniffing : public OTSniffGUI { |
18 | 29 | ||
19 | Q_OBJECT | 30 | Q_OBJECT |
20 | 31 | ||
21 | public : | 32 | public : |
22 | 33 | ||
23 | OTSniffing( QWidget * parent ); | 34 | OTSniffing( QWidget * parent ); |
24 | ~OTSniffing(); | 35 | ~OTSniffing(); |
25 | 36 | ||
26 | private slots : | 37 | private slots : |
27 | 38 | ||
28 | void SLOT_Trace( void ); | 39 | void SLOT_Trace( bool ); |
29 | void SLOT_ClearLog( void ); | 40 | void SLOT_ClearLog( void ); |
41 | void SLOT_Load( void ); | ||
42 | void SLOT_Save( void ); | ||
43 | void SLOT_ProcessExited( MyProcess * ); | ||
44 | void SLOT_Show( const QString & ); | ||
30 | 45 | ||
31 | signals : | 46 | signals : |
32 | 47 | ||
33 | protected : | 48 | protected : |
34 | 49 | ||
35 | private : | 50 | private : |
36 | 51 | ||
37 | OTGateway * OT; | 52 | OTGateway * OT; |
53 | MyProcess * HciDump; | ||
54 | System * Sys; | ||
38 | }; | 55 | }; |
39 | }; | 56 | }; |
40 | 57 | ||
41 | #include <OTPairingGUI.h> | 58 | #include <OTPairingGUI.h> |
42 | 59 | ||
43 | namespace Opietooth2 { | 60 | namespace Opietooth2 { |
44 | class OTPairing : public OTPairingGUI { | 61 | class OTPairing : public OTPairingGUI { |
45 | 62 | ||
46 | Q_OBJECT | 63 | Q_OBJECT |
47 | 64 | ||
48 | public : | 65 | public : |
49 | 66 | ||
50 | OTPairing( QWidget * parent, | 67 | OTPairing( QWidget * parent, |
51 | OTIcons * _Ic = 0 ); | 68 | OTIcons * _Ic = 0 ); |
52 | ~OTPairing(); | 69 | ~OTPairing(); |
53 | 70 | ||
54 | private slots : | 71 | private slots : |
55 | 72 | ||
56 | void SLOT_Unpair( void ); | 73 | void SLOT_Unpair( void ); |
57 | 74 | ||
58 | signals : | 75 | signals : |
59 | 76 | ||
60 | protected : | 77 | protected : |
61 | 78 | ||
62 | private : | 79 | private : |
63 | 80 | ||
64 | bool MyIcons; | 81 | bool MyIcons; |
65 | OTIcons * Icons; | 82 | OTIcons * Icons; |
66 | OTGateway * OT; | 83 | OTGateway * OT; |
67 | }; | 84 | }; |
68 | }; | 85 | }; |
69 | 86 | ||
70 | #include <OTScanGUI.h> | 87 | #include <OTScanGUI.h> |
71 | 88 | ||
72 | namespace Opietooth2 { | 89 | namespace Opietooth2 { |
73 | 90 | ||
74 | class OTGateway; | 91 | class OTGateway; |
75 | class OTDriver; | 92 | class OTDriver; |
76 | class OTInquiry; | 93 | class OTInquiry; |
77 | class OTPeer; | 94 | class OTPeer; |
78 | 95 | ||
79 | class OTScan : public OTScanGUI { | 96 | class OTScan : public OTScanGUI { |
80 | 97 | ||
81 | Q_OBJECT | 98 | Q_OBJECT |
82 | 99 | ||
83 | public : | 100 | public : |
84 | 101 | ||
85 | OTScan( QWidget * parent, | 102 | OTScan( QWidget * parent, |
86 | OTIcons * _Ic = 0 ); | 103 | OTIcons * _Ic = 0 ); |
87 | ~OTScan(); | 104 | ~OTScan(); |
88 | 105 | ||
89 | // static function to return a device and a channel | 106 | // static function to return a device and a channel |
90 | static int getDevice( OTPeer *& Peer, | 107 | static int getDevice( OTPeer *& Peer, |
91 | int & Channel, | 108 | int & Channel, |
92 | OTGateway * OT, | 109 | OTGateway * OT, |
93 | const UUIDVector & Filter = 0, | 110 | const UUIDVector & Filter = 0, |
94 | QWidget* Parent = 0); | 111 | QWidget* Parent = 0); |
95 | 112 | ||
96 | // show only services that match any of the filter | 113 | // show only services that match any of the filter |
97 | void setScanFilter( const UUIDVector & Filter ); | 114 | void setScanFilter( const UUIDVector & Filter ); |
98 | void resetScanFilter( void ); | 115 | void resetScanFilter( void ); |
99 | 116 | ||
100 | inline OTPeer * selectedPeer( void ) | 117 | inline OTPeer * selectedPeer( void ) |
101 | { return SelectedPeer; } | 118 | { return SelectedPeer; } |
102 | inline int selectedChannel( void ) | 119 | inline int selectedChannel( void ) |
103 | { return SelectedChannel; } | 120 | { return SelectedChannel; } |
104 | 121 | ||
105 | public slots : | 122 | public slots : |
106 | 123 | ||
107 | private slots : | 124 | private slots : |
108 | 125 | ||
109 | void SLOT_DoScan( bool ); | 126 | void SLOT_DoScan( bool ); |
110 | void SLOT_NewPeer( OTPeer *, bool ); | 127 | void SLOT_NewPeer( OTPeer *, bool ); |
111 | void SLOT_FinishedDetecting(); | 128 | void SLOT_FinishedDetecting(); |
112 | void SLOT_Show( QListViewItem *); | 129 | void SLOT_Show( QListViewItem *); |
113 | void SLOT_RefreshServices( void ); | 130 | void SLOT_RefreshServices( void ); |
114 | void SLOT_RefreshState( void ); | 131 | void SLOT_RefreshState( void ); |
115 | void SLOT_CleanupOld( void ); | 132 | void SLOT_CleanupOld( void ); |
116 | void SLOT_UpdateStrength( void ); | 133 | void SLOT_UpdateStrength( void ); |
117 | void SLOT_PeerState( OTPeer * ); | 134 | void SLOT_PeerState( OTPeer * ); |
118 | void SLOT_Selected( QListViewItem * ); | 135 | void SLOT_Selected( QListViewItem * ); |
119 | 136 | ||
120 | signals : | 137 | signals : |
121 | 138 | ||
122 | void selected( void ); | 139 | void selected( void ); |
123 | 140 | ||
124 | protected : | 141 | protected : |
125 | 142 | ||
126 | private : | 143 | private : |
127 | 144 | ||
128 | void refreshState( PeerLVI *, bool ); | 145 | void refreshState( PeerLVI *, bool ); |
129 | void scanMode( bool ); | 146 | void scanMode( bool ); |
130 | 147 | ||
131 | // load scanned devices | 148 | // load scanned devices |
132 | 149 | ||
133 | bool MyIcons; | 150 | bool MyIcons; |
134 | OTIcons * Icons; | 151 | OTIcons * Icons; |
135 | OTGateway * OT; | 152 | OTGateway * OT; |
136 | OTInquiry * Scanning; | 153 | OTInquiry * Scanning; |
137 | UUIDVector Filter; | 154 | UUIDVector Filter; |
138 | 155 | ||
139 | Opie::Ui::OLedBox * Paired_Led; | 156 | Opie::Ui::OLedBox * Paired_Led; |
140 | QTimer * StrengthTimer; | 157 | QTimer * StrengthTimer; |
141 | PeerLVI * Current; | 158 | PeerLVI * Current; |
142 | 159 | ||
143 | OTPeer * SelectedPeer; | 160 | OTPeer * SelectedPeer; |
144 | int SelectedChannel; | 161 | int SelectedChannel; |
145 | }; | 162 | }; |
146 | }; | 163 | }; |
147 | 164 | ||
148 | #include <OTManageGUI.h> | 165 | #include <OTManageGUI.h> |
149 | namespace Opietooth2 { | 166 | namespace Opietooth2 { |
150 | 167 | ||
151 | class OTManage : public OTManageGUI { | 168 | class OTManage : public OTManageGUI { |
152 | 169 | ||
153 | Q_OBJECT | 170 | Q_OBJECT |
154 | 171 | ||
155 | public : | 172 | public : |
156 | 173 | ||
157 | OTManage( QWidget * parent, | 174 | OTManage( QWidget * parent, |
158 | OTIcons * _IC = 0 ); | 175 | OTIcons * _IC = 0 ); |
159 | ~OTManage(); | 176 | ~OTManage(); |
160 | 177 | ||
161 | public slots : | 178 | public slots : |
162 | 179 | ||
163 | private slots : | 180 | private slots : |
164 | 181 | ||
165 | void SLOT_ShowDriver( QListViewItem * ); | 182 | void SLOT_ShowDriver( QListViewItem * ); |
166 | void SLOT_UpDriver( bool ); | 183 | void SLOT_UpDriver( bool ); |
167 | void SLOT_StateChange( OTDriver * , bool ); | 184 | void SLOT_StateChange( OTDriver * , bool ); |
168 | void SLOT_DriverListChanged(); | 185 | void SLOT_DriverListChanged(); |
169 | void SLOT_SetRefreshTimer( int ); | 186 | void SLOT_SetRefreshTimer( int ); |
170 | 187 | ||
171 | signals : | 188 | signals : |
172 | 189 | ||
173 | protected : | 190 | protected : |
174 | 191 | ||
175 | private : | 192 | private : |
176 | 193 | ||
177 | // load scanned devices | 194 | // load scanned devices |
178 | 195 | ||
179 | bool MyIcons; | 196 | bool MyIcons; |
180 | OTIcons * Icons; | 197 | OTIcons * Icons; |
181 | OTGateway * OT; | 198 | OTGateway * OT; |
182 | OTInquiry * Scanning; | 199 | OTInquiry * Scanning; |
183 | }; | 200 | }; |
184 | }; | 201 | }; |
185 | 202 | ||
186 | #include <OTMainGUI.h> | 203 | #include <OTMainGUI.h> |
187 | 204 | ||
188 | namespace Opietooth2 { | 205 | namespace Opietooth2 { |
189 | class OTMain : public OTMainGUI { | 206 | class OTMain : public OTMainGUI { |
190 | 207 | ||
191 | Q_OBJECT | 208 | Q_OBJECT |
192 | 209 | ||
193 | public : | 210 | public : |
194 | 211 | ||
195 | OTMain( QWidget * parent ); | 212 | OTMain( QWidget * parent ); |
196 | ~OTMain(); | 213 | ~OTMain(); |
197 | 214 | ||
198 | public slots : | 215 | public slots : |
199 | 216 | ||
200 | private slots : | 217 | private slots : |
201 | 218 | ||
202 | void SLOT_Pairing( void ); | 219 | void SLOT_Pairing( void ); |
203 | void SLOT_Manage( void ); | 220 | void SLOT_Manage( void ); |
204 | void SLOT_Sniffing( void ); | 221 | void SLOT_Sniffing( void ); |
205 | void SLOT_Scan( void ); | 222 | void SLOT_Scan( void ); |
206 | void SLOT_EnableBluetooth( bool ); | 223 | void SLOT_EnableBluetooth( bool ); |
207 | void SLOT_DriverListChanged(); | 224 | void SLOT_DriverListChanged(); |
208 | void SLOT_DeviceIsEnabled( bool ); | 225 | void SLOT_DeviceIsEnabled( bool ); |
209 | void SLOT_StateChange( OTDriver * , bool ); | 226 | void SLOT_StateChange( OTDriver * , bool ); |
210 | 227 | ||
211 | signals : | 228 | signals : |
212 | 229 | ||
213 | protected : | 230 | protected : |
214 | 231 | ||
215 | private : | 232 | private : |
216 | 233 | ||
217 | // load scanned devices | 234 | // load scanned devices |
218 | OTIcons * Icons; | 235 | OTIcons * Icons; |
219 | OTGateway * OT; | 236 | OTGateway * OT; |
220 | OTSniffing * SnifWindow; | 237 | QDialog * SnifWindow; |
221 | }; | 238 | }; |
222 | }; | 239 | }; |
223 | #endif | 240 | #endif |
diff --git a/noncore/settings/networksettings2/opietooth2/libopietooth2.control b/noncore/settings/networksettings2/opietooth2/libopietooth2.control index fd01fb5..c2c8eb8 100644 --- a/noncore/settings/networksettings2/opietooth2/libopietooth2.control +++ b/noncore/settings/networksettings2/opietooth2/libopietooth2.control | |||
@@ -1,9 +1,9 @@ | |||
1 | Package: libopietooth2 | 1 | Package: libopietooth2 |
2 | Files: lib/libopietooth2.so.* apps/Settings/opietooth-manager.desktop pics/opietooth/*.png pics/opietooth/icons/*.png | 2 | Files: lib/libopietooth2.so.* apps/Settings/opietooth-manager.desktop pics/opietooth/*.png pics/opietooth/icons/*.png |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/system | 4 | Section: opie/system |
5 | Maintainer: wim delvaux <wim.delvaux@handhelds.org> | 5 | Maintainer: wim delvaux <wim.delvaux@handhelds.org> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION$EXTRAVERSION | 7 | Version: $QPE_VERSION$EXTRAVERSION |
8 | Depends: task-opie-minimal, libbluetooth1, opie-bluepin | opie-multiauth-bluepingplugin, bluez-utils-nodbus | 8 | Depends: task-opie-minimal, opie-networksettings2, libbluetooth1, opie-bluepin | opie-multiauth-bluepingplugin, bluez-utils-nodbus |
9 | Description: Opie bluetooth support library version 2 | 9 | Description: Opie bluetooth support library version 2 |
diff --git a/noncore/settings/networksettings2/opietooth2/opietooth2.pro b/noncore/settings/networksettings2/opietooth2/opietooth2.pro index cfb527d..e0057a9 100644 --- a/noncore/settings/networksettings2/opietooth2/opietooth2.pro +++ b/noncore/settings/networksettings2/opietooth2/opietooth2.pro | |||
@@ -1,37 +1,37 @@ | |||
1 | TEMPLATE = lib | 1 | TEMPLATE = lib |
2 | CONFIG += qt warn_on release | 2 | CONFIG += qt warn_on release |
3 | #CONFIG += qt warn_on debug | 3 | #CONFIG += qt warn_on debug |
4 | DESTDIR = $(OPIEDIR)/lib$(PROJMAK) | 4 | DESTDIR = $(OPIEDIR)/lib$(PROJMAK) |
5 | HEADERS = OTDevice.h \ | 5 | HEADERS = OTDevice.h \ |
6 | OTDriver.h \ | 6 | OTDriver.h \ |
7 | OTGateway.h \ | 7 | OTGateway.h \ |
8 | OTHCISocket.h \ | 8 | OTHCISocket.h \ |
9 | OTInquiry.h \ | 9 | OTInquiry.h \ |
10 | OTDeviceAddress.h \ | 10 | OTDeviceAddress.h \ |
11 | OTIcons.h \ | 11 | OTIcons.h \ |
12 | OTUUID.h \ | 12 | OTUUID.h \ |
13 | OTSDPAttribute.h \ | 13 | OTSDPAttribute.h \ |
14 | OTSDPService.h \ | 14 | OTSDPService.h \ |
15 | OTPeer.h \ | 15 | OTPeer.h \ |
16 | Opietooth.h | 16 | Opietooth.h |
17 | SOURCES = OTDevice.cpp \ | 17 | SOURCES = OTDevice.cpp \ |
18 | OTDriver.cpp \ | 18 | OTDriver.cpp \ |
19 | OTDriverList.cpp \ | 19 | OTDriverList.cpp \ |
20 | OTHCISocket.cpp \ | 20 | OTHCISocket.cpp \ |
21 | OTInquiry.cpp \ | 21 | OTInquiry.cpp \ |
22 | OTDeviceAddress.cpp \ | 22 | OTDeviceAddress.cpp \ |
23 | OTUUID.cpp \ | 23 | OTUUID.cpp \ |
24 | OTSDPAttribute.cpp \ | 24 | OTSDPAttribute.cpp \ |
25 | OTSDPService.cpp \ | 25 | OTSDPService.cpp \ |
26 | OTIcons.cpp \ | 26 | OTIcons.cpp \ |
27 | OTPeer.cpp \ | 27 | OTPeer.cpp \ |
28 | OTGateway.cpp \ | 28 | OTGateway.cpp \ |
29 | Opietooth.cpp | 29 | Opietooth.cpp |
30 | INCLUDEPATH+= $(OPIEDIR)/include | 30 | INCLUDEPATH+= $(OPIEDIR)/include ../networksettings2 |
31 | DEPENDPATH+= $(OPIEDIR)/include | 31 | DEPENDPATH+= $(OPIEDIR)/include |
32 | LIBS += -lqpe -lopiecore2 -lbluetooth | 32 | LIBS += -lqpe -lopiecore2 -lbluetooth -lnetworksettings2 |
33 | INTERFACES= OTMainGUI.ui OTSniffGUI.ui OTScanGUI.ui OTManageGUI.ui OTPairingGUI.ui | 33 | INTERFACES= OTMainGUI.ui OTSniffGUI.ui OTScanGUI.ui OTManageGUI.ui OTPairingGUI.ui |
34 | TARGET = opietooth2 | 34 | TARGET = opietooth2 |
35 | VERSION = 1.0.0 | 35 | VERSION = 1.0.0 |
36 | 36 | ||
37 | include ( $(OPIEDIR)/include.pro ) | 37 | include ( $(OPIEDIR)/include.pro ) |