summaryrefslogtreecommitdiff
Unidiff
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
@@ -4,21 +4,21 @@ HEADERS = obex.h obexhandler.h obexsend.h receiver.h obeximpl.h obexbase.h obe
4 SOURCES= obex.cpp obexsend.cpp obexhandler.cpp receiver.cpp obeximpl.cpp obexbase.cpp obexserver.cpp 4 SOURCES= obex.cpp obexsend.cpp obexhandler.cpp receiver.cpp obeximpl.cpp obexbase.cpp obexserver.cpp
5 TARGET = opieobex 5 TARGET = opieobex
6 DESTDIR = $(OPIEDIR)/plugins/obex 6 DESTDIR = $(OPIEDIR)/plugins/obex
7INTERFACES = obexsendbase.ui 7INTERFACES = obexsendbase.ui
8INCLUDEPATH += $(OPIEDIR)/include $(OPIEDIR)/core/launcher 8INCLUDEPATH += $(OPIEDIR)/include $(OPIEDIR)/core/launcher
9DEPENDPATH += 9DEPENDPATH +=
10LIBS += -lqpe -lopiecore2 10LIBS += -lqpe -lopiecore2 -lopenobex
11 VERSION = 0.0.4 11 VERSION = 0.0.4
12 12
13include( $(OPIEDIR)/include.pro ) 13include( $(OPIEDIR)/include.pro )
14target.path = $$prefix/plugins/applets 14target.path = $$prefix/plugins/applets
15 15
16#FIXME: These parameters are used if bluetooth is used 16#FIXME: These parameters are used if bluetooth is used
17CONFTEST = $$system( echo $CONFIG_LIBOPIETOOTH ) 17CONFTEST = $$system( echo $CONFIG_LIBOPIETOOTH )
18contains( CONFTEST, y ){ 18contains( CONFTEST, y ){
19HEADERS += btobex.h 19HEADERS += btobex.h
20SOURCES += btobex.cpp 20SOURCES += btobex.cpp
21INCLUDEPATH += $(OPIEDIR)/noncore/net/opietooth/lib 21INCLUDEPATH += $(OPIEDIR)/noncore/net/opietooth/lib
22LIBS += -lopietooth1 -lbluetooth -lopenobex 22LIBS += -lopietooth1 -lbluetooth
23DEFINES += BLUETOOTH 23DEFINES += BLUETOOTH
24} 24}
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
@@ -204,13 +204,25 @@ static void obex_conn_event (obex_t *handle, obex_object_t *object,
204 break; 204 break;
205 205
206 case OBEX_EV_REQ: 206 case OBEX_EV_REQ:
207 /* Comes when a server-request has been received. */ 207 /* Comes when a server-request has been received. */
208 handle_request (handle, object, event, obex_cmd); 208 handle_request (handle, object, event, obex_cmd);
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:
212 break; 224 break;
213 } 225 }
214} 226}
215 227
216/** 228/**
@@ -420,27 +432,21 @@ bool ObexServer::start(RunMode runmode, Communication comm)
420 // We set the close on exec flag. 432 // We set the close on exec flag.
421 // Closing of fd[1] indicates that the execvp succeeded! 433 // Closing of fd[1] indicates that the execvp succeeded!
422 if ( fd[ 1 ] ) 434 if ( fd[ 1 ] )
423 fcntl( fd[ 1 ], F_SETFD, FD_CLOEXEC ); 435 fcntl( fd[ 1 ], F_SETFD, FD_CLOEXEC );
424 436
425 if (initObex() == 0) { 437 if (initObex() == 0) {
438 if ( fd[ 1 ] ) {
439 ::close(fd[1]);
440 fd[1] = 0;
441 }
426 do { 442 do {
427 int result; //Connection result 443 if (OBEX_HandleInput(m_obex, 60) < 0) {
428 if ( fd[ 1 ] ) { 444 fprintf(stderr,"failed to OBEX_HandleInput(), errno=%d\n",errno);
429 ::close(fd[1]); 445 _exit(errno?errno:-1);
430 fd[1] = 0; 446 }
431 }
432 if ((result = OBEX_HandleInput(m_obex, 60)) < 0) {
433 if (errno != ECONNRESET) {
434 printf("OBEX_HandleInput error %d\n", errno);
435 fflush(stdout);
436 _exit(-1);
437 }
438 else
439 _exit(0);
440 }
441 } while(1); 447 } while(1);
442 } 448 }
443 char resultByte = 1; 449 char resultByte = 1;
444 if ( fd[ 1 ] ) 450 if ( fd[ 1 ] )
445 write( fd[ 1 ], &resultByte, 1 ); 451 write( fd[ 1 ], &resultByte, 1 );
446 _exit( -1 ); 452 _exit( -1 );