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

 ;;             Version 2, June 1991                                ;;
 ;;                                                                 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 URLMAXLEN               = 1024
-primary_buffer_size     = 4096
+BUFFERSIZE              = 4096
 __DEBUG__       = 1
         db      'MENUET01'      ; header
         dd      0x01            ; header version
         dd      START           ; entry point
         dd      IM_END          ; image size
-        dd      I_END           ; required memory
+        dd      I_END+0x100     ; required memory
-        dd      I_END           ; esp
+        dd      I_END+0x100     ; esp
         dd      params          ; I_PARAM
         dd      0x0             ; I_Path
         stdcall dll.Load, @IMPORT
         test    eax, eax
         jnz     exit
-; prepare webAddr area
 ; prepare webAddr area
         mov     al, ' '
         mov     edi, webAddr
         mov     ecx, URLMAXLEN
         rep     stosb
 ; url is followed by shared memory name.
         inc     esi
   .done:
-        mov     [shared_name], esi
-        mov     ah, 22   ; strange way to tell that socket should be opened...
-        call    socket_commands
         mov     [shared_name], esi
         jmp     still
 prepare_event:
 red:    ; redraw
         call    draw_window
 still:
-        mcall   23, 1   ; wait here for event
+        mcall   10      ; wait here for event
         cmp     eax, 1  ; redraw request ?
         je      red
         je      button
         cmp     eax, 6  ; mouse in buffer ?
-        je      mouse
-; Get the web page data from the remote server
-        cmp     eax, 8
-        jne     still
-        call    read_incoming_data
-        cmp     [status], 4
-        je      .no_send
-        mov     [onoff], 1
-        call    send_request
-  .no_send:
-        call    print_status
-        cmp     [prev_status], 4
-        jne     no_close
-        cmp     [status], 4             ; connection closed by server
-        jbe     no_close                ; respond to connection close command
-; draw page
-        call    read_incoming_data
-        mcall   close, [socketnum]
-        mov     [onoff], 0
         je      mouse
-no_close:
+        jmp     still
         jmp     still
-key:
-        mcall   2       ; read key
+key:
+        mcall   2       ; read key
         stdcall [edit_box_key], dword edit1
-        shr     eax, 8
+        stdcall [edit_box_key], dword edit1
         cmp     eax, 13
-        je      retkey
+        cmp     ax, 13 shl 8
+        je      download
+        jmp     still
-        jmp     still
+button:
+        mcall   17      ; get id
+        cmp     ah, 26
-button:
+        jne     @f
+        call    save_to_file
+        jmp     still
   @@:
-        mcall   17      ; get id
+        cmp     ah, 1   ; button id=1 ?
-        cmp     ah, 26
+        je      exit
-        je      save
+        jmp     download
+mouse:
+        stdcall [edit_box_mouse], edit1
+        jmp     still
+exit:
+        or      eax, -1  ; close this program
+        mcall
+download:
-        cmp     ah, 1   ; button id=1 ?
+        DEBUGF  1, "Starting download\n"
+        call    parse_url
+        call    open_socket
+        call    send_request
+        mcall   68, 12, BUFFERSIZE
+        mov     [buf_ptr], eax
-        jne     noclose
+        mov     [buf_size], 0
-;        DEBUGF  1, "Closing socket before exit...\n"
+        call    read_incoming_data
-close_end_exit:
+        mcall   close, [socketnum]
-exit:
+        call    parse_result
-        or      eax, -1  ; close this program
+        call    save
-        mcall
+        mcall   68, 13, [final_buffer]
-mouse:
-        stdcall [edit_box_mouse], edit1
         jmp     still
-save:
-        DEBUGF  2, "File saved\n"
-        mcall   70, fileinfo
-        mov     ecx, [sc.work_text]
+save:
+        mov     ecx, [shared_name]
-        or      ecx, 0x80000000
+        test    ecx, ecx
-        mcall   4, <10, 93>, , download_complete
+        jz      @f
+        cmp     [ecx], byte 0
+        jnz     save_in_shared
+    @@:
+        call    save_to_file
+; if called from command line, then exit
+        cmp     byte[params], 0
+        jne     exit
+        ret
-        jmp     still
+save_in_shared:
+        mov     esi, 1   ; SHM_OPEN+SHM_WRITE
+        mcall   68, 22
+        test    eax, eax
+        jz      exit
+        sub     edx, 4
+        jbe     exit
+        mov     ecx, [final_size]
+        cmp     ecx, edx
+        jb      @f
+        mov     ecx, edx
+    @@:
+        mov     [eax], ecx
+        lea     edi, [eax+4]
+        mov     esi, [final_buffer]
+        mov     edx, ecx
+        shr     ecx, 2
+        rep     movsd
+        mov     ecx, edx
+        and     ecx, 3
+        rep     movsb
+        jmp     exit
-noclose:
+;****************************************************************************
-        cmp     ah, 31
+;    Function
-        jne     noup
+;       save_to_file
 ;****************************************************************************
 send_request:
-        DEBUGF  1, "Sending request\n"
         DEBUGF  1, "Sending request\n"
         pusha
         mov     esi, string0
         mov     edi, request
         movsd
         popa
         mov     esi, edi
         sub     esi, request    ; length
-        xor     edi, edi        ; flags
-;;;;now write \r\nConnection: Close \r\n\r\n
+        xor     edi, edi        ; flags
-        mcall   send, [socketnum], request  ;' HTTP/1.1 .. '
-        popa
-        ret
-;****************************************************************************
-;    Function
-;       print_status
-;
-;   Description
-;       displays the socket/data received status information
-;
-;****************************************************************************
-print_status:
-        pusha
-        mcall   26, 9
-        cmp     eax, [nextupdate]
-        jb      status_return
-        add     eax, 25
-        mov     [nextupdate], eax
-        mov     ecx, [winys]
-        shl     ecx, 16
-        add     ecx, -18 shl 16 + 10
-        mcall   13, <5, 100>, , 0xffffff
-        mov     edx, 12 shl 16 - 18
-        add     edx, [winys]
-        xor     esi, esi
-        mcall   47, <3, 0>, [status], ,
-        mov     edx, 40 shl 16 - 18
-        add     edx, [winys]
-        mcall   , <6, 0>, [pos]
-status_return:
-        popa
+        mcall   send, [socketnum], request  ;' HTTP/1.1 .. '
         ret
 ;****************************************************************************
 ;   Description
 ;       receive the web page from the server, storing it without processing
+;
 ;****************************************************************************
 read_incoming_data:
-        cmp     [onoff], 1
-        je      .rid
-        ret
-  .rid:
-        push    esi
         push    edi
+        DEBUGF  1, "Reading incoming data\n"
+        mov     eax, [buf_ptr]
-        DEBUGF  1, "Reading incoming data\n"
+        mov     [pos], eax
+  .read:
-  .read:
+        mcall   23, 100         ; 1 second timeout
-        ; TODO: implement timeout !
+  .read_dontwait:
-        mcall   recv, [socketnum], primary_buf, primary_buffer_size, 0
+        mcall   recv, [socketnum], [pos], BUFFERSIZE, 0
         inc     eax             ; -1 = error (socket closed?)
         jz      .no_more_data
         dec     eax             ; 0 bytes...
-        jz      .read
+        jz      .read           ; timeout
         DEBUGF  1, "Got chunk of %u bytes\n", eax
-        mov     edi, [pos]
+        add     [buf_size], eax
+        add     [pos], eax
+        push    eax
-        add     [pos], eax
+        mov     ecx, [buf_size]
+        add     ecx, BUFFERSIZE
-        push    eax
+        mcall   68, 20, , [buf_ptr]     ; reallocate memory block (make bigger)
-        mcall   68, 20, [pos], [buf_ptr]
-        mov     [buf_ptr], eax
+        ; TODO: parse header and resize buffer only once
-        add     edi, eax
+        pop     eax
         mov     esi, primary_buf
+        cmp     eax, BUFFERSIZE
+        je      .read_dontwait
-        pop     ecx             ; number of recently read bytes
+        jmp     .read
-        lea     edx, [ecx - 3]
-        rep     movsb
-  .no_more_data:
-        DEBUGF  1, "No more data\n"
-;        mov     [status], 4     ; connection closed by server
-        call    parse_result
-        DEBUGF  1, "Parsing complete\n"
-        mov     ecx, [shared_name]
-        test    ecx, ecx
-        jz      @f
-        cmp     [ecx], byte 0
-        jnz     save_in_shared
-    @@:
-        mcall   70, fileinfo
-        DEBUGF  2, "File saved\n"
-        mov     ecx, [sc.work_text]
-        or      ecx, 0x80000000
-        mcall   4, <10, 93>, , download_complete
         pop     edi
-        pop     esi
-; if called from command line, then exit
-        cmp     byte[params], 0
-        jne     exit
-        ret
-save_in_shared:
-        mov     esi, 1   ; SHM_OPEN+SHM_WRITE
-        mcall   68, 22
-        test    eax, eax
-        jz      save_in_shared_done
-        sub     edx, 4
-        jbe     save_in_shared_done
-        mov     ecx, [final_size]
-        cmp     ecx, edx
-        jb      @f
-        mov     ecx, edx
-    @@:
-        mov     [eax], ecx
-        lea     edi, [eax+4]
-        mov     esi, [final_buffer]
-        mov     edx, ecx
-        shr     ecx, 2
-        rep     movsd
+  .no_more_data:
-        mov     ecx, edx
+        mov     eax, [buf_ptr]
-        and     ecx, 3
+        sub     [pos], eax
-        rep     movsb
 save_in_shared_done:
-        pop     edi
+        DEBUGF  1, "No more data\n"
-        pop     esi
-        jmp     exit
+        ret
 ; this function cuts header, and removes chunk sizes if doc is chunked
 ; in: buf_ptr, pos; out: buf_ptr, pos.
         mov     ebx, [buf_size]
         sub     ebx, [body_pos]
         cmp     eax, ebx
+        jbe     .size_ok
-        jbe     .size_ok
+        sub     eax, ebx
-        DEBUGF  2, "Not all data was received!\n"
+        DEBUGF  2, "%u bytes of data are missing!\n", eax
         mov     eax, ebx
   .size_ok:
         mov     [final_size], eax
         rep     movsb
         jmp     .read_size
 chunks_end:
+chunks_end:
-; free old buffer
-        DEBUGF  1, "chunks end\n"
         DEBUGF  1, "chunks end\n"
-        mcall   68, 13, [buf_ptr]
+        mcall   68, 13, [buf_ptr]       ; free old buffer
 ; done!
         ret
         ret
 ;****************************************************************************
 ;    Function
-;       socket_commands
+;       open_socket
 ;
 ;   Description
-;       opens or closes the socket
+;       opens the socket
 ;
-;****************************************************************************
-socket_commands:
-        cmp     ah, 22   ; open socket
+;****************************************************************************
-        jne     tst3
-        DEBUGF  1, "opening socket\n"
-; Clear all page memory
-        xor     eax, eax
-        mov     [prev_chunk_end], eax    ; 0
-        cmp     [buf_ptr], eax   ; 0
-        jz      no_free
-        mcall   68, 13, [buf_ptr] ; free  buffer
-no_free:
-        xor     eax, eax
-        mov     [buf_size], eax  ; 0
+open_socket:
 ; Parse the entered url
-        call    parse_url
+        DEBUGF  1, "opening socket\n"
         mov     edx, 80
     @@:
         mcall   socket, AF_INET4, SOCK_STREAM, 0
         mov     [socketnum], eax
-        mcall   connect, [socketnum], sockaddr1, 18
-        mov     [pagexs], 80
-        push    eax
-        xor     eax, eax ; 0
-        mov     [pos], eax
-        mov     [pagex], eax
-        mov     [pagey], eax
-        mov     [command_on_off], eax
-        mov     [is_body], eax
+        mcall   connect, [socketnum], sockaddr1, 18
-        pop     eax
-        ret
-tst3:
-        cmp     ah, 24   ; close socket
-        jne     no_24
         mcall   close, [socketnum]
-no_24:
+        ret
         ret
         or      ecx, 80000000h
         mcall   4, <102, 59>, , button_text
         mcall   12, 2 ; end window redraw
+        ret
         ret
 ;-----------------------------------------------------------------------------
 ; Data area
 ;-----------------------------------------------------------------------------
 align   4
 final_size      dd 0
 final_buffer    dd 0
                 db '/rd/1/.download', 0
-body_pos        dd 0
 body_pos        dd 0
 buf_size        dd 0
 buf_ptr         dd 0
 ;---------------------------------------------------------------------
 type_pls        db 'URL:', 0
 button_text     db 'DOWNLOAD     STOP     RESAVE', 0
-download_complete db 'File saved as /rd/1/.download', 0
-display_from    dd 20
-pos             dd 0
-pagex           dd 0
-pagey           dd 0
-pagexs          dd 80
-command_on_off  dd 0
-text_type       db 1
-com2            dd 0
-script          dd 0
-socketnum       dd 0
-addr            dd 0
-ya              dd 0
-len             dd 0
 download_complete db 'File saved as /rd/1/.download', 0
 title           db 'HTTP Downloader', 0
 ;---------------------------------------------------------------------
 s_contentlength db 'Content-Length:'
 len_contentlength = 15
-s_chunked       db 'Transfer-Encoding: chunked'
-len_chunked     = $ - s_chunked
-is_body         dd 0    ; 0 if headers, 1 if content
 is_chunked      dd 0
-prev_chunk_end  dd 0
+s_chunked       db 'Transfer-Encoding: chunked'
-cur_chunk_size  dd 0
+len_chunked     = $ - s_chunked
 proxyPort       dd 80
-shared_name     dd 0
-status          dd 0x0
-prev_status     dd 0x0
-onoff           dd 0x0
 nextupdate      dd 0
-winys           dd 400
+shared_name     dd 0
 ;---------------------------------------------------------------------
 document_user   db 'http://', 0
 document        rb URLMAXLEN
 ;---------------------------------------------------------------------
 align 4
 webAddr         rb URLMAXLEN+1
 ;---------------------------------------------------------------------
+pos             dd ?
-align 4
+socketnum       dd ?
-primary_buf     rb primary_buffer_size
+is_chunked      dd ?
+prev_chunk_end  dd ?
+cur_chunk_size  dd ?
+;---------------------------------------------------------------------
 params          rb 1024
 request         rb 256
-proxyAddr       rb 256
-proxyUser       rb 256
-proxyPassword   rb 256
+proxyAddr       rb 256

Subversion Repositories Kolibri OS

(root)/programs/network/downloader/downloader.asm – Rev 3564 → 3566