summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/obex/obexserver.cpp23
1 files changed, 13 insertions, 10 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
@@ -207,7 +207,18 @@ static void obex_conn_event (obex_t *handle, obex_object_t *object,
/* 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);
+ break;
+ default:
+ break;
+ }
+ break;
case OBEX_EV_LINKERR:
break;
}
@@ -424,20 +435,12 @@ bool ObexServer::start(RunMode runmode, Communication comm)
if (initObex() == 0) {
do {
- int result; //Connection result
if ( fd[ 1 ] ) {
::close(fd[1]);
fd[1] = 0;
}
- if ((result = OBEX_HandleInput(m_obex, 60)) < 0) {
- if (errno != ECONNRESET) {
- printf("OBEX_HandleInput error %d\n", errno);
- fflush(stdout);
- _exit(-1);
- }
- else
+ if (OBEX_HandleInput(m_obex, 10) < 0)
_exit(0);
- }
} while(1);
}
char resultByte = 1;