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

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                                 ;;
-;; Copyright (C) KolibriOS team 2004-2017. All rights reserved.    ;;
+;; Copyright (C) KolibriOS team 2004-2018. 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      = 8192
+        BUFFERSIZE      = 512*1024
         TIMEOUT         = 500  ; in 1/100 s
         lea     esi, [eax + http_msg.http_header]
         push    flags
         pop     [eax + http_msg.flags]
         or      [eax + http_msg.flags], FLAG_CONNECTED
         mov     [eax + http_msg.write_ptr], esi
+        mov     ebx, [buffersize]
+        sub     ebx, http_msg.http_header
-        mov     [eax + http_msg.buffer_length], BUFFERSIZE -  http_msg.http_header
+        mov     [eax + http_msg.buffer_length], ebx
         mov     [eax + http_msg.chunk_ptr], 0
         mov     [eax + http_msg.status], 0
         mov     [eax + http_msg.header_length], 0
         inc     eax
         ret
+;;================================================================================================;;
+proc HTTP_buffersize_get ;////////////////////////////////////////////////////////////////////////;;
+;;------------------------------------------------------------------------------------------------;;
+;? Get HTTP buffer size                                                                           ;;
+;;------------------------------------------------------------------------------------------------;;
+;< eax = buffer size in bytes                                                                     ;;
+;;================================================================================================;;
+        mov     eax, [BUFFERSIZE]
+        ret
+endp
+;;================================================================================================;;
+proc HTTP_buffersize_set ;////////////////////////////////////////////////////////////////////////;;
+;;------------------------------------------------------------------------------------------------;;
+;? Set HTTP buffer size                                                                           ;;
+;;------------------------------------------------------------------------------------------------;;
+;> eax = buffer size in bytes                                                                     ;;
+;;================================================================================================;;
+        mov     [BUFFERSIZE], eax
+        ret
+endp
 ;;================================================================================================;;
 proc HTTP_disconnect identifier ;/////////////////////////////////////////////////////////////////;;
 ;;------------------------------------------------------------------------------------------------;;
 ;? Stops the open connection                                                                      ;;
         jz      .error
         mov     [socketnum], eax
 ; Create the HTTP request.
   .send_request:
-        invoke  mem.alloc, BUFFERSIZE
+        invoke  mem.alloc, [buffersize]
         test    eax, eax
         jz      .error
         mov     [buffer], eax
         mov     edi, eax
         jz      .error
         mov     [socketnum], eax
 ; Create the HTTP request.
   .send_request:
-        invoke  mem.alloc, BUFFERSIZE
+        invoke  mem.alloc, [buffersize]
         test    eax, eax
         jz      .error
         mov     [buffer], eax
         mov     edi, eax
         jz      .error
         mov     [socketnum], eax
 ; Create the HTTP request.
   .send_request:
-        invoke  mem.alloc, BUFFERSIZE
+        invoke  mem.alloc, [buffersize]
         test    eax, eax
         jz      .error
         mov     [buffer], eax
         mov     edi, eax
         test    [ebp + http_msg.flags], FLAG_REUSE_BUFFER
         jz      .new_buffer
         mov     eax, [ebp + http_msg.content_ptr]
+        mov     [ebp + http_msg.write_ptr], eax
-        mov     [ebp + http_msg.write_ptr], eax
+        push    [buffersize]
-        mov     [ebp + http_msg.buffer_length], BUFFERSIZE
+        pop     [ebp + http_msg.buffer_length]
         jmp     .receive
   .new_buffer:
-        invoke  mem.alloc, BUFFERSIZE
+        invoke  mem.alloc, [buffersize]
         test    eax, eax
         jz      .err_no_ram
+        mov     [ebp + http_msg.content_ptr], eax
-        mov     [ebp + http_msg.content_ptr], eax
+        mov     [ebp + http_msg.write_ptr], eax
-        mov     [ebp + http_msg.write_ptr], eax
+        push    [buffersize]
-        mov     [ebp + http_msg.buffer_length], BUFFERSIZE
+        pop     [ebp + http_msg.buffer_length]
         DEBUGF  1, "New buffer: 0x%x\n", eax
         stdcall HTTP_find_header_field, ebp, str_te
         test    eax, eax
         jnz     .ct_hdr_found
   .not_chunked:
-        mov     edx, BUFFERSIZE
+        mov     edx, [buffersize]
         call    alloc_contentbuff
         test    eax, eax
         jz      .err_no_ram
         xor     eax, eax
         jne     .not_chunked
         or      [ebp + http_msg.flags], FLAG_CHUNKED
         DEBUGF  1, "Transfer type is: chunked\n"
-        mov     edx, BUFFERSIZE
+        mov     edx, [buffersize]
         call    alloc_contentbuff
         test    eax, eax
 ; Calculate new write ptr
         sub     [ebp + http_msg.write_ptr], edx
         test    [ebp + http_msg.flags], FLAG_STREAM
         jnz     .dont_resize
 ; Realloc buffer, make it 'chunksize' bigger.
+        mov     edx, ebx
-        lea     edx, [ebx + BUFFERSIZE]
+        add     edx, [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, "Resizing buffer 0x%x, it will now be %u bytes\n", [ebp + http_msg.content_ptr], edx
         invoke  mem.realloc, [ebp + http_msg.content_ptr], edx
   .buffer_full:
         test    [ebp + http_msg.flags], FLAG_STREAM
         jnz     .multibuff
         mov     eax, [ebp + http_msg.write_ptr]
-        add     eax, BUFFERSIZE
+        add     eax, [buffersize]
         sub     eax, [ebp + http_msg.content_ptr]
         invoke  mem.realloc, [ebp + http_msg.content_ptr], eax
         or      eax, eax
         jz      .err_no_ram
+        call    recalculate_pointers
-        call    recalculate_pointers
+        push    [buffersize]
-        mov     [ebp + http_msg.buffer_length], BUFFERSIZE
+        pop     [ebp + http_msg.buffer_length]
         ; Need more data
         popa
         xor     eax, eax
         dec     eax
 alloc_contentbuff:
         test    [ebp + http_msg.flags], FLAG_STREAM
         jz      @f
-        mov     edx, BUFFERSIZE
+        mov     edx, [buffersize]
   @@:
 align 4
 @EXPORT:
 export  \
         lib_init                , 'lib_init'            , \
 x00010001              , 'version'             , \
+        HTTP_buffersize_get     , 'buffersize_get'      , \
+        HTTP_buffersize_set     , 'buffersize_set'      , \
         HTTP_get                , 'get'                 , \
         HTTP_head               , 'head'                , \
         HTTP_post               , 'post'                , \
         HTTP_find_header_field  , 'find_header_field'   , \
         HTTP_process            , 'process'             , \    ; To be removed
 dd      0xffffffff
 str_hex:
+db '0123456789ABCDEF'
-db '0123456789ABCDEF'
+buffersize      dd BUFFERSIZE
 include_debug_strings

Subversion Repositories Kolibri OS

(root)/programs/develop/libraries/http/http.asm – Rev 7296 → 7512