| 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 @@ -216,2 +216,3 @@ static void obex_conn_event (obex_t *handle, obex_object_t *object, OBEX_TransportDisconnect(handle); + _exit(0); break; @@ -436,3 +437,2 @@ bool ObexServer::start(RunMode runmode, Communication comm) if (initObex() == 0) { - do { if ( fd[ 1 ] ) { @@ -441,4 +441,7 @@ bool ObexServer::start(RunMode runmode, Communication comm) } - 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); |