author | paule <paule> | 2007-07-16 09:38:45 (UTC) |
---|---|---|
committer | paule <paule> | 2007-07-16 09:38:45 (UTC) |
commit | 6e556a6cd6b4edf2abcf08a657c9f0b19a0fca76 (patch) (unidiff) | |
tree | de3724f66caa45e5fee614c22494587657093de8 /core/obex | |
parent | 15fbd2a9189281ca84d89ad6a77261d0046add36 (diff) | |
download | opie-6e556a6cd6b4edf2abcf08a657c9f0b19a0fca76.zip opie-6e556a6cd6b4edf2abcf08a657c9f0b19a0fca76.tar.gz opie-6e556a6cd6b4edf2abcf08a657c9f0b19a0fca76.tar.bz2 |
Commit "thanks-pfalcon-this-one-is-better.patch" as attached to bug #1854. This fixes libopieobex previously being built without being linked to libopenobex, as well as some other issues that prevented IR recieve from working.upstream
Original patch by Marek Vasut <marek.vasut@gmail.com>; improved with input from pfalcon & polyonymous.
-rw-r--r-- | core/obex/obex.pro | 4 | ||||
-rw-r--r-- | core/obex/obexserver.cpp | 28 |
2 files changed, 19 insertions, 13 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 | |||
9 | DEPENDPATH += | 9 | DEPENDPATH += |
10 | LIBS += -lqpe -lopiecore2 | 10 | LIBS += -lqpe -lopiecore2 -lopenobex |
11 | VERSION = 0.0.4 | 11 | VERSION = 0.0.4 |
@@ -21,3 +21,3 @@ SOURCES += btobex.cpp | |||
21 | INCLUDEPATH += $(OPIEDIR)/noncore/net/opietooth/lib | 21 | INCLUDEPATH += $(OPIEDIR)/noncore/net/opietooth/lib |
22 | LIBS += -lopietooth1 -lbluetooth -lopenobex | 22 | LIBS += -lopietooth1 -lbluetooth |
23 | DEFINES += BLUETOOTH | 23 | 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, | |||
209 | break; | 209 | break; |
210 | 210 | case OBEX_EV_REQDONE: | |
211 | switch(obex_cmd) { | ||
212 | case OBEX_CMD_PUT: | ||
213 | case OBEX_CMD_CONNECT: | ||
214 | break; | ||
215 | case OBEX_CMD_DISCONNECT: | ||
216 | OBEX_TransportDisconnect(handle); | ||
217 | _exit(0); | ||
218 | break; | ||
219 | default: | ||
220 | break; | ||
221 | } | ||
222 | break; | ||
211 | case OBEX_EV_LINKERR: | 223 | case OBEX_EV_LINKERR: |
@@ -425,4 +437,2 @@ bool ObexServer::start(RunMode runmode, Communication comm) | |||
425 | if (initObex() == 0) { | 437 | if (initObex() == 0) { |
426 | do { | ||
427 | int result; //Connection result | ||
428 | if ( fd[ 1 ] ) { | 438 | if ( fd[ 1 ] ) { |
@@ -431,10 +441,6 @@ bool ObexServer::start(RunMode runmode, Communication comm) | |||
431 | } | 441 | } |
432 | if ((result = OBEX_HandleInput(m_obex, 60)) < 0) { | 442 | do { |
433 | if (errno != ECONNRESET) { | 443 | if (OBEX_HandleInput(m_obex, 60) < 0) { |
434 | printf("OBEX_HandleInput error %d\n", errno); | 444 | fprintf(stderr,"failed to OBEX_HandleInput(), errno=%d\n",errno); |
435 | fflush(stdout); | 445 | _exit(errno?errno:-1); |
436 | _exit(-1); | ||
437 | } | ||
438 | else | ||
439 | _exit(0); | ||
440 | } | 446 | } |