WebSVN – Kolibri OS – Diff – /programs/network/ftpc/ftpc.asm

   .portloop:
         lodsb
         cmp     al, 0x20
         jbe     .port_done
         sub     al, '0'
+        jnb     @f
+        mov     eax, str_err_host
-        jb      error_hostname
+        jmp     error
-        cmp     al, 9
+    @@: cmp     al, 9
+        jna     @f
+        mov     eax, str_err_host
-        ja      error_hostname
+        jmp     error
-        lea     ebx, [ebx*4 + ebx]
+    @@: lea     ebx, [ebx*4 + ebx]
         shl     ebx, 1
         add     ebx, eax
         jmp     .portloop
         push    esp     ; reserve stack place
         invoke  getaddrinfo, buf_cmd, 0, 0, esp
         pop     esi
 ; test for error
         test    eax, eax
+        jz      @f
-        jnz     error_resolve
+        mov     eax, str_err_resolve
+        jmp     error
+    @@:
 ; write results
         invoke  con_write_asciiz, str8          ; ' (',0
         mov     eax, [esi+addrinfo.ai_addr]     ; convert IP address to decimal notation
         mov     eax, [eax+sockaddr_in.sin_addr] ;
         mov     [sockaddr1.ip], eax             ;
         invoke  freeaddrinfo, esi               ; free allocated memory
         invoke  con_write_asciiz, str9          ; ')',10,0
 ; open the socket
         mcall   socket, AF_INET4, SOCK_STREAM, 0
         cmp     eax, -1
+        jne     @f
+        mov     eax, str_err_socket
-        je      error_socket
+        jmp     error
-        mov     [controlsocket], eax
+    @@: mov     [controlsocket], eax
 ; connect to the server
         invoke  con_write_asciiz, str_connect
         mcall   connect, [controlsocket], sockaddr1, 18
         cmp     eax, -1
+        jne     @f
-        je      error_connect
+        mov     eax, str_err_connect
+        jmp     error
-        mov     [status], STATUS_CONNECTING
+    @@: mov     [status], STATUS_CONNECTING
 ; Tell the user we're waiting for the server now.
         invoke  con_write_asciiz, str_waiting
 ; Reset 'offset' variable, it's used by the data receiver
         mov     [timeout], eax
   .receive_loop:
         mcall   23, 50          ; Wait for event with timeout
         mcall   26, 9
         cmp     eax, [timeout]
+        jl      @f
-        jge     error_timeout
+        mov     eax, str_err_timeout
+        jmp     error
-        mcall   recv, [controlsocket], buf_buffer1, BUFFERSIZE, MSG_DONTWAIT
+    @@: mcall   recv, [controlsocket], buf_buffer1, BUFFERSIZE, MSG_DONTWAIT
         test    eax, eax
         jnz     .got_data
         cmp     ebx, EWOULDBLOCK
+        je      @f
+        mov     eax, str_err_recv
-        jne     error_socket
+        jmp     error
-        jmp     .receive_loop
+    @@: jmp     .receive_loop
   .got_data:
         mov     [offset], 0
         ret
   .active:
         mcall   socket, AF_INET4, SOCK_STREAM, 0
+        cmp     eax, -1
+        jne     @f
-        cmp     eax, -1
+        mov     eax, str_err_socket
-        je      error_socket
+        jmp     error
-        mov     [datasocket], eax
+    @@: mov     [datasocket], eax
         mov     ax, [acti_port_start]
         xchg    al, ah
         mov     [sockaddr2.port], ax
+        mcall   bind, [datasocket], sockaddr2, 18
+        cmp     eax, -1
+        jne     @f
-        mcall   bind, [datasocket], sockaddr2, 18
+        mov     eax, str_err_bind
-        cmp     eax, -1
+        jmp     error
+    @@:
-        je      error_socket
+        mcall   listen, [datasocket], 1
+        cmp     eax, -1
         jne     @f
-        mcall   listen, [datasocket], 1
+        mov     eax, str_err_listen
-        cmp     eax, -1
+        jmp     error
-        je      error_socket
+    @@:
         lea     esi, [edi - buf_buffer1]
         mcall   send, [controlsocket], buf_buffer1, , 0
         mcall   accept, [datasocket], sockaddr2, 18        ; time to accept the awaiting connection..
+        cmp     eax, -1
+        jne     @f
-        cmp     eax, -1
+        mov     eax, str_err_accept
-        je      error_socket
+        jmp     error
-        push    eax
+    @@: push    eax
         mcall   close, [datasocket]
         pop     [datasocket]
         jnz     @r
         pop     ecx ebx edx
-        ret
-error_hostname:
-        invoke  con_set_flags, 0x0c                     ; print errors in red
-        invoke  con_write_asciiz, str_err_host
-        jmp     wait_for_keypress
-error_connect:
-        invoke  con_set_flags, 0x0c                     ; print errors in red
-        invoke  con_write_asciiz, str_err_connect
-        jmp     wait_for_keypress
-error_timeout:
-        invoke  con_set_flags, 0x0c                     ; print errors in red
-        invoke  con_write_asciiz, str_err_timeout
-        jmp     wait_for_keypress
+        ret
-error_socket:
-        invoke  con_set_flags, 0x0c                     ; print errors in red
-        invoke  con_write_asciiz, str_err_socket
-        jmp     wait_for_keypress
 error:
+        push    eax
-error_resolve:
+        invoke  con_set_flags, 0x0c                     ; print errors in red
-        invoke  con_set_flags, 0x0c                     ; print errors in red
+        pop     eax
-        invoke  con_write_asciiz, str_err_resolve
+        invoke  con_write_asciiz, eax
         jmp     wait_for_keypress
 str_prompt      db '> ',0
 str_resolve     db 'Resolving ',0
 str_newline     db 10,0
 str_err_resolve db 10,'Name resolution failed.',10,0
+str_err_socket  db 10,'[75,0 socket]: Error creating a socket',10,0
+str_err_bind    db 10,'[75,2 bind]: Error binding to socket',10,0
+str_err_listen  db 10,'[75,3 listen]: Cannot accept incoming connections',10,0
+str_err_accept  db 10,'[75,5 accept]: Error accepting a connection',10,0
-str_err_socket  db 10,'Socket error.',10,0
+str_err_recv    db 10,'[75,7 recv]: Error receiving data from server',10,0
 str_err_heap    db 10,'Cannot allocate memory from heap.',10,0
 str_err_timeout db 10,'Timeout - no response from server.',10,0
-str_err_connect db 10,'Cannot connect to the server.',10,0
+str_err_connect db 10,'[75,4 connect]: Cannot connect to the server.',10,0
+str_err_host    db 10,'Invalid hostname.',10,0
-str_err_host    db 10,'Invalid hostname.',10,0
+str_err_params  db 10,'Invalid parameters',10,0
 str8            db ' (',0
 str9            db ')',10,0
 str_push        db 'Push any key to continue.',0
 str_connect     db 'Connecting...',10,0

Subversion Repositories Kolibri OS

(root)/programs/network/ftpc/ftpc.asm – Rev 6394 → 6436