mirror of
https://github.com/Doczom/simple-httpd.git
synced 2025-09-23 23:53:52 +02:00
Release first beta version server
Version 0.1.0 has been released: - Added a feature for easily sending an http response - Minor bugs have been fixed - Updated API for server modules - Added a readme file
This commit is contained in:
Doczom
GitHub
@@ -21,6 +21,7 @@ mime_file=/usbhd0/3/mime_types.bin
|
||||
; list units
|
||||
; path = path to lib in units_dir
|
||||
test=test_unit.obj
|
||||
rasp=test_unit_2.obj
|
||||
;database/sqlite3=sqlite3_serv.obj
|
||||
;database/cvs=cvs_table_server.obj
|
||||
|
||||
|
||||
@@ -1,10 +1,15 @@
|
||||
format MS COFF
|
||||
public @EXPORT as 'EXPORTS'
|
||||
|
||||
NO_DEBUG_INPUT = 1
|
||||
API_VERSION = 0x05
|
||||
FLAG_KEEP_ALIVE = 0x01
|
||||
|
||||
NO_DEBUG_INPUT = 0
|
||||
include 'D:\kos\programs\macros.inc'
|
||||
|
||||
struct EXPORT_DATA
|
||||
struct IMPORT_DATA
|
||||
version rd 1 ; dword for check api
|
||||
sizeof rd 1 ; size struct
|
||||
netfunc_socket rd 1
|
||||
netfunc_close rd 1
|
||||
netfunc_bind rd 1
|
||||
@@ -16,6 +21,26 @@ struct EXPORT_DATA
|
||||
FileRead rd 1
|
||||
Alloc rd 1
|
||||
Free rd 1
|
||||
parse_http_query rd 1
|
||||
;send_resp(RESPD* ptr, char* content, uint32_t length)
|
||||
;create_resp(CONNECT_DATA* session, uint32_t flags)
|
||||
; FLAG_KEEP_ALIVE = 0x01
|
||||
; FLAG_ADD_DATE = 0x02 ;(not supported)
|
||||
; FLAG_NO_SET_CACHE = 0x04 ;(not supported)
|
||||
; FLAG_NO_CONTENT_ENCODING = 0x08 ;(not supported)
|
||||
;
|
||||
;destruct_resp(RESPD* ptr)
|
||||
;set_http_status(RESPD* ptr, uint32_t status) ; status in '200' format,
|
||||
;add_http_header(RESPD* ptr, char* ptr_header)
|
||||
;del_http_header(RESPD* ptr, char* ptr_header) ; no del std header
|
||||
;set_http_ver(RESPD* ptr, char* version) ; example: RTSP/1.1
|
||||
send_resp rd 1
|
||||
create_resp rd 1
|
||||
destruct_resp rd 1
|
||||
set_http_status rd 1
|
||||
add_http_header rd 1
|
||||
del_http_header rd 1
|
||||
set_http_ver rd 1
|
||||
|
||||
base_response rd 1
|
||||
GLOBAL_DATA rd 1
|
||||
@@ -64,13 +89,25 @@ end if
|
||||
section '.flat' code readable align 16
|
||||
|
||||
unit_init:
|
||||
mov eax, -1
|
||||
push esi edi
|
||||
mov esi, [esp + 4*2 + 4]
|
||||
mov [import_httpd], esi
|
||||
|
||||
mov eax, [esp + 4]
|
||||
mov [import_httpd], eax
|
||||
cmp dword[esi + IMPORT_DATA.version], API_VERSION
|
||||
jne .exit
|
||||
|
||||
mov edi, IMPORT
|
||||
mov ecx, [esi + IMPORT_DATA.sizeof]
|
||||
shr ecx, 2 ; div 4
|
||||
rep movsd
|
||||
|
||||
xor eax, eax
|
||||
.exit:
|
||||
pop edi esi
|
||||
ret 4
|
||||
|
||||
|
||||
server_entry:
|
||||
push esi edi
|
||||
mov esi, [esp + 4*2 + 4]
|
||||
@@ -106,6 +143,11 @@ server_entry:
|
||||
cmp dword[ecx], 'txt'
|
||||
jne .no_args
|
||||
|
||||
mov dword[text_message], ' '
|
||||
mov dword[text_message + 4], ' '
|
||||
mov dword[text_message + 8], ' '
|
||||
mov dword[text_message + 12], ' '
|
||||
|
||||
push esi edi
|
||||
mov esi, [eax + 12]
|
||||
mov edi, text_message
|
||||
@@ -123,8 +165,7 @@ server_entry:
|
||||
board_input 'create message'
|
||||
; create http message
|
||||
push dword 8*1024
|
||||
mov eax, [import_httpd]
|
||||
call [eax + EXPORT_DATA.Alloc]
|
||||
call [IMPORT + IMPORT_DATA.Alloc]
|
||||
test eax, eax
|
||||
jz .exit
|
||||
|
||||
@@ -168,13 +209,12 @@ server_entry:
|
||||
; set httpcode
|
||||
mov dword[edi + sceleton_resp.code], '200 '
|
||||
; send http message
|
||||
mov ecx, [import_httpd]
|
||||
|
||||
push dword 0 ; flags
|
||||
push sceleton_resp.size
|
||||
push edi
|
||||
push dword[esi + CONNECT_DATA.socket]
|
||||
call [ecx + EXPORT_DATA.netfunc_send]
|
||||
call [IMPORT + IMPORT_DATA.netfunc_send]
|
||||
|
||||
board_input 'send'
|
||||
.exit:
|
||||
@@ -224,3 +264,6 @@ text_message:
|
||||
export \
|
||||
unit_init, 'httpd_init', \
|
||||
server_entry, 'httpd_serv'
|
||||
|
||||
|
||||
IMPORT IMPORT_DATA ;
|
||||
Binary file not shown.
264
example/test_unit_2.asm
Normal file
264
example/test_unit_2.asm
Normal file
@@ -0,0 +1,264 @@
|
||||
format MS COFF
|
||||
public @EXPORT as 'EXPORTS'
|
||||
|
||||
API_VERSION = 0x05
|
||||
FLAG_KEEP_ALIVE = 0x01
|
||||
|
||||
NO_DEBUG_INPUT = 0
|
||||
include 'D:\kos\programs\macros.inc'
|
||||
purge mov,add,sub
|
||||
include 'D:\kos\programs\proc32.inc'
|
||||
|
||||
struct IMPORT_DATA
|
||||
version rd 1 ; dword for check api
|
||||
sizeof rd 1 ; size struct
|
||||
netfunc_socket rd 1
|
||||
netfunc_close rd 1
|
||||
netfunc_bind rd 1
|
||||
netfunc_accept rd 1
|
||||
netfunc_listen rd 1
|
||||
netfunc_recv rd 1
|
||||
netfunc_send rd 1
|
||||
FileInfo rd 1
|
||||
FileRead rd 1
|
||||
Alloc rd 1
|
||||
Free rd 1
|
||||
parse_http_query rd 1
|
||||
;send_resp(RESPD* ptr, char* content, uint32_t length)
|
||||
;create_resp(CONNECT_DATA* session, uint32_t flags)
|
||||
; FLAG_KEEP_ALIVE = 0x01
|
||||
; FLAG_ADD_DATE = 0x02 ;(not supported)
|
||||
; FLAG_NO_SET_CACHE = 0x04 ;(not supported)
|
||||
; FLAG_NO_CONTENT_ENCODING = 0x08 ;(not supported)
|
||||
;
|
||||
;destruct_resp(RESPD* ptr)
|
||||
;set_http_status(RESPD* ptr, uint32_t status) ; status in '200' format,
|
||||
;add_http_header(RESPD* ptr, char* ptr_header)
|
||||
;del_http_header(RESPD* ptr, char* ptr_header) ; no del std header
|
||||
;set_http_ver(RESPD* ptr, char* version) ; example: RTSP/1.1
|
||||
send_resp rd 1
|
||||
create_resp rd 1
|
||||
destruct_resp rd 1
|
||||
set_http_status rd 1
|
||||
add_http_header rd 1
|
||||
del_http_header rd 1
|
||||
set_http_ver rd 1
|
||||
|
||||
base_response rd 1
|
||||
GLOBAL_DATA rd 1
|
||||
ends
|
||||
|
||||
struct CONNECT_DATA ; 16*4 = 64 bytes
|
||||
socket dd 0 ; номер сокета подключения
|
||||
sockaddr dd 16/4 ; socaddr connection
|
||||
buffer_request dd 0 ; pointer to buffer for geting message socket
|
||||
request_size dd 0 ; size geted data from client
|
||||
end_buffer_request dd 0 ; для парсера
|
||||
buffer_response dd 0 ; pointer to buffwr for resp message
|
||||
http_method dd 0 ; указатель на строку
|
||||
http_verion dd 0 ; указатель на строку
|
||||
num_headers dd 0 ; number items in REQUEST_DATA
|
||||
http_headers dd 0 ; указатель на массив REQUEST_DATA
|
||||
uri_scheme dd 0 ; указатель на схему
|
||||
uri_authority dd 0 ; pointer to struct ?
|
||||
uri_path dd 0 ; указатель на декодированный путь к ресурсу(без параметров)
|
||||
num_uri_args dd 0 ;
|
||||
uri_arg dd 0 ; pointer to array REQUEST_DATA аргументов uri строк
|
||||
uri_fragment dd 0 ; указатель на строку
|
||||
message_body dd 0 ; указатель на тело http запроса
|
||||
ends
|
||||
|
||||
macro board_input message {
|
||||
if NO_DEBUG_INPUT = 0
|
||||
local ..str, ..end
|
||||
push eax ebx ecx esi
|
||||
mov esi, ..str
|
||||
@@:
|
||||
mov cl, [esi]
|
||||
mcall 63, 1
|
||||
inc esi
|
||||
|
||||
cmp cl, 10
|
||||
jne @b
|
||||
jmp ..end
|
||||
..str:
|
||||
db message,13, 10
|
||||
..end:
|
||||
pop esi ecx ebx eax
|
||||
end if
|
||||
}
|
||||
|
||||
section '.flat' code readable align 16
|
||||
|
||||
unit_init:
|
||||
mov eax, -1
|
||||
push esi edi
|
||||
mov esi, [esp + 4*2 + 4]
|
||||
|
||||
cmp dword[esi + IMPORT_DATA.version], API_VERSION
|
||||
jne .exit
|
||||
|
||||
mov edi, IMPORT
|
||||
mov ecx, [esi + IMPORT_DATA.sizeof]
|
||||
shr ecx, 2 ; div 4
|
||||
rep movsd
|
||||
|
||||
xor eax, eax
|
||||
.exit:
|
||||
pop edi esi
|
||||
ret 4
|
||||
|
||||
|
||||
server_entry:
|
||||
push esi edi
|
||||
mov esi, [esp + 4*2 + 4]
|
||||
; work
|
||||
board_input 'first'
|
||||
|
||||
cmp [esi + CONNECT_DATA.num_uri_args], 1
|
||||
jb .no_args
|
||||
|
||||
mov eax, [esi + CONNECT_DATA.uri_arg]
|
||||
|
||||
mov ecx, [eax]
|
||||
cmp word[ecx], 'gr'
|
||||
jne .no_args
|
||||
|
||||
cmp byte[ecx + 2], 0
|
||||
jne .no_args
|
||||
|
||||
|
||||
mov ecx, [eax + 4]
|
||||
cmp dword[ecx], 'bpo'
|
||||
jne .no_bpo
|
||||
|
||||
board_input 'bpo'
|
||||
invoke IMPORT.Alloc, sceleton_resp.size
|
||||
test eax, eax
|
||||
jz .exit
|
||||
|
||||
push esi
|
||||
mov edi, eax
|
||||
mov esi, sceleton_resp
|
||||
mov ecx, sceleton_resp.size
|
||||
rep movsb
|
||||
|
||||
lea edi, [eax + sceleton_resp.name]
|
||||
mov esi, bpo_name
|
||||
mov ecx, bpo_name.size
|
||||
rep movsb
|
||||
|
||||
lea edi, [eax + sceleton_resp.data]
|
||||
mov esi, bpo_data
|
||||
mov ecx, bpo_data.size
|
||||
rep movsb
|
||||
pop esi
|
||||
|
||||
jmp .send_data
|
||||
.no_bpo:
|
||||
cmp dword[ecx], 'btp'
|
||||
jne .err_404
|
||||
|
||||
board_input 'btp'
|
||||
invoke IMPORT.Alloc, sceleton_resp.size
|
||||
test eax, eax
|
||||
jz .exit
|
||||
|
||||
push esi
|
||||
mov edi, eax
|
||||
mov esi, sceleton_resp
|
||||
mov ecx, sceleton_resp.size
|
||||
rep movsb
|
||||
|
||||
lea edi, [eax + sceleton_resp.name]
|
||||
mov esi, btp_name
|
||||
mov ecx, btp_name.size
|
||||
rep movsb
|
||||
|
||||
lea edi, [eax + sceleton_resp.data]
|
||||
mov esi, btp_data
|
||||
mov ecx, btp_data.size
|
||||
rep movsb
|
||||
pop esi
|
||||
|
||||
jmp .send_data
|
||||
.no_args:
|
||||
board_input 'no_arg'
|
||||
invoke IMPORT.create_resp, esi, 0
|
||||
test eax, eax
|
||||
jz .exit
|
||||
|
||||
push eax
|
||||
invoke IMPORT.send_resp, eax, sceleton_resp, sceleton_resp.size
|
||||
invoke IMPORT.destruct_resp ; arg in stack
|
||||
.exit:
|
||||
pop edi esi
|
||||
ret 4
|
||||
|
||||
.send_data: ; eax - ptr to buffer
|
||||
mov edi, eax
|
||||
board_input 'create_resp'
|
||||
invoke IMPORT.create_resp, esi, 0
|
||||
test eax, eax
|
||||
jz .exit
|
||||
|
||||
board_input 'send_data'
|
||||
push eax
|
||||
invoke IMPORT.send_resp, eax, edi, sceleton_resp.size
|
||||
invoke IMPORT.destruct_resp ; arg in stack
|
||||
|
||||
invoke IMPORT.Free, edi
|
||||
jmp .exit
|
||||
|
||||
.err_404:
|
||||
; send resp 404
|
||||
board_input 'err404'
|
||||
invoke IMPORT.create_resp, esi, 0
|
||||
test eax, eax
|
||||
jz .exit
|
||||
|
||||
mov edi, eax
|
||||
invoke IMPORT.set_http_status, edi, dword '404'
|
||||
invoke IMPORT.send_resp, edi, 0, 0
|
||||
invoke IMPORT.destruct_resp, edi
|
||||
jmp .exit
|
||||
|
||||
|
||||
|
||||
section '.data' data readable writable align 16
|
||||
|
||||
_10: dd 10
|
||||
|
||||
sceleton_resp:
|
||||
db '<!DOCTYPE html>'
|
||||
db '<html><head><meta charset="utf-8"><title>Test Server 2</title></head>'
|
||||
db '<body><ul><il><a href="?gr=bpo">bpo</a></il><br><il><a href="?gr=btp">btp</a></il></ul>'
|
||||
db '<b>Название группы: </b>'
|
||||
.name = $ - sceleton_resp
|
||||
db ' <br><b>Экзамены:</b>'
|
||||
.data = $ - sceleton_resp
|
||||
db ' <br></body></html>'
|
||||
.size = $ - sceleton_resp
|
||||
|
||||
|
||||
bpo_data:
|
||||
db 'Дискретка'
|
||||
.size = $ - bpo_data
|
||||
bpo_name:
|
||||
db 'БПО09-23-21'
|
||||
.size = $ - bpo_name
|
||||
|
||||
btp_data:
|
||||
db 'Эти лохи химию сдают'
|
||||
.size = $ - btp_data
|
||||
btp_name:
|
||||
db 'БТП-23-21'
|
||||
.size = $ - btp_name
|
||||
|
||||
@EXPORT:
|
||||
export \
|
||||
unit_init, 'httpd_init', \
|
||||
server_entry, 'httpd_serv'
|
||||
|
||||
|
||||
IMPORT IMPORT_DATA ;
|
||||
BIN
example/test_unit_2.obj
Normal file
BIN
example/test_unit_2.obj
Normal file
Binary file not shown.
Reference in New Issue
Block a user