WebSVN – Kolibri OS – Diff – /kernel/branches/net/applications/tftpc/TFTP.asm

 use32
-	org 0x0
+    org 0x0
+    db 'MENUET01'
+    dd 0x1
+    dd START
+    dd I_END
-	db 'MENUET01'
+    dd IM_END
+    dd IM_END
-	dd 1, START, I_END, IM_END+0x1000, IM_END+0x1000, 0, 0
+    dd 0, 0
-include '../proc32.inc'
-include '../macros.inc'
+include '../proc32.inc'
+include '../macros.inc'
-include '../dll.inc'
+include '../libio.inc'
-include '../libio.inc'
+include '../dll.inc'
-include '../../../../../programs/develop/libraries/box_lib/trunk/box_lib.mac'
+include 'editbox_ex.mac'
 include '../network.inc'
 filebuffer_size equ 4*4096 ; 16kb   (dont try to change it yet..)
-TIMEOUT 	equ 500
+TIMEOUT 	equ 100
 buffer_len	equ 1500
 AF_INET4	equ 2
 IP_PROTO_UDP	equ 17
-opcode_rrq	equ 1 shl 8
+opcode_rrq	equ 1
-opcode_wrq	equ 2 shl 8
+opcode_wrq	equ 2
 ;  ---------------------
 ; error packet
+;
 ;  2 bytes  2 bytes        string    1 byte
-;  -----------------------------------------
+;  ----------------------------------------
 ; | Opcode |  ErrorCode |   ErrMsg   |   0  |
-;  -----------------------------------------
+;  ----------------------------------------
 START:
 	mcall	38,10*65536+380, 130*65536+130,0x00000000
 	mcall	4,350*65536+137, 0x80000000, str_kb_s
-;        mcall   47,1 shl 31 + 7 shl 16 + 1,kbps,305*65536+137,0x00000000
+	mcall	47,1 shl 31 + 7 shl 16 + 1,kbps,305*65536+137,0x00000000
 	push	esp	; reserve stack place
 	push	esp	; fourth parameter
 	push	0	; third parameter
 	push	0	; second parameter
-	push	SRV	; first parameter
+	push	dword SRV     ; first parameter
 	call	[getaddrinfo]
-	pop	esi	; now we will have pointer to result in esi
+	pop	esi
 ; test for error
 	test	eax, eax
 	jnz	still
-	mov	esi, [esi + addrinfo.ai_addr]
-	mov	esi, [esi + sockaddr_in.sin_addr]
-	mov	dword [IP], esi
-	stdcall mem.Alloc, buffer_len
-	test	eax, eax
-	jz	stop_transfer
-	mov	[packetbuff], eax
-	invoke	file_open, local_addr, O_READ + O_WRITE + O_CREATE
 	cmp	eax, 32
-	jb	stop_transfer
+	mov	esi, [esi]
 	mov	esi, [esi + sockaddr_in.sin_addr]
-	mov	[fh], eax
+	mov	dword [IP], esi
-	mcall	connect, [socketnum], sockaddr, sockaddr_len	; socket_connect
+	mcall	connect, [socketnum], sockaddr, sockaddr_len	     ; socket_connect
 	cmp	eax, -1
 	je	still
 	mov	word [I_END], opcode_rrq
-	cmp	[option_group2],op3		; method = get?
+	cmp	[option_group2],op3
-	jz	@f
+	je	@f
 	mov	word [I_END], opcode_wrq
-       @@:
+      @@:
 	xor	al , al
 	mov	edi, remote_addr
 	mov	ecx, 250
 	repnz	scasb
-	sub	edi, remote_addr
+	sub	edi, remote_addr-1
 	mov	ecx, edi
 	mov	edi, I_END+2
 	sub	edi, I_END
 	mov	esi, edi
+	mcall	send, [socketnum], I_END
-	mcall	send, [socketnum], I_END
+	mcall	40, 10000101b
-	mov	[last_ack], 0
-;        mcall   26, 9
-;        mov     [last_time], eax
-	mov	[status], str_transfering
-	call	draw_window
-	mcall	40, 10000101b
+	mov	[last_ack], 0
-	cmp	[option_group2],op3		; method = get?
 	jnz	send_data_loop
-	invoke	file_truncate, [fh]
-receive_data_loop:
+receive_data_loop:
 	mcall	23, TIMEOUT
 	mcall	23, TIMEOUT
-	dec	eax
-	jz	.redraw
-	dec	eax
 	dec	eax
-	jz	.btn
 	jz	.red
-	mcall	recv, [socketnum], [packetbuff], buffer_len ; receive data
-	mov	esi, [packetbuff]
-	cmp	word[esi], opcode_data
-	jne	.error
-	mov	bx, [last_ack]
-	inc	bx
-	rol	bx, 8
+	dec	eax
-	cmp	word [esi + 2], bx
+	jz	.key
-	jne	.packet_got_lost
-	inc	[last_ack]
-	; now, we need to store the data
-	add	esi, 4
-	sub	eax, 4
 	mov	ecx, eax
-	invoke	file_write, [fh], esi ,ecx
-	cmp	ecx, 512      ; full data packet?
-	jge	.continue
 	; last packet, or something else
-	mov	[status], str_success
-.kill_xfer:
-	invoke	file_close, [fh]
-	mcall	close, [socketnum]
-	jmp	stop_transfer
+	mcall	recv, [socketnum], buffer, buffer_len, 0  ; receive data
-.error:
-	cmp	word[esi], opcode_error
-	je	.decode_error
-	jmp	.continue
+	cmp	word[buffer], opcode_data
 	jne	.error
-.packet_got_lost:
-.continue:
-;        mcall   26, 9
-;        mov     ebx, [last_time]
+	mov	bx, [last_ack]
+	cmp	word [buffer + 2], bx
-;        mov     [last_time], eax
+	jne	.packet_got_lost
-;        xor     edx, edx
+	inc	[last_ack]
-;        sub     eax, ebx
-;        xchg    eax, ecx
+	cmp	eax, 4+512
+	je	.continue
-;        div     ecx
+; last packet, or something else
+.error:
+.packet_got_lost:
-;        mov     [kbps], eax
-;        mcall   47,1 shl 31 + 7 shl 16 + 1,kbps,305*65536+137,0x40000000, 0x00ffffff
 	mov	word [buffer], opcode_ack		 ; send ack
-	mov	ax, [last_ack]
+.continue:
-	rol	ax, 8
+	mov	word[buffer], opcode_ack		; send ack
+	mcall	send, [socketnum], buffer, 4, 0
-	mov	word [buffer+2], ax
+	jmp	receive_data_loop
-	mcall	send, [socketnum], buffer, 4, 0
+.red:
-	jmp	receive_data_loop
+	call	draw_window
-.btn:
+	jmp	receive_data_loop
+.key:
+	mcall	2
+	cmp	ah, 2
+	jz	exit
-	mcall	17
+	; close socket ?
+	jmp	receive_data_loop
+;--------------------------------
+send_:
+	invoke	file_open, local_addr, O_READ
+	or	eax, eax
-	jmp	.kill_xfer
+	jz	.exit
-.redraw:
-	call	draw_window
+	mov	[fh], eax
-	jmp	receive_data_loop
+	stdcall mem.Alloc, filebuffer_size
 	or	eax, eax
 	jz	.exit
-.decode_error:
+	mov	[fb], eax
-	movzx	esi, word[esi + 2]
-	cmp	esi, 7
-	cmovg	esi, [zero]
-	mov	esi, dword [4*esi + error_crosslist]
-	mov	[status], esi
-	jmp	.kill_xfer
+	mov	[last_ack], 0
+	mov	[fo], 0
-;--------------------------------
 .read_chunk:
-send_data_loop:
+	invoke	file_seek, [fh], [fo], SEEK_END
-	mov	word[buffer], opcode_data
+	cmp	eax, -1
+	je	.exit
-.read_chunk:
+	invoke	file_read, [fh], [fb], filebuffer_size
-	inc	[last_ack]
+	cmp	eax, -1
-	mov	ax, [last_ack]
+	je	.exit
-	xchg	al, ah
-	mov	word[buffer+2], ax
-	invoke	file_read, [fh], buffer + 4, 512
-	cmp	eax, -1
+	add	[fo], filebuffer_size
-	je	.kill_xfer
+	cmp	eax, filebuffer_size
-	add	eax, 4
-	mov	[packetsize], eax
-.send_packet:
+	je	.packet
+	; ijhidfhfdsndsfqk
-	mcall	send, [socketnum], buffer, [packetsize], 0	 ; send data
-.loop:
+.packet:
-	mcall	23, TIMEOUT
+	movzx	esi, [last_ack]
+	and	esi, 0x000000001f   ; last five bits    BUFFER SIZE MUST BE 16 kb for this to work !!!
-	dec	eax
+	shl	esi, 9		    ; = * 512
-	jz	.red
-	dec	eax
-	dec	eax
-	jz	.btn
+	add	esi, [fb]
 	mov	edi, buffer
 kbps	       dd 0
 done	       dd 0
 sockaddr:
 	dw AF_INET4
-	dw 69 shl 8
+	dw 69
 IP	db 192,168,1,115
 sockaddr_len = $ - sockaddr
 align 16
 @IMPORT:
-library box_lib , 'box_lib.obj',\
+library box_lib , 'box_lib.obj'
-	io_lib	, 'libio.obj',\
+library io_lib	, 'libio.obj'
-	network , 'network.obj'
+library network , 'network.obj'
-	inet_ntoa	, 'inet_ntoa'		,\
+	inet_ntoa		, 'inet_ntoa'		,\
-	getaddrinfo	, 'getaddrinfo' 	,\
+	getaddrinfo		, 'getaddrinfo' 	,\
-	freeaddrinfo	, 'freeaddrinfo'
+	freeaddrinfo		, 'freeaddrinfo'
-edit1 edit_box 300,80,5 ,0xffffff,0x6f9480,0,0,0,99 ,SRV,ed_focus,  13,13
+edit1 edit_box 300,80,5 ,0xffffff,0x6f9480,0,0,0,99 ,SRV,ed_focus,  11,11
-edit2 edit_box 300,80,25,0xffffff,0x6a9480,0,0,0,99 ,remote_addr,ed_figure_only, 5,5
+edit2 edit_box 300,80,25,0xffffff,0x6a9480,0,0,0,99 ,remote_addr,ed_figure_only, 10,10
-edit3 edit_box 300,80,45,0xffffff,0x6a9480,0,0,0,99 ,local_addr,ed_figure_only, 13,13
+edit3 edit_box 300,80,45,0xffffff,0x6a9480,0,0,0,99 ,local_addr,ed_figure_only, 27,27
-edit4 edit_box 40,340,68,0xffffff,0x6a9480,0,0,0,5 ,BLK,ed_figure_only, 3, 3
+edit4 edit_box 40,340,68,0xffffff,0x6a9480,0,0,0,5 ,BLK,ed_figure_only, 3,3
 op1 option_box option_group1,80,68,6,12,0xffffff,0,0,netascii,octet-netascii
 op2 option_box option_group1,80,85,6,12,0xFFFFFF,0,0,octet,get-octet
-op3 option_box option_group2,210,68,6,12,0xffffff,0,0,get,put-get
-op4 option_box option_group2,210,85,6,12,0xFFFFFF,0,0,put,BLK-put
+op3 option_box option_group2,210,68,6,12,0xffffff,0,0,get,put-get
 op4 option_box option_group2,210,85,6,12,0xFFFFFF,0,0,put,BLK-put
 option_group1	dd op1
-option_group2	dd op3
+option_group1	dd op1
 str_method	db 'Method:',0
 str_blocksize	db 'Blocksize:',0
 str_kb_s	db 'kb/s',0
 str_complete	db '% complete',0
 str_transfer	db 'Transfer',0
-str_waiting	db 'Welcome!',0
-str_transfering db 'Transfering...',0
-str_success	db 'Tranfser completed sucessfully',0
-str_fail	db 'Transfer failed!',0
 str_error:
 ._0 db 'Not defined, see error message (if any).',0
 ._1 db 'File not found.',0
 ._5 db 'Unknown transfer ID.',0
 ._6 db 'File already exists.',0
 ._7 db 'No such user.',0
-error_crosslist:
-dd	str_error._0
-dd	str_error._1
-dd	str_error._2
-dd	str_error._3
-dd	str_error._4
-dd	str_error._5
-dd	str_error._6
-dd	str_error._7
 netascii db 'NetASCII'
 octet	 db 'Octet'
 get	 db 'GET'
 put	 db 'PUT'
-BLK	 db "512",0,0,0
+BLK	 db "512",0,0,0
-last_ack dw ?
-fh	 dd ?	; file handle
-last_time dd ?
 last_ack dw ?
-packetbuff	dd	?
-packetsize	dd	?
+fh	 dd ?	; file handle
-status		dd	str_waiting
+fo	 dd ?	; file offset
-zero		dd	0
+fb	 dd ?	; file buffer
 SRV db "192.168.1.115",0
-times (SRV + 256 - $) db 0
 rb (SRV + 256 - $)
 remote_addr db "3.png",0
-times (remote_addr + 256 - $) db 0
+remote_addr db "IMG00",0
 rb (remote_addr + 256 - $)

Subversion Repositories Kolibri OS

(root)/kernel/branches/net/applications/tftpc/TFTP.asm – Rev 1373 → 1514