diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po index 00f6b467..b7bcc393 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 ff97d3db..af7df100 100644 Binary files a/.Floppies/A2OSX.SRC.po and b/.Floppies/A2OSX.SRC.po differ diff --git a/BIN/NETSTAT.S.txt b/BIN/NETSTAT.S.txt index 22fb7181..cf2f5522 100644 --- a/BIN/NETSTAT.S.txt +++ b/BIN/NETSTAT.S.txt @@ -92,13 +92,12 @@ CS.RUN >LDYA L.MSG0 bne .2 lda (ZPPTR1) - cmp #S.SOCKET.SOCK.RAW+1 + tax + cpx #S.SOCKET.SOCK.SEQPACKET+1 bcc .3 - lda #S.SOCKET.SOCK.RAW+1 -.3 asl - tax - >PUSHB L.MSG1+1,x + ldx #S.SOCKET.SOCK.SEQPACKET+1 +.3 >PUSHB L.MSG1+1,x >PUSHB L.MSG1,x >PUSHBI 17 >LDYA L.MSG1 diff --git a/INC/LIBTCPIP.I.txt b/INC/LIBTCPIP.I.txt index 925d6f86..e6306750 100644 --- a/INC/LIBTCPIP.I.txt +++ b/INC/LIBTCPIP.I.txt @@ -111,7 +111,7 @@ S.DNSCACHE.IP .EQ 8 S.DNSCACHE .EQ 12 *-------------------------------------- S.SOCKADDR.IP .EQ 0 -S.SOCKADDR.IP .EQ 4 +S.SOCKADDR.PORT .EQ 4 * S.SOCKADDR .EQ 6 *-------------------------------------- @@ -119,7 +119,7 @@ S.SOCKET.SOCK .EQ 0 S.SOCKET.SOCK.RAW .EQ 0 S.SOCKET.SOCK.DGRAM .EQ 2 S.SOCKET.SOCK.STREAM .EQ 4 -S.SOCKET.SOCK_SEQPACKET .EQ 6 +S.SOCKET.SOCK.SEQPACKET .EQ 6 S.SOCKET.SO .EQ 1 S.SOCKET.SO.DEBUG .EQ $01 S.SOCKET.SO.ACCEPTCONN .EQ $02 diff --git a/LIB/LIBTCPIP.S.SKT.txt b/LIB/LIBTCPIP.S.SKT.txt index dc7e9a5f..c76998e9 100644 --- a/LIB/LIBTCPIP.S.SKT.txt +++ b/LIB/LIBTCPIP.S.SKT.txt @@ -145,21 +145,24 @@ SKT.New >PULLW ZPTmpPtr1 sta (ZPPtrSKT),y dey bpl .7 - + lda (ZPPtrSKT) cmp #S.SOCKET.SOCK.STREAM bne .8 ldy #S.SOCKET.SO lda (ZPPtrSKT),y + and #S.SOCKET.SO.ACCEPTCONN bne .8 From Listen, do not send SYN packet jsr SKT.NewTCB bcs .99 - lda #S.TCP.OPTIONS.SYN - jsr TCP.OUT.SendOptA Send SYN,Only for CLIENT conn!!!! + ldy #S.SOCKET.TCP.OPTIONS + lda (ZPPtrSKT),y + ora #S.TCP.OPTIONS.SYN + jsr TCP.OUT.SendOptA Send SYN,Only for CLIENT conn,or SYN/ACK if comminf from LISTEN bcs .99 ldy #S.SOCKET.TCP.STATUS diff --git a/LIB/LIBTCPIP.S.TCP.txt b/LIB/LIBTCPIP.S.TCP.txt index 132b6202..f4e8d816 100644 --- a/LIB/LIBTCPIP.S.TCP.txt +++ b/LIB/LIBTCPIP.S.TCP.txt @@ -81,6 +81,8 @@ TCP.IN.JMP.LISTEN sta SKT.Template+S.SOCKET.SOCK stz SKT.Template+S.SOCKET.SO stz SKT.Template+S.SOCKET.TCP.STATUS + lda #S.TCP.OPTIONS.ACK + sta SKT.Template+S.SOCKET.TCP.OPTIONS >PUSHW L.SKT.Template