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

         dd      1               ; header version
         dd      start           ; entry point
         dd      i_end           ; initialized size
         dd      mem+0x1000      ; required memory
         dd      mem+0x1000      ; stack pointer
-        dd      0               ; parameters
+        dd      params          ; parameters
         dd      path            ; path
 include '../macros.inc'
 purge mov,add,sub
 ; load libraries
         stdcall dll.Load, @IMPORT
         test    eax, eax
         jnz     exit
+        mcall   68, 11                  ; init heap
 ; find path to main settings file
-        mov     edi, path      ; Calculate the length of zero-terminated string
+        mov     edi, path               ; Calculate the length of zero-terminated string
         xor     al , al
         mov     ecx, 1024
         repne   scasb
         dec     edi
-        mov     esi, filename
+        mov     esi, filename           ; append it with '.ini'
         movsd
         movsb
         je      listen_err
         push    str2b
+        call    [con_write_asciiz]
+mainloop:
+        mcall   10                              ; Wait here for incoming connections on the base socket (socketnum)
-        call    [con_write_asciiz]
+        mcall   51, 1, threadstart, 0           ; Start a new thread for every incoming connection
+                                                ; NOTE: upon initialisation of the thread, stack will not be available!
+        jmp     mainloop
         mcall   10
+threadstart:
+        mcall   68, 12, sizeof.thread_data      ; allocate the thread data struct
+        cmp     eax, -1
+        je      exit
+        lea     esp, [eax + thread_data.stack]  ; init stack
+        push    eax                             ; save pointer to thread_data on stack
+        mcall   40, 1 shl 7                     ; we only want network events for this thread
+        push    str8
+        call    [con_write_asciiz]                                              ; print on the console that we have created the new thread successfully
-        mcall   accept, [socketnum], sockaddr1, sockaddr1.length
+        mcall   accept, [socketnum], sockaddr1, sockaddr1.length                ; time to accept the awaiting connection..
         cmp     eax, -1
-        je      acpt_err
+        je      thread_exit
         mov     edx, [esp]                                                      ; pointer to thread_data
+        mov     [edx + thread_data.socketnum], eax
-        mov     [socketnum2], eax
+        mcall   send, [edx + thread_data.socketnum], str220, str220.length, 0   ; send welcome string to the FTP client
+threadloop:
+        mcall   10
-        mcall   send, [socketnum2], str220, str220.length, 0    ; send welcome string
+        mov     edx, [esp]                                                      ; pointer to thread_data
         cmp     [edx + thread_data.mode], MODE_PASSIVE_WAIT
-  .loop:
+        jne     @f
-        mcall   10
+        mov     ecx, [edx + thread_data.passivesocknum]
+        lea     edx, [edx + thread_data.datasock]
-        cmp     [mode], MODE_PASSIVE_WAIT
+        mov     esi, sizeof.thread_data.datasock
-        jne     @f
+        mcall   accept
-        mcall   accept, [passivesocknum], datasock, datasock.length
+        mov     edx, [esp]                                                      ; pointer to thread_data
         cmp     eax, -1
         je      @f
-        mov     [datasocketnum], eax
+        mov     [edx + thread_data.datasocketnum], eax
-        mov     [mode], MODE_PASSIVE_OK
+        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
-        push    str_datasock
+       @@:
+        mov     ecx, [edx + thread_data.socketnum]
-        call    [con_write_asciiz]
+        lea     edx, [edx + thread_data.buffer]
-       @@:
+        mov     esi, sizeof.thread_data.buffer
         mcall   recv
+        cmp     eax, -1                                                         ; error?
-        mcall   recv, [socketnum2], buffer, buffer.length
+        je      threadloop
-        cmp     eax, -1
+        or      eax, eax                                                        ; 0 bytes read?
-        je      .loop
+        jz      threadloop
-        or      eax, eax
+        push    eax                                                             ; save number of bytes read on stack
-        jz      .loop
-        push    eax
+        mov     edx, [esp+4]                                                    ; pointer to thread_data
         mov     byte [edx + thread_data.buffer + eax], 0                        ; append received data with a 0 byte
-        mov     byte[buffer+eax], 0
-        pushd   0x0a
-        call    [con_set_flags]
-        push    buffer
-        call    [con_write_asciiz]
-        pushd   0x07
-        call    [con_set_flags]
-        pop     ecx
-        mov     esi, buffer
+        pushd   0x0a                                                            ; print received data to console (in green color)
-        call    parse_cmd
         call    [con_set_flags]
-        jmp     .loop
+        lea     eax, [edx + thread_data.buffer]
-acpt_err:
+        push    eax
         call    [con_write_asciiz]
-        pushd   0x0c
+        pushd   0x07
         call    [con_set_flags]
         push    str8
-        call    [con_write_asciiz]
+        pop     ecx                                                             ; number of bytes read
-        jmp     done
         lea     esi, [edx + thread_data.buffer]
-listen_err:
+        call    parse_cmd
-        pushd   0x0c
+        jmp     threadloop
-        call    [con_set_flags]
-        push    str3
+listen_err:
-        call    [con_write_asciiz]
-        jmp     done
+        pushd   0x0c
         call    [con_set_flags]
-bind_err:
+        push    str3
         call    [con_write_asciiz]
         call    [con_exit]
 exit:
         mcall   -1
+thread_exit:
+        push    str_bye
+        call    [con_write_asciiz]      ; say bye bye
+        pop     ecx                     ; get the thread_data pointer from stack
+        mcall   68, 13                  ; free the memory
+        mcall   -1                      ; and kill the thread
 ; initialized data
 ; data
-title   db      'KolibriOS FTP daemon 0.1', 0
+title           db 'KolibriOS FTP daemon 0.1', 0
-str1    db      'Starting FTP daemon on port %u', 0
+str1            db 'Starting FTP daemon on port %u', 0
-str2    db      '.', 0
+str2            db '.', 0
-str2b   db      ' OK!',10,10,0
+str2b           db ' OK!',10,10,0
-str3    db      'Listen error',10,10,0
+str3            db 'Listen error',10,10,0
-str4    db      'Bind error',10,10,0
+str4            db 'Bind error',10,10,0
-str5    db      'Setsockopt error.',10,10,0
+;str5            db 'Setsockopt error.',10,10,0
+str6            db 'Could not open socket',10,10,0
-str6    db      'Could not open socket',10,10,0
+str7            db 'Got data!',10,10,0
-str7    db      'Got data!',10,10,0
+str8            db 10,'New thread created!',10,10,0
-str8    db      'Error accepting connection',10,10,0
+str_bye         db 10,'Closing thread!',10,10,0
 str_logged_in   db 'Login ok',10,10,0
 str_pass_ok     db 'Password ok - Logged in',10,10,0
 str_pwd         db 'Current directory is "%s"\n',0
 str_err2        db 'ERROR: cannot open directory',10,10,0
-str_datasock    db 'Passive data socket connected!',10,10,0
-str_notfound    db 'ERROR: file not found',10,10,0
-str_sockerr     db 'ERROR: socket error',10,10,0
+str_datasock    db 'Passive data socket connected!',10,10,0
-str_newline     db 10,0
+str_notfound    db 'ERROR: file not found',10,10,0
+str_sockerr     db 'ERROR: socket error',10,10,0
+str_newline     db 10, 0
+str_mask        db '*', 0
+months          dd 'Jan '
+                dd 'Feb '
+                dd 'Mar '
+                dd 'Apr '
+                dd 'May '
+                dd 'Jun '
-str_mask        db '*', 0
+                dd 'Jul '
                 dd 'Aug '
                 dd 'Sep '
-months:
+                dd 'Oct '
-.ip     dd 0
+  .ip           dd 0
-        rb 10
+                rb 10
-.length = $ - sockaddr1
+  .length       = $ - sockaddr1
+; import
 ; import
 align 4
 @IMPORT:
-        file.find.close , 'file_find_close'
+        file.find.close,        'file_find_close'
-i_end:
-socketnum       dd ?
-; thread specific data
-socketnum2      dd ?
-state           dd ?
-home_dir        db '/rd/1/', 0
-                rb 1024
+i_end:
-work_dir        rb 1024
-fpath           rb 1024*3
-type            db ?
+; uninitialised data
-mode            db ?    ; active/passive
-passivesocknum  dd ?
-datasocketnum   dd ?
-datasock:
-        dw AF_INET4
-.port   dw ?
-.ip     dd ?
-        rb 10

Subversion Repositories Kolibri OS

(root)/kernel/branches/net/applications/ftpd/ftpd.asm @ 2585 – Rev 2571 → 2578