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

         db 'ABOR'
         dd cmdABOR
         db 'CWD', 0
-        db 'CWD', 0
+        dd cmdCWD
-        dd cmdCWD
         db 'DELE'
-        db 'DELE'
+        dd cmdDELE
-        dd cmdDELE
         db 'LIST'
-        db 'LIST'
+        dd cmdLIST
-        dd cmdLIST
         db 'NLST'
-        db 'NLST'
+        dd cmdNLST
-        dd cmdNLST
         db 'NOOP'
-        db 'NOOP'
+        dd cmdNOOP
-        dd cmdNOOP
         db 'PASS'
-        db 'PASS'
+        dd cmdPASS
-        dd cmdPASS
         db 'PASV'
-        db 'PWD', 0     ; Print Working Directory
+        dd cmdPASV
-        dd cmdPWD
+        db 'PWD', 0     ; Print Working Directory
+        dd cmdPWD
         db 'PORT'
-        db 'PORT'
+        dd cmdPORT
-        dd cmdPORT
         db 'QUIT'
-        db 'QUIT'
+        dd cmdQUIT
-        dd cmdQUIT
         db 'RETR'
-        db 'RETR'
+        dd cmdRETR
-        dd cmdRETR
         db 'STOR'
-        db 'STOR'
+        dd cmdSTOR
-        dd cmdSTOR
         db 'SYST'
-        db 'SYST'
+        dd cmdSYST
-        dd cmdSYST
         db 'TYPE'
-        db 'TYPE'
+        dd cmdTYPE
-        dd cmdTYPE
         db 'USER'
-        db 'USER'
+        dd cmdUSER
-        dd cmdUSER
         db 'XPWD'
-        db 'XPWD'
+        dd cmdPWD
-        dd cmdPWD
         db 0            ; end marker
         db 0                    ; end marker
 align 4
 cmdABOR:
 cmdLIST:
-        ret
+        cmp     [mode], MODE_ACTIVE
+        jne     @f
+        mcall   connect, [datasocketnum], datasock, datasock.length
+        cmp     eax, -1
+        je      .err
+  @@:
+        mcall   send, [socketnum2], str150, str150.length, 0    ; here it comes..
+        push    FA_READONLY + FA_FOLDER
+        push    str_mask
+        push    home_dir
+        call    [file.find.first]
+        mov     edi, buffer
+        jmp     .parse_file
+  .checknextfile:
+        push    edx
+        call    [file.find.next]
+  .parse_file:
+        test    eax, eax
+        jz      .done
+        mov     edx, eax
+; first, convert the attributes
+        test    [eax + FileInfoA.Attributes], FA_FOLDER
+        jnz     .folder
+        test    [eax + FileInfoA.Attributes], FA_READONLY
+        jnz     .readonly
+        mov     eax, '-rw-'
+        stosd
+        jmp     .attr
+  .folder:
+        mov     eax, 'drwx'
+        stosb
+        jmp     .attr
+  .readonly:
+        mov     eax, '-r--'
+        stosd
+  .attr:
+        mov     eax, 'rw-r'
+        stosd
+        mov     ax, 'w-'
+        stosw
+        mov     al, ' '
+        stosb
+; now..
+        mov     ax, '1 '
+        stosw
+; now write owner, everything is owned by FTP, woohoo!
+        mov     eax, 'FTP '
+        stosd
+        stosd
+; now the filesize in ascii
+        mov     ebx, dword [edx + FileInfoA.FileSize]
+        call    dword_to_ascii
+        mov     al, ' '
+        stosb
+; then date (month/day/year)
+        movzx   ebx, [edx + FileInfoA.DateModify + FileDateTime.month]
+        mov     eax, [months + 4*ebx]
+        stosd
+        movzx   ebx, [edx + FileInfoA.DateModify + FileDateTime.day]
+        call    dword_to_ascii
+        mov     al, ' '
+        stosb
+        movzx   ebx, [edx + FileInfoA.DateModify + FileDateTime.year]
+        call    dword_to_ascii
+        mov     al, ' '
+        stosb
+; and last but not least, filename
+        lea     esi, [edx + FileInfoA.FileName]
+        mov     ecx, 250
+  .nameloop:
+        lodsb
+        test    al, al
+        jz      .namedone
+        stosb
+        loop    .nameloop
+  .namedone:
+        mov     ax, 0x0d0a
+        stosw
+        jmp     .checknextfile
+  .done:
+        push    edx
+        call    [file.find.close]
+        xor     al, al
+        stosb
+        push    buffer
+        call    [con_write_asciiz]
+        lea     esi, [edi - buffer]
+        mcall   send, [datasocketnum], buffer, , 0
+        mcall   close, [datasocketnum]
+        cmp     [mode], MODE_PASSIVE_OK
+        jne     @f
+        mov     [mode], MODE_PASSIVE_WAIT
+      @@:
+        mcall   send, [socketnum2], str226, str226.length, 0    ; transfer ok
+        ret
+  .err:
+        pushd   0x0c
+        call    [con_set_flags]
+        push    str_err1
+        call    [con_write_asciiz]
+        pushd   0x07
+        call    [con_set_flags]
+        ret
 align 4
 cmdNLST:
 cmdPASV:
-        mov     [mode], MODE_PASSIVE
+; 227 Entering Passive Mode (a1,a2,a3,a4,p1,p2)
-; TODO: open the UDP socket and return our IP + port
-; 227 Entering Passive Mode (a1,a2,a3,a4,p1,p2)
 ; where a1.a2.a3.a4 is the IP address and p1*256+p2 is the port number.
+        mcall   socket, AF_INET4, SOCK_STREAM, 0
+        cmp     eax, -1
+;        je      .err
+        mov     [passivesocknum], eax
+        mov     [datasock.port], 2000
+        mov     [datasock.ip], 0
+        mcall   bind, [passivesocknum], datasock, datasock.length
+        cmp     eax, -1
+        je      bind_err
+        mcall   listen, [passivesocknum], 1
+        mov     [mode], MODE_PASSIVE_WAIT
+        mov     edi, buffer
+        mov     eax, '227 '     ; FIXME (now hardcoded to 127.0.0.1:2000)
+        stosd
+        mov     eax, '(127'
+        stosd
+        mov     eax, ',0,0'
+        stosd
+        mov     eax, ',1,7'
+        stosd
+        mov     eax, ',208'
+        stosd
+        mov     al, ')'
+        stosb
+        mov     ax, 0x0d0a
+        stosw
+        xor     al, al
+        stosb
+        lea     esi, [edi - buffer]
+        mcall   send, [socketnum2], buffer, ,0
         ret
 align 4
         mcall   send, [socketnum2], buffer, , 0
-        ret
+;        push    work_dir
+;        push    str_pwd
+;        call    [con_printf]
+        ret
 align 4
 cmdPORT:
         mov     [datasock.port], dx
-        mcall   socket, AF_INET4, SOCK_DGRAM, 0
+        mcall   socket, AF_INET4, SOCK_STREAM, 0
         cmp     eax, -1
         je      .err
         mov     [datasocketnum], eax
-        mcall   connect, [datasocketnum], datasock, datasock.length
-        cmp     eax, -1
-        je      .err
         mcall   send, [socketnum2], str225, str225.length, 0
         ret
 cmdRETR:
-        ret
+;        mcall   connect, [datasocketnum], datasock, datasock.length
+;        cmp     eax, -1
+;        je      .err
+;        push    O_READ
+;        push    home_dir
+;        call    [file.open]
+;        test    eax, eax
+;        jz      .cannot_open
+;
+;        push    BUFFERSIZE
+;        push    buffer
+;        push    eax
+;        call    [file.read]
+;        cmp     eax, -1
+;        jz      .cannot_open
+        ret
 align 4
 cmdSTOR:
         ret
 align 4
+dword_to_ascii: ; edi = ptr where to write, ebx is number
+        mov     eax, '1'
+        stosb
+        ret
 str150  db '150 Here it comes...', 13, 10
-str150  db '150 Here it comes...', 13, 10
+.length = $ - str150
 str200  db '200 Command OK.', 13, 10
 .length = $ - str200
 .length = $ - str225
 str226  db '226 Transfer OK, Closing connection', 13, 10
-str230  db '230 You are now logged in.', 13, 10
+.length = $ - str226
-.length = $ - str230
+str230  db '230 You are now logged in.', 13, 10
-str250  db '250 command successful', 13, 10
+.length = $ - str230
+str250  db '250 command successful', 13, 10
 ;str257  db '257 "'
 ;.length = $ - str257
 ;str257b db '"', 13, 10
 ;.length = $ - str257b
 str331  db '331 Please specify the password.', 13, 10

Subversion Repositories Kolibri OS

(root)/kernel/branches/net/applications/ftpd/commands.inc – Rev 2560 → 2562