| -rw-r--r-- | core/obex/obexserver.cpp | 15 |
1 files changed, 9 insertions, 6 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 @@ -209,16 +209,17 @@ static void obex_conn_event (obex_t *handle, obex_object_t *object, 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; } @@ -429,23 +430,25 @@ bool ObexServer::start(RunMode runmode, Communication comm) 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) { + if ( fd[ 1 ] ) { + ::close(fd[1]); + fd[1] = 0; + } do { - if ( fd[ 1 ] ) { - ::close(fd[1]); - fd[1] = 0; - } - if (OBEX_HandleInput(m_obex, 10) < 0) - _exit(0); + 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_ ) |