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

 include '../libio.inc'
 include '../network.inc'
-include 'commands.inc'
 include 'commands.inc'
 align 4
 start:
         mcall   68, 11                  ; init heap
         invoke  ini.get_int, path, str_ftpd, str_port, 21
         mov     [sockaddr1.port], ax
         invoke  con_printf, str1, eax
-        invoke  con_printf, str1, eax
+        add     esp, 8
         mcall   socket, AF_INET4, SOCK_STREAM, 0
         mov     [pasv_start], ax
         invoke  ini.get_int, path, str_pasv, str_end, 5000
         mov     [pasv_end], ax
 mainloop:
+        mcall   23, 100                         ; Wait here for incoming connections on the base socket (socketnum)
+                                                ; One second timeout, we sill use this to check if console is still working
+        test    eax, 1 shl 7                    ; network event?
-        mcall   10                              ; Wait here for incoming connections on the base socket (socketnum)
+        jz      .checkconsole
         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
+  .checkconsole:
+        invoke  con_get_flags                   ; Is console still running?
+        test    eax, 0x0200
+        jz      mainloop
-                                                ; NOTE: upon initialisation of the thread, stack will not be available!
+        mcall   close, [socketnum]              ; kill the listening socket
+        mcall   -1                              ; and exit
         jmp     mainloop
         diff16  "threadstart", 0, $
         diff16  "threadstart", 0, $
 threadstart:
 ;;;        mcall   68, 11                          ; init heap
         lea     esp, [eax + thread_data.stack]  ; init stack
         mov     ebp, eax
+        mcall   40, 1 shl 7                     ; we only want network events for this thread
+        lea     ebx, [ebp + thread_data.buffer] ; get information about the current process
+        or      ecx, -1
+        mcall   9
+        mov     eax, dword [ebp + thread_data.buffer + 30]              ; PID is at offset 30
-        mcall   40, 1 shl 7                     ; we only want network events for this thread
+        mov     [ebp + thread_data.pid], eax
+        invoke  con_set_flags, 0x03
-        invoke  con_set_flags, 0x03
+        invoke  con_printf, str8, [ebp + thread_data.pid]               ; print on the console that we have created the new thread successfully
-        invoke  con_write_asciiz, str8          ; print on the console that we have created the new thread successfully
+        add     esp, 8                                                  ; balance stack
         invoke  con_set_flags, 0x07
         mov     [ebp + thread_data.buffer_ptr], eax
         mov     [ebp + thread_data.passivesocknum], -1
+        sendFTP "220 Welcome to KolibriOS FTP daemon"
         sendFTP "220 Welcome to KolibriOS FTP daemon"
+        diff16  "threadloop", 0, $
+threadloop:
+; Check if our socket is still connected
+        mcall   send, [ebp + thread_data.socketnum], 0, 0       ; Try to send zero bytes, if socket is closed, this will return -1
+        cmp     eax, -1
+        je      thread_exit
 threadloop:
-        mcall   10
+        mcall   10                                              ; Wait for network event
         cmp     [ebp + thread_data.mode], MODE_PASSIVE_WAIT
-        jne     .not_passive
+        cmp     [ebp + thread_data.mode], MODE_PASSIVE_WAIT
-        mov     [ebp + thread_data.mode], MODE_PASSIVE_FAILED           ; assume that we will fail
+        jne     .not_passive
         mov     ecx, [ebp + thread_data.passivesocknum]
         lea     edx, [ebp + thread_data.datasock]
         invoke  con_set_flags, 0x0c                     ; print errors in red
         invoke  con_write_asciiz, str6
         jmp     done
-done:
-        invoke  con_getch2
+done:
-        invoke  con_exit, 1
+        invoke  con_exit, 0
 exit:
         mcall   -1
 thread_exit:
-        invoke  con_set_flags, 0x02                     ; print thread info in blue
+        invoke  con_set_flags, 0x03                             ; print thread info in blue
-        invoke  con_write_asciiz, str_bye
+        invoke  con_printf, str_bye, [ebp + thread_data.pid]    ; print on the console that we are about to kill the thread
-        pop     ecx                                     ; get the thread_data pointer from stack
+        add     esp, 8                                          ; balance stack
-        mcall   68, 13                                  ; free the memory
+        mcall   68, 13, ebp                                     ; free the memory
-        mcall   -1                                      ; and kill the thread
+        mcall   -1                                              ; and kill the thread
 ; initialized data
 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
 str2b           db ' OK!',10,0
 str3            db 'Listen error',10,0
-str4            db 'Bind error',10,0
+str4            db 10,'ERROR: local port is already in use.',10,0
 ;str5            db 'Setsockopt error.',10,10,0
-str6            db 'Could not open socket',10,0
+str6            db 'ERROR: Could not open socket.',10,0
 str7            db 'Got data!',10,10,0
-str8            db 10,'New thread created!',10,0
+str8            db 10,'Thread %d created',10,0
-str_bye         db 10,'Closing thread!',10,0
+str_bye         db 10,'Thread %d killed',10,0
 str_logged_in   db 'Login ok',10,0
 str_pass_ok     db 'Password ok',10,0
 str_pass_err    db 'Password/Username incorrect',10,0
 str_pwd         db 'Current directory is "%s"\n',0
         con_gets,               'con_gets',\
         con_cls,                'con_cls',\
         con_printf,             'con_printf',\
         con_getch2,             'con_getch2',\
         con_set_cursor_pos,     'con_set_cursor_pos',\
-        con_set_flags,          'con_set_flags'
+        con_set_flags,          'con_set_flags',\
+        con_get_flags,          'con_get_flags'
 import  libini,\
         ini.get_str,            'ini_get_str',\

Subversion Repositories Kolibri OS

(root)/kernel/branches/net/applications/ftpd/ftpd.asm – Rev 2610 → 2624