obex receive fixes

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
@@ -194,33 +194,44 @@ static void obex_conn_event (obex_t *handle, obex_object_t *object,
         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)
@@ -411,46 +422,38 @@ bool ObexServer::start(RunMode runmode, Communication comm)
             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
     {