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

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                                 ;;
-;; Copyright (C) KolibriOS team 2004-2014. All rights reserved.    ;;
+;; Copyright (C) KolibriOS team 2004-2015. All rights reserved.    ;;
 ;; Distributed under terms of the GNU General Public License       ;;
 ;;                                                                 ;;
 ;;  HTTP library for KolibriOS                                     ;;
 ;;                                                                 ;;
 ;;   Written by hidnplayr@kolibrios.org                            ;;
         stosb
         jmp     .copyloop
   .copydone:
+}
-macro HTTP_init_buffer buffer, socketnum {
+macro HTTP_init_buffer buffer, socketnum, flags {
         mov     eax, buffer
         push    socketnum
+        popd    [eax + http_msg.socket]
+        lea     esi, [eax + http_msg.http_header]
-        popd    [eax + http_msg.socket]
+        push    flags
-        lea     esi, [eax + http_msg.http_header]
+        pop     [eax + http_msg.flags]
-        mov     [eax + http_msg.flags], FLAG_CONNECTED
+        or      [eax + http_msg.flags], FLAG_CONNECTED
         mov     [eax + http_msg.write_ptr], esi
         mov     [eax + http_msg.buffer_length], BUFFERSIZE -  http_msg.http_header
         popa
         ret
+endp
 endp
 ;;================================================================================================;;
-proc HTTP_get URL, add_header ;///////////////////////////////////////////////////////////////////;;
+proc HTTP_get URL, identifier, flags, add_header ;////////////////////////////////////////////////;;
 ;;------------------------------------------------------------------------------------------------;;
 ;? Initiates a HTTP connection, using 'GET' method.                                               ;;
+;;------------------------------------------------------------------------------------------------;;
+;> URL                  = pointer to ASCIIZ URL                                                   ;;
-;;------------------------------------------------------------------------------------------------;;
+;> identifier           = Identifier of an already open connection, or NULL to create a new one.  ;;
-;> URL          = pointer to ASCIIZ URL                                                           ;;
+;> flags                = Flags indicating how to threat the connection.                          ;;
-;> add_header   = pointer to additional header parameters (ASCIIZ), or null for none.             ;;
+;> add_header           = pointer to additional header parameters (ASCIIZ), or NULL for none.     ;;
 ;;------------------------------------------------------------------------------------------------;;
 ;< eax = 0 (error) / buffer ptr                                                                   ;;
 ;;================================================================================================;;
 locals
-        hostname        dd ?
-        pageaddr        dd ?
+        hostname        dd ?
-        sockaddr        dd ?
+        pageaddr        dd ?
         socketnum       dd ?
         buffer          dd ?
+        port            dd ?
+endl
         port            dd ?
-endl
+        and     [flags], FLAG_KEEPALIVE or FLAG_MULTIBUFF       ; filter out invalid flags
         pusha
 ; split the URL into hostname and pageaddr
         stdcall parse_url, [URL]
         test    eax, eax
+        jz      .error
+        mov     [hostname], eax
+        mov     [pageaddr], ebx
+        mov     [port], ecx
+        mov     eax, [identifier]
+        test    eax, eax
+        jz      .open_new
+        test    [eax + http_msg.flags], FLAG_CONNECTED
         jz      .error
+        mov     eax, [eax + http_msg.socket]
-        mov     [hostname], eax
+        mov     [socketnum], eax
-        mov     [pageaddr], ebx
+        jmp     .send_request
         mov     [port], ecx
 ; Connect to the other side.
-; Connect to the other side.
+  .open_new:
+        stdcall open_connection, [hostname], [port]
-        stdcall open_connection, [hostname], [port]
+        test    eax, eax
-        test    eax, eax
+        jz      .error
-        jz      .error
+        mov     [socketnum], eax
         mov     [socketnum], eax
 ; Create the HTTP request.
         copy_till_zero
   @@:
         mov     esi, str_close
+        mov     ecx, str_close.length
+        test    [flags], FLAG_KEEPALIVE
+        jz      @f
+        mov     esi, str_keep
+        mov     ecx, str_keep.length
-        mov     ecx, str_close.length
+  @@:
         rep     movsb
         mcall   send, [socketnum], [buffer]
         test    eax, eax
         jz      .error
         DEBUGF  1, "Request has been sent to server.\n"
+        cmp     [identifier], 0
+        jne     .old_connection
-        HTTP_init_buffer [buffer], [socketnum]
+        HTTP_init_buffer [buffer], [socketnum], [flags]
         popa
+        mov     eax, [buffer]   ; return buffer ptr
+        ret
+  .old_connection:
+        invoke  mem.free, [buffer]
+        popa
-        mov     eax, [buffer]   ; return buffer ptr
+        mov     eax, [identifier]
         ret
   .error:
         DEBUGF  1, "Error!\n"
 endp
 ;;================================================================================================;;
-proc HTTP_head URL, add_header ;//////////////////////////////////////////////////////////////////;;
+proc HTTP_head URL, identifier, flags, add_header ;///////////////////////////////////////////////;;
 ;;------------------------------------------------------------------------------------------------;;
 ;? Initiates a HTTP connection, using 'HEAD' method.                                              ;;
+;? This will only return HTTP header and status, no content                                       ;;
+;;------------------------------------------------------------------------------------------------;;
-;? This will only return HTTP header and status, no content                                       ;;
+;> URL                  = pointer to ASCIIZ URL                                                   ;;
-;;------------------------------------------------------------------------------------------------;;
+;> identifier           = Identifier of an already open connection, or NULL to create a new one.  ;;
-;> URL          = pointer to ASCIIZ URL                                                           ;;
+;> flags                = Flags indicating how to threat the connection.                          ;;
-;> add_header   = pointer to additional header parameters (ASCIIZ), or null for none.             ;;
+;> add_header           = pointer to additional header parameters (ASCIIZ), or NULL for none.     ;;
 ;;------------------------------------------------------------------------------------------------;;
 ;< eax = 0 (error) / buffer ptr                                                                   ;;
 ;;================================================================================================;;
-locals
-        hostname        dd ?
+locals
-        pageaddr        dd ?
+        hostname        dd ?
-        sockaddr        dd ?
+        pageaddr        dd ?
         socketnum       dd ?
+        buffer          dd ?
+        port            dd ?
-        buffer          dd ?
+endl
         port            dd ?
-endl
+        and     [flags], FLAG_KEEPALIVE or FLAG_MULTIBUFF       ; filter out invalid flags
         pusha
 ; split the URL into hostname and pageaddr
         stdcall parse_url, [URL]
         test    eax, eax
+        jz      .error
+        mov     [hostname], eax
+        mov     [pageaddr], ebx
+        mov     [port], ecx
+        mov     eax, [identifier]
+        test    eax, eax
+        jz      .open_new
+        test    [eax + http_msg.flags], FLAG_CONNECTED
         jz      .error
+        mov     eax, [eax + http_msg.socket]
-        mov     [hostname], eax
+        mov     [socketnum], eax
-        mov     [pageaddr], ebx
+        jmp     .send_request
         mov     [port], ecx
 ; Connect to the other side.
-; Connect to the other side.
+  .open_new:
+        stdcall open_connection, [hostname], [port]
-        stdcall open_connection, [hostname], [port]
+        test    eax, eax
-        test    eax, eax
+        jz      .error
-        jz      .error
+        mov     [socketnum], eax
         mov     [socketnum], eax
 ; Create the HTTP request.
         copy_till_zero
   @@:
         mov     esi, str_close
+        mov     ecx, str_close.length
+        test    [flags], FLAG_KEEPALIVE
+        jz      @f
+        mov     esi, str_keep
+        mov     ecx, str_keep.length
-        mov     ecx, str_close.length
+  @@:
         rep     movsb
-        mov     byte[edi], 0
-        DEBUGF  1, "Request:\n%s", [buffer]
+        mov     byte[edi], 0
         DEBUGF  1, "Request:\n%s", [buffer]
 ; Free unused memory
         push    edi
         mcall   send, [socketnum], [buffer]
         test    eax, eax
         jz      .error
         DEBUGF  1, "Request has been sent to server.\n"
+        cmp     [identifier], 0
+        jne     .old_connection
-        HTTP_init_buffer [buffer], [socketnum]
+        HTTP_init_buffer [buffer], [socketnum], [flags]
+        popa
+        mov     eax, [buffer]   ; return buffer ptr
+        ret
+  .old_connection:
-        popa
+        invoke  mem.free, [buffer]
+        popa
-        mov     eax, [buffer]
+        mov     eax, [identifier]
-        ret                     ; return buffer ptr
+        ret
   .error:
 endp
 ;;================================================================================================;;
-proc HTTP_post URL, add_header, content_type, content_length ;////////////////////////////////////;;
+proc HTTP_post URL, identifier, flags, add_header, content_type, content_length ;/////////////////;;
 ;;------------------------------------------------------------------------------------------------;;
 ;? Initiates a HTTP connection, using 'POST' method.                                              ;;
+;? This method is used to send data to the HTTP server                                            ;;
+;;------------------------------------------------------------------------------------------------;;
-;? This method is used to send data to the HTTP server                                            ;;
+;> URL                  = pointer to ASCIIZ URL                                                   ;;
-;;------------------------------------------------------------------------------------------------;;
+;> identifier           = Identifier of an already open connection, or NULL to create a new one.  ;;
-;> URL                  = pointer to ASCIIZ URL                                                   ;;
+;> flags                = Flags indicating how to threat the connection.                          ;;
-;> add_header           = pointer to additional header parameters (ASCIIZ), or null for none.     ;;
+;> add_header           = pointer to additional header parameters (ASCIIZ), or NULL for none.     ;;
 ;> content_type         = pointer to ASCIIZ string containing content type                        ;;
 ;> content_length       = length of content (in bytes)                                            ;;
 ;;------------------------------------------------------------------------------------------------;;
-;< eax = 0 (error) / buffer ptr                                                                   ;;
+;< eax = 0 (error) / buffer ptr (aka Identifier)                                                  ;;
 ;;================================================================================================;;
-locals
-        hostname        dd ?
+locals
-        pageaddr        dd ?
+        hostname        dd ?
-        sockaddr        dd ?
+        pageaddr        dd ?
         socketnum       dd ?
+        buffer          dd ?
+        port            dd ?
-        buffer          dd ?
+endl
         port            dd ?
-endl
+        and     [flags], FLAG_KEEPALIVE or FLAG_MULTIBUFF       ; filter out invalid flags
         pusha
 ; split the URL into hostname and pageaddr
         stdcall parse_url, [URL]
         test    eax, eax
+        jz      .error
+        mov     [hostname], eax
+        mov     [pageaddr], ebx
+        mov     [port], ecx
+        mov     eax, [identifier]
+        test    eax, eax
+        jz      .open_new
+        test    [eax + http_msg.flags], FLAG_CONNECTED
         jz      .error
+        mov     eax, [eax + http_msg.socket]
-        mov     [hostname], eax
+        mov     [socketnum], eax
-        mov     [pageaddr], ebx
+        jmp     .send_request
         mov     [port], ecx
 ; Connect to the other side.
-; Connect to the other side.
+  .open_new:
+        stdcall open_connection, [hostname], [port]
-        stdcall open_connection, [hostname], [port]
+        test    eax, eax
-        test    eax, eax
+        jz      .error
-        jz      .error
+        mov     [socketnum], eax
         mov     [socketnum], eax
 ; Create the HTTP request.
         copy_till_zero
   @@:
         mov     esi, str_close
+        mov     ecx, str_close.length
+        test    [flags], FLAG_KEEPALIVE
+        jz      @f
+        mov     esi, str_keep
+        mov     ecx, str_keep.length
-        mov     ecx, str_close.length
+  @@:
         rep     movsb
         mcall   send, [socketnum], [buffer]
         test    eax, eax
         jz      .error
         DEBUGF  1, "Request has been sent to server.\n"
+        cmp     [identifier], 0
+        jne     .old_connection
-        HTTP_init_buffer [buffer], [socketnum]
+        HTTP_init_buffer [buffer], [socketnum], [flags]
+        popa
+        mov     eax, [buffer]   ; return buffer ptr
+        ret
+  .old_connection:
+        invoke  mem.free, [buffer]
-        popa
+        mov     ebx, [flags]
+        mov     eax, [identifier]
+        or      [eax + http_msg.flags], ebx
+        popa
-        mov     eax, [buffer]
+        mov     eax, [identifier]
-        ret                     ; return buffer ptr
+        ret
   .error:
 ; If the connection is closed, return immediately
         test    [ebp + http_msg.flags], FLAG_CONNECTED
+        jz      .connection_closed
+; If the buffer is full, allocate a new one
+        cmp     [ebp + http_msg.buffer_length], 0
+        jne     .receive
+        test    [ebp + http_msg.flags], FLAG_MULTIBUFF
+        jz      .err_header
+        invoke  mem.alloc, BUFFERSIZE
+        test    eax, eax
+        jz      .err_no_ram
+        mov     [ebp + http_msg.content_ptr], eax
+        mov     [ebp + http_msg.write_ptr], eax
-        jz      .connection_closed
+        mov     [ebp + http_msg.buffer_length], BUFFERSIZE
 ; Receive some data
-; Receive some data
+  .receive:
         mcall   recv, [ebp + http_msg.socket], [ebp + http_msg.write_ptr], \
                       [ebp + http_msg.buffer_length], MSG_DONTWAIT
         add     [ebp + http_msg.content_received], ecx
 ; Calculate new write ptr
         mov     edx, esi
         sub     edx, [ebp + http_msg.chunk_ptr]         ; edx is now length of chunkline
         sub     [ebp + http_msg.write_ptr], edx
+        test    [ebp + http_msg.flags], FLAG_MULTIBUFF
+        jnz     .dont_resize
 ; Realloc buffer, make it 'chunksize' bigger.
         lea     edx, [ebx + BUFFERSIZE]
         mov     [ebp + http_msg.buffer_length], edx     ; remaining space in new buffer
         add     edx, [ebp + http_msg.write_ptr]
         sub     edx, [ebp + http_msg.content_ptr]
         DEBUGF  1, "New buffer = 0x%x\n", eax
         or      eax, eax
         jz      .err_no_ram
         call    recalculate_pointers                    ; Because it's possible that buffer begins on another address now
         add     esi, eax                                ; recalculate esi too!
+  .dont_resize:
 ; Remove chunk header (aka chunkline) from the buffer by shifting all received data after chunkt_ptr to the left
         mov     edi, [ebp + http_msg.chunk_ptr]
         rep movsb
 ; Update chunk ptr to point to next chunk
         add     [ebp + http_msg.chunk_ptr], ebx
         xor     eax, eax
         dec     eax
         ret
+  .buffer_full:
-  .buffer_full:
+        test    [ebp + http_msg.flags], FLAG_MULTIBUFF
-        ; Lets make it bigger..
+        jnz     .multibuff
         mov     eax, [ebp + http_msg.write_ptr]
         add     eax, BUFFERSIZE
         sub     eax, [ebp + http_msg.content_ptr]
         invoke  mem.realloc, [ebp + http_msg.content_ptr], eax
         popa
         xor     eax, eax
         dec     eax
         ret
+  .multibuff:
+        ; This buffer is full
+        popa
+        xor     eax, eax
+        ret
   .need_more_data_for_header:
         cmp     [ebp + http_msg.buffer_length], 0
         je      .err_header                     ; It's just too damn long!
         ; Need more data
 endp
 ;;================================================================================================;;
-proc HTTP_escape URI ;////////////////////////////////////////////////////////////////////////////;;
+proc HTTP_escape URI, length ;////////////////////////////////////////////////////////////////////;;
 ;;------------------------------------------------------------------------------------------------;;
+;?                                                                                                ;;
-;?                                                                                                ;;
+;;------------------------------------------------------------------------------------------------;;
-;;------------------------------------------------------------------------------------------------;;
+;> URI = ptr to ASCIIZ URI/data                                                                   ;;
-;> URI = ptr to ASCIIZ URI                                                                        ;;
+;> length = length of URI/data                                                                    ;;
 ;;------------------------------------------------------------------------------------------------;;
-;< eax = 0 (error) / ptr to ASCIIZ URI/data                                                       ;;
-;< ebx = length of escaped URI/data                                                               ;;
-;;================================================================================================;;
 ;< eax = 0 (error) / ptr to ASCIIZ URI/data                                                       ;;
 ;< ebx = length of escaped URI/data                                                               ;;
-; TODO: instead of static buffer allocation, make it 4096 bytes and larger only if needed
+;;================================================================================================;;
         DEBUGF  1, "HTTP_escape: %s\n", [URI]
         pusha
 endp
 ;;================================================================================================;;
-proc HTTP_unescape URI ;//////////////////////////////////////////////////////////////////////////;;
+proc HTTP_unescape URI, length ;//////////////////////////////////////////////////////////////////;;
 ;;------------------------------------------------------------------------------------------------;;
 ;?                                                                                                ;;
 ;;================================================================================================;;
         DEBUGF  1, "HTTP_unescape: %s\n", [URI]
         pusha
-        invoke  mem.alloc, URLMAXLEN
+        invoke  mem.alloc, URLMAXLEN            ; FIXME: use length provided by caller
         test    eax, eax
         jz      .error
         mov     [esp + 7 * 4], eax              ; return ptr in eax
   .length       = $ - str_post_cl
 str_post_ct     db 13, 10, 'Content-Type: '
   .length       = $ - str_post_ct
 str_proxy_auth  db 13, 10, 'Proxy-Authorization: Basic '
   .length       = $ - str_proxy_auth
-str_close       db 'User-Agent: KolibriOS libHTTP/1.0', 13, 10, 'Connection: Close', 13, 10, 13, 10
+str_close       db 'User-Agent: KolibriOS libHTTP/1.1', 13, 10, 'Connection: Close', 13, 10, 13, 10
+  .length       = $ - str_close
+str_keep        db 'User-Agent: KolibriOS libHTTP/1.1', 13, 10, 'Connection: Keepalive', 13, 10, 13, 10
   .length       = $ - str_close
 str_http        db 'http://', 0

Subversion Repositories Kolibri OS

(root)/programs/develop/libraries/http/http.asm – Rev 4996 → 5534