WebSVN – Kolibri OS – Diff – /programs/network/ftpc/servercommands.inc

 ; Commands are always 3 numbers and followed by a space
 ; If a server decides it needs multiline output,
 ; first lines will have a dash instead of space after numbers,
 ; thus they are simply ignored in this simple command parser.
+        cmp     dword[buf_cmd+4], "Open"
+        je      init_download_count
         cmp     dword[buf_cmd], "150 "
         je      data_loop
         cmp     dword[buf_cmd], "220 "
-        je      welcome
+        je      connect_ok
         cmp     dword[buf_cmd], "503 "         ; login first
         je      welcome
         cmp     dword[buf_cmd], "530 "         ; password incorrect
-        mov     [use_params], 0
+        cmp     dword[buf_cmd], "530 "         ; password incorrect
         je      welcome
         mov     [status], STATUS_CONNECTED
+        jmp     wait_for_usercommand
+connect_ok:
-        jmp     wait_for_usercommand
+        mov     [status], STATUS_CONNECTED
         jmp     arg_handler.copy_user
 pass:
-        mov     [status], STATUS_NEEDPASSWORD
-        jmp     wait_for_usercommand
+        mov     [status], STATUS_NEEDPASSWORD
+        jmp     wait_for_usercommand
 login_ok:
-        mov     [status], STATUS_LOGGED_IN
+login_ok:
-        cmp     [use_params], 0
-        je      wait_for_usercommand
-        cmp     [param_path+4], 0
-        je      wait_for_usercommand
-        ; copy path to buf_cmd and execute CWD
-        mov     edi, buf_cmd
+        mov     [status], STATUS_LOGGED_IN
         mov     esi, param_path
-  @@:
+        cmp     [param_path], 0x20 ; no path specified
         call    ascii_dec
         mov     byte[sockaddr2.port+0], bl
         call    ascii_dec
         mov     byte[sockaddr2.port+1], bl
-        invoke  con_write_asciiz, str_open
+        icall   eax, interface_addr, interface.print, str_open
         mcall   connect, [datasocket], sockaddr2, 18
         cmp     eax, -1
         jne     @f
         mov     eax, str_err_connect
         jmp     error
     @@: jmp     wait_for_servercommand
   .fail:
+        icall   eax, interface_addr, interface.print, str_unknown
+        jmp     wait_for_servercommand
+; get file size, initialize count for number of bytes downloaded
+init_download_count:
-        invoke  con_write_asciiz, str_unknown
+        mov     edx, 0
+        ; search for 'Open' in buf_cmd
+        lea     esi, [buf_cmd+3]
+      @@:
+        inc     esi
+        cmp     dword[esi], 'Open'
+        je      @f
+        cmp     byte[esi], 0
+        jne     @b
+        jmp     data_loop
+      @@:
+        ; get file size
+        mov     al, '('
+        mov     ecx, -1
+        mov     edi, buf_cmd
+        repne   scasb
+        xor     eax, eax
+        mov     ebx, 10
+        xor     ecx, ecx
+        mov     esi, edi
+      @@:
+        push    eax
+        lodsb
+        sub     al, '0'
+        mov     cl, al
-        jmp     wait_for_servercommand
+        pop     eax
+        mul     ebx
+        add     eax, ecx
         cmp     byte[esi], ' '
         jne     @b
+        mov     [file_size], eax
 data_loop:
 data_loop:
+        cmp     [operation], OPERATION_STOR
-        invoke  con_write_asciiz, str_dot
+        je      .stor
-        cmp     [operation], OPERATION_STOR
+        push    edx
-        je      .stor
+; we are receiving data
         mcall   recv, [datasocket], buf_buffer2, BUFFERSIZE, 0
-; we are receiving data
+        pop     edx ; get byte count
-        mcall   recv, [datasocket], buf_buffer2, BUFFERSIZE, 0
+        add     edx, eax
+        test    ebx, ebx
+        jnz     .done
+        mov     byte[buf_buffer2 + eax], 0
         test    ebx, ebx
-        jnz     .done
+        cmp     [operation], OPERATION_RETR
-        mov     byte[buf_buffer2 + eax], 0
+        je      .retr
+        cmp     [operation], OPERATION_RDIR
+        je      .rdir
+        cmp     [operation], OPERATION_LIST
         je      .list
         cmp     [operation], OPERATION_RETR
-        je      .retr
+; not retreiving, just print to console
         icall   eax, interface_addr, interface.print, buf_buffer2
-        cmp     [operation], OPERATION_RDIR
+        jmp     data_loop
         je      .rdir
+; for console, simply print. for gui, add name to tree list
+  .list:
+        ijmp    ebx, interface_addr, interface.list
 ; retreiving, save to file
-; not retreiving, just print to console
+  .retr:
+        mov     [filestruct.ptr], buf_buffer2
+        mov     [filestruct.size], eax
-        invoke  con_write_asciiz, buf_buffer2
+        push    eax
-        jmp     data_loop
+        mcall   70, filestruct
         test    eax, eax
-; retreiving, save to file
+        jz      @f
-  .retr:
+        call    error_fs
-        mov     [filestruct.ptr], buf_buffer2
+        jmp     close_datacon
-        mov     [filestruct.size], eax
+      @@:
+        pop     eax
+        add     [filestruct.offset], eax
-        push    eax
+        icall   eax, interface_addr, interface.progress
-        mcall   70, filestruct
+        jmp     data_loop
         pop     eax
-        add     [filestruct.offset], eax
+; storing, send all data
+  .stor:
+        mcall   70, filestruct
-        jmp     data_loop
+        cmp     eax, 6          ; end of file
         je      .last_call
-; storing, send all data
+        test    eax, eax        ; error
-  .stor:
+        jz      @f
+        call    error_fs
+        jmp     close_datacon
-        mcall   70, filestruct
+      @@:
-        cmp     eax, 6          ; end of file
+        add     [filestruct.offset], ebx
-        je      .last_call
+        mov     esi, ebx
-        test    eax, eax        ; error
+        mcall   send, [datasocket], buf_buffer2, , 0
-;        jne     .fileerror
+        mov     edx, [filestruct.offset]
-        add     [filestruct.offset], ebx
+        icall   eax, interface_addr, interface.progress
 close_datacon:
         cmp     [operation], OPERATION_NONE
         je      wait_for_usercommand
-        invoke  con_write_asciiz, str_close
+        icall   eax, interface_addr, interface.print, str_close
         mcall   close, [datasocket]

Subversion Repositories Kolibri OS

(root)/programs/network/ftpc/servercommands.inc – Rev 6437 → 6582