| 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) (side-by-side diff) | |
| tree | 6cb098508e6513f67d608278bf6f61a08fb6d158 | |
| 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 @@ -206,9 +206,20 @@ static void obex_conn_event (obex_t *handle, obex_object_t *object, 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); + break; + default: + break; + } + break; case OBEX_EV_LINKERR: break; } } @@ -423,22 +434,14 @@ bool ObexServer::start(RunMode runmode, Communication comm) fcntl( fd[ 1 ], F_SETFD, FD_CLOEXEC ); 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 - _exit(0); - } + if (OBEX_HandleInput(m_obex, 10) < 0) + _exit(0); } while(1); } char resultByte = 1; if ( fd[ 1 ] ) |