Put brackets around ipv6 addresses in `inet6 present`

[factor.git] / basis / io / sockets / sockets.factor

diff --git a/basis/io/sockets/sockets.factor b/basis/io/sockets/sockets.factor
index da1d5c5205a1c3086faa114b41b4242973c8ad02..9ffa6231ca496d3d20bc705c65cb6e7b2e651a5c 100644 (file)
--- a/basis/io/sockets/sockets.factor
+++ b/basis/io/sockets/sockets.factor
@@ -101,10 +101,10 @@ M: ipv4 protocol-family drop PF_INET ;
 
 M: ipv4 sockaddr-size drop sockaddr-in heap-size ;
 
-M: ipv4 empty-sockaddr drop sockaddr-in <struct> ;
+M: ipv4 empty-sockaddr drop sockaddr-in new ;
 
 : make-sockaddr-part ( inet -- sockaddr )
-    sockaddr-in <struct>
+    sockaddr-in new
         AF_INET >>family
         swap
         port>> 0 or htons >>port ; inline
@@ -173,10 +173,10 @@ M: ipv6 protocol-family drop PF_INET6 ;
 
 M: ipv6 sockaddr-size drop sockaddr-in6 heap-size ;
 
-M: ipv6 empty-sockaddr drop sockaddr-in6 <struct> ;
+M: ipv6 empty-sockaddr drop sockaddr-in6 new ;
 
 : make-sockaddr-in6-part ( inet -- sockaddr )
-    sockaddr-in6 <struct>
+    sockaddr-in6 new
         AF_INET6 >>family
         swap
         port>> 0 or htons >>port ; inline
@@ -214,7 +214,7 @@ M: inet6 parse-sockaddr
     [ call-next-method ] [ drop port>> ntohs ] 2bi with-port ;
 
 M: inet6 present
-    [ call-next-method ] [ port>> number>string ] bi ":" glue ;
+    [ call-next-method "[" "]" surround ] [ port>> number>string ] bi ":" glue ;
 
 M: inet6 protocol drop 0 ;
 
@@ -306,7 +306,7 @@ HOOK: (send) io-backend ( bytes addrspec datagram -- )
 HOOK: addrinfo-error-string io-backend ( n -- string )
 
 : prepare-addrinfo ( -- addrinfo )
-    addrinfo <struct>
+    addrinfo new
         PF_UNSPEC >>family
         IPPROTO_TCP >>protocol ;
 
@@ -382,8 +382,7 @@ CONSTANT: datagram-size 65536
 MEMO: ipv6-supported? ( -- ? )
     [ "::1" 0 <inet6> binary <server> dispose t ] [ drop f ] recover ;
 
-[ \ ipv6-supported? reset-memoized ]
-"io.sockets:ipv6-supported?" add-startup-hook
+STARTUP-HOOK: [ \ ipv6-supported? reset-memoized ]
 
 GENERIC: resolve-host ( addrspec -- seq )