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

 ;;                                                                 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+format binary as ""
+__DEBUG__       = 0
-format binary as ""
+__DEBUG_LEVEL__ = 1
 use32
         org     0x0
 include '../../libio.inc'
 include '../../dll.inc'
 include '../../develop/libraries/box_lib/trunk/box_lib.mac'
+include '../../network.inc'
-include '../../network.inc'
 include '../../debug-fdo.inc'
-filebuffer_size = 4*4096        ; 16kb   (dont try to change it yet..)
 TIMEOUT         = 100
-buffer_len      = 1500
+buffer_len      = 4096
-opcode_rrq      = 1
+opcode_rrq      = 1 shl 8
-opcode_wrq      = 2
+opcode_wrq      = 2 shl 8
-opcode_data     = 3
+opcode_data     = 3 shl 8
-opcode_ack      = 4
+opcode_ack      = 4 shl 8
-opcode_error    = 5
+opcode_error    = 5 shl 8
         stdcall dll.Load, @IMPORT
         or      eax, eax
         jnz     exit
-stop_transfer:
+home:
         mcall   40, EVM_MOUSE + EVM_MOUSE_FILTER + EVM_REDRAW + EVM_BUTTON + EVM_KEY + EVM_STACK
-red_win:
-        call    draw_window
+redraw:
-align 4
+        call    draw_window
-still:
-        mcall   10
 mainloop:
-        dec     eax
+        mcall   10
-        jz      red_win
         dec     eax
-        dec     eax
+        jz      redraw
-        jz      key
+        dec     eax
         jz      key
         invoke  edit_box_mouse, edit4
         invoke  option_box_mouse, Option_boxs1
         invoke  option_box_mouse, Option_boxs2
-        jmp     still
+        jmp     mainloop
 button:
         mcall   17
         cmp     ah, 0x10        ; connect button
         je      start_transfer
         test    ah , ah
         invoke  edit_box_key, edit1
         invoke  edit_box_key, edit2
         invoke  edit_box_key, edit3
         invoke  edit_box_key, edit4
-        jmp still
+        jmp     mainloop
         invoke  option_box_draw, Option_boxs2
         mov     esi, [sc.work_button]
+        mcall   8, 210 shl 16 + 170, 105 shl 16 + 16, 0x10
+        mcall   38, 10 shl 16 + 380, 130 shl 16 + 130, [sc.work_graph]
+        cmp     [errormsg], 0
-        mcall   8, 210 shl 16 + 170, 105 shl 16 + 16, 0x10
+        je      .no_error
         mov     ecx, 0x80000000
+        or      ecx, [sc.work_text]
+        mcall   4, 20 shl 16 + 137, , [errormsg]
+        mcall   12, 2
-        or      ecx, [sc.work_button_text]
+        jmp     .draw_btn
         mcall   4, 260 shl 16 + 110, , str_transfer
   .no_error:
         mov     ecx, 0x80000000
+        or      ecx, [sc.work_text]
+        mcall   4, 350 shl 16 + 137, , str_kb_s
+        mcall   4, 50 shl 16 + 137, , str_complete
-        or      ecx, [sc.work_text]
+        mcall   47, 1 shl 31 + 7 shl 16 + 1, kbps, 305 shl 16 + 137, [sc.work_text]
+        mcall   47, 1 shl 31 + 3 shl 16 + 1, done, 25 shl 16 + 137
-        mcall   4, 350 shl 16 + 137, , str_kb_s
+  .draw_btn:
-        mcall   4, 50 shl 16 + 137, , str_complete
+        cmp     [socketnum], 0
         je      .no_transfer
-        mcall   38, 10 shl 16 + 380, 130 shl 16 + 130, [sc.work_graph]
+        mov     ecx, 0x80000000
+        or      ecx, [sc.work_button_text]
+        mcall   4, 270 shl 16 + 110, , str_stop
+        mcall   12, 2
+        ret
         mcall   47, 1 shl 31 + 7 shl 16 + 1, kbps, 305 shl 16 + 137, [sc.work_text]
-        mcall   47, 1 shl 31 + 3 shl 16 + 1, done, 25 shl 16 + 137, ;[sc.work_text]
+  .no_transfer:
+        mov     ecx, 0x80000000
         or      ecx, [sc.work_button_text]
-        mcall   12, 2
+        mcall   4, 260 shl 16 + 110, , str_transfer
         push    dword SRV     ; first parameter
         call    [getaddrinfo]
         pop     esi
-; test for error
+        ; test for error
         test    eax, eax
-        jnz     still
+        jnz     home
-        mov     esi, [esi]
+        mov     eax, [esi + addrinfo.ai_addr]
-        mov     esi, [esi + sockaddr_in.sin_addr]
+        mov     eax, [eax + sockaddr_in.sin_addr]
-        mov     dword [IP], esi
+        mov     [sockaddr.ip], eax
+        ; free allocated memory
+        push    esi
+        call    [freeaddrinfo]
+; Open a socket & connect to server
         mov     [errormsg], str_err_socket
-        mcall   socket, AF_INET4, SOCK_DGRAM, 0                ; socket_open
-        cmp     eax, -1
+        mcall   socket, AF_INET4, SOCK_DGRAM, 0
-        je      still
+        cmp     eax, -1
+        je      home
+        mov     [socketnum], eax
-        mov     [socketnum], eax
         mcall   connect, [socketnum], sockaddr, sockaddr_len
-        mcall   connect, [socketnum], sockaddr, sockaddr_len         ; socket_connect
+        cmp     eax, -1
-        cmp     eax, -1
+        je      home
-        je      still
+; Create the read/write request packet
         mov     word[buffer], opcode_rrq
-        mov     word [I_END], opcode_rrq
+        cmp     [option_group2], op3
-        cmp     [option_group2],op3
+        je      @f
-        je      @f
+        mov     word[buffer], opcode_wrq
-        mov     word [I_END], opcode_wrq
-      @@:
       @@:
-        xor     al , al
+; Copy in the remote filename (asciiz)
+        xor     al, al
+        mov     edi, remote_addr
-        mov     edi, remote_addr
+        mov     ecx, 255
-        mov     ecx, 250
+        repnz   scasb
-        repnz   scasb
-        sub     edi, remote_addr-1
+        lea     ecx, [edi - remote_addr - 1]
-        mov     ecx, edi
+        mov     esi, remote_addr
-        mov     edi, I_END+2
+        mov     edi, buffer+2
-        mov     esi, remote_addr
         rep     movsb
         stosb
-        cmp     [option_group1], op1
         je      .ascii
 ; Append the data type (asciiz)
-        mov     esi, octet
+        cmp     [option_group1], op1
+        je      .ascii
-        movsd
+        mov     esi, octet
-        movsb
         movsd
-        jmp     .send_request
+        movsb
+        jmp     .send_request
+      .ascii:
+        mov     esi, netascii
+        movsd
+        movsd
-      .ascii:
+; Send the request to the server
-        mov     esi, netascii
-        movsd
-        movsd
+      .send_request:
+        xor     al, al
+        stosb
+        lea     esi, [edi - buffer]
+        xor     edi, edi
+        mcall   send, [socketnum], buffer
+        cmp     eax, -1
+        je      home
+; Jump to send/receive code
+        cmp     word[buffer], opcode_wrq
+        je      tftp_send
+tftp_receive:
+        mcall   40, EVM_REDRAW + EVM_BUTTON + EVM_STACK
+        mov     [last_ack], 0
+        mov     [errormsg], 0
       .send_request:
-        xor     al, al
+        call    draw_window
         stosb
-        sub     edi, I_END
+; Open/create local file
+        mov     [file_struct.subfn], 2
-        mov     esi, edi
+        mov     [file_struct.offset], 0
-        mcall   send, [socketnum], I_END
         mov     [file_struct.size], 0
+        mcall   70, file_struct
+; Truncate it to 0 bytes
+        mov     [file_struct.subfn], 4
+        mcall   70, file_struct
         mcall   40, EVM_REDRAW + EVM_BUTTON + EVM_STACK
 ; Set parameters for writing to file
+        mov     [file_struct.subfn], 3
+        mov     [file_struct.data], buffer + 4
-        mov     [last_ack], 0
+  .loop:
+        mcall   23, TIMEOUT
+        dec     eax
         jz      .red
+        dec     eax
-receive_data_loop:
+        dec     eax
+        jz      .button
-        mcall   23, TIMEOUT
-        dec     eax
-        jz      .red
-        dec     eax
-        jz      .key
+        mcall   recv, [socketnum], buffer, buffer_len, MSG_DONTWAIT     ; receive data
+        cmp     eax, -1
+        je      .loop
+        DEBUGF  1, "Got %u bytes\n", eax
+        cmp     word[buffer], opcode_error
-        mcall   recv, [socketnum], buffer, buffer_len, MSG_DONTWAIT     ; receive data
+        je      tftp_error
+        cmp     word[buffer], opcode_data
+        jne     .error
+; Verify ACK number
-        cmp     word[buffer], opcode_data
-        jne     .error
+        mov     bx, word[buffer + 2]
         rol     bx, 8
+        cmp     [last_ack], 0
-        mov     bx, [last_ack]
-        cmp     word [buffer + 2], bx
-        jne     .packet_got_lost
-        inc     [last_ack]
+        je      @f
+        cmp     [last_ack], bx
-        cmp     eax, 4+512
+        jne     .packet_got_lost
-        je      .continue
+        inc     bx
-; last packet, or something else
-.error:
-.packet_got_lost:
+      @@:
+        mov     [last_ack], bx
+; Write to the file
+        lea     ecx, [eax - 4]
+        mov     [file_struct.size], ecx
+        mcall   70, file_struct
+        add     [file_struct.offset], ecx
+; Send ACK
+        mov     word[buffer], opcode_ack
+        mcall   send, [socketnum], buffer, 4, 0
+        jmp     .loop
+  .packet_got_lost:
+        ;TODO
+        jmp     .loop
+  .red:
+        call    draw_window
-.continue:
-        mov     word[buffer], opcode_ack                ; send ack
-        mcall   send, [socketnum], buffer, 4, 0
-        jmp     receive_data_loop
-.red:
+        jmp     .loop
-        call    draw_window
+  .button:
+        mcall   17
-        jmp     receive_data_loop
+        cmp     ah, 1
+        jne     .abort
-.key:
-        mcall   2
+        mcall   close, [socketnum]
-        cmp     ah, 2
-        jz      exit
+        mcall   -1
-        ; close socket ?
-        jmp     receive_data_loop
+  .abort:
-;--------------------------------
         mcall   close, [socketnum]
-send_:
+        xor     eax, eax
         mov     [socketnum], eax
-        invoke  file_open, local_addr, O_READ
+        mov     [errormsg], str_abort
-        or      eax, eax
+        jmp     home
-        jz      .exit
-        mov     [fh], eax
-        stdcall mem.Alloc, filebuffer_size
+  .error:
+        mcall   close, [socketnum]
+        xor     eax, eax
-        or      eax, eax
+        mov     [socketnum], eax
+        mov     [errormsg], str_err_unexp
+        jmp     home
+  .done:
+        mcall   close, [socketnum]
-        jz      .exit
+        xor     eax, eax
-        mov     [fb], eax
         mov     [socketnum], eax
-        mov     [last_ack], 0
+        mov     [errormsg], str_success
-        mov     [fo], 0
         jmp     home
-.read_chunk:
+tftp_send:
+        mcall   40, EVM_REDRAW + EVM_BUTTON + EVM_STACK
+        mov     [last_ack], 0
-        invoke  file_seek, [fh], [fo], SEEK_END
+        mov     [errormsg], 0
-        cmp     eax, -1
-        je      .exit
+        call    draw_window
         invoke  file_read, [fh], [fb], filebuffer_size
-        cmp     eax, -1
+        mov     [file_struct.subfn], 0
-        je      .exit
-        add     [fo], filebuffer_size
-        cmp     eax, filebuffer_size
-        je      .packet
+        mov     [file_struct.offset], 0
+        mov     [file_struct.size], buffer_len
+        mov     [file_struct.data], buffer + 4
+  .next:
+        mov     edi, buffer
+        mov     ax, opcode_data
-        ; ijhidfhfdsndsfqk
+        stosw
-.packet:
+        mov     ax, [last_ack]
+        stosw
+        mcall   70, file_struct
+        test    eax, eax
-        movzx   esi, [last_ack]
+;        jnz     .done
-        and     esi, 0x000000001f   ; last five bits    BUFFER SIZE MUST BE 16 kb for this to work !!!
-        shl     esi, 9              ; = * 512
+        mov     [size], ebx
-        add     esi, [fb]
+  .resend:
+        mov     ebx, [size]
+        lea     esi, [ebx + 4]
+        xor     edi, edi
+        mcall   send, [socketnum], buffer
+  .loop:
+        mcall   23, TIMEOUT
+        dec     eax
+        jz      .red
-        mov     edi, buffer
+        dec     eax
+        dec     eax
+        jz      .button
+        mcall   recv, [socketnum], buffer, buffer_len, MSG_DONTWAIT
+        cmp     eax, -1
+        je      .loop
-        mov     ax, opcode_data
-        stosw
-        mov     ax, [last_ack]
+        cmp     word[buffer], opcode_error
+        je      tftp_error
+        cmp     word[buffer], opcode_ack
+        jne     .error
+        mov     ax, [last_ack]
+        cmp     word[buffer+2], ax
+        jne     .resend
+        mov     eax, [size]
+        cmp     eax, buffer_len
+        jb      .done
+        add     [file_struct.offset], eax
+        inc     [last_ack]
+        jmp     .next
+  .red:
+        call    draw_window
+        jmp     .loop
+  .button:
+        mcall   17
+        cmp     ah, 1
+        jne     .abort
+        mcall   close, [socketnum]
+        mcall   -1
+  .abort:
+        mcall   close, [socketnum]
+        xor     eax, eax
+        mov     [socketnum], eax
+        mov     [errormsg], str_abort
+        jmp     home
+  .error:
+        mcall   close, [socketnum]
+        xor     eax, eax
+        mov     [socketnum], eax
+        mov     [errormsg], str_err_unexp
+        jmp     home
+  .done:
+        mcall   close, [socketnum]
+        xor     eax, eax
+        mov     [socketnum], eax
-        stosw
+        mov     [errormsg], str_success
-        mov     ecx, 512/4
+        jmp     home
         rep     movsd
         mcall   send, [socketnum], buffer, 4+512, 0       ; send data
+tftp_error:
         mcall   close, [socketnum]
         xor     eax, eax
-.loop:
+        mov     [socketnum], eax
-        mcall   23, TIMEOUT
         mov     ax, word[buffer+2]
+        xchg    al, ah
+        test    ax, ax
+        jz      .0
+        dec     ax
+        jz      .1
+        dec     ax
+        jz      .2
+        dec     ax
-        dec     eax
+        jz      .3
-        jz      .red
+        dec     ax
+        jz      .4
-        dec     eax
-        jz      .key
+        dec     ax
         jz      .5
-        mcall   recv, [socketnum], buffer, buffer_len, MSG_DONTWAIT  ; receive ack
+        dec     ax
+        jz      .6
-        cmp     word[buffer], opcode_ack
+        dec     ax
-        jne     .exit
+        jz      .7
-        mov     ax, [last_ack]
+  .0:
-        cmp     word[buffer+2], ax
+        mov     [errormsg], str_error.0
-        jne     .packet
+        jmp     home
-        inc     [last_ack]
+  .1:
-        test    [last_ack],0x001f
+        mov     [errormsg], str_error.1
-        jz      .read_chunk
+        jmp     redraw
-        jmp     .packet
-.red:
-        call    draw_window
-        jmp     .loop
-.key:
-        mcall   2
-        cmp     ah, 2
-        jz      exit
-        ; close socket ?
+  .2:
         mov     [errormsg], str_error.2
-        jmp     .loop
+        jmp     home
   .3:
-.exit:
+        mov     [errormsg], str_error.3
-        invoke  file_close, [fh]
+        jmp     home
-        jmp     still
+  .4:
+        mov     [errormsg], str_error.4
         jmp     home
   .5:
         mov     [errormsg], str_error.5
 str_method      db 'Method:', 0
 str_blocksize   db 'Blocksize:', 0
 str_kb_s        db 'kB/s', 0
 str_complete    db '% complete', 0
 str_transfer    db 'Transfer', 0
+str_stop        db 'Stop', 0
 str_error:
-._0 db 'Not defined, see error message (if any).', 0
+.0              db 'Error.', 0                      ; not further defined error
-._1 db 'File not found.', 0
+.1              db 'File not found.', 0
-._2 db 'Access violation.', 0
+.2              db 'Access violation.', 0
-._3 db 'Disk full or allocation exceeded.', 0
+.3              db 'Disk full or allocation exceeded.', 0
-._4 db 'Illegal TFTP operation.', 0
+.4              db 'Illegal TFTP operation.', 0
-._5 db 'Unknown transfer ID.', 0
+.5              db 'Unknown transfer ID.', 0
-._6 db 'File already exists.', 0
+.6              db 'File already exists.', 0
-._7 db 'No such user.', 0
+.7              db 'No such user.', 0
+str_welcome     db 'Welcome.', 0
+str_err_resolve db 'Unable to resolve server address.', 0
+str_err_socket  db 'Socket error.', 0
+str_err_unexp   db 'Unexpected command from server.', 0
+str_success     db 'Operation completed successfully.', 0
+str_abort       db 'Operation aborted by user.', 0
-netascii db 'NetASCII'
+netascii        db 'NetASCII'
-octet    db 'Octet'
+octet           db 'Octet'
-get      db 'GET'
+get             db 'GET'
-put      db 'PUT'
+put             db 'PUT'
-BLK      db "512", 0, 0, 0
-last_ack dw ?
-fh       dd ?   ; file handle
-fo       dd ?   ; file offset
-fb       dd ?   ; file buffer
+BLK             db "512", 0, 0, 0
 SRV             db "192.168.1.115", 0
                 rb (SRV + 256 - $)
-remote_addr     db "IMG00", 0
+remote_addr     db "file", 0
+                rb (remote_addr + 256 - $)
-                rb (remote_addr + 256 - $)
+local_addr      db "/tmp0/1/file", 0
+                rb (local_addr + 256 - $)
+include_debug_strings
 I_END:
-local_addr      db "/hd0/1/KolibriOS/kernel.mnt", 0
                 rb (local_addr + 256 - $)
 last_ack        dw ?
-I_END:
+size            dd ?

Subversion Repositories Kolibri OS

(root)/programs/network/tftpc/tftpc.asm @ 6836 – Rev 4468 → 4655