WebSVN – Kolibri OS – Diff – /programs/develop/libraries/http/http.asm

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                                 ;;
-;; Copyright (C) KolibriOS team 2004-2013. All rights reserved.    ;;
+;; Copyright (C) KolibriOS team 2004-2014. All rights reserved.    ;;
 ;; Distributed under terms of the GNU General Public License       ;;
 ;;                                                                 ;;
 ;;  HTTP library for KolibriOS                                     ;;
 ;;                                                                 ;;
 ;;   Written by hidnplayr@kolibrios.org                            ;;
 ; "HTTP made really easy", http://www.jmarshall.com/easy/http/
 ; "Hypertext Transfer Protocol -- HTTP/1.1", http://tools.ietf.org/html/rfc2616
         URLMAXLEN       = 65535
-        BUFFERSIZE      = 4096
+        BUFFERSIZE      = 8192
         TIMEOUT         = 1000  ; in 1/100 s
 macro HTTP_init_buffer buffer, socketnum {
         mov     eax, buffer
         push    socketnum
         popd    [eax + http_msg.socket]
-        lea     esi, [eax + http_msg.data]
+        lea     esi, [eax + http_msg.http_header]
         mov     [eax + http_msg.flags], FLAG_CONNECTED
         mov     [eax + http_msg.write_ptr], esi
-        mov     [eax + http_msg.buffer_length], BUFFERSIZE -  http_msg.data
+        mov     [eax + http_msg.buffer_length], BUFFERSIZE -  http_msg.http_header
         mov     [eax + http_msg.chunk_ptr], 0
+        mov     [eax + http_msg.status], 0
-        mov     [eax + http_msg.status], 0
+        mov     [eax + http_msg.header_length], 0
-        mov     [eax + http_msg.header_length], 0
+        mov     [eax + http_msg.content_ptr], 0
         mov     [eax + http_msg.content_length], 0
         mov     [eax + http_msg.content_received], 0
         invoke  ini.get_str, inifile, sec_proxy, key_user, proxyUser, 256, proxyUser
         invoke  ini.get_str, inifile, sec_proxy, key_password, proxyPassword, 256, proxyPassword
         popa
-        DEBUGF  1, "HTTP library: init OK\n"
         DEBUGF  1, "HTTP library: init OK\n"
         xor     eax, eax
         ret
-  .error:
-        DEBUGF  1, "ERROR loading libraries\n"
+  .error:
         DEBUGF  1, "ERROR loading libraries\n"
-        xor     eax, eax
-        inc     eax
+        xor     eax, eax
         invoke  mem.alloc, BUFFERSIZE
         test    eax, eax
         jz      .error
         mov     [buffer], eax
         mov     edi, eax
-        DEBUGF  1, "Buffer has been allocated.\n"
+        DEBUGF  1, "Buffer allocated: 0x%x\n", eax
         mov     esi, str_get
         copy_till_zero
 ;;================================================================================================;;
 proc HTTP_head URL, add_header ;//////////////////////////////////////////////////////////////////;;
 ;;------------------------------------------------------------------------------------------------;;
+;? Initiates a HTTP connection, using 'HEAD' method.                                              ;;
-;? Initiates a HTTP connection, using 'HEAD' method.                                              ;;
+;? This will only return HTTP header and status, no content                                       ;;
 ;;------------------------------------------------------------------------------------------------;;
 ;> URL          = pointer to ASCIIZ URL                                                           ;;
 ;> add_header   = pointer to additional header parameters (ASCIIZ), or null for none.             ;;
 ;;------------------------------------------------------------------------------------------------;;
 ;;================================================================================================;;
 proc HTTP_post URL, add_header, content_type, content_length ;////////////////////////////////////;;
+;;------------------------------------------------------------------------------------------------;;
-;;------------------------------------------------------------------------------------------------;;
+;? Initiates a HTTP connection, using 'POST' method.                                              ;;
-;? Initiates a HTTP connection, using 'GET' method.                                               ;;
+;? This method is used to send data to the HTTP server                                            ;;
 ;;------------------------------------------------------------------------------------------------;;
 ;> URL                  = pointer to ASCIIZ URL                                                   ;;
 ;> add_header           = pointer to additional header parameters (ASCIIZ), or null for none.     ;;
 ; We havent found the (final) header yet, search for it..
   .scan_again:
         ; eax = total number of bytes received so far
         mov     eax, [ebp + http_msg.write_ptr]
-        sub     eax, http_msg.data
+        sub     eax, http_msg.http_header
         sub     eax, ebp
         sub     eax, [ebp + http_msg.header_length]
         ; edi is ptr to begin of header
-        lea     edi, [ebp + http_msg.data]
+        lea     edi, [ebp + http_msg.http_header]
         add     edi, [ebp + http_msg.header_length]
         ; put it in esi for next proc too
         mov     esi, edi
         sub     eax, 3
         dec     eax
         jnz     .scan_loop
         jmp     .need_more_data
   .end_of_header:
-        add     edi, 4 - http_msg.data
+        add     edi, 4 - http_msg.http_header
         sub     edi, ebp
         mov     [ebp + http_msg.header_length], edi     ; If this isnt the final header, we'll use this as an offset to find real header.
         DEBUGF  1, "Header length: %u\n", edi
         or      [ebp + http_msg.flags], FLAG_GOT_HEADER
 ; Now, convert all header names to lowercase.
 ; This way, it will be much easier to find certain header fields, later on.
-        lea     esi, [ebp + http_msg.data]
+        lea     esi, [ebp + http_msg.http_header]
         mov     ecx, [ebp + http_msg.header_length]
   .need_newline:
         inc     esi
         ja      .next_char
         or      byte[esi], 0x20 ; convert to lowercase
         jmp     .next_char
   .convert_done:
         mov     byte[esi-1], 0
-        lea     esi, [ebp + http_msg.data]
+        lea     esi, [ebp + http_msg.http_header]
         DEBUGF  1, "Header names converted to lowercase:\n%s\n", esi
 ; Check for content-length header field.
         stdcall HTTP_find_header_field, ebp, str_cl
   .cl_ok:
         mov     [ebp + http_msg.content_length], edx
-        DEBUGF  1, "Content-length: %u\n", edx
-; Resize buffer according to content-length.
-        add     edx, [ebp + http_msg.header_length]
-        add     edx, http_msg.data
+        DEBUGF  1, "Content-length: %u\n", edx
-        mov     ecx, edx
-        sub     ecx, [ebp + http_msg.write_ptr]
+        test    edx, edx
-        mov     [ebp + http_msg.buffer_length], ecx
+        jz      .got_all_data
-        invoke  mem.realloc, ebp, edx
-        or      eax, eax
-        jz      .no_ram
-  .not_chunked:
-        mov     eax, [ebp + http_msg.write_ptr]
+        call    alloc_contentbuff
-        sub     eax, [ebp + http_msg.header_length]
+        test    eax, eax
-        sub     eax, http_msg.data
+        jz      .no_ram
-        sub     eax, ebp
+        xor     eax, eax
-        jmp     .header_parsed  ; hooray!
+        jmp     .header_parsed
   .no_content:
         DEBUGF  1, "Content-length not found.\n"
+; We didnt find 'content-length', maybe server is using chunked transfer encoding?
+; Try to find 'transfer-encoding' header.
+        stdcall HTTP_find_header_field, ebp, str_te
+        test    eax, eax
+        jnz     .ct_hdr_found
+  .not_chunked:
+        mov     edx, BUFFERSIZE
+        call    alloc_contentbuff
-; We didnt find 'content-length', maybe server is using chunked transfer encoding?
+        test    eax, eax
-; Try to find 'transfer-encoding' header.
+        jz      .no_ram
-        stdcall HTTP_find_header_field, ebp, str_te
+        xor     eax, eax
-        test    eax, eax
+        jmp     .header_parsed
         jz      .not_chunked
         jne     .not_chunked
         or      [ebp + http_msg.flags], FLAG_CHUNKED
+        DEBUGF  1, "Transfer type is: chunked\n"
+        mov     edx, BUFFERSIZE
+        call    alloc_contentbuff
+        test    eax, eax
-        DEBUGF  1, "Transfer type is: chunked\n"
+        jz      .no_ram
-; Set chunk pointer where first chunk should begin.
-        lea     eax, [ebp + http_msg.data]
+; Set chunk pointer where first chunk should begin.
-        add     eax, [ebp + http_msg.header_length]
+        mov     eax, [ebp + http_msg.content_ptr]
         mov     [ebp + http_msg.chunk_ptr], eax
   .chunk_loop:
-        mov     ecx, [ebp + http_msg.write_ptr]
-        sub     ecx, [ebp + http_msg.chunk_ptr]
+        mov     ecx, [ebp + http_msg.write_ptr]
-        jb      .need_more_data_chunked         ; TODO: use this ecx !!!
+        sub     ecx, [ebp + http_msg.chunk_ptr]
         jb      .need_more_data_chunked
 ; Chunkline starts here, convert the ASCII hex number into ebx
         mov     esi, [ebp + http_msg.chunk_ptr]
   .chunk_hex:
         shl     ebx, 4
         add     bl, al
         jmp     .chunk_hexloop
   .chunk_:
-        DEBUGF  1, "got chunk of %u bytes\n", ebx
-;;        cmp     esi, [ebp + http_msg.chunk_ptr]
-;;        je
-; If chunk size is 0, all chunks have been received.
-        test    ebx, ebx
-        jz      .got_all_data_chunked           ; last chunk, hooray! FIXME: what if it wasnt a valid hex number???
 ; Chunkline ends with a CR, LF or simply LF
+        dec     esi
   .end_of_chunkline?:
+        lodsb
         cmp     al, 10
         je      .end_of_chunkline
-        lodsb
-        cmp     edi, [ebp + http_msg.write_ptr]
+        cmp     esi, [ebp + http_msg.write_ptr]
         jb      .end_of_chunkline?
         jmp     .need_more_data
   .end_of_chunkline:
+        DEBUGF  1, "Chunk of %u bytes\n", ebx
+; If chunk size is 0, all chunks have been received.
+        test    ebx, ebx
+        jz      .got_all_data_chunked
-; Update chunk ptr, and remember old one
+; Calculate how many data bytes we'll need to shift
+        mov     ecx, [ebp + http_msg.write_ptr]
+        sub     ecx, [ebp + http_msg.chunk_ptr]
+; Calculate how many bytes we'll need to shift them
-        mov     edi, [ebp + http_msg.chunk_ptr]
+        sub     esi, [ebp + http_msg.chunk_ptr]
+; Update write ptr
-        add     [ebp + http_msg.chunk_ptr], ebx
+        sub     [ebp + http_msg.write_ptr], esi
 ; Realloc buffer, make it 'chunksize' bigger.
-        mov     eax, [ebp + http_msg.buffer_length]
+        add     ebx, [ebp + http_msg.chunk_ptr]
-        add     eax, ebx
+        sub     ebx, [ebp + http_msg.content_ptr]
+        add     ebx, BUFFERSIZE                 ; add some space for new chunkline header
+        DEBUGF  1, "Resizing buffer 0x%x, it will now be %u bytes\n", [ebp + http_msg.content_ptr], ebx
-        invoke  mem.realloc, ebp, eax
+        invoke  mem.realloc, [ebp + http_msg.content_ptr], ebx
+        DEBUGF  1, "New buffer = 0x%x\n", eax
         or      eax, eax
         jz      .no_ram
-        add     [ebp + http_msg.buffer_length], ebx
+        call    recalculate_pointers
-; Update write ptr
+; Calculate remaining available buffer size
-        mov     eax, esi
+        mov     eax, [ebp + http_msg.content_ptr]
-        sub     eax, edi
+        add     eax, ebx
-        sub     [ebp + http_msg.write_ptr], eax
+        sub     eax, [ebp + http_msg.write_ptr]
+        mov     [ebp + http_msg.buffer_length], eax
-; Now move all received data to the left (remove chunk header).
+; Move all received data to the left (remove chunk header).
-; Update content_length accordingly.
-        mov     ecx, [ebp + http_msg.write_ptr]
+        mov     edi, [ebp + http_msg.chunk_ptr]
-        sub     ecx, esi
+        add     esi, edi
+        ; Update chunk ptr so it points to next chunk
+        sub     ebx, BUFFERSIZE
+        add     [ebp + http_msg.chunk_ptr], ebx
+        ; Update number of received content bytes
         add     [ebp + http_msg.content_received], ecx
+        DEBUGF  1, "Moving %u bytes from 0x%x to 0x%x\n", ecx, esi, edi
-        rep     movsb
+        rep movsb
+        xor     eax, eax
         jmp     .chunk_loop
 ;---------------------------------------------------------
 ; Check if we got all the data.
   .header_parsed:
         add     [ebp + http_msg.content_received], eax
         test    [ebp + http_msg.flags], FLAG_CONTENT_LENGTH
         cmp     eax, [ebp + http_msg.content_length]
         jae     .got_all_data
         jmp     .need_more_data
+  .need_more_data_and_space:
+        test    [ebp + http_msg.flags], FLAG_GOT_HEADER
-  .need_more_data_and_space:
+        jz      .invalid_header                 ; It's just too damn long!
         mov     eax, [ebp + http_msg.write_ptr]
         add     eax, BUFFERSIZE
-        sub     eax, ebp
+        sub     eax, [ebp + http_msg.content_ptr]
-        invoke  mem.realloc, ebp, eax
+        invoke  mem.realloc, [ebp + http_msg.content_ptr], eax
         or      eax, eax
+        jz      .no_ram
-        jz      .no_ram
+        call    recalculate_pointers
         mov     [ebp + http_msg.buffer_length], BUFFERSIZE
   .need_more_data:
         dec     eax
         ret
   .got_all_data_chunked:
         mov     eax, [ebp + http_msg.chunk_ptr]
-        sub     eax, [ebp + http_msg.header_length]
-        sub     eax, http_msg.data
-        sub     eax, ebp
+        sub     eax, [ebp + http_msg.content_ptr]
         mov     [ebp + http_msg.content_length], eax
         mov     [ebp + http_msg.content_received], eax
   .got_all_data:
         DEBUGF  1, "We got all the data! (%u bytes)\n", [ebp + http_msg.content_received]
         jne     .socket_error
         mcall   29, 9
         sub     eax, TIMEOUT
         cmp     eax, [ebp + http_msg.timestamp]
-        jb      .need_more_data
+        jl      .need_more_data
         DEBUGF  1, "ERROR: timeout\n"
         or      [ebp + http_msg.flags], FLAG_TIMEOUT_ERROR
         jmp     .disconnect
         ret
+endp
+alloc_contentbuff:
+; Allocate content buffer
+        invoke  mem.alloc, edx
+        or      eax, eax
+        jz      .no_ram
+        DEBUGF  1, "Content buffer allocated: 0x%x\n", eax
+; Copy already received content into content buffer
+        mov     edi, eax
+        lea     esi, [ebp + http_msg.http_header]
+        add     esi, [ebp + http_msg.header_length]
+        mov     ecx, [ebp + http_msg.write_ptr]
+        sub     ecx, esi
+        mov     ebx, ecx
+        rep movsb
+; Update pointers to point to new buffer
+        mov     [ebp + http_msg.content_ptr], eax
+        mov     [ebp + http_msg.content_received], ebx
+        sub     edx, ebx
+        mov     [ebp + http_msg.buffer_length], edx
+        add     eax, ebx
+        mov     [ebp + http_msg.write_ptr], eax
+; Shrink header buffer
+        mov     eax, http_msg.http_header
+        add     eax, [ebp + http_msg.header_length]
+        invoke  mem.realloc, ebp, eax
+        or      eax, eax
+  .no_ram:
+        ret
+recalculate_pointers:
+        sub     eax, [ebp + http_msg.content_ptr]
+        jz      .done
+        add     [ebp + http_msg.content_ptr], eax
+        add     [ebp + http_msg.write_ptr], eax
+        add     [ebp + http_msg.chunk_ptr], eax
+  .done:
-endp
+        ret
 ;;------------------------------------------------------------------------------------------------;;
 ;> identifier   = pointer to buffer containing http_msg struct.                                   ;;
 ;;------------------------------------------------------------------------------------------------;;
 ;< none                                                                                           ;;
 ;;================================================================================================;;
+        DEBUGF  1, "HTTP_free: 0x%x\n", [identifier]
         pusha
         mov     ebp, [identifier]
         test    [ebp + http_msg.flags], FLAG_CONNECTED
         mov     ebx, [identifier]
         test    [ebx + http_msg.flags], FLAG_GOT_HEADER
         jz      .fail
-        lea     edx, [ebx + http_msg.data]
+        lea     edx, [ebx + http_msg.http_header]
         mov     ecx, edx
         add     ecx, [ebx + http_msg.header_length]

Subversion Repositories Kolibri OS

(root)/programs/develop/libraries/http/http.asm – Rev 4241 → 4541