author | Michael Krelin <hacker@klever.net> | 2007-07-15 23:55:02 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2007-07-15 23:55:02 (UTC) |
commit | 174edcd91bcb969c4ee71a824849d8737223dd8f (patch) (side-by-side diff) | |
tree | 912ef42f7902a1c400ed469e8abc322346765ef3 | |
parent | 655a28b22bfb5cb2b8080eaf8f3c3d0ef769882e (diff) | |
download | opie-174edcd91bcb969c4ee71a824849d8737223dd8f.zip opie-174edcd91bcb969c4ee71a824849d8737223dd8f.tar.gz opie-174edcd91bcb969c4ee71a824849d8737223dd8f.tar.bz2 |
unbreak error handling while preserving functionality
- exit after disconnecting
- spit out error message on error
- don't close fd in the loop, once is enough
-rw-r--r-- | core/obex/obexserver.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/core/obex/obexserver.cpp b/core/obex/obexserver.cpp index 786e9f7..286961f 100644 --- a/core/obex/obexserver.cpp +++ b/core/obex/obexserver.cpp @@ -201,32 +201,33 @@ static void obex_conn_event (obex_t *handle, obex_object_t *object, OBEX_RSP_NOT_IMPLEMENTED); break; } break; case OBEX_EV_REQ: /* Comes when a server-request has been received. */ handle_request (handle, object, event, obex_cmd); break; case OBEX_EV_REQDONE: switch(obex_cmd) { case OBEX_CMD_PUT: case OBEX_CMD_CONNECT: break; case OBEX_CMD_DISCONNECT: OBEX_TransportDisconnect(handle); + _exit(0); break; default: break; } break; case OBEX_EV_LINKERR: break; } } /** * Function handles OBEX event * @param handle OBEX connection handle * @param object OBEX object itself * @param mode * @param event event code @@ -421,39 +422,41 @@ bool ObexServer::start(RunMode runmode, Communication comm) if ( run_mode == DontCare ) setpgid( 0, 0 ); // restore default SIGPIPE handler (Harri) struct sigaction act; sigemptyset( &( act.sa_mask ) ); sigaddset( &( act.sa_mask ), SIGPIPE ); act.sa_handler = SIG_DFL; act.sa_flags = 0; sigaction( SIGPIPE, &act, 0L ); // We set the close on exec flag. // Closing of fd[1] indicates that the execvp succeeded! if ( fd[ 1 ] ) fcntl( fd[ 1 ], F_SETFD, FD_CLOEXEC ); if (initObex() == 0) { - do { if ( fd[ 1 ] ) { ::close(fd[1]); fd[1] = 0; } - if (OBEX_HandleInput(m_obex, 10) < 0) - _exit(0); + do { + if (OBEX_HandleInput(m_obex, 60) < 0) { + fprintf(stderr,"failed to OBEX_HandleInput(), errno=%d\n"); + _exit(1); + } } while(1); } char resultByte = 1; if ( fd[ 1 ] ) write( fd[ 1 ], &resultByte, 1 ); _exit( -1 ); } else if ( -1 == pid_ ) { // forking failed runs = false; return false; } else { |