Kernel 0.94

BIN/HTTPGET.S.txt

@@ -13,7 +13,7 @@ NEW
 				.INB inc/libtcpip.i
 				.INB inc/net.http.i
 *--------------------------------------
-TIMEOUT.MAX		.EQ 600					60 sec.
+TIMEOUT.MAX		.EQ 250					25 sec.
 *--------------------------------------
 				.DUMMY
 				.OR ZPBIN
@@ -69,6 +69,7 @@ L.SA.REMOTE		.DA SA.REMOTE
 L.SA.REMOTE.AD	.DA SA.REMOTE+S.SOCKADDR.ADDR
 L.MSG.IPKO		.DA MSG.IPKO
 L.MSG.USAGE		.DA MSG.USAGE
+L.MSG.CRLF		.DA MSG.CRLF
 L.MSG.UNKNOWN	.DA MSG.UNKNOWN
 L.MSG.CONNECT	.DA MSG.CONNECT
 L.MSG.SKTKO		.DA MSG.SKTKO
@@ -76,7 +77,6 @@ L.MSG.CONNECTED	.DA MSG.CONNECTED
 L.MSG.SKTERR	.DA MSG.SKTERR
 L.MSG.IOERR		.DA MSG.IOERR
 L.MSG.FileLength	.DA MSG.FileLength
-L.MSG.CRLF		.DA MSG.CRLF
 L.MSG.Progress	.DA MSG.Progress
 L.HTTP.GET		.DA HTTP.GET
 				.DA 0
@@ -463,7 +463,9 @@ CS.RUN.REQUEST	jsr Init.TimeOut
 				pla
 				plp
 
-.9				rts
+.9
+CS.RUN.REQUEST.RTS
+				rts
 *--------------------------------------
 CS.RUN.RESPONSE jsr Init.TimeOut
 
@@ -476,6 +478,9 @@ CS.RUN.RESPONSE jsr Init.TimeOut
 				cmp #E.NODATA
 				bne .80
 
+				jsr CS.RUN.CtrlC
+				bcs CS.RUN.REQUEST.RTS
+
 				lda TimeOut
 				bne .1
 
@@ -528,8 +533,7 @@ CS.RUN.RESPONSE jsr Init.TimeOut
 
 .70				>PUSHW L.MSG.Progress
 				>PUSHL Received
-				>PUSHL Length
-				>PUSHBI 8
+				>PUSHBI 4
 
 				>SYSCALL PrintF
 				bcs .9
@@ -662,6 +666,23 @@ CS.RUN.CHECKLEN	ldx #3
 
 .9				rts
 *--------------------------------------
+CS.RUN.CtrlC	ldy #S.PS.hStdIn
+				lda (pPS),y
+				>SYSCALL FEOF
+				bcs .8
+
+				tay
+				bne .8					CC
+
+				>SYSCALL GetChar
+				bcs .9
+
+				cmp #$03				Ctrl-C
+				beq .9					CS
+				
+.8				clc				
+.9				rts			
+*--------------------------------------
 CS.DOEVENT		lda (pEvent)
 				bpl .9					is it a TIMER event?
 
@@ -716,16 +737,16 @@ MSG.IPKO		.AZ "TCP/IP Not Loaded/Configured."
 MSG.USAGE		.AS "Usage : HTTPGET <ip|host> [port]\r\n"
 				.AS "        -U Url\r\n"
 				.AS "        -F UrlFile\r\n"
-				.AZ "        -O OutputFile\r\n"
+				.AS "        -O OutputFile"
+MSG.CRLF		.AZ "\r\n"
 MSG.UNKNOWN		.AZ "%s: Unknown host\r\n"
 MSG.CONNECT		.AZ "Connecting to %d.%d.%d.%d:%D (%s)..."
 MSG.SKTKO		.AZ "Failed to Open Socket."
 MSG.CONNECTED	.AZ "Connected."
 MSG.SKTERR		.AZ "Socket Error : $%h\r\n"
 MSG.IOERR		.AZ "I/O Error : $%h\r\n"
-MSG.FileLength	.AS "File Length : %u Bytes"
-MSG.CRLF		.AZ "\r\n"
-MSG.Progress	.AZ "\rReceived : %10u/%u"
+MSG.FileLength	.AZ "File Length : %10u Bytes\r\n"
+MSG.Progress	.AZ "\rReceived    : %10u"
 *--------------------------------------
 SA.LOCAL		.DA #AF.INET			S.SOCKADDR.AF
 				.BS 1

LIB/LIBTCPIP.S.TCP.txt

@@ -196,8 +196,7 @@ TCP.IN.JMP.ESTBLSH
 
 .5				lda (ZPFrameInPtr),y
 				eor SKT.Cache+S.SOCKET.TCP.INSEQNUM,x
-*				bne .90					Missed a frame.....
-				bne .8
+				bne .90					Missed a frame.....
 				
 				dey
 				dex
@@ -248,7 +247,13 @@ TCP.IN.JMP.ESTBLSH
 .80				clc
 .99				rts
 
-.90				lda #S.TCP.OPTIONS.ACK
+.90				lda #S.TCP.OPTIONS.ACK	Send 3 ACK for last SEQ number
+				jsr TCP.OUT.SendOptA
+				
+				lda #S.TCP.OPTIONS.ACK
+				jsr TCP.OUT.SendOptA
+				
+				lda #S.TCP.OPTIONS.ACK
 .91				jmp TCP.OUT.SendOptA
 *--------------------------------------
 TCP.IN.JMP.LASTACK
@@ -567,7 +572,8 @@ TCP.OUT.Send	ldy #S.TCP.OPTIONS
 				dex
 				bpl .3
 
-				sec						DONT Queue if fail
+				clc
+*				sec						DONT Queue if fail
 
 				jsr FRM.SendIP
 				bcs TCP.OUT.Send.RTS