From fdab7b432e44889981e7a8da7b488f4581bd0464 Mon Sep 17 00:00:00 2001
From: John Bintz <hello@theindustriousrabbit.com>
Date: Thu, 25 Apr 2024 14:40:47 -0400
Subject: [PATCH] 1.1.0 applied and working

---
 .gitignore                |   5 ++
 src/AMOSPro_BSDSocket.Lib | Bin 5892 -> 6068 bytes
 src/BSDSocket.s           | 105 ++++++++++++++++++++++++++++++++++----
 src/BSDSocket_Labels.s    |   3 +-
 src/BSDSocket_Size.s      |   4 +-
 5 files changed, 104 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index c03c60e..e618a7f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,8 @@ dist/
 build/
 aminet/
 Disk.info
+test/
+stuff/
+patches/
+.vamosrc
+activate
diff --git a/src/AMOSPro_BSDSocket.Lib b/src/AMOSPro_BSDSocket.Lib
index 14341093646faa280e4ac5d92a7d950d73e443e2..a83c2feed9efbb1370ac61554c355dc2d81f97ac 100644
GIT binary patch
delta 309
zcmZqC+oC@~T=WS81M^D;238==;0I(2F)#=pnW*E-UcwO0pv<7VvF<OEFe8IXaei`k
zYKcNdYEe<%27~_$o2!@)2nHEQC^4uo{1g1nz~Gq1z`&=b%a-JGzvMs(lV7QlL$IUJ
zjlh%t{|NnIU{G-Ic&^Z(&#jir#G#W7v}@geJ+*kB`;0953`!mfOkguy734Puh(<An
zxu=!{csys;Qvj;I@P}!UiiZ-Ab?Fb&CWW633=KRACl!7I9n1hFy^ziQcS|kat0A3%
zK|sysKM;W3!{Aq{COCPKn5wOzo`J5Bfsu)Uk&&^2Msj{is$NDS&~HUarFnWOsb!iB
UDq*fcRtkoC$SOgWF))7u0J*bUkN^Mx

delta 140
zcmdm@-=a4`TyzHm1M^D;238==;KRVc^pAl-SZkt=FKZY>ID_KGhQCakCo=CB6ubBb
zsDMeITP>G~LnoVo!EfDvJ+=7Fi$tRsCr63P+8XE?>KYjs85@`w7%ONb=clCVWh5qN
frxqoZ=IN!RmT5Amgt-P;DH!S@s|1<}wEq(TMB*ed

diff --git a/src/BSDSocket.s b/src/BSDSocket.s
index cd9c1b6..7947dd7 100644
--- a/src/BSDSocket.s
+++ b/src/BSDSocket.s
@@ -7,7 +7,7 @@
 ; extension number 18
 ExtNb           equ 18-1
 Version         MACRO
-                dc.b "1.0.1-20230403"
+                dc.b "1.1.0-20240223"
                 ENDM
 VerNumber       equ $1
 
@@ -68,6 +68,20 @@ Error_PortOutOfRange         EQU -11
 Error_FdsetOutOfRange        EQU -11
 Error_UnableToBind           EQU -12
 
+; socket herrno and tag lists
+; built from:
+; * https://wiki.amigaos.net/amiga/autodocs/bsdsocket.doc.txt
+; * https://github.com/deplinenoise/amiga-sdk/blob/master/netinclude/amitcp/socketbasetags.h
+; * http://amigadev.elowar.com/read/ADCD_2.1/Includes_and_Autodocs_2._guide/node012E.html
+
+TAG_USER EQU (1<<31)
+SBTF_REF EQU $8000
+SBTB_CODE EQU 1
+SBTS_CODE EQU $3FFF
+SBTC_HERRNO EQU 6
+
+HerrnoTag EQU (TAG_USER|SBTF_REF|((SBTC_HERRNO&SBTS_CODE)<<SBTB_CODE))
+
 ; wrap code that doesn't take arguments with these
 PreserveStackInstruction MACRO
   MOVEM.L A2-A6/D6-D7,-(SP)
@@ -330,6 +344,9 @@ C_Tk    dc.w    1,0
         AddTokenFunction SocketCloseSocket
         dc.b    "socket close socke","t"+$80,"00",-1
 
+        AddTokenFunction SocketHerrno
+        dc.b    "socket herrn","0"+$80,"0",-1
+
 ;       TOKEN_END
         dc.w    0
         dc.l    0          ; Important!
@@ -386,6 +403,8 @@ getsockopt_len      ds.l 1
 MaxSocketSeen       dc.w 0
 
 sockaddr_ram        ds.l 1
+
+; also used for errno tags
 AcceptScratchArea   ds.b 16
 SelectScratchArea   ds.l 2
 
@@ -1900,26 +1919,52 @@ _SocketReuseAddr_LibraryOpen:
     Ret_String
 
 _DnsGetHostAddressByName_LibraryOpen:
-
     ; string so you need demande, hichaine, and chvide
     MOVE.L D3,A0 ; name
-    ADD.L #2,A0  ; skip length, string is null terminated (?)
+    MOVE.W (A0)+,D0 ; d0 contains length
+    MOVE.L D0,D1    ; d1 also has length
+    MOVE.L D0,D2    ; d2 also has length
+    Rjsr L_RamFast  ; d0 contains address
+    BNE .StringRamAllocated
 
-    WithDataStorage
-      LoadBSDSocketBase
-      CALLLIB gethostbyname
-    EndDataStorage
+    MOVE.L ChVide(A5),D3
+
+    RestoreStackFunction
+    Ret_String
+
+.StringRamAllocated:
+    MOVE.L D0,A1 ; a1 contains address
+    SUBQ #1,D1   ; reduce by one for DBRA
+
+.KeepCopyingAMOSString
+    MOVE.B (A0)+,(A1)+ ; byte copy
+    DBRA D1,.KeepCopyingAMOSString ; keep copying
+    MOVE.B #0,(A1)+ ; null terminate string
+    MOVE.L D0,A0 ; first param of gethostbyname
+
+    MOVEM.L A0/D2,-(SP)
+      WithDataStorage
+        LoadBSDSocketBase
+        CALLLIB gethostbyname
+      EndDataStorage
+    MOVEM.L (SP)+,A0/D2
+
+    ; free the ram before we go any farther
+    MOVE.L D0,-(SP)
+      MOVE.L A0,A1
+      MOVE.L D2,D0
+      Rjsr L_RamFree
+    MOVE.L (SP)+,D0
 
     TST.L D0
-    BNE _DnsGetHostAddressByName_GetIPAddress
+    BNE .GetIPAddress
 
     RestoreStackFunction
 
     MOVE.L ChVide(A5),D3
     Ret_String
 
-_DnsGetHostAddressByName_GetIPAddress:
-
+.GetIPAddress:
     MOVE.L D0,A0
     MOVE.L 16(A0),A1 ; **h_addr_list
     MOVE.L (A1),A1 ; *h_addr_list
@@ -2053,6 +2098,46 @@ _SocketCloseSocket_LibraryOpen:
     RestoreStackFunction
     Ret_Int
 
+; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+;   Int=Socket Herrno
+;
+;   Return Herrno value, errors related to DNS resolution
+; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+    Lib_Par SocketHerrno
+; - - - - - - - - - - - - -
+    PreserveStackFunction
+
+    ; set up tag list memory and place for herrno to go
+    Dlea AcceptScratchArea,A0
+    MOVE.L A0,A2
+    Dlea SelectScratchArea,A1
+
+    ; build the tag list
+    MOVE.L HerrnoTag,(A0)+
+    MOVE.L A1,(A0)+
+    MOVE.L 0,(A0)+
+    MOVE.L 0,(A0)+
+    MOVE.L A2,A0
+
+    WithDataStorage
+      LoadBSDSocketBase
+      CALLLIB SocketBaseTagList
+    EndDataStorage
+
+    TST.L D0
+    BEQ .success
+
+    ; failed
+    MOVE.L #-1,D3
+
+    RestoreStackFunction
+    Ret_Int
+
+.success
+    MOVE.L (A1),D3
+
+    RestoreStackFunction
+    Ret_Int
 ;
 ; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 ;   Even if you do not have error messages, you MUST
diff --git a/src/BSDSocket_Labels.s b/src/BSDSocket_Labels.s
index 5bae0fe..97c99e2 100644
--- a/src/BSDSocket_Labels.s
+++ b/src/BSDSocket_Labels.s
@@ -1,5 +1,5 @@
 ; ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-; BSDSocket.s, list of the library functions on the 25-04-2024 13:11:43
+; BSDSocket.s, list of the library functions on the 25-04-2024 14:34:43
 ;
 ; ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 L_Cold:			set	0
@@ -37,3 +37,4 @@ L_SetSockoptInt:	set	32
 L_DnsGetHostAddressByName:set	33
 L_SocketSetTimeout:	set	34
 L_SocketCloseSocket:	set	35
+L_SocketHerrno:		set	36
diff --git a/src/BSDSocket_Size.s b/src/BSDSocket_Size.s
index ab31be3..744803d 100644
--- a/src/BSDSocket_Size.s
+++ b/src/BSDSocket_Size.s
@@ -1,5 +1,5 @@
 ; ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-; BSDSocket.s, library size on the 25-04-2024 13:11:43
+; BSDSocket.s, library size on the 25-04-2024 14:34:43
 ;
 ; ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Lib_Size		equ	 38
+Lib_Size		equ	 39