summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/obex/obex.pro4
-rw-r--r--core/obex/obexserver.cpp36
2 files changed, 23 insertions, 17 deletions
diff --git a/core/obex/obex.pro b/core/obex/obex.pro
index 05118ab..2372d12 100644
--- a/core/obex/obex.pro
+++ b/core/obex/obex.pro
@@ -9,3 +9,3 @@ INCLUDEPATH += $(OPIEDIR)/include $(OPIEDIR)/core/launcher
DEPENDPATH +=
-LIBS += -lqpe -lopiecore2
+LIBS += -lqpe -lopiecore2 -lopenobex
VERSION = 0.0.4
@@ -21,3 +21,3 @@ SOURCES += btobex.cpp
INCLUDEPATH += $(OPIEDIR)/noncore/net/opietooth/lib
-LIBS += -lopietooth1 -lbluetooth -lopenobex
+LIBS += -lopietooth1 -lbluetooth
DEFINES += BLUETOOTH
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,17 +437,11 @@ bool ObexServer::start(RunMode runmode, Communication comm)
if (initObex() == 0) {
+ if ( fd[ 1 ] ) {
+ ::close(fd[1]);
+ fd[1] = 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, 60) < 0) {
+ fprintf(stderr,"failed to OBEX_HandleInput(), errno=%d\n",errno);
+ _exit(errno?errno:-1);
+ }
} while(1);