unix.ffi,windows.winsock: add the rest of the AI_* flags

Currently unused, but they are useful if you are calling the getaddrinfo
function directly

diff --git a/basis/unix/ffi/ffi.factor b/basis/unix/ffi/ffi.factor
index 9edfab4df96e78702e2b2f8447e021a7046f2373..622d611ac4a8e5d12fcac154752b30f7710eae95 100644 (file)
--- a/basis/unix/ffi/ffi.factor
+++ b/basis/unix/ffi/ffi.factor
@@ -36,6 +36,14 @@ CONSTANT: DT_WHT      14
 : SIG_DFL ( -- obj ) ALIEN: 0 void* <ref> ; inline
 : SIG_IGN ( -- obj ) ALIEN: 1 void* <ref> ; inline
 
+! Possible values for 'ai_flags' in 'addrinfo'.
+CONSTANT: AI_PASSIVE        0x0001
+CONSTANT: AI_CANONNAME      0x0002
+CONSTANT: AI_NUMERICHOST    0x0004
+CONSTANT: AI_V4MAPPED       0x0008
+CONSTANT: AI_ALL            0x0010
+CONSTANT: AI_ADDRCONFIG     0x0020
+
 LIBRARY: libc
 
 STRUCT: group

diff --git a/basis/unix/ffi/linux/linux.factor b/basis/unix/ffi/linux/linux.factor
index b842d834ca3e966f9ca9ee01769750f9008cfb11..afa0bbb8278fe63e2a75ee3386d12409bed59901 100644 (file)
--- a/basis/unix/ffi/linux/linux.factor
+++ b/basis/unix/ffi/linux/linux.factor
@@ -83,7 +83,13 @@ ALIAS: PF_INET6 AF_INET6
 CONSTANT: IPPROTO_TCP 6
 CONSTANT: IPPROTO_UDP 17
 
-CONSTANT: AI_PASSIVE 1
+! Flags only valid in gnu libcs' getaddrinfo
+CONSTANT: AI_IDN                        0x0040
+CONSTANT: AI_CANONIDN                   0x0080
+CONSTANT: AI_IDN_ALLOW_UNASSIGNED       0x0100
+CONSTANT: AI_IDN_USE_STD3_ASCII_RULES   0x0200
+CONSTANT: AI_NUMERICSERV                0x0400
+
 
 CONSTANT: SEEK_SET 0
 CONSTANT: SEEK_CUR 1

diff --git a/basis/unix/ffi/macosx/macosx.factor b/basis/unix/ffi/macosx/macosx.factor
index 6efea54dfb04cc3c3377bd3c6b889c2081890d6b..678f4bd007388bc82bcf2162f9f117d0e91d35d8 100644 (file)
--- a/basis/unix/ffi/macosx/macosx.factor
+++ b/basis/unix/ffi/macosx/macosx.factor
@@ -81,8 +81,6 @@ ALIAS: PF_INET AF_INET
 CONSTANT: IPPROTO_TCP 6
 CONSTANT: IPPROTO_UDP 17
 
-CONSTANT: AI_PASSIVE 1
-
 CONSTANT: SEEK_SET 0
 CONSTANT: SEEK_CUR 1
 CONSTANT: SEEK_END 2

diff --git a/basis/windows/winsock/winsock.factor b/basis/windows/winsock/winsock.factor
index f105c0714429c3b4da168d433795e6cd74f5e0c5..234d4b1c5b88e96c8e58c72b04e4c435bba32e10 100644 (file)
--- a/basis/windows/winsock/winsock.factor
+++ b/basis/windows/winsock/winsock.factor
@@ -75,9 +75,11 @@ CONSTANT: PF_LOCAL       1
 CONSTANT: PF_INET        2
 CONSTANT: PF_INET6      23
 
-CONSTANT: AI_PASSIVE     1
-CONSTANT: AI_CANONNAME   2
-CONSTANT: AI_NUMERICHOST 4
+CONSTANT: AI_PASSIVE        0x0001
+CONSTANT: AI_CANONNAME      0x0002
+CONSTANT: AI_NUMERICHOST    0x0004
+CONSTANT: AI_ALL            0x0100
+CONSTANT: AI_ADDRCONFIG     0x0400
 
 CONSTANT: AI_MASK flags{ AI_PASSIVE AI_CANONNAME AI_NUMERICHOST }