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

 URLMAXLEN               = 1024
 primary_buffer_size     = 4096
 __DEBUG__       = 1
-__DEBUG_LEVEL__ = 1
+__DEBUG_LEVEL__ = 2
 mouse:
         stdcall [edit_box_mouse], edit1
         jmp     still
 save:
-        DEBUGF  1, "file saved\n"
+        DEBUGF  2, "File saved\n"
         mcall   70, fileinfo
         mov     ecx, [sc.work_text]
         ret
   .rid:
         push    esi
         push    edi
-        DEBUGF  1, "rid\n"
+        DEBUGF  1, "Reading incoming data\n"
   .read:
-  .read:
+        ; TODO: implement timeout !
         mcall   recv, [socketnum], primary_buf, primary_buffer_size, 0
         inc     eax             ; -1 = error (socket closed?)
         jz      .no_more_data
+        dec     eax             ; 0 bytes...
+        jz      .read
         dec     eax             ; 0 bytes...
-        jz      .read
+        DEBUGF  1, "Got chunk of %u bytes\n", eax
         mov     edi, [pos]
         add     [pos], eax
         lea     edx, [ecx - 3]
         rep     movsb
+  .no_more_data:
-  .no_more_data:
+        DEBUGF  1, "No more data\n"
+;        mov     [status], 4     ; connection closed by server
+        call    parse_result
 ;        mov     [status], 4     ; connection closed by server
         DEBUGF  1, "Parsing complete\n"
         call    parse_result
         mov     ecx, [shared_name]
         test    ecx, ecx
         jz      @f
         cmp     [ecx], byte 0
+        jnz     save_in_shared
+    @@:
         jnz     save_in_shared
-    @@:
+        mcall   70, fileinfo
-        mcall   70, fileinfo
         DEBUGF  2, "File saved\n"
         mov     ecx, [sc.work_text]
-        or      ecx, 0x80000000
+        mov     ecx, [sc.work_text]
 parse_result:
 ; close socket
-        mcall   close, [socketnum]
         mcall   close, [socketnum]
         DEBUGF  1, "close socketnum: 0x%x\n", eax
         mov     edi, [buf_ptr]
         mov     edx, [pos]
         mov     [buf_size], edx
 ;       mcall   70, fileinfo_tmp
-        DEBUGF  1, "pos = 0x%x\n", edx
+        DEBUGF  1, "Parsing result (%u bytes)\n", edx
 ; first, find end of headers
   .next_byte:
         cmp     dword[edi], 0x0d0a0d0a  ; ìíå ëåíü ÷èòàòü ñòàíäàðò, ïóñòü áóäóò îáà âàðèàíòà
         je      .end_of_headers
         cmp     dword[edi], 0x0a0d0a0d
         je      .end_of_headers
+        inc     edi
-        inc     edi
+        dec     edx
-        dec     edx
+        jne     .next_byte
-        jne     .next_byte
+        DEBUGF  1, "Uh-oh, there's no end of header!\n"
 ; no end of headers. it's an error. let client see all those headers.
         ret
   .end_of_headers:
 ; here we look at headers and search content-length or transfer-encoding headers
-;       DEBUGF  1, "eoh\n"
+        DEBUGF  1, "Found end of header\n"
         inc     esi
         dec     ebx
         je      .cl_error
         jmp     .cl_next
   .cl_error:
-;       DEBUGF  1, "content-length not found\n"
+        DEBUGF  1, "content-length not found\n"
 ; find 'chunked'
 ; äà, ÿ êîïèðóþ êîä, ýòî óæàñíî, íî ìíå õî÷åòñÿ, ÷òîáû ïîñêîðåå çàðàáîòàëî
 ; à òàì óæ îòðåôàêòîðþ
         mov     [prev_chunk_end], eax
         jmp     parse_chunks
   .cl_found:
+        call    read_number     ; eax = number from *esi
-        call    read_number     ; eax = number from *esi
+        DEBUGF  1, "Content length: %u\n", eax
-  .write_final_size:
-        mov     [final_size], eax        ; if this works, i will b very happy...
+  .write_final_size:
+        mov     ebx, [buf_size]
+        sub     ebx, [body_pos]
+        cmp     eax, ebx
+        jbe     .size_ok
+        DEBUGF  2, "Not all data was received!\n"
-        mov     ebx, [pos]       ; we well check if it is right
+        mov     eax, ebx
-        sub     ebx, [body_pos]
+  .size_ok:
-; everything is ok, so we return
+        mov     [final_size], eax
-        mov     eax, [body_pos]
-        mov     ebx, [buf_ptr]
-        add     ebx, eax
-        mov     [final_buffer], ebx
+        mov     ebx, [body_pos]
-;       mov     ebx, [pos]
+        add     ebx, [buf_ptr]
-;       sub     ebx, eax
+        mov     [final_buffer], ebx
 ;       mov     [final_size], ebx
         ret
 parse_chunks:
-;       DEBUGF  1, "parse chunks\n"
+        DEBUGF  1, "parse chunks\n"
 .read_size:
         mov     eax, [prev_chunk_end]
         mov     ebx, eax
         sub     ebx, [buf_ptr]
         mov     edx, eax
-;       DEBUGF  1, "rs "
+        DEBUGF  1, "rs "
         cmp     ebx, [pos]
         jae     chunks_end      ; not good
         call    read_hex        ; in: eax=pointer to text. out:eax=hex number, ebx=end of text.
         mov     edx, ebx ; edx = size of size of chunk
         add     ebx, eax
         mov     [prev_chunk_end], ebx
-;       DEBUGF  1, "sz "
+        DEBUGF  1, "sz "
 ; do copying: from buf_ptr+edx to final_buffer+prev_final_size count eax
 ; realloc final buffer
         push    eax
         push    edx
         push    dword [final_size]
         add     [final_size], eax
         mcall   68, 20, [final_size], [final_buffer]
         mov     [final_buffer], eax
-;       DEBUGF  1, "re "
+        DEBUGF  1, "re "
         pop     edi
         pop     esi
         pop     ecx
 ;       add     [pos], ecx
         add     edi, [final_buffer]
-;       DEBUGF  1, "cp "
+        DEBUGF  1, "cp "
         jne     @r
         mov     byte [edi], 0
 pu_009:
 ; For debugging, display resulting strings
-        DEBUGF  1, "document_user: %s\n", document_user
-        DEBUGF  1, "webAddr: %s\n", webAddr
-        DEBUGF  1, "document: %s\n", document
+        DEBUGF  2, "Downloadng %s\n", document_user
 ; Look up the ip address, or was it specified?
         mov     al, [proxyAddr]
         push    0       ; third parameter
         push    0       ; second parameter
         push    webAddr
         call    [getaddrinfo]
         pop     esi
-; test for error
+; TODO: handle error
-        DEBUGF  1, "eax=0x%x\n", eax
 ;        test    eax, eax
 ;        jnz     .fail_dns
-; fill in ip in sockstruct
+; fill in ip
         mov     eax, [esi + addrinfo.ai_addr]
         mov     eax, [eax + sockaddr_in.sin_addr]
         mov     [server_ip], eax

Subversion Repositories Kolibri OS

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