-rw-r--r-- | core/obex/obexserver.cpp | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/core/obex/obexserver.cpp b/core/obex/obexserver.cpp index f1fb205..59fcb0f 100644 --- a/core/obex/obexserver.cpp +++ b/core/obex/obexserver.cpp @@ -209,3 +209,15 @@ 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: @@ -425,4 +437,2 @@ bool ObexServer::start(RunMode runmode, Communication comm) if (initObex() == 0) { - do { - int result; //Connection result if ( fd[ 1 ] ) { @@ -431,10 +441,6 @@ bool ObexServer::start(RunMode runmode, Communication comm) } - if ((result = OBEX_HandleInput(m_obex, 60)) < 0) { - if (errno != ECONNRESET) { - printf("OBEX_HandleInput error %d\n", errno); - fflush(stdout); - _exit(-1); - } - else - _exit(0); + do { + if (OBEX_HandleInput(m_obex, 60) < 0) { + fprintf(stderr,"failed to OBEX_HandleInput(), errno=%d\n",errno); + _exit(errno?errno:-1); } |