WebSVN – Kolibri OS – Diff – /programs/network/downloader/trunk/downloader.asm

-;
-;    HTTPC.ASM
+; wget 0.2 by barsuk
-;
-;    Compile with FASM for Menuet ( v1.40 for DOS )
-;
-;    This program implements a very simple web browser
-;
-;    Version 0.4    2nd December 2003 Mike Hibbett
-;    Enabled lowercase/uppcase characters in URL
-;    Version 0.3    30th November 2003 Mike Hibbett
-;    Fixed bug with tcp socket opne - uses unique port
-;    Version 0.2    27th November 2003 Mike Hibbett
-;    Added user entry of url, and implements url -> IP address
-;    resolution through DNS
+; based on Menuet Httpc
-;
-;    Version 0.1  Ville Mikael Turjanmaa
-;    Original version
 ; Enabling debugging puts stuff to the debug board
 DEBUGGING_ENABLED           equ     1
 DEBUGGING_DISABLED          equ     0
-DEBUGGING_STATE             equ     DEBUGGING_DISABLED
+DEBUGGING_STATE             equ     DEBUGGING_ENABLED
 use32
  org    0x0
  db     'MENUET01'    ; header
  dd     0x01          ; header version
  dd     START         ; entry point
+ dd     I_END         ; image size
- dd     I_END         ; image size
+ dd     0x100000      ; required memory
- dd     0x100000      ; required memory
+ dd     0x100000      ; esp
- dd     0x100000      ; esp
+ dd     params		  ; I_PARAM
- dd     0x0 , 0x0     ; I_Param , I_Path
+ dd		0x0     	  ;I_Path
+include 'lang.inc'
+include '../../../macros.inc'
-include 'lang.inc'
+include "DEBUG.INC"
-include 'macros.inc'
-;include "DEBUG.INC"
-URLMAXLEN       equ     50  ; maximum length of url string
+URLMAXLEN       equ     256  ; maximum length of url string
-; Memory usage
+primary_buffer_size	equ	4096
 ; webpage source file at 0x10000
-; decoded text page at   0x20000
+; Memory usage
+; webpage headers at buf_headers
+START:                              ; start of execution
+;dps <"Program started",13,10>
+    mov     eax,40                          ; Report events
+    mov     ebx,10000111b                   ; Stack 8 + defaults
+    mcall
+	mov		eax, 68						; create local heap
+	mov		ebx, 11
+	mcall
+	call		load_settings
+	cmp		byte [params], 0
+	jz		red
+	; we have an url
+	mov		edi, document_user
+	mov		al, ' '
+	mov		ecx, URLMAXLEN
+	rep		stosb
+	mov		esi, params
+	mov		edi, document_user
+.copy_param:
+	mov		al, [esi]
+	cmp		al, 0
+	jz		.done
+	cmp		al, ' '
+	jz		.done_inc
+	mov		[edi], al
+	inc		esi
+	inc		edi
+	jmp		.copy_param
+.done_inc:
-; text attribute         0x30000  (1 = normal, 2 = bold, 128+ = link)
+	; url is followed by shared memory name.
 	inc		esi
-START:                              ; start of execution
+.done:
 	mov		[shared_name], esi
 button:                 ; button
 ;dps <"Button pressed",13,10>
     mov     eax,17      ; get id
+    mcall
+	cmp		ah,26
-    mcall
+	je		save
     cmp     ah,1                   ; button id=1 ?
     jne     noclose
-;dps "Closing socket before exit... "
-    mov     eax, 53
-    mov     ebx, 8
+;dps "Closing socket before exit... "
     mov     ecx, [socket]
-    mcall
+close_end_exit:
 ;dpd eax
+;dps <13,10>
+exit:
+    or      eax,-1                 ; close this program
+    mcall
+save:
+dps "saving"
+newline
+	mov		eax, 70
-;dps <13,10>
+	mov		ebx, fileinfo
 	mcall
-exit:
+;pregs
     or      eax,-1                 ; close this program
-    mcall
+	jmp		still
     mov     [addr],dword document_user
     mov     [ya],dword 38
     mov     [len],dword URLMAXLEN
-    mov     ecx,[len]
+    mov     ecx,URLMAXLEN
     mov     edi,[addr]
     mov     al,' '
 ;    Function
 ;       send_request
+;
 ;   Description
 ;       Transmits the GET request to the server.
-;       This is done as GET then URL then HTTP/1.0',13,10,13,10 in 3 packets
+;       This is done as GET then URL then HTTP/1.1',13,10,13,10 in 3 packets
+;
 ;****************************************************************************
 send_request:
     pusha
-    mov     eax,53     ; 'GET '
-    mov     ebx,7
-    mov     ecx,[socket]
-    mov     edx,4
-    mov     esi,string0
+	mov		esi, string0
+	mov		edi, request
-    mcall
+	movsd
+    ; If proxy is used, make absolute URI - prepend http://
+	cmp		byte [proxyAddr], 0
+	jz		.noproxy
+	mov		dword [edi], 'http'
+	mov		byte [edi+4], ':'
+	mov		word [edi+5], '//'
+	add		edi, 7
+	mov		esi, webAddr
+.copy_host_loop:
+	lodsb
+	cmp		al, ' '
+	jz		.noproxy
+	stosb
+	jmp		.copy_host_loop
+.noproxy:
-    mov     edx,0
 	mov		edx, 0
+.next_edx:
+    ; Determine the length of the url to send in the GET request
+	mov		al, [edx+document]
+	cmp		al, ' '
+    je     	.document_done
-next_edx:
+	mov		[edi], al
-    ; Determine the length of the url to send in the GET request
+	inc		edi
     inc     edx
+	jmp		.next_edx
-    cmp     [edx+document],byte ' '
+.document_done:
+	mov		esi, stringh
-    jne     next_edx
+	mov		ecx, stringh_end-stringh
+	rep		movsb
+	mov		edx, 0
+.webaddr_next:
-    mov     eax,53     ; document_user
+	mov		al, [webAddr + edx]
+	cmp		al, ' '
-    mov     ebx,7
+	je		.webaddr_done
+	mov		[edi], al
+	inc		edi
+	inc		edx
+	jmp		.webaddr_next
+.webaddr_done:
+	cmp		byte [proxyUser], 0
+	jz		@f
+	call		append_proxy_auth_header
+@@:
+	mov		esi, connclose
+	mov		ecx, connclose_end-connclose
+	rep		movsb
+	pusha
+	mov  eax,63
+	mov  ebx,1
+	mov  edx, request
+@@:
+   mov  cl,[edx]
+   cmp edx,edi
+   jz   @f
+   int  40h
+   inc  edx
+   jmp  @b
+@@:
+	popa
-    mov     ecx,[socket]
+    mov     edx, edi
-    mov     esi,document
+	sub		edx, request
     mcall
-    mov     eax,53     ; ' HTTP/1.0 .. '
+	;;;;now write \r\nConnection: Close \r\n\r\n
-    mov     ebx,7
+    mov     eax, 53     ; ' HTTP/1.1 .. '
-    mov     ecx,[socket]
+    mov     ebx, 7
-    mov     edx,stringh_end-stringh
+    mov     ecx, [socket]
     cmp     [onoff],1
     je      rid
     ret
+rid:
+	push	esi
-rid:
+	push	edi
+dps "rid"
-    mov     ecx,-1
+newline
+newbyteread:
 	;call	print_status
 newbyteread:
     mov     eax, 53
     mov     ebx, 2
     mov     ecx, [socket]
     mcall
     cmp     eax,0
-    je      no_more_data
+    cmp     eax,0
+    je      no_more_data
+    mov     eax, 53
-read_more:
+    mov     ebx, 11
+	mov		edx, primary_buf
+    mov     ecx, [socket]
-    mov     eax, 53
+	mov		esi, primary_buffer_size
+    mcall
-    mov     ebx, 3
+;dps "part "
+;dph eax
+;newline
+	mov		edi, [pos]
-    mov     ecx, [socket]
+	add		[pos], eax
-    mcall
+	push	eax
+	mov		eax, 68
+	mov		ebx, 20
+	mov		ecx, [pos]
+	mov		edx, [buf_ptr]
+	mcall
-yesm:
+	mov		[buf_ptr], eax
-    inc     [pos]
-    mov     ecx,[pos]
+	add		edi, eax
-    mov     [0x10000+ecx],bl
+	mov		esi, primary_buf
+	pop		ecx					; number of recently read bytes
 	lea		edx, [ecx - 3]
+	rep		movsb
-    call    print_status
+no_more_data:
+	mov		eax, 53
+	mov		ebx, 6
+	mov		ecx, [socket]
+	mcall
+	cmp		eax, 4
+	jne		no_more_data.finish
+	jmp		newbyteread
+.finish:
+;dps "finish "
+;pregs
+	call	parse_result
+	mov		ecx, [shared_name]
+	cmp		byte [ecx], 0
+	jnz		save_in_shared
+	mov		eax, 70
+	mov		ebx, fileinfo
+	mcall
+;dps "saving "
+;pregs
     cmp     eax,0
+	;jmp		close_end_exit
+	pop		edi
+	pop		esi
+	; if called from command line, then exit
+	cmp		byte [params], 0
+	jnz		exit
+    ret
+save_in_shared:
+	mov	eax, 68
+	mov	ebx, 22
+	mov	esi, 1	; SHM_OPEN+SHM_WRITE
+	mcall
+	test	eax, eax
+	jz	save_in_shared_done
+	sub	edx, 4
+	jbe	save_in_shared_done
+	mov	ecx, [final_size]
+	cmp	ecx, edx
+	jb	@f
+	mov	ecx, edx
+@@:
+	mov	[eax], ecx
+	lea	edi, [eax+4]
-    jne     read_more
-    mov     eax,5
-    mov     ebx,50
-    mcall
-    jmp     newbyteread
+	mov	esi, [final_buffer]
-no_more_data:
-    ret
-;****************************************************************************
-;    Function
+	mov	edx, ecx
-;       draw_page
+	shr	ecx, 2
-;
-;   Description
-;       parses the web page data, storing displayable data at 0x20000
-;       and attributes at 0x30000. It then calls display_page to render
-;       the data
-;
-;****************************************************************************
-draw_page:
-    pusha
-    mov     esi,0
+	rep	movsd
-    mov     [command_on_off],0
-newlettercheck:
-    movzx   eax,byte [esi+0x10000]
+	mov	ecx, edx
-    cmp     al,'<'
-    jne     no_c_on
+	and	ecx, 3
-    mov     [command_on_off],1
+	rep	movsb
+save_in_shared_done:
-no_c_on:
+	pop	edi
-    cmp     al,'>'
+	pop	esi
-    jne     no_c_off
+	jmp	exit
+	; this function cuts header, and removes chunk sizes if doc is chunked
-    mov     [command_on_off],0
+	; in: buf_ptr, pos; out: buf_ptr, pos.
+parse_result:
-no_c_off:
-    cmp     [command_on_off],0
+	; close socket
+    mov     eax, 53
+    mov     ebx, 8
-    je      no_lower_case
+    mov     ecx, [socket]
+    mcall
+dps "close socket: "
-    cmp     eax,96
+dph eax
+newline
+	mov		edi, [buf_ptr]
-    jg      no_lower_case
+	mov		edx, [pos]
-    cmp     eax,65
+	mov		[buf_size], edx
+	;mov		eax, 70
+	;mov		ebx, fileinfo_tmp
+	;mcall
-    jb      no_lower_case
-    add     eax,32
+dps "pos = "
+dph edx
-no_lower_case:
-    mov     [esi+0x10000],al
-    inc     esi
-    cmp     esi,[pos]
-    jbe     newlettercheck
-    mov     edi,0x30000
-    mov     ecx,0x10000
-    mov     al,0
-    cld
-    rep     stosb
-    mov     [text_type],1
+newline
-    mov     [command_on_off],0
+	; first, find end of headers
+.next_byte:
+	cmp		dword [edi], 0x0d0a0d0a		; ìíå ëåíü ÷èòàòü ñòàíäàðò, ïóñòü áóäóò îáà âàðèàíòà
+	je		.end_of_headers
-    mov     esi,0
-    mov     ecx,[pos]
-    ; search for double lf
-find_dlf:
+	cmp		dword [edi], 0x0a0d0a0d
-    cmp     [0x10000+esi-4],dword 0x0d0a0d0a
-    je      found_dlf
-    cmp     [0x10000+esi-4],dword 0x0a0d0a0d
-    je      found_dlf
-    cmp     [0x10000+esi-2],word 0x0d0d
+	je		.end_of_headers
-    je      found_dlf
-    cmp     [0x10000+esi-2],word 0x0a0a
+	inc		edi
-    je      found_dlf
+	dec		edx
+	jne		.next_byte
-    cmp     esi,5500
+	; no end of headers. it's an error. let client see all those headers.
-    je      found_dlf
+	ret
-    inc     esi
+.end_of_headers:
-    jmp     find_dlf
+	; here we look at headers and search content-length or transfer-encoding headers
+;dps "eoh "
-found_dlf:
+;newline
-newbyte:
+	sub		edi, [buf_ptr]
+	add		edi, 3
+	mov		[body_pos], edi		; store position where document body starts
-    mov     al,[esi+0x10000]
+	mov		[is_chunked], 0
+	; find content-length in headers
+	; not good method, but should work for 'Content-Length:'
+	mov		esi, [buf_ptr]
-    cmp     al,'<'
+	mov		edi, s_contentlength
-    jne     no_command_on
+	mov		ebx, [body_pos]
+	mov		edx, 0
+.cl_next:
-    mov     [command_on_off],1
+	mov		al, [esi]
+	cmp		al, [edi + edx]
+	jne		.cl_fail
-no_command_on:
+	inc		edx
-    cmp     al,'>'
+	cmp		edx, len_contentlength
-    jne     no_command_off
+	je		.cl_found
-    mov     [command_on_off],0
+	jmp		.cl_incr
-    jmp     byte_done
+.cl_fail:
+	mov		edx, 0
+.cl_incr:
+	inc		esi
-no_command_off:
+	dec		ebx
+	je		.cl_error
+	jmp		.cl_next
+.cl_error:
-    mov     eax,[esi+0x10000]    ;
-    cmp     ax,'->'
-    jne     no_com2_end
+	call	read_number		; eax = number from *esi
-    mov     [com2],0
+	inc		eax				; bugfix :)
-    inc     esi
+.write_final_size:
-    jmp     byte_done
+	mov		[final_size], eax		; if this works, i will b very happy...
-no_com2_end:
-    mov     eax,[esi+0x10000]    ;
-    cmp     eax,'
-    jne     no_script_start
-    mov     [script],1
-no_script_start:
-    mov     eax,[esi+0x10000]    ; /script>
-    cmp     eax,'
-    jne     no_script_end
-    mov     [script],0
-    inc     esi
-    jmp     byte_done
-no_script_end:
-    cmp     [command_on_off],0
-    jne     no_print
-    cmp     [com2],0
-    jne     no_print
-    cmp     [script],0
-    jne     no_print
-    mov     al,[esi+0x10000] ; &
-    cmp     al,'&'
+	mov		ebx, [pos]	; we well check if it is right
-    jne     no_nbsp
+	sub		ebx, [body_pos]
-newsps:
-    inc     esi
-    mov     al,[esi+0x10000] ;
-    cmp     al,';'
-    jne     newsps
-    jmp     byte_done
-no_nbsp:
-    cmp     al,13
-    jne     no_lb
-    jmp     byte_done
-no_lb:
-    cmp     al,10
-    jne     no_lf
+;dps "check cl eax==ebx "
+;pregs
-    jmp     byte_done
+	; everything is ok, so we return
-no_lf:
-    mov     ebx,[pagey]
-    imul    ebx,[pagexs]
-    add     ebx,[pagex]
-    add     ebx,0x20000
-    and     eax,0xff
-    cmp     eax,31
-    jbe     byte_done
-    cmp     [lastletter],al
-    jne     letter_ok
-    cmp     al,' '
-    je      byte_done
+	mov		eax, [body_pos]
-letter_ok:
-    mov     [ebx],al
+	mov		ebx, [buf_ptr]
-    mov     dl,[text_type]
+	add		ebx, eax
-    mov     [ebx+0x10000],dl
-    mov     [pageyinc],0
-    mov     [lastletter],al
+	mov		[final_buffer], ebx
-    inc     [pagex]
+	;mov		ebx, [pos]
-    mov     ebx,[pagex]
-    cmp     ebx,[pagexs]
-    jb      byte_done
-    mov     [pagex],0
+	;sub		ebx, eax
-    inc     [pagey]
-    jmp     byte_done
-no_print:
+	;mov		[final_size], ebx
+	ret
+parse_chunks:
+;dps "parse chunks"
-    ; HTML -COMMAND
+;newline
+	; we have to look through the data and remove sizes of chunks we see
+	; 1. read size of next chunk
+	; 2. if 0, it's end. if not, continue.
+	; 3. make a good buffer and copy a chunk there
+	mov		[final_buffer], 0
+	mov		[final_size], 0
+.read_size:
-    mov     ax,[esi+0x10000]    ; b> bold
+	mov		eax, [prev_chunk_end]
+	mov		ebx, eax
-    cmp     ax,'b>'
+	sub		ebx, [buf_ptr]
-    jne     no_bold_start
+	mov		edx, eax
+;dps "rs "
+;pregs
+	cmp		ebx, [pos]
+	jae		chunks_end			; not good
+	call	read_hex			; in: eax=pointer to text. out:eax=hex number,ebx=end of text.
-    mov     [text_type],2
+	cmp		eax, 0
+	jz		chunks_end
+	add		ebx, 1
+	mov		edx, ebx			; edx = size of size of chunk
+	add		ebx, eax
+	mov		[prev_chunk_end], ebx
-no_bold_start:
-    mov     eax,[esi+0x10000]    ; /b bold end
-    cmp     eax,''
-    jne     no_bold_end
-    mov     [text_type],1
+;dps "sz "
+;pregs
+	; do copying: from buf_ptr+edx to final_buffer+prev_final_size count eax
+	; realloc final buffer
+	push	eax
+	push	edx
+	push	dword [final_size]
+	add		[final_size], eax
+	mov		eax, 68
+	mov		ebx, 20
+	mov		ecx, [final_size]
+	mov		edx, [final_buffer]
+	mcall
+	mov		[final_buffer], eax
+;dps "re "
+;pregs
+	pop		edi
+	pop		esi
+	pop		ecx
+	;add		[pos], ecx
+	add		edi, [final_buffer]
+;dps "cp "
+;pregs
-    add     esi,2
+	rep		movsb
+	jmp		.read_size
 no_bold_end:
-    mov     ax,[esi+0x10000]    ;
+chunks_end:
+	; free old buffer
+dps "chunks end"
+newline
-    cmp     ax,'a '
+	mov		eax, 68
-    jne     no_link_start
-    mov     [text_type],128
+	mov		ebx, 13
+	mov		ecx, [buf_ptr]
+	mcall
+	; done!
+	ret
+; reads content-length from [edi+ecx], result in eax
+read_number:
+	push	ebx
+	xor		eax, eax
-    add     esi,2
+	xor		ebx, ebx
+.next:
+	mov		bl, [esi]
+;dph ebx
+	cmp		bl, '0'
+	jb		.not_number
+	cmp		bl, '9'
+	ja		.not_number
+	sub		bl, '0'
+	shl		eax, 1
+	lea		eax,[eax + eax * 4]		; eax *= 10
+	add		eax, ebx
+.not_number:
+	cmp		bl, 13
+	jz		.done
+	inc		esi
+	jmp		.next
+.done:
+	pop		ebx
+;newline
+;dps "strtoint eax "
+;pregs
+	ret
+; reads hex from eax, result in eax, end of text in ebx
+read_hex:
+	add		eax, 2
+	mov		ebx, eax
+	mov		eax, [ebx]
 	mov		[deba], eax
+;	pushf
+;   pushad
+;   mov  edx,deba
+;   call debug_outstr
+;   popad
+;   popf
+	xor		eax, eax
+	xor		ecx, ecx
+.next:
+	mov		cl, [ebx]
+	inc		ebx
+	cmp		cl, 0x0d
-no_link_start:
+	jz		.done
-    mov     ax,[esi+0x10000]    ; /a
+;dph ebx
-    cmp     ax,'/a'
+	or		cl, 0x20
-    jne     no_link_end2
+	sub		cl, '0'
-    mov     [text_type],1
+	jb		.bad
-    add     esi,0
+	cmp		cl, 0x9
 	jbe		.adding
-no_link_end2:
+	sub		cl, 'a'-'0'-10
-    mov     ax,[esi+0x10000]
+	cmp		cl, 0x0a
-    cmp     ax,'br'
-    jne     no_br
-    call    linefeed
-    inc     esi
-no_br:
-    mov     ax,[esi+0x10000]
-    cmp     ax,'td'
+	jb		.bad
-    jne     no_td
-    call    linefeed
-    inc     esi
+	cmp		cl, 0x0f
 	ja		.bad
-no_td:
+.adding:
-    mov     eax,[esi+0x10000]
+	shl		eax, 4
-    cmp     eax,'tabl'
+	or		eax, ecx
-    jne     no_table
+;	jmp		.not_number
-    call    linefeed
+;.bad:
-    add     esi,3
+.bad:
 	jmp		.next
-no_table:
-byte_done:
-    inc     esi
-    cmp     esi,[pos]
-    jbe     newbyte
-    mov     [display_from],0
-    call    display_page
-    popa
-    ret
-;****************************************************************************
-;    Function
-;       linefeed
-;
-;   Description
-;
-;
-;****************************************************************************
-linefeed:
-    cmp     [pageyinc],2
-    jge     nolf
-    mov     [pagex],0
-    inc     [pagey]
-    inc     [pageyinc]
-nolf:
-    ret
-;****************************************************************************
-;    Function
-;       display_page
-;
-;   Description
-;       Renders the text decoded by draw_page
-;
-;****************************************************************************
-display_page:
-    pusha
-    mov     eax,0
-    mov     ebx,0
-newpxy:
-    push    eax
-    push    ebx
-    mov     eax,13       ; background for letter
-    mov     ebx,[esp+4]
-    imul    ebx,6
-    add     ebx,[dpx]
-    shl     ebx,16
-    add     ebx,6
-    mov     ecx,[esp+0]
-    imul    ecx,10
-    add     ecx,[dpy]
-    shl     ecx,16
-    add     ecx,10
-    mov     edx,0xffffff
-    mcall
-    mov     eax,4
-    mov     ebx,[esp+4]
-    imul    ebx,6
-    add     ebx,[dpx]
-    shl     ebx,16
-    mov     bx,[esp+0]
-    imul    bx,10
-    add     bx,word [dpy]
+.done:
-    mov     esi,[esp]
-    imul    esi,[pagexs]
-    add     esi,[esp+4]
+;newline
 ;dps "hextoint eax "
-    mov     edx,[display_from]
+;pregs
-    imul    edx,[pagexs]
+	ret
     add     edx,0x20000
 ;****************************************************************************
 socket_commands:
     cmp     ah,22       ; open socket
     jnz     tst3
+	dps "opening socket"
 	newline
+    ; Clear all page memory
-    ; Clear all page memory
+	mov		[prev_chunk_end], 0
-    mov     edi,0x10000
+	cmp		[buf_ptr], 0
+	jz		no_free
-    mov     ecx,0x30000
+	mov		eax, 68		; free buffer
+	mov		ebx, 13
-    mov     al,0
+	mov		ecx, [buf_ptr]
+	mcall
-    cld
+no_free:
-    rep     stosb
+	mov		[buf_size], 0
     ; Parse the entered url
         jz              getlp1              ; yes - so try next
     mov     eax,53
     mov     ebx,5
+    mov     edx,80
+    cmp     [proxyAddr], 0
+    jz      sc000
+    mov     edx,[proxyPort]
-    mov     edx,80
+sc000:
     mov     esi,dword [server_ip]
     mov     edi,1
     mcall
     mov     [pagex],0
     mov     [pagey],0
     mov     [pagexs],80
     mov     [command_on_off],0
+	mov		[is_body], 0
     ret
 tst3:
     mov     ecx,URLMAXLEN
     rep     stosb
     mov     edi, webAddr
     mov     ecx,URLMAXLEN
     rep     stosb
     mov     al, '/'
     mov     [document], al
     mov     esi, document_user
 pu_005:
     ; copy page to document address
     ; esi = delimiter
-    push    esi
-    inc     esi
+    push    esi
     mov     ecx, edi            ; end of document_user
     mov     edi, document
     cld
     mov     esi, document
     call    debug_print_string
 end if
+    ; Look up the ip address, or was it specified?
+    mov     al, [proxyAddr]
+    cmp     al, 0
-    ; Look up the ip address, or was it specified?
+    jnz     pu_015
+    mov     al, [webAddr]
-    mov     al, [webAddr]
+pu_015:
     cmp     al, '0'
     jb      pu_010              ; Resolve address
     cmp     al, '9'
     mov     esi, str2       ; print gotip
     call    debug_print_string
 end if
+    ; Convert address
+    ; If proxy is given, get proxy address instead of server
+    mov     esi,proxyAddr-1
+    cmp     byte [esi+1], 0
-    ; Convert address
+    jnz     pu_020
+    mov     esi,webAddr-1
+pu_020:
     mov     esi,webAddr-1
     mov     edi,server_ip
     xor     eax,eax
 ip1:
     inc     esi
     mov     [dnsMsg+8], eax
     ; domain name goes in at dnsMsg+12
     mov     esi, dnsMsg + 12        ; location of label length
+    mov     edi, dnsMsg + 13        ; label start
+    mov     edx, proxyAddr
+    cmp     byte [edx], 0
-    mov     edi, dnsMsg + 13        ; label start
+    jnz     td000
+    mov     edx, webAddr
-    mov     edx, webAddr
+td000:
     mov     ecx, 12                  ; total string length so far
 td002:
     mov     [esi], byte 0
     inc     ecx
 td0021:
+    mov     al, [edx]
+    cmp     al, ' '
-    mov     al, [edx]
+    je      td001                   ; we have finished the string translation
-    cmp     al, ' '
+    cmp     al, 0
-    je      td001                   ; we have finished the string translation
+    je      td001
     cmp     al, '.'                 ; we have finished the label
         mcall
         pop         ecx
         cmp         eax, 0                      ; is this local port in use?
         jz              getlp               ; yes - so try next
+    ; Get DNS IP
+    mov     eax, 52
+    mov     ebx, 13
+    mcall
     mov     esi, eax
     ; First, open socket
     mov     eax, 53
     mov     ebx, 0
     mov     edx, 53    ; remote port - dns
-    mov     esi, dword [dns_ip]
+;    mov     esi, dword [dns_ip]
     mcall
 sn_exit:
     inc     esi
+    ret
+;***************************************************************************
+;   Function
+;       load_settings
+;
+;   Description
+;       Load settings from configuration file network.ini
+;
+;***************************************************************************
+include "proc32.inc"
+include "dll.inc"
+load_settings:
+    stdcall dll.Load, @IMPORT
+    test    eax, eax
+    jnz     ls001
+    invoke  ini.get_str, inifile, sec_proxy, key_proxy, proxyAddr, 256, proxyAddr
+    invoke  ini.get_int, inifile, sec_proxy, key_proxyport, 80
+    mov     [proxyPort], eax
+    invoke  ini.get_str, inifile, sec_proxy, key_user, proxyUser, 256, proxyUser
+    invoke  ini.get_str, inifile, sec_proxy, key_password, proxyPassword, 256, proxyPassword
+ls001:
+    ret
+;***************************************************************************
+;   Function
+;       append_proxy_auth_header
+;
+;   Description
+;       Append header to HTTP request for proxy authentification
+;
+;***************************************************************************
+append_proxy_auth_header:
+    mov     esi, proxy_auth_basic
+    mov     ecx, proxy_auth_basic_end - proxy_auth_basic
+    rep     movsb
+    ; base64-encode string :
+    mov     esi, proxyUser
+apah000:
+    lodsb
+    test    al, al
+    jz      apah001
+    call    encode_base64_byte
+    jmp     apah000
+apah001:
+    mov     al, ':'
+    call    encode_base64_byte
+    mov     esi, proxyPassword
+apah002:
+    lodsb
+    test    al, al
+    jz      apah003
+    call    encode_base64_byte
+    jmp     apah002
+apah003:
+    call    encode_base64_final
+    ret
+encode_base64_byte:
+    inc     ecx
+    shl     edx, 8
+    mov     dl, al
+    cmp     ecx, 3
+    je      ebb001
+    ret
+ebb001:
+    shl     edx, 8
+    inc     ecx
+ebb002:
+    rol     edx, 6
+    xor     eax, eax
+    xchg    al, dl
+    mov     al, [base64_table+eax]
+    stosb
+    loop    ebb002
+    ret
+encode_base64_final:
+    mov     al, 0
+    test    ecx, ecx
+    jz      ebf000
+    call    encode_base64_byte
+    test    ecx, ecx
+    jz      ebf001
+    call    encode_base64_byte
+    mov     byte [edi-2], '='
+ebf001:
-    ret
+    mov     byte [edi-1], '='
 ebf000:
     ret
 ;   *********************************************
 ;   *******  WINDOW DEFINITIONS AND DRAW ********
 ;   *********************************************
+draw_window:
+	cmp		byte [params], 0
+	jz		.noret
+    mov     eax,12                    ; function 12:tell os about windowdraw
+    mov     ebx,1                     ; 1, start of draw
+    mcall
+	; ýòî íåñêîëüêî çàãàäî÷íî, íî åñëè íå ðèñîâàòü îêîøêî ñîâñåì, ïðîãà íå ïàøåò.
+    mov     eax,0                     ; function 0 : define and draw window
+    mov     ebx,0          ; [x start] *65536 + [x size]
+    mov     ecx,0          ; [y start] *65536 + [y size]
+    mov     edx,0x14ffffff            ; color of work area RRGGBB,8->color gl
+    mov     edi,title                 ; WINDOW LABEL
+    mcall
+    mov     eax,12                    ; function 12:tell os about windowdraw
+    mov     ebx,2                     ; 2, end of draw
+    mcall
+	ret
-draw_window:
+.noret:
     mov     eax,12                    ; function 12:tell os about windowdraw
     mov     ebx,1                     ; 1, start of draw
     mcall
                                    ; DRAW WINDOW
     mov     eax,0                     ; function 0 : define and draw window
-    mov     ebx,50*65536+550          ; [x start] *65536 + [x size]
+    mov     ebx,50*65536+600          ; [x start] *65536 + [x size]
-    mov     ecx,50*65536+400          ; [y start] *65536 + [y size]
+    mov     ecx,350*65536+200          ; [y start] *65536 + [y size]
     mov     edx,0x14ffffff            ; color of work area RRGGBB,8->color gl
     mov     ebx,30*65536+38           ; [x start] *65536 + [y start]
     mov     ecx,0x000000              ; color of text RRGGBB
     mov     edx,document_user         ; pointer to text beginning
     mcall
-    mov     eax,38
+    ; mov     eax,38
-    mov     ebx,5*65536+545
+    ; mov     ebx,5*65536+545
-    mov     ecx,60*65536+60
+    ; mov     ecx,60*65536+60
-    mov     edx,0x000000
+    ; mov     edx,0x000000
-    mcall
+    ; mcall
     ;mov     eax,38
     ;mov     ebx,5*65536+545
-    mov     ecx,[winys]
+    ; mov     ecx,[winys]
-    shl     ecx,16
+    ; shl     ecx,16
-    add     ecx,[winys]
+    ; add     ecx,[winys]
-    sub     ecx,26*65536+26
+    ; sub     ecx,26*65536+26
     ;mov     edx,0x000000
-    mcall
+    ;mcall
                                    ; RELOAD
     mov     eax,8                     ; function 8 : define and draw button
     mov     ebx,388*65536+50          ; [x start] *65536 + [x size]
     mov     ecx,34*65536+14           ; [y start] *65536 + [y size]
     mov     edx,24                    ; button id
     ;mov     esi,0x5588dd              ; button color RRGGBB
     mcall
+									; SAVE
+    mov     ebx,(443+55)*65536+50          ; [x start] *65536 + [x size]
+    mov     ecx,34*65536+14           ; [y start] *65536 + [y size]
+    mov     edx,26                    ; button id
+    ;mov     esi,0x5588dd              ; button color RRGGBB
+    mcall
                                    ; BUTTON TEXT
     mov     eax,4                     ; function 4 : write text to window
     mov     ebx,390*65536+38          ; [x start] *65536 + [y start]
     mov     ecx,0xffffff              ; color of text RRGGBB
     mov     edx,button_text           ; pointer to text beginning
-    mov     esi,20                    ; text length
+    mov     esi,30                    ; text length
     mcall
     call    display_page
     mov     eax,12                    ; function 12:tell os about windowdraw
+    mov     ebx,2                     ; 2, end of draw
+    mcall
+    ret
+align 4
+@IMPORT:
+library	libini, 'libini.obj'
+import	libini, \
+	ini.get_str, 'ini_get_str',	\
+	ini.get_int, 'ini_get_int'
+fileinfo		dd	2, 0, 0
+final_size		dd		0
+final_buffer	dd		0
+				db	'/rd/1/.download',0
+body_pos		dd		0
+;fileinfo_tmp	dd	2, 0, 0
+buf_size		dd		0
+buf_ptr			dd		0
-    mov     ebx,2                     ; 2, end of draw
+				;db	'/rd/1/1',0
     mcall
 deba			dd		0
-    ret
+				db		0
+if DEBUGGING_STATE = DEBUGGING_ENABLED
+str1:       db  "Resolving...",0
-if DEBUGGING_STATE = DEBUGGING_ENABLED
+str3:       db  "Resolved",0
-str1:       db  "Resolving...",0
+str2:       db  "GotIP",0
-str3:       db  "Resolved",0
+str4:       db  "GotResponse",0
-str2:       db  "GotIP",0
+end if
 str4:       db  "GotResponse",0
-end if
+params		db	1024 dup(0)
 addr            dd  0x0
 ya              dd  0x0
 len             dd  0x00
-title         db      'HTTPC - PgUp/PgDown',0
+title         db      'Downloader',0
+server_ip:      db      207,44,212,20
-server_ip:      db      207,44,212,20
+;dns_ip:         db      194,145,128,1
-dns_ip:         db      194,145,128,1
+webAddr:        times URLMAXLEN db ' '
-webAddr:        times 128 db ' '
+db 0
 document_user:  db      'Click on the button to the left to enter a URL',0
+times URLMAXLEN+document_user-$ db 0
+document:       db      '/'
+times URLMAXLEN-1       db      ' '
+s_contentlength		db	'Content-Length:'
+len_contentlength	=	15
+s_chunked			db	'Transfer-Encoding: chunked'
+len_chunked			= $ - s_chunked
+is_body			dd		0 ; 0 if headers, 1 if content
-times  100      db      0x0
+is_chunked		dd		0
-document:       db      '/'
+prev_chunk_end	dd		0
-times  100      db      ' '
+cur_chunk_size	dd		0
+string0:        db      'GET '
+stringh:        db      ' HTTP/1.1',13,10,'Host: '
+stringh_end:
+proxy_auth_basic: db      13,10,'Proxy-Authorization: Basic '
+proxy_auth_basic_end:
+connclose:		db		13,10,'User-Agent: Kolibrios Downloader',13,10,'Connection: Close',13,10,13,10
+connclose_end:
+base64_table	db	'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'
+		db	'0123456789+/'
+inifile		db	'/sys/network/zeroconf.ini',0
+sec_proxy:
+key_proxy		db		'proxy',0
+key_proxyport		db		'port',0
+key_user		db		'user',0
+key_password		db		'password',0
+request			db		256 dup(0)
+proxyAddr		db		256 dup(0)
+proxyUser		db		256 dup(0)
+proxyPassword	db		256 dup(0)
+proxyPort		dd		80
-string0:        db      'GET '
+shared_name		dd		0
-stringh:        db      ' HTTP/1.0',13,10,13,10
+;yandex:			db		'menuetos.net'
-stringh_end:
+;yandex_end:
+status          dd      0x0
 prev_status     dd      0x0
 status          dd      0x0
-prev_status     dd      0x0
+onoff           dd      0x0

Subversion Repositories Kolibri OS

(root)/programs/network/downloader/trunk/downloader.asm – Rev 661 → 1645