Added 206 response with file splitting.

README.md

@@ -12,16 +12,19 @@ Features:
 
 What works:
 * Serving files from specified document root.
+* 200 for < ~10MB files
+* 206 for > ~10MB files. File is split and supports Content-Range header.
 * 404 if file not found.
 * Content-types: xml, html, xhtml, gif, png, jpeg, css, and js.
 
 Planned Features:
 * Directory listing.
 
-Limitations being worked on:
+Current Limitations / Known Issues
 =======
-* Files are not read in chuncks, attempting to tranfer a large file will not work.
-
+
+* Most clients do not use 206 to recieve large files. Need to improve 200 to continuously stream data.  
+
 Installation
 =======
 
@@ -36,6 +39,11 @@ Usage
 
 Changes
 =======
+2014-02-01 : asmttpd - 0.03
+
+* Files are split if too large to fit into buffer. 
+* Added 206 responses with Content-Range handling
+
 
 2014-01-30 : asmttpd - 0.02
 

constants.asm

@@ -31,6 +31,7 @@
 %define THREAD_BUFFER_SIZE 11534336 ; 11MB local thread storage. 10 MB for file buffer, 1MB for request. Buffer: start [ HTTP-Request,HTTP-Response,File-Data ] end
 					                ; File portion will be reduced incase of large HTTP-Requests.
 
+%define HEADER_RESERVED_SIZE 1048576 ; 1MB
 ;Flags
 %define MMAP_PROT_READ     0x1
 %define MMAP_PROT_WRITE    0x2
@@ -51,11 +52,24 @@
 %define SOCK_STREAM    1
 %define PROTO_TCP      6
 
-;%define RECV_WAITALL   0x100   
+%define LSEEK_SET      0 ; seek to offset bytes
+%define LSEEK_END      2 ; seek to end plus offset
+
+;Internal Constants
+%define CONTENT_TYPE_HTML         0
+%define CONTENT_TYPE_OCTET_STREAM 1
+%define CONTENT_TYPE_CSS          2
+%define CONTENT_TYPE_JAVASCRIPT   3
+%define CONTENT_TYPE_XHTML	      4
+%define CONTENT_TYPE_XML	      5
+%define CONTENT_TYPE_GIF	      6
+%define CONTENT_TYPE_PNG	      7
+%define CONTENT_TYPE_JPEG	      8
 
 ;System Call Values
 %define SYS_READ  0  ;int fd, const void *buf, size_t count
 %define SYS_WRITE 1  ;int fd, const void *buf, size_t count
+%define SYS_LSEEK 8  ;int fd, off_t offset, int whence
 %define SYS_MMAP  9  ;void *addr, size_t length, int prot, int flags, int fd, off_t offset
 %define SYS_CLONE 56 ;unsigned long clone_flags, unsigned long newsp, void ___user *parent_tid, void __user *child_tid, struct pt_regs *regs
 %define SYS_EXIT       60   ;int status

data.asm

@@ -52,28 +52,50 @@
 	msg_using_directory_len equ $ - msg_using_directory
 	msg_not_a_directory dd "Error: Specified document root is not a directory",0x00
 	msg_not_a_directory_len equ $ - msg_not_a_directory
-	msg_request_log dd 0x0a,"Request: ",0x00
+	msg_request_log db 0x0a,"Request: ",0x00
 	msg_request_log_len equ $ - msg_request_log
 
+	header_range_search db "Range: ",0x00
+	header_range_search_len equ $ - header_range_search
 
-	filter_test db "/home/nemasu/../something",0x00
-	filter_test_len equ $ - filter_test
-
+	find_bytes_range db "bytes=",0x00
+	find_bytes_range_len equ $ - find_bytes_range
+	
 	filter_prev_dir db "../",0x00
 	filter_prev_dir_len equ $ - filter_prev_dir
 
+	crlfx2 db 0x0d,0x0a,0x0d,0x0a,0x00
+	crlfx2_len equ $ - crlfx2
+
 	crlf db 0x0d,0x0a,0x00
 	crlf_len equ $ - crlf
 
+	char_slash db "/",0x00
+	char_hyphen db "-",0x00
+
 	;HTTP
+	;need 413-toolarge 416-rangesucks
+
 	http_200 db "HTTP/1.1 200 OK",0x0d,0x0a,0x00
 	http_200_len equ $ - http_200
+	http_206 db "HTTP/1.1 206 Partial Content",0x0d,0x0a,0x00
+	http_206_len equ $ - http_206
 	http_404 db "HTTP/1.1 404 Not Found",0x0d,0x0a,0x00
 	http_404_len equ $ - http_404
 	http_404_text db "I'm sorry, Dave. I'm afraid I can't do that. 404 Not Found",0x00
 	http_404_text_len equ $ - http_404_text_len
 	server_header db     "Server: asmttpd/",ASMTTPD_VERSION,0x0d,0x0a,0x00
 	server_header_len equ $ - server_header
+
+	range_header db "Accept-Ranges: bytes",0x0d,0x0a,0x00
+	range_header_len equ $ - range_header
+
+	content_range db "Content-Range: bytes ",0x00
+	content_range_len equ $ - content_range  ;Content-Range: bytes 200-1000/3000
+
+	content_length db "Content-Length: ",0x00 ;Content-Length: 800
+	content_length_len equ $ - content_length
+
 	connection_header db "Connection: close",0x0d,0x0a,0x00
 	connection_header_len equ $ - connection_header