diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po index e1221230..a6ae9a32 100644 Binary files a/.Floppies/A2OSX.BUILD.po and b/.Floppies/A2OSX.BUILD.po differ diff --git a/.Floppies/A2OSX.SRC.po b/.Floppies/A2OSX.SRC.po index fdaf601d..e9361311 100644 Binary files a/.Floppies/A2OSX.SRC.po and b/.Floppies/A2OSX.SRC.po differ diff --git a/BIN/TELNET.S.txt b/BIN/TELNET.S.txt index 93d34273..3344956e 100644 --- a/BIN/TELNET.S.txt +++ b/BIN/TELNET.S.txt @@ -90,12 +90,13 @@ CS.RUN.IPOK ldy #S.PS.ARGC >SYSCALL GetArg >PUSHYA >LDYA L.MSG.UNKNOWN + >SYSCALL printf bra .99 .9 >LDYA L.MSG.USAGE + >SYSCALL puts -.99 >SYSCALL puts - lda #K.E.SYN +.99 lda #K.E.SYN sec rts @@ -149,6 +150,8 @@ CS.RUN.OPENSKT ldx #3 txa >STA.G hBuf + >DEBUG + CS.RUN.LOOP >PUSHB.G hSocket >PUSHW ZPBufPtr >PUSHWI BUFSIZE diff --git a/INC/A2osX.I.txt b/INC/A2osX.I.txt index 0dfae876..6322c3ff 100644 --- a/INC/A2osX.I.txt +++ b/INC/A2osX.I.txt @@ -381,14 +381,14 @@ S.DIB .EQ 25 * S.FD *-------------------------------------- S.FD.T .EQ 0 -S.FD.T.REG .EQ 0 -S.FD.T.DIR .EQ 2 -S.FD.T.CDEV .EQ 4 -S.FD.T.BDEV .EQ 6 -S.FD.T.LNK .EQ 8 -S.FD.T.DSOCK .EQ 10 -S.FD.T.SSOCK .EQ 12 -S.FD.T.FIFO .EQ 14 +S.FD.T.REG .EQ 0 +S.FD.T.DIR .EQ 2 +S.FD.T.CDEV .EQ 4 +S.FD.T.BDEV .EQ 6 +S.FD.T.LNK .EQ 8 +S.FD.T.DSOCK .EQ 10 +S.FD.T.SSOCK .EQ 12 +S.FD.T.FIFO .EQ 14 S.FD.HANDLER .EQ 1 0=KRNL,!0=hLIB (LIBNFS,LIBTCPIP.....) *-------------------------------------- S.FD.REG.REF .EQ 2 diff --git a/LIB/LIBTCPIP.S.SKT.txt b/LIB/LIBTCPIP.S.SKT.txt index 0bb2782f..83e6be9b 100644 --- a/LIB/LIBTCPIP.S.SKT.txt +++ b/LIB/LIBTCPIP.S.SKT.txt @@ -11,12 +11,7 @@ AUTO 4,1 * YA = PTR to new S.SOCKET * X = hSocket *\-------------------------------------- -SKT.New clc - .HS B0 BCS -SKT.New.Listen sec - ror - sta .71+1 - >PULLW ZPTmpPtr1 +SKT.New >PULLW ZPTmpPtr1 ldy #S.SOCKET.SRC.PORT+1 lda (ZPTmpPtr1),y dey @@ -91,14 +86,11 @@ SKT.New.Listen sec ldy #S.SOCKET.SO lda (ZPTmpPtr1),y and #S.SOCKET.SO.ACCEPTCONN - bne .8 + bne .8 From Listen, do not send SYN packet jsr SKT.NewTCB bcs .99 -.71 lda #$ff - bmi .8 From Listen, do not send SYN packet - >LDYA ZPTmpPtr3 >STYA ZPPtrSKT lda #S.TCP.OPTIONS.SYN diff --git a/LIB/LIBTCPIP.S.TCP.txt b/LIB/LIBTCPIP.S.TCP.txt index d15fa3b7..f88dda2c 100644 --- a/LIB/LIBTCPIP.S.TCP.txt +++ b/LIB/LIBTCPIP.S.TCP.txt @@ -98,7 +98,7 @@ TCP.IN.JMP.LISTEN >PUSHW L.SKT.Template - jsr SKT.New.Listen Assign OUTNEXTSEQ + jsr SKT.New Assign OUTNEXTSEQ bcs .99 sty .1+1 diff --git a/LIB/LIBTCPIP.S.txt b/LIB/LIBTCPIP.S.txt index 2520fb44..b92671b0 100644 --- a/LIB/LIBTCPIP.S.txt +++ b/LIB/LIBTCPIP.S.txt @@ -217,7 +217,7 @@ POLL >PUSHW L.IOCTL PULSE and #S.EVT.F.T1SEC beq .1 -* jsr ARP.EXPIRE + jsr ARP.EXPIRE jsr DNS.EXPIRE .1 jsr DNS.POLL