WebSVN – Kolibri OS – Diff – /kernel/branches/net/applications/ftpd/ftpd.asm

         movsd
         movsd
         movsw
-; initialize console
-        push    1
+; initialize console
-        call    [con_start]
-        push    title
-        push    -1
-        push    -1
-        push    -1
-        push    -1
+        invoke  con_start, 1
-        call    [con_init]
+        invoke  con_init, -1, -1, -1, -1, title
         mcall   40, 1 shl 7             ; we only want network events
         mov     [serverip], ebx
         invoke  ini.get_int, path, str_ftpd, str_port, 21
-        mov     [sockaddr1.port], ax
-        push    eax
+        mov     [sockaddr1.port], ax
         push    str1
-        call    [con_printf]
+        invoke  con_printf, str1, eax
-        mcall   socket, AF_INET4, SOCK_STREAM, 0
-        cmp     eax, -1
+        mcall   socket, AF_INET4, SOCK_STREAM, 0
-        je      sock_err
+        cmp     eax, -1
-        mov     [socketnum], eax
+        je      sock_err
         mov     [socketnum], eax
         push    str2
-        call    [con_write_asciiz]
+        invoke  con_write_asciiz, str2
 ;        mcall   setsockopt, [socketnum], SOL_SOCKET, SO_REUSEADDR, &yes,
-;        cmp     eax, -1
-;        je      opt_err
+;        cmp     eax, -1
 ;        je      opt_err
         mcall   bind, [socketnum], sockaddr1, sockaddr1.length
-        cmp     eax, -1
-        je      bind_err
+        mcall   bind, [socketnum], sockaddr1, sockaddr1.length
         cmp     eax, -1
-        push    str2
+        je      bind_err
         call    [con_write_asciiz]
-        invoke  ini.get_int, path, str_ftpd, str_conn, 1        ; Backlog (max connections)
+        invoke  con_write_asciiz, str2
         mov     edx, eax
         invoke  ini.get_int, path, str_ftpd, str_conn, 1        ; Backlog (max connections)
-        push    str2
+        mov     edx, eax
         push    eax                             ; save pointer to thread_data on stack
         mov     ebp, esp
-        mcall   40, 1 shl 7                     ; we only want network events for this thread
+        mcall   40, 1 shl 7                     ; we only want network events for this thread
-        pushd   0x03
-        call    [con_set_flags]
-        push    str8
-        call    [con_write_asciiz]                                              ; print on the console that we have created the new thread successfully
+        invoke  con_set_flags, 0x03
-        pushd   0x07
+        invoke  con_write_asciiz, str8          ; print on the console that we have created the new thread successfully
-        call    [con_set_flags]
+        invoke  con_set_flags, 0x07
         mcall   accept, [socketnum], sockaddr1, sockaddr1.length                ; time to accept the awaiting connection..
         sendFTP "220 Welcome to KolibriOS FTP daemon"
-threadloop:
-        mcall   10
+threadloop:
         mcall   10
         mov     edx, [ebp]                                                      ; pointer to thread_data
         cmp     [edx + thread_data.mode], MODE_PASSIVE_WAIT
-        cmp     [edx + thread_data.mode], MODE_PASSIVE_WAIT
+        jne     .not_passive
-        jne     .not_passive
+        mov     [edx + thread_data.mode], MODE_PASSIVE_FAILED                   ; assume that we will fail
         mov     ecx, [edx + thread_data.passivesocknum]
         lea     edx, [edx + thread_data.datasock]
         mov     esi, sizeof.thread_data.datasock
         mcall   accept
         mov     edx, [ebp]                                                      ; pointer to thread_data
         cmp     eax, -1
         je      .not_passive
-        mov     [edx + thread_data.datasocketnum], eax
-        mov     [edx + thread_data.mode], MODE_PASSIVE_FAILED
+        mov     [edx + thread_data.datasocketnum], eax
         mov     [edx + thread_data.mode], MODE_PASSIVE_OK
         push    str_datasock
-        call    [con_write_asciiz]                                              ; print on the console that the datasock is now ready
+        invoke  con_write_asciiz, str_datasock
         mov     al, 13
         repne   scasb
         jne     threadloop
+; We got a command!
-; We got a command!
+        mov     byte [edi + 1], 0                                               ; append string with zero byte
-        lea     eax, [edx + thread_data.buffer]
+        lea     esi, [edx + thread_data.buffer]
         mov     ecx, [edx + thread_data.buffer_ptr]
-        sub     ecx, eax
-        push    ecx                                                             ; push full data size on stack
+        sub     ecx, esi
-        mov     [edx + thread_data.buffer_ptr], eax                             ; reset buffer ptr
-        push    eax;;;;
-        pushd   0x02                                                            ; print received data to console (in green color)
-        call    [con_set_flags]
-        push    str_newline
-        call    [con_write_asciiz]
-;;;;        push    eax
-        call    [con_write_asciiz]
-        pushd   0x07
-        call    [con_set_flags]
+        mov     [edx + thread_data.buffer_ptr], esi                             ; reset buffer ptr
-        mov     edx, [ebp]
+        invoke  con_set_flags, 0x02                                                            ; print received data to console (in green color)
-        pop     ecx                                                             ; number of bytes read
+        invoke  con_write_asciiz, str_newline
-        lea     esi, [edx + thread_data.buffer]
+        invoke  con_write_asciiz, esi
+        invoke  con_set_flags, 0x07
         call    parse_cmd
-        jmp     threadloop
+        push    threadloop
-listen_err:
+        jmp     parse_cmd
         pushd   0x0c
-        call    [con_set_flags]
+listen_err:
-        push    str3
-        call    [con_write_asciiz]
+        invoke  con_set_flags, 0x0c                                                            ; print received data to console (in green color)
-        jmp     done
+        invoke  con_write_asciiz, str3
-bind_err:
+        jmp     done
         pushd   0x0c
-        call    [con_set_flags]
-        push    str4
+bind_err:
-        call    [con_write_asciiz]
-        jmp     done
+        invoke  con_set_flags, 0x0c                                                            ; print received data to console (in green color)
         invoke  con_write_asciiz, str4
-sock_err:
+        jmp     done
-        pushd   0x0c
-        call    [con_set_flags]
-        push    str6
+sock_err:
-        call    [con_write_asciiz]
+        invoke  con_set_flags, 0x0c                                                            ; print received data to console (in green color)
-        jmp     done
+        invoke  con_write_asciiz, str6
         jmp     done
-done:
-        call    [con_getch2]
+done:
-        push    1
+        invoke  con_getch2
-        call    [con_exit]
+        invoke  con_exit, 1
 exit:
 str7            db 'Got data!',10,10,0
 str8            db 10,'New thread created!',10,0
 str_bye         db 10,'Closing thread!',10,0
 str_logged_in   db 'Login ok',10,0
-str_pass_ok     db 'Password ok - Logged in',10,0
+str_pass_ok     db 'Password ok',10,0
 str_pwd         db 'Current directory is "%s"\n',0
 str_err2        db 'ERROR: cannot open directory',10,0
 str_datasock    db 'Passive data socket connected!',10,0
 str_notfound    db 'ERROR: file not found',10,0
 str_sockerr     db 'ERROR: socket error',10,0
 str_login_invalid db 'Login invalid',10,0
 str_newline     db 10, 0
-str_newline     db 10, 0
+str_mask        db '*', 0
-str_mask        db '*', 0
+str_infinity    db 0xff, 0xff, 0xff, 0xff, 0

Subversion Repositories Kolibri OS

(root)/kernel/branches/net/applications/ftpd/ftpd.asm @ 2609 – Rev 2598 → 2602