author | Marek Vasut <marek.vasut@gmail.com> | 2007-07-14 22:09:38 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2007-07-15 18:33:28 (UTC) |
commit | 9dacb2c97939fad573446c0858f6b536b3d7bf15 (patch) (unidiff) | |
tree | 6cb098508e6513f67d608278bf6f61a08fb6d158 /core/obex/obexserver.cpp | |
parent | 15fbd2a9189281ca84d89ad6a77261d0046add36 (diff) | |
download | opie-9dacb2c97939fad573446c0858f6b536b3d7bf15.zip opie-9dacb2c97939fad573446c0858f6b536b3d7bf15.tar.gz opie-9dacb2c97939fad573446c0858f6b536b3d7bf15.tar.bz2 |
obex receive fixes
-rw-r--r-- | core/obex/obexserver.cpp | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/core/obex/obexserver.cpp b/core/obex/obexserver.cpp index f1fb205..786e9f7 100644 --- a/core/obex/obexserver.cpp +++ b/core/obex/obexserver.cpp | |||
@@ -162,97 +162,108 @@ static void handle_request (obex_t* handle, obex_object_t* object, | |||
162 | break; | 162 | break; |
163 | case OBEX_CMD_DISCONNECT: | 163 | case OBEX_CMD_DISCONNECT: |
164 | OBEX_ObjectSetRsp (object, OBEX_RSP_SUCCESS, OBEX_RSP_SUCCESS); | 164 | OBEX_ObjectSetRsp (object, OBEX_RSP_SUCCESS, OBEX_RSP_SUCCESS); |
165 | break; | 165 | break; |
166 | default: | 166 | default: |
167 | printf("Denied %02x request\n", cmd); | 167 | printf("Denied %02x request\n", cmd); |
168 | fflush(stdout); | 168 | fflush(stdout); |
169 | OBEX_ObjectSetRsp (object, OBEX_RSP_NOT_IMPLEMENTED, | 169 | OBEX_ObjectSetRsp (object, OBEX_RSP_NOT_IMPLEMENTED, |
170 | OBEX_RSP_NOT_IMPLEMENTED); | 170 | OBEX_RSP_NOT_IMPLEMENTED); |
171 | break; | 171 | break; |
172 | } | 172 | } |
173 | } | 173 | } |
174 | 174 | ||
175 | 175 | ||
176 | /** | 176 | /** |
177 | * Function handles OBEX event when a client is connected to the server | 177 | * Function handles OBEX event when a client is connected to the server |
178 | * @param handle OBEX connection handle | 178 | * @param handle OBEX connection handle |
179 | * @param object OBEX object itself | 179 | * @param object OBEX object itself |
180 | * @param mode | 180 | * @param mode |
181 | * @param event event code | 181 | * @param event event code |
182 | * @param obex_cmd OBEX command itself | 182 | * @param obex_cmd OBEX command itself |
183 | * @param obex_rsp OBEX responce | 183 | * @param obex_rsp OBEX responce |
184 | */ | 184 | */ |
185 | static void obex_conn_event (obex_t *handle, obex_object_t *object, | 185 | static void obex_conn_event (obex_t *handle, obex_object_t *object, |
186 | int mode, int event, int obex_cmd, int obex_rsp) | 186 | int mode, int event, int obex_cmd, int obex_rsp) |
187 | { | 187 | { |
188 | (void)mode; | 188 | (void)mode; |
189 | (void)obex_rsp; | 189 | (void)obex_rsp; |
190 | 190 | ||
191 | switch(event) { | 191 | switch(event) { |
192 | case OBEX_EV_REQHINT: | 192 | case OBEX_EV_REQHINT: |
193 | switch(obex_cmd) { | 193 | switch(obex_cmd) { |
194 | case OBEX_CMD_PUT: | 194 | case OBEX_CMD_PUT: |
195 | case OBEX_CMD_CONNECT: | 195 | case OBEX_CMD_CONNECT: |
196 | case OBEX_CMD_DISCONNECT: | 196 | case OBEX_CMD_DISCONNECT: |
197 | OBEX_ObjectSetRsp (object, OBEX_RSP_CONTINUE, OBEX_RSP_SUCCESS); | 197 | OBEX_ObjectSetRsp (object, OBEX_RSP_CONTINUE, OBEX_RSP_SUCCESS); |
198 | break; | 198 | break; |
199 | default: | 199 | default: |
200 | OBEX_ObjectSetRsp (object, OBEX_RSP_NOT_IMPLEMENTED, | 200 | OBEX_ObjectSetRsp (object, OBEX_RSP_NOT_IMPLEMENTED, |
201 | OBEX_RSP_NOT_IMPLEMENTED); | 201 | OBEX_RSP_NOT_IMPLEMENTED); |
202 | break; | 202 | break; |
203 | } | 203 | } |
204 | break; | 204 | break; |
205 | 205 | ||
206 | case OBEX_EV_REQ: | 206 | case OBEX_EV_REQ: |
207 | /* Comes when a server-request has been received. */ | 207 | /* Comes when a server-request has been received. */ |
208 | handle_request (handle, object, event, obex_cmd); | 208 | handle_request (handle, object, event, obex_cmd); |
209 | break; | 209 | break; |
210 | 210 | case OBEX_EV_REQDONE: | |
211 | switch(obex_cmd) { | ||
212 | case OBEX_CMD_PUT: | ||
213 | case OBEX_CMD_CONNECT: | ||
214 | break; | ||
215 | case OBEX_CMD_DISCONNECT: | ||
216 | OBEX_TransportDisconnect(handle); | ||
217 | break; | ||
218 | default: | ||
219 | break; | ||
220 | } | ||
221 | break; | ||
211 | case OBEX_EV_LINKERR: | 222 | case OBEX_EV_LINKERR: |
212 | break; | 223 | break; |
213 | } | 224 | } |
214 | } | 225 | } |
215 | 226 | ||
216 | /** | 227 | /** |
217 | * Function handles OBEX event | 228 | * Function handles OBEX event |
218 | * @param handle OBEX connection handle | 229 | * @param handle OBEX connection handle |
219 | * @param object OBEX object itself | 230 | * @param object OBEX object itself |
220 | * @param mode | 231 | * @param mode |
221 | * @param event event code | 232 | * @param event event code |
222 | * @param obex_cmd OBEX command itself | 233 | * @param obex_cmd OBEX command itself |
223 | * @param obex_rsp OBEX responce | 234 | * @param obex_rsp OBEX responce |
224 | */ | 235 | */ |
225 | static void obex_event (obex_t* handle, obex_object_t* object, int mode, | 236 | static void obex_event (obex_t* handle, obex_object_t* object, int mode, |
226 | int event, int obex_cmd, int obex_rsp) | 237 | int event, int obex_cmd, int obex_rsp) |
227 | { | 238 | { |
228 | 239 | ||
229 | obex_t *obex; //OBEX connection handle | 240 | obex_t *obex; //OBEX connection handle |
230 | 241 | ||
231 | switch (event) { | 242 | switch (event) { |
232 | case OBEX_EV_ACCEPTHINT: | 243 | case OBEX_EV_ACCEPTHINT: |
233 | obex = OBEX_ServerAccept (handle, obex_conn_event, NULL); | 244 | obex = OBEX_ServerAccept (handle, obex_conn_event, NULL); |
234 | break; | 245 | break; |
235 | 246 | ||
236 | default: | 247 | default: |
237 | obex_conn_event(handle, object, mode, event, obex_cmd, obex_rsp); | 248 | obex_conn_event(handle, object, mode, event, obex_cmd, obex_rsp); |
238 | } | 249 | } |
239 | } | 250 | } |
240 | 251 | ||
241 | /** | 252 | /** |
242 | * Function registers OBEX push service on a specified channel | 253 | * Function registers OBEX push service on a specified channel |
243 | * Based on The same function from GPE. | 254 | * Based on The same function from GPE. |
244 | * @param session SDP session | 255 | * @param session SDP session |
245 | * @param chan channel to listen | 256 | * @param chan channel to listen |
246 | * @name name to show | 257 | * @name name to show |
247 | */ | 258 | */ |
248 | sdp_session_t* ObexServer::addOpushSvc(uint8_t chan, const char* name) | 259 | sdp_session_t* ObexServer::addOpushSvc(uint8_t chan, const char* name) |
249 | { | 260 | { |
250 | sdp_list_t *svclass_id, *pfseq, *apseq, *root; | 261 | sdp_list_t *svclass_id, *pfseq, *apseq, *root; |
251 | uuid_t root_uuid, opush_uuid, l2cap_uuid, rfcomm_uuid, obex_uuid; | 262 | uuid_t root_uuid, opush_uuid, l2cap_uuid, rfcomm_uuid, obex_uuid; |
252 | sdp_profile_desc_t profile[1]; | 263 | sdp_profile_desc_t profile[1]; |
253 | sdp_list_t *aproto, *proto[3]; | 264 | sdp_list_t *aproto, *proto[3]; |
254 | sdp_record_t record; | 265 | sdp_record_t record; |
255 | sdp_data_t *channel; | 266 | sdp_data_t *channel; |
256 | uint8_t formats[] = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06 }; | 267 | uint8_t formats[] = { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06 }; |
257 | //uint8_t formats[] = { 0xff }; | 268 | //uint8_t formats[] = { 0xff }; |
258 | void *dtds[sizeof(formats)], *values[sizeof(formats)]; | 269 | void *dtds[sizeof(formats)], *values[sizeof(formats)]; |
@@ -379,110 +390,102 @@ bool ObexServer::start(RunMode runmode, Communication comm) | |||
379 | 390 | ||
380 | runs = true; | 391 | runs = true; |
381 | 392 | ||
382 | QApplication::flushX(); | 393 | QApplication::flushX(); |
383 | 394 | ||
384 | // WABA: Note that we use fork() and not vfork() because | 395 | // WABA: Note that we use fork() and not vfork() because |
385 | // vfork() has unclear semantics and is not standardized. | 396 | // vfork() has unclear semantics and is not standardized. |
386 | pid_ = fork(); | 397 | pid_ = fork(); |
387 | 398 | ||
388 | if ( 0 == pid_ ) | 399 | if ( 0 == pid_ ) |
389 | { | 400 | { |
390 | if ( fd[ 0 ] ) | 401 | if ( fd[ 0 ] ) |
391 | close( fd[ 0 ] ); | 402 | close( fd[ 0 ] ); |
392 | if ( !runPrivileged() ) | 403 | if ( !runPrivileged() ) |
393 | { | 404 | { |
394 | setgid( gid ); | 405 | setgid( gid ); |
395 | #if defined( HAVE_INITGROUPS) | 406 | #if defined( HAVE_INITGROUPS) |
396 | 407 | ||
397 | if ( pw ) | 408 | if ( pw ) |
398 | initgroups( pw->pw_name, pw->pw_gid ); | 409 | initgroups( pw->pw_name, pw->pw_gid ); |
399 | #endif | 410 | #endif |
400 | 411 | ||
401 | setuid( uid ); | 412 | setuid( uid ); |
402 | } | 413 | } |
403 | // The child process | 414 | // The child process |
404 | if ( !commSetupDoneC() ) | 415 | if ( !commSetupDoneC() ) |
405 | qWarning( "Could not finish comm setup in child!" ); | 416 | qWarning( "Could not finish comm setup in child!" ); |
406 | 417 | ||
407 | setupEnvironment(); | 418 | setupEnvironment(); |
408 | 419 | ||
409 | // Matthias | 420 | // Matthias |
410 | if ( run_mode == DontCare ) | 421 | if ( run_mode == DontCare ) |
411 | setpgid( 0, 0 ); | 422 | setpgid( 0, 0 ); |
412 | // restore default SIGPIPE handler (Harri) | 423 | // restore default SIGPIPE handler (Harri) |
413 | struct sigaction act; | 424 | struct sigaction act; |
414 | sigemptyset( &( act.sa_mask ) ); | 425 | sigemptyset( &( act.sa_mask ) ); |
415 | sigaddset( &( act.sa_mask ), SIGPIPE ); | 426 | sigaddset( &( act.sa_mask ), SIGPIPE ); |
416 | act.sa_handler = SIG_DFL; | 427 | act.sa_handler = SIG_DFL; |
417 | act.sa_flags = 0; | 428 | act.sa_flags = 0; |
418 | sigaction( SIGPIPE, &act, 0L ); | 429 | sigaction( SIGPIPE, &act, 0L ); |
419 | 430 | ||
420 | // We set the close on exec flag. | 431 | // We set the close on exec flag. |
421 | // Closing of fd[1] indicates that the execvp succeeded! | 432 | // Closing of fd[1] indicates that the execvp succeeded! |
422 | if ( fd[ 1 ] ) | 433 | if ( fd[ 1 ] ) |
423 | fcntl( fd[ 1 ], F_SETFD, FD_CLOEXEC ); | 434 | fcntl( fd[ 1 ], F_SETFD, FD_CLOEXEC ); |
424 | 435 | ||
425 | if (initObex() == 0) { | 436 | if (initObex() == 0) { |
426 | do { | 437 | do { |
427 | int result; //Connection result | ||
428 | if ( fd[ 1 ] ) { | 438 | if ( fd[ 1 ] ) { |
429 | ::close(fd[1]); | 439 | ::close(fd[1]); |
430 | fd[1] = 0; | 440 | fd[1] = 0; |
431 | } | 441 | } |
432 | if ((result = OBEX_HandleInput(m_obex, 60)) < 0) { | 442 | if (OBEX_HandleInput(m_obex, 10) < 0) |
433 | if (errno != ECONNRESET) { | 443 | _exit(0); |
434 | printf("OBEX_HandleInput error %d\n", errno); | ||
435 | fflush(stdout); | ||
436 | _exit(-1); | ||
437 | } | ||
438 | else | ||
439 | _exit(0); | ||
440 | } | ||
441 | } while(1); | 444 | } while(1); |
442 | } | 445 | } |
443 | char resultByte = 1; | 446 | char resultByte = 1; |
444 | if ( fd[ 1 ] ) | 447 | if ( fd[ 1 ] ) |
445 | write( fd[ 1 ], &resultByte, 1 ); | 448 | write( fd[ 1 ], &resultByte, 1 ); |
446 | _exit( -1 ); | 449 | _exit( -1 ); |
447 | } | 450 | } |
448 | else if ( -1 == pid_ ) | 451 | else if ( -1 == pid_ ) |
449 | { | 452 | { |
450 | // forking failed | 453 | // forking failed |
451 | 454 | ||
452 | runs = false; | 455 | runs = false; |
453 | return false; | 456 | return false; |
454 | } | 457 | } |
455 | else | 458 | else |
456 | { | 459 | { |
457 | if ( fd[ 1 ] ) | 460 | if ( fd[ 1 ] ) |
458 | close( fd[ 1 ] ); | 461 | close( fd[ 1 ] ); |
459 | // the parent continues here | 462 | // the parent continues here |
460 | 463 | ||
461 | // Discard any data for stdin that might still be there | 464 | // Discard any data for stdin that might still be there |
462 | input_data = 0; | 465 | input_data = 0; |
463 | 466 | ||
464 | // Check whether client could be started. | 467 | // Check whether client could be started. |
465 | if ( fd[ 0 ] ) | 468 | if ( fd[ 0 ] ) |
466 | for ( ;; ) | 469 | for ( ;; ) |
467 | { | 470 | { |
468 | char resultByte; | 471 | char resultByte; |
469 | int n = ::read( fd[ 0 ], &resultByte, 1 ); | 472 | int n = ::read( fd[ 0 ], &resultByte, 1 ); |
470 | if ( n == 1 ) | 473 | if ( n == 1 ) |
471 | { | 474 | { |
472 | // Error | 475 | // Error |
473 | runs = false; | 476 | runs = false; |
474 | close( fd[ 0 ] ); | 477 | close( fd[ 0 ] ); |
475 | pid_ = 0; | 478 | pid_ = 0; |
476 | return false; | 479 | return false; |
477 | } | 480 | } |
478 | if ( n == -1 ) | 481 | if ( n == -1 ) |
479 | { | 482 | { |
480 | if ( ( errno == ECHILD ) || ( errno == EINTR ) ) | 483 | if ( ( errno == ECHILD ) || ( errno == EINTR ) ) |
481 | continue; // Ignore | 484 | continue; // Ignore |
482 | } | 485 | } |
483 | break; // success | 486 | break; // success |
484 | } | 487 | } |
485 | if ( fd[ 0 ] ) | 488 | if ( fd[ 0 ] ) |
486 | close( fd[ 0 ] ); | 489 | close( fd[ 0 ] ); |
487 | 490 | ||
488 | if ( !commSetupDoneP() ) // finish communication socket setup for the parent | 491 | if ( !commSetupDoneP() ) // finish communication socket setup for the parent |