diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po index b7bcc393..9e14b66f 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 af7df100..e28d96cd 100644 Binary files a/.Floppies/A2OSX.SRC.po and b/.Floppies/A2OSX.SRC.po differ diff --git a/LIB/LIBTCPIP.S.SKT.txt b/LIB/LIBTCPIP.S.SKT.txt index c76998e9..3bdc1d9a 100644 --- a/LIB/LIBTCPIP.S.SKT.txt +++ b/LIB/LIBTCPIP.S.SKT.txt @@ -44,6 +44,23 @@ AUTO 4,1 * CC: A = hSOCKET * CS: A = EC *\-------------------------------------- +SKT.connect >SYSCALL GetMemPtr + >STYA ZPPtrSKT + + >PULLW ZPTmpPtr1 sockaddr + + ldy #S.SOCKET.SOCK + lda (ZPTmpPtr1),y + tax + jmp (J.SKT.connect,x) + +SKT.connect.RAW +SKT.connect.DGRAM + + +SKT.connect.STREAM +SKT.connect.SEQPACKET + */-------------------------------------- * # SKT.listen * Create a new socket @@ -162,7 +179,7 @@ SKT.New >PULLW ZPTmpPtr1 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 + jsr TCP.OUT.SendOptA Send SYN,Only for CLIENT conn,or SYN/ACK if coming from LISTEN bcs .99 ldy #S.SOCKET.TCP.STATUS diff --git a/LIB/LIBTCPIP.S.TCP.txt b/LIB/LIBTCPIP.S.TCP.txt index f4e8d816..90d1192d 100644 --- a/LIB/LIBTCPIP.S.TCP.txt +++ b/LIB/LIBTCPIP.S.TCP.txt @@ -58,7 +58,7 @@ TCP.IN jsr IP.FillSKT.TemplateSrcDstIPP asl tax - jmp (L.TCP.IN.JMP,x) + jmp (J.TCP.IN,x) .7 lda ZPPtrSKT clc @@ -81,9 +81,11 @@ 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 + lda #S.TCP.OPTIONS.SYN+S.TCP.OPTIONS.ACK sta SKT.Template+S.SOCKET.TCP.OPTIONS + jsr ARP.AddFromFrameInPtr + >PUSHW L.SKT.Template jsr SKT.New Assign OUTNEXTSEQ @@ -106,8 +108,6 @@ TCP.IN.JMP.LISTEN jsr SKT.StoreTCB - jsr ARP.AddFromFrameInPtr - lda #S.TCP.OPTIONS.SYN+S.TCP.OPTIONS.ACK jsr TCP.OUT.SendOptA SYN received, Send SYN.ACK bcs .9 diff --git a/LIB/LIBTCPIP.S.txt b/LIB/LIBTCPIP.S.txt index ee5d05db..e1f28606 100644 --- a/LIB/LIBTCPIP.S.txt +++ b/LIB/LIBTCPIP.S.txt @@ -113,7 +113,7 @@ L.SKT.Template .DA SKT.Template L.HST.SScanF .DA HST.SScanF L.IOCTL .DA IOCTL L.DCB.NIC .DA DCB.NIC -L.TCP.IN.JMP .DA TCP.IN.JMP.CLOSED +J.TCP.IN .DA TCP.IN.JMP.CLOSED .DA TCP.IN.JMP.LISTEN .DA TCP.IN.JMP.SYNSENT .DA TCP.IN.JMP.SYNRCVD @@ -124,6 +124,10 @@ L.TCP.IN.JMP .DA TCP.IN.JMP.CLOSED .DA TCP.IN.JMP.FINWT2 .DA TCP.IN.JMP.CLOSING .DA TCP.IN.JMP.TIMEWT +J.SKT.connect .DA SKT.connect.RAW + .DA SKT.connect.DGRAM + .DA SKT.connect.STREAM + .DA SKT.connect.SEQPACKET .DA 0 *-------------------------------------- LIB.LOAD ldx RefCount diff --git a/SBIN/TCPIPD.S.txt b/SBIN/TCPIPD.S.txt index 9bf821ec..21cbd07b 100644 --- a/SBIN/TCPIPD.S.txt +++ b/SBIN/TCPIPD.S.txt @@ -17,7 +17,8 @@ CS.START cld jmp (.1,x) .DA #$61 6502,Level 1 (65c02) .DA #1 BIN Layout Version 1 - .DA 0 + .DA #S.PS.F.EVENT + .DA #0 .DA CS.END-CS.START CS .DA DS.END-DS.START DS .DA #64 SS @@ -38,11 +39,7 @@ CS.INIT >LDYA L.LIBTCPIP bcs .99 sta hLIBTCPIP - lda (pPs) - ora #S.PS.F.EVENT Now accept events - sta (pPs) - - clc +* clc .99 rts *-------------------------------------- CS.RUN >LIBCALL hLIBTCPIP,LIBTCPIP.POLL