sdongles/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

Added HTTP_send, renamed HTTP_process to HTTP_receive, renamed HTTP_stop to HTTP_disconnect, added HTTP_free

Browse Source 
git-svn-id: svn://kolibrios.org@4996 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
hidnplayr 2014-07-16 14:11:19 +00:00
parent 99a74843c7
commit a440af1ed3
2 changed files with 92 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

130
programs/develop/libraries/http/http.asm
View File

@ -121,7 +121,60 @@ lib_init: ;//////////////////////////////////////////////////////////////////;;
ret ret
;;================================================================================================;;
proc HTTP_disconnect identifier ;/////////////////////////////////////////////////////////////////;;
;;------------------------------------------------------------------------------------------------;;
;? Stops the open connection ;;
;;------------------------------------------------------------------------------------------------;;
;> identifier = pointer to buffer containing http_msg struct. ;;
;;------------------------------------------------------------------------------------------------;;
;< none ;;
;;================================================================================================;;
pusha
mov ebp, [identifier]
test [ebp + http_msg.flags], FLAG_CONNECTED
jz .error
and [ebp + http_msg.flags], not FLAG_CONNECTED
mcall close, [ebp + http_msg.socket]
popa
ret
.error:
DEBUGF 1, "Cant close already closed connection!\n"
popa
ret
endp
;;================================================================================================;;
proc HTTP_free identifier ;///////////////////////////////////////////////////////////////////////;;
;;------------------------------------------------------------------------------------------------;;
;? Free the http_msg structure ;;
;;------------------------------------------------------------------------------------------------;;
;> 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
jz .not_connected
and [ebp + http_msg.flags], not FLAG_CONNECTED
mcall close, [ebp + http_msg.socket]
.not_connected:
invoke mem.free, ebp
popa
ret
endp
;;================================================================================================;; ;;================================================================================================;;
proc HTTP_get URL, add_header ;///////////////////////////////////////////////////////////////////;; proc HTTP_get URL, add_header ;///////////////////////////////////////////////////////////////////;;
@ -485,9 +538,9 @@ endp
;;================================================================================================;; ;;================================================================================================;;
proc HTTP_process identifier ;////////////////////////////////////////////////////////////////////;; proc HTTP_receive identifier ;////////////////////////////////////////////////////////////////////;;
;;------------------------------------------------------------------------------------------------;; ;;------------------------------------------------------------------------------------------------;;
;? Receive data from the server, parse headers and put data in receive buffer. ;; ;? Receive data from the server, parse headers and put data in receive buffer(s). ;;
;? To complete a transfer, this procedure must be called over and over again untill it returns 0. ;; ;? To complete a transfer, this procedure must be called over and over again untill it returns 0. ;;
;;------------------------------------------------------------------------------------------------;; ;;------------------------------------------------------------------------------------------------;;
;> identifier = pointer to buffer containing http_msg struct. ;; ;> identifier = pointer to buffer containing http_msg struct. ;;
@ -991,66 +1044,46 @@ recalculate_pointers:
;;================================================================================================;; ;;================================================================================================;;
proc HTTP_free identifier ;///////////////////////////////////////////////////////////////////////;; proc HTTP_send identifier, dataptr, datalength ;//////////////////////////////////////////////////;;
;;------------------------------------------------------------------------------------------------;; ;;------------------------------------------------------------------------------------------------;;
;? Free the http_msg structure ;; ;? Send data to the server ;;
;;------------------------------------------------------------------------------------------------;; ;;------------------------------------------------------------------------------------------------;;
;> identifier = pointer to buffer containing http_msg struct. ;; ;> identifier = pointer to buffer containing http_msg struct. ;;
;> dataptr = pointer to data to be sent. ;;
;> datalength = length of data (in bytes) to be sent ;;
;;------------------------------------------------------------------------------------------------;; ;;------------------------------------------------------------------------------------------------;;
;< none ;; ;< eax = number of bytes sent, -1 on error ;;
;;================================================================================================;; ;;================================================================================================;;
DEBUGF 1, "HTTP_free: 0x%x\n", [identifier]
pusha
mov ebp, [identifier]
test [ebp + http_msg.flags], FLAG_CONNECTED push ebx ecx edx esi edi
jz .not_connected mov edx, [identifier]
test [edx + http_msg.flags], FLAG_CONNECTED
jz .fail
mcall send, [edx + http_msg.socket], [dataptr], [datalength], 0
pop edi esi edx ecx ebx
ret
and [ebp + http_msg.flags], not FLAG_CONNECTED .fail:
mcall close, [ebp + http_msg.socket] pop edi esi edx ecx ebx
xor eax, eax
.not_connected: dec eax
invoke mem.free, ebp
popa
ret ret
endp endp
;;================================================================================================;;
proc HTTP_stop identifier ;///////////////////////////////////////////////////////////////////////;;
;;------------------------------------------------------------------------------------------------;;
;? Stops the open connection ;;
;;------------------------------------------------------------------------------------------------;;
;> identifier = pointer to buffer containing http_msg struct. ;;
;;------------------------------------------------------------------------------------------------;;
;< none ;;
;;================================================================================================;;
pusha
mov ebp, [identifier]
and [ebp + http_msg.flags], not FLAG_CONNECTED
mcall close, [ebp + http_msg.socket]
popa
ret
endp
;;================================================================================================;; ;;================================================================================================;;
proc HTTP_find_header_field identifier, headername ;//////////////////////////////////////////////;; proc HTTP_find_header_field identifier, headername ;//////////////////////////////////////////////;;
;;------------------------------------------------------------------------------------------------;; ;;------------------------------------------------------------------------------------------------;;
;? Find a header field in the received HTTP header ;; ;? Find a header field in the received HTTP header ;;
;? ;;
;? NOTE: this function returns a pointer which points into the original header data. ;;
;? The header field is terminated by a CR, LF, space or maybe even tab. ;;
;? A free operation should not be operated on this pointer! ;;
;;------------------------------------------------------------------------------------------------;; ;;------------------------------------------------------------------------------------------------;;
;> identifier = ptr to http_msg struct ;; ;> identifier = ptr to http_msg struct ;;
;> headername = ptr to ASCIIZ string containg field you want to find (must be in lowercase) ;; ;> headername = ptr to ASCIIZ string containing field you want to find (must be in lowercase) ;;
;;------------------------------------------------------------------------------------------------;; ;;------------------------------------------------------------------------------------------------;;
;< eax = 0 (error) / ptr to content of the HTTP header field ;; ;< eax = 0 (error) / ptr to content of the HTTP header field ;;
;;================================================================================================;; ;;================================================================================================;;
@ -1690,6 +1723,9 @@ import network,\
;;===========================================================================;; ;;===========================================================================;;
HTTP_stop = HTTP_disconnect
HTTP_process = HTTP_receive
align 4 align 4
@EXPORT: @EXPORT:
export \ export \
@ -1699,12 +1735,14 @@ export \
HTTP_head , 'head' , \ HTTP_head , 'head' , \
HTTP_post , 'post' , \ HTTP_post , 'post' , \
HTTP_find_header_field , 'find_header_field' , \ HTTP_find_header_field , 'find_header_field' , \
HTTP_process , 'process' , \ HTTP_process , 'process' , \ ; To be removed
HTTP_send , 'send' , \
HTTP_receive , 'receive' , \
HTTP_disconnect , 'disconnect' , \
HTTP_free , 'free' , \ HTTP_free , 'free' , \
HTTP_stop , 'stop' , \ HTTP_stop , 'stop' , \ ; To be removed
HTTP_escape , 'escape' , \ HTTP_escape , 'escape' , \
HTTP_unescape , 'unescape' HTTP_unescape , 'unescape'
; HTTP_put , 'put' , \ ; HTTP_put , 'put' , \
; HTTP_delete , 'delete' , \ ; HTTP_delete , 'delete' , \
; HTTP_trace , 'trace' , \ ; HTTP_trace , 'trace' , \

9
programs/develop/libraries/http/http_en.txt
View File

@ -24,7 +24,7 @@ The content itself must be send to the socket (which you can find in the structu
using system function 75, 6. using system function 75, 6.
- returns 0 on error, identifier otherwise - returns 0 on error, identifier otherwise
process(identifier); receive(identifier);
identifier = identifier which one of the previous functions returned identifier = identifier which one of the previous functions returned
This procedure will handle all incoming data for a connection and place it in the buffer. This procedure will handle all incoming data for a connection and place it in the buffer.
As long as the procedure expects more data, -1 is returned and the procedure must be called again. As long as the procedure expects more data, -1 is returned and the procedure must be called again.
@ -42,4 +42,11 @@ In content_ptr you'll find a pointer to the actual content.
In content_length you'll find the length of the content. In content_length you'll find the length of the content.
In content_received, you'll find the number of content bytes already received. In content_received, you'll find the number of content bytes already received.
send(identifier, *dataptr, datalength);
identifier = identifier which one of the previous functions returned
*dataptr = pointer to the data you want to send
datalength = length of the data to send (in bytes)
This procedure can be used to send data to the server (POST)
- returns number of bytes sent, -1 on error
All procedures are non blocking! All procedures are non blocking!