| -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 @@ -178,65 +178,76 @@ static void handle_request (obex_t* handle, obex_object_t* object, * @param handle OBEX connection handle * @param object OBEX object itself * @param mode * @param event event code * @param obex_cmd OBEX command itself * @param obex_rsp OBEX responce */ static void obex_conn_event (obex_t *handle, obex_object_t *object, int mode, int event, int obex_cmd, int obex_rsp) { (void)mode; (void)obex_rsp; switch(event) { case OBEX_EV_REQHINT: switch(obex_cmd) { case OBEX_CMD_PUT: case OBEX_CMD_CONNECT: case OBEX_CMD_DISCONNECT: OBEX_ObjectSetRsp (object, OBEX_RSP_CONTINUE, OBEX_RSP_SUCCESS); break; default: OBEX_ObjectSetRsp (object, OBEX_RSP_NOT_IMPLEMENTED, OBEX_RSP_NOT_IMPLEMENTED); break; } break; 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; } } /** * Function handles OBEX event * @param handle OBEX connection handle * @param object OBEX object itself * @param mode * @param event event code * @param obex_cmd OBEX command itself * @param obex_rsp OBEX responce */ static void obex_event (obex_t* handle, obex_object_t* object, int mode, int event, int obex_cmd, int obex_rsp) { obex_t *obex; //OBEX connection handle switch (event) { case OBEX_EV_ACCEPTHINT: obex = OBEX_ServerAccept (handle, obex_conn_event, NULL); break; default: obex_conn_event(handle, object, mode, event, obex_cmd, obex_rsp); } } /** * Function registers OBEX push service on a specified channel @@ -395,78 +406,70 @@ bool ObexServer::start(RunMode runmode, Communication comm) #if defined( HAVE_INITGROUPS) if ( pw ) initgroups( pw->pw_name, pw->pw_gid ); #endif setuid( uid ); } // The child process if ( !commSetupDoneC() ) qWarning( "Could not finish comm setup in child!" ); setupEnvironment(); // Matthias if ( run_mode == DontCare ) setpgid( 0, 0 ); // restore default SIGPIPE handler (Harri) struct sigaction act; sigemptyset( &( act.sa_mask ) ); sigaddset( &( act.sa_mask ), SIGPIPE ); act.sa_handler = SIG_DFL; act.sa_flags = 0; sigaction( SIGPIPE, &act, 0L ); // We set the close on exec flag. // Closing of fd[1] indicates that the execvp succeeded! if ( fd[ 1 ] ) 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 ] ) write( fd[ 1 ], &resultByte, 1 ); _exit( -1 ); } else if ( -1 == pid_ ) { // forking failed runs = false; return false; } else { if ( fd[ 1 ] ) close( fd[ 1 ] ); // the parent continues here // Discard any data for stdin that might still be there input_data = 0; // Check whether client could be started. if ( fd[ 0 ] ) for ( ;; ) { char resultByte; int n = ::read( fd[ 0 ], &resultByte, 1 ); if ( n == 1 ) { // Error |