2
0
Эх сурвалжийг харах

gethostbyname -> getaddrinfo

Alexander Shiryaev 8 жил өмнө
parent
commit
f5953c6c57

BIN
BlackBox/_Linux_/Comm/Mod/TCP.odc


+ 2 - 2
BlackBox/_Linux_/Lin/Mod/gen-Net/Makefile

@@ -6,7 +6,7 @@
 
 INCDIR ?= /usr/include
 
-all: Net.txt dumphstrerrno
+all: Net.txt
 
 PY = python2.7
 DEFS = defs-socket defs-so
@@ -22,4 +22,4 @@ defs-so:
 	./dumpdefs.py 3 1 s ${INCDIR}/asm-generic/socket.h | grep "	SO_" > $@
 
 clean:
-	rm -f Net.txt ${DEFS} dumphstrerrno
+	rm -f Net.txt ${DEFS}

+ 36 - 7
BlackBox/_Linux_/Lin/Mod/gen-Net/Net.txt.templ

@@ -1,7 +1,7 @@
 MODULE LinNet ["libc.so.6"];
 
 	(*
-		A. V. Shiryaev, 2012.11
+		A. V. Shiryaev, 2012.11, 2016.11
 
 		GNU/Linux
 		32-bit
@@ -23,6 +23,7 @@ MODULE LinNet ["libc.so.6"];
 %%defs-so%%
 		(* /usr/include/netinet/in.h *)
 			INADDR_NONE* = -1;
+			INADDR_ANY* = 0;
 %%defs-in%%
 		(* /usr/include/asm-generic/param.h *)
 			MAXHOSTNAMELEN* = 64; (* max length of hostname *)
@@ -33,7 +34,9 @@ MODULE LinNet ["libc.so.6"];
 			__FD_SETSIZE = 1024;
 
 	TYPE
-		SOCKET* = INTEGER;
+		int* = INTEGER;
+
+		SOCKET* = int;
 
 		(* /usr/include/i386-linux-gnu/bits/types.h *)
 			socklen_t* = INTEGER;
@@ -44,6 +47,7 @@ MODULE LinNet ["libc.so.6"];
 			in_port_t* = SHORTINT;
 
 		(* /usr/include/i386-linux-gnu/bits/socket.h *)
+			Ptrsockaddr* = POINTER [untagged] TO sockaddr;
 			sockaddr* = RECORD [untagged]
 				sa_family: sa_family_t;
 				sa_data: ARRAY [untagged] 14 OF SHORTCHAR;
@@ -70,6 +74,7 @@ MODULE LinNet ["libc.so.6"];
 			END;
 
 		(* /usr/include/linux/in.h *)
+			Ptrsockaddr_in* = POINTER [untagged] TO sockaddr_in;
 			sockaddr_in* = RECORD [untagged]
 				sin_family*: sa_family_t; (* address family *)
 				sin_port*: SHORTINT; (* port number *)
@@ -78,13 +83,27 @@ MODULE LinNet ["libc.so.6"];
 			END;
 
 		(* /usr/include/netdb.h *)
-			Ptrhostent* = POINTER TO hostent;
+(* deprecated
+			Ptrhostent* = POINTER [untagged] TO hostent;
 			hostent* = RECORD [untagged]
 				h_name*: Libc.PtrSTR; (* official name of host *)
-				h_aliases*: POINTER TO ARRAY [untagged] OF Libc.PtrSTR; (* alias list *)
+				h_aliases*: POINTER [untagged] TO ARRAY [untagged] OF Libc.PtrSTR; (* alias list *)
 				h_addrtype*: INTEGER; (* host address type *)
 				h_length*: INTEGER; (* length of address *)
-				h_addr_list*: POINTER TO ARRAY [untagged] OF POINTER TO ARRAY [untagged] OF in_addr; (* list of addresses from name server *)
+				h_addr_list*: POINTER [untagged] TO ARRAY [untagged] OF POINTER [untagged] TO ARRAY [untagged] OF in_addr; (* list of addresses from name server *)
+			END;
+*)
+
+			Ptraddrinfo* = POINTER [untagged] TO addrinfo;
+			addrinfo* = RECORD [untagged]
+				ai_flags*: SET; (* input flags *)
+				ai_family*: int; (* protocol family for socket *)
+				ai_socktype*: int; (* socket type *)
+				ai_protocol*: int; (* protocol for socket *)
+				ai_addrlen*: socklen_t; (* length of socket-address *)
+				ai_addr*: Ptrsockaddr; (* socket-address for socket *)
+				ai_canonname*: Libc.PtrSTR; (* canonical name for service location (iff req) *)
+				ai_next*: Ptraddrinfo; (* pointer to next in list *)
 			END;
 
 		(* /usr/include/linux/time.h *)
@@ -98,8 +117,9 @@ MODULE LinNet ["libc.so.6"];
 			__fd_mask = SET;
 			fd_set* = ARRAY [untagged] __FD_SETSIZE DIV (SIZE(__fd_mask) * 8) OF __fd_mask;
 
-	VAR
-		h_errno*: INTEGER;
+(* deprecated
+	PROCEDURE [ccall] __h_errno_location* (): INTEGER;
+*)
 
 	PROCEDURE [ccall] socket* (domain: INTEGER; type: INTEGER; protocol: INTEGER): SOCKET;
 	PROCEDURE [ccall] accept* (sockfd: SOCKET; VAR addr: sockaddr; VAR addrlen: socklen_t): SOCKET;
@@ -114,12 +134,16 @@ MODULE LinNet ["libc.so.6"];
 
 	PROCEDURE [ccall] htons* (hostshort: SHORTINT): SHORTINT;
 
+(* deprecated
 	PROCEDURE [ccall] gethostbyname* (name: Libc.PtrSTR): Ptrhostent;
+*)
 	PROCEDURE [ccall] inet_addr* (cp: Libc.PtrSTR): in_addr_t;
 
 	PROCEDURE [ccall] getsockname* (sockfd: SOCKET; VAR addr: sockaddr; VAR addrlen: socklen_t): INTEGER;
 
+(* deprecated
 	PROCEDURE [ccall] hstrerror* (err: INTEGER): Libc.PtrSTR;
+*)
 
 (*
 	PROCEDURE FD_ZERO (VAR set: Net.fd_set);
@@ -136,4 +160,9 @@ MODULE LinNet ["libc.so.6"];
 
 	PROCEDURE [ccall] select* (nfds: INTEGER; VAR [nil] readfds: fd_set; VAR [nil] writefds: fd_set; VAR [nil] exceptfds: fd_set; VAR timeout: timeval): INTEGER;
 
+	PROCEDURE [ccall] getaddrinfo* (hostname, servname: Libc.PtrSTR; VAR [nil] hints: addrinfo; VAR res: Ptraddrinfo): int;
+	PROCEDURE [ccall] freeaddrinfo* (ai: Ptraddrinfo);
+
+	PROCEDURE [ccall] gai_strerror* (ecode: int): Libc.PtrSTR;
+
 END LinNet.

+ 0 - 1
BlackBox/_Linux_/Lin/Mod/gen-Net/dumphstrerrno.c

@@ -1 +0,0 @@
-../../../../_OpenBSD_/Lin/Mod/gen-Net/dumphstrerrno.c

BIN
BlackBox/_OpenBSD_/Comm/Mod/TCP.odc


+ 76 - 38
BlackBox/_OpenBSD_/Lin/Mod/Net.txt

@@ -1,9 +1,9 @@
 MODULE LinNet ["libc.so.89.2"];
 
 	(*
-		A. V. Shiryaev, 2012.11, 2013.08, 2015.09
+		A. V. Shiryaev, 2012.11, 2013.08, 2015.09, 2016.11
 
-		OpenBSD 5.8
+		OpenBSD 6.0
 		32-bit
 	*)
 
@@ -96,6 +96,7 @@ MODULE LinNet ["libc.so.89.2"];
 
 		(* /usr/include/netinet/in.h *)
 			INADDR_NONE* = -1;
+			INADDR_ANY* = 0;
 			IPPROTO_IP* = 0; (* dummy for IP *)
 			IPPROTO_HOPOPTS* = IPPROTO_IP; (* Hop-by-hop option header *)
 			IPPROTO_ICMP* = 1; (* control message protocol *)
@@ -136,42 +137,53 @@ MODULE LinNet ["libc.so.89.2"];
 			IPPROTO_DIVERT_INIT* = 02H; (* {1} *) (* divert packets initial direction *)
 
 		(* /usr/include/sys/param.h *)
-			MAXHOSTNAMELEN* = 256; (* max hostname size *)
+			MAXHOSTNAMELEN* = 256; (* max hostname length w/ NUL *)
 
 		(* /usr/include/netdb.h *)
-			NETDB_INTERNAL* = -1; (* see errno *)
-			NETDB_SUCCESS* = 0; (* no problem *)
-			HOST_NOT_FOUND* = 1; (* Authoritative Answer Host not found *)
-			TRY_AGAIN* = 2; (* Non-Authoritative Host not found, or SERVERFAIL *)
-			NO_RECOVERY* = 3; (* Non recoverable errors, FORMERR, REFUSED, NOTIMP *)
-			NO_DATA* = 4; (* Valid name, no data record of requested type *)
-			NO_ADDRESS* = NO_DATA; (* no address *)
-			NI_MAXHOST* = 256; (* max host name from getnameinfo (MAXHOSTNAMELEN) *)
-			NI_MAXSERV* = 32; (* max serv. name length returned by getnameinfo *)
-			RRSET_VALIDATED* = 1;
-			ERRSET_SUCCESS* = 0;
-			ERRSET_NOMEMORY* = 1;
-			ERRSET_FAIL* = 2;
-			ERRSET_INVAL* = 3;
-			ERRSET_NONAME* = 4;
-			ERRSET_NODATA* = 5;
+			AI_PASSIVE* = {0}; (* socket address is intended for bind() *)
+			AI_CANONNAME* = {1}; (* request for canonical name *)
+			AI_NUMERICHOST* = {2}; (* don't ever try hostname lookup *)
+			AI_EXT* = {3}; (* enable non-portable extensions *)
+			AI_NUMERICSERV* = {4}; (* don't ever try servname lookup *)
+			AI_FQDN* = {5}; (* return the FQDN that was resolved *)
+			AI_ADDRCONFIG* = {6}; (* return configured address families only *)
+			EAI_BADFLAGS* = -1; (* invalid value for ai_flags *)
+			EAI_NONAME* = -2; (* name or service is not known *)
+			EAI_AGAIN* = -3; (* temporary failure in name resolution *)
+			EAI_FAIL* = -4; (* non-recoverable failure in name resolution *)
+			EAI_NODATA* = -5; (* no address associated with name *)
+			EAI_FAMILY* = -6; (* ai_family not supported *)
+			EAI_SOCKTYPE* = -7; (* ai_socktype not supported *)
+			EAI_SERVICE* = -8; (* service not supported for ai_socktype *)
+			EAI_ADDRFAMILY* = -9; (* address family for name not supported *)
+			EAI_MEMORY* = -10; (* memory allocation failure *)
+			EAI_SYSTEM* = -11; (* system error (code indicated in errno) *)
+			EAI_BADHINTS* = -12; (* invalid value for hints *)
+			EAI_PROTOCOL* = -13; (* resolved protocol is unknown *)
+			EAI_OVERFLOW* = -14; (* argument buffer overflow *)
 
 		(* /usr/include/sys/select.h *)
 			FD_SETSIZE = 1024;
 			__NBBY = 8;
 
 	TYPE
-		SOCKET* = INTEGER;
+		PtrVoid* = INTEGER;
+		int* = INTEGER;
+		socklen_t* = INTEGER;
+		sa_family_t* = SHORTCHAR;
+		in_addr_t* = INTEGER;
+		in_port_t* = SHORTINT;
+		time_t* = LONGINT;
+		suseconds_t* = INTEGER;
+		u_int8_t* = SHORTCHAR;
+		int8_t* = SHORTCHAR;
+		size_t* = INTEGER;
+		ssize_t* = INTEGER;
 
-		(* /usr/include/sys/_types.h *)
-			socklen_t* = INTEGER;
-			sa_family_t* = SHORTCHAR;
-			in_addr_t* = INTEGER;
-			in_port_t* = SHORTINT;
-			time_t = LONGINT;
-			suseconds_t = INTEGER;
+		SOCKET* = int;
 
 		(* /usr/include/sys/socket.h *)
+			Ptrsockaddr* = POINTER [untagged] TO sockaddr;
 			sockaddr* = RECORD [untagged]
 				sa_len*: SHORTCHAR; (* total length *)
 				sa_family*: sa_family_t; (* address family *)
@@ -207,22 +219,37 @@ MODULE LinNet ["libc.so.89.2"];
 				END;
 			END;
 
+			Ptrsockaddr_in* = POINTER [untagged] TO sockaddr_in;
 			sockaddr_in* = RECORD [untagged]
-				sin_len*: SHORTCHAR;
+				sin_len*: u_int8_t;
 				sin_family*: sa_family_t;
 				sin_port*: in_port_t;
 				sin_addr*: in_addr;
-				sin_zero*: ARRAY [untagged] 8 OF SHORTCHAR;
+				sin_zero*: ARRAY [untagged] 8 OF int8_t;
 			END;
 
 		(* /usr/include/netdb.h *)
-			Ptrhostent* = POINTER TO hostent;
+(* deprecated
+			Ptrhostent* = POINTER [untagged] TO hostent;
 			hostent* = RECORD [untagged]
 				h_name*: Libc.PtrSTR; (* official name of host *)
-				h_aliases*: POINTER TO ARRAY [untagged] OF Libc.PtrSTR; (* alias list *)
+				h_aliases*: POINTER [untagged] TO ARRAY [untagged] OF Libc.PtrSTR; (* alias list *)
 				h_addrtype*: INTEGER; (* host address type *)
 				h_length*: INTEGER; (* length of address *)
-				h_addr_list*: POINTER TO ARRAY [untagged] OF POINTER TO ARRAY [untagged] OF in_addr; (* list of addresses from name server *)
+				h_addr_list*: POINTER [untagged] TO ARRAY [untagged] OF POINTER [untagged] TO ARRAY [untagged] OF in_addr; (* list of addresses from name server *)
+			END;
+*)
+
+			Ptraddrinfo* = POINTER [untagged] TO addrinfo;
+			addrinfo* = RECORD [untagged]
+				ai_flags*: SET; (* input flags *)
+				ai_family*: int; (* protocol family for socket *)
+				ai_socktype*: int; (* socket type *)
+				ai_protocol*: int; (* protocol for socket *)
+				ai_addrlen*: socklen_t; (* length of socket-address *)
+				ai_addr*: Ptrsockaddr; (* socket-address for socket *)
+				ai_canonname*: Libc.PtrSTR; (* canonical name for service location (iff req) *)
+				ai_next*: Ptraddrinfo; (* pointer to next in list *)
 			END;
 
 		(* /usr/include/sys/time.h *)
@@ -235,28 +262,34 @@ MODULE LinNet ["libc.so.89.2"];
 			__fd_mask = SET;
 			fd_set* = ARRAY [untagged] (FD_SETSIZE + (SIZE(__fd_mask) * __NBBY - 1)) DIV (SIZE(__fd_mask) * __NBBY) OF __fd_mask;
 
+(* deprecated
 	VAR
 		h_errno*: INTEGER;
+*)
 
-	PROCEDURE [ccall] socket* (domain: INTEGER; type: INTEGER; protocol: INTEGER): SOCKET;
+	PROCEDURE [ccall] socket* (domain: int; type: int; protocol: int): SOCKET;
 	PROCEDURE [ccall] accept* (s: SOCKET; VAR addr: sockaddr; VAR addrlen: socklen_t): SOCKET;
 	PROCEDURE [ccall] bind* (s: SOCKET; VAR name: sockaddr; namelen: socklen_t): INTEGER;
 	PROCEDURE [ccall] connect* (s: SOCKET; VAR name: sockaddr; namelen: socklen_t): INTEGER;
 	PROCEDURE [ccall] listen* (s: SOCKET; backlog: INTEGER): INTEGER;
-	PROCEDURE [ccall] recv* (s: SOCKET; buf: Libc.PtrVoid; len: Libc.size_t; flags: SET): Libc.ssize_t;
-	PROCEDURE [ccall] send* (s: SOCKET; msg: Libc.PtrVoid; len: Libc.size_t; flags: SET): Libc.ssize_t;
+	PROCEDURE [ccall] recv* (s: SOCKET; buf: PtrVoid; len: size_t; flags: SET): ssize_t;
+	PROCEDURE [ccall] send* (s: SOCKET; msg: PtrVoid; len: size_t; flags: SET): ssize_t;
 	PROCEDURE [ccall] shutdown* (s: SOCKET; how: INTEGER): INTEGER;
-	PROCEDURE [ccall] getsockopt* (s: SOCKET; level: INTEGER; optname: SET; optval: Libc.PtrVoid; VAR optlen: socklen_t): INTEGER;
-	PROCEDURE [ccall] setsockopt* (s: SOCKET; level: INTEGER; optname: SET; optval: Libc.PtrVoid; optlen: socklen_t): INTEGER;
+	PROCEDURE [ccall] getsockopt* (s: SOCKET; level: INTEGER; optname: SET; optval: PtrVoid; VAR optlen: socklen_t): INTEGER;
+	PROCEDURE [ccall] setsockopt* (s: SOCKET; level: INTEGER; optname: SET; optval: PtrVoid; optlen: socklen_t): INTEGER;
 
 	PROCEDURE [ccall] htons* (host16: SHORTINT): SHORTINT;
 
+(* deprecated
 	PROCEDURE [ccall] gethostbyname* (name: Libc.PtrSTR): Ptrhostent;
+*)
 	PROCEDURE [ccall] inet_addr* (cp: Libc.PtrSTR): in_addr_t;
 
 	PROCEDURE [ccall] getsockname* (s: SOCKET; VAR name: sockaddr; VAR namelen: socklen_t): INTEGER;
 
+(* deprecated
 	PROCEDURE [ccall] hstrerror* (err: INTEGER): Libc.PtrSTR;
+*)
 
 (*
 	PROCEDURE FD_ZERO (VAR set: Net.fd_set);
@@ -273,4 +306,9 @@ MODULE LinNet ["libc.so.89.2"];
 
 	PROCEDURE [ccall] select* (nfds: INTEGER; VAR [nil] readfds: fd_set; VAR [nil] writefds: fd_set; VAR [nil] exceptfds: fd_set; VAR timeout: timeval): INTEGER;
 
-END LinNet.
+	PROCEDURE [ccall] getaddrinfo* (hostname, servname: Libc.PtrSTR; VAR [nil] hints: addrinfo; VAR res: Ptraddrinfo): int;
+	PROCEDURE [ccall] freeaddrinfo* (ai: Ptraddrinfo);
+
+	PROCEDURE [ccall] gai_strerror* (ecode: int): Libc.PtrSTR;
+
+END LinNet.

+ 2 - 2
BlackBox/_OpenBSD_/Lin/Mod/gen-Net/Makefile

@@ -6,7 +6,7 @@
 
 INCDIR ?= /usr/include
 
-all: Net.txt dumphstrerrno
+all: Net.txt
 
 PY = python2.7
 DEFS = defs-socket defs-in defs-netdb
@@ -30,4 +30,4 @@ defs-netdb:
 	./dumpdefs.py 3 2 i ${INCDIR}/netdb.h > ${.TARGET}
 
 clean:
-	rm -f Net.txt ${DEFS} dumphstrerrno
+	rm -f Net.txt ${DEFS}

+ 45 - 25
BlackBox/_OpenBSD_/Lin/Mod/gen-Net/Net.txt.templ

@@ -1,9 +1,9 @@
-MODULE LinNet ["libc.so.86.0"];
+MODULE LinNet ["libc.so.89.2"];
 
 	(*
-		A. V. Shiryaev, 2012.11, 2013.08, 2015.09
+		A. V. Shiryaev, 2012.11, 2013.08, 2015.09, 2016.11
 
-		OpenBSD 5.8
+		OpenBSD 6.0
 		32-bit
 	*)
 
@@ -17,10 +17,10 @@ MODULE LinNet ["libc.so.86.0"];
 %%defs-socket%%
 		(* /usr/include/netinet/in.h *)
 			INADDR_NONE* = -1;
+			INADDR_ANY* = 0;
 %%defs-in%%
 		(* /usr/include/sys/param.h *)
-			MAXHOSTNAMELEN* = 256; (* max hostname size *)
-
+%%defs-param%%
 		(* /usr/include/netdb.h *)
 %%defs-netdb%%
 		(* /usr/include/sys/select.h *)
@@ -28,17 +28,11 @@ MODULE LinNet ["libc.so.86.0"];
 			__NBBY = 8;
 
 	TYPE
-		SOCKET* = INTEGER;
-
-		(* /usr/include/sys/_types.h *)
-			socklen_t* = INTEGER;
-			sa_family_t* = SHORTCHAR;
-			in_addr_t* = INTEGER;
-			in_port_t* = SHORTINT;
-			time_t = LONGINT;
-			suseconds_t = INTEGER;
+%%defs-basictypes%%
+		SOCKET* = int;
 
 		(* /usr/include/sys/socket.h *)
+			Ptrsockaddr* = POINTER [untagged] TO sockaddr;
 			sockaddr* = RECORD [untagged]
 				sa_len*: SHORTCHAR; (* total length *)
 				sa_family*: sa_family_t; (* address family *)
@@ -74,22 +68,37 @@ MODULE LinNet ["libc.so.86.0"];
 				END;
 			END;
 
+			Ptrsockaddr_in* = POINTER [untagged] TO sockaddr_in;
 			sockaddr_in* = RECORD [untagged]
-				sin_len*: SHORTCHAR;
+				sin_len*: u_int8_t;
 				sin_family*: sa_family_t;
 				sin_port*: in_port_t;
 				sin_addr*: in_addr;
-				sin_zero*: ARRAY [untagged] 8 OF SHORTCHAR;
+				sin_zero*: ARRAY [untagged] 8 OF int8_t;
 			END;
 
 		(* /usr/include/netdb.h *)
-			Ptrhostent* = POINTER TO hostent;
+(* deprecated
+			Ptrhostent* = POINTER [untagged] TO hostent;
 			hostent* = RECORD [untagged]
 				h_name*: Libc.PtrSTR; (* official name of host *)
-				h_aliases*: POINTER TO ARRAY [untagged] OF Libc.PtrSTR; (* alias list *)
+				h_aliases*: POINTER [untagged] TO ARRAY [untagged] OF Libc.PtrSTR; (* alias list *)
 				h_addrtype*: INTEGER; (* host address type *)
 				h_length*: INTEGER; (* length of address *)
-				h_addr_list*: POINTER TO ARRAY [untagged] OF POINTER TO ARRAY [untagged] OF in_addr; (* list of addresses from name server *)
+				h_addr_list*: POINTER [untagged] TO ARRAY [untagged] OF POINTER [untagged] TO ARRAY [untagged] OF in_addr; (* list of addresses from name server *)
+			END;
+*)
+
+			Ptraddrinfo* = POINTER [untagged] TO addrinfo;
+			addrinfo* = RECORD [untagged]
+				ai_flags*: SET; (* input flags *)
+				ai_family*: int; (* protocol family for socket *)
+				ai_socktype*: int; (* socket type *)
+				ai_protocol*: int; (* protocol for socket *)
+				ai_addrlen*: socklen_t; (* length of socket-address *)
+				ai_addr*: Ptrsockaddr; (* socket-address for socket *)
+				ai_canonname*: Libc.PtrSTR; (* canonical name for service location (iff req) *)
+				ai_next*: Ptraddrinfo; (* pointer to next in list *)
 			END;
 
 		(* /usr/include/sys/time.h *)
@@ -102,28 +111,34 @@ MODULE LinNet ["libc.so.86.0"];
 			__fd_mask = SET;
 			fd_set* = ARRAY [untagged] (FD_SETSIZE + (SIZE(__fd_mask) * __NBBY - 1)) DIV (SIZE(__fd_mask) * __NBBY) OF __fd_mask;
 
+(* deprecated
 	VAR
 		h_errno*: INTEGER;
+*)
 
-	PROCEDURE [ccall] socket* (domain: INTEGER; type: INTEGER; protocol: INTEGER): SOCKET;
+	PROCEDURE [ccall] socket* (domain: int; type: int; protocol: int): SOCKET;
 	PROCEDURE [ccall] accept* (s: SOCKET; VAR addr: sockaddr; VAR addrlen: socklen_t): SOCKET;
 	PROCEDURE [ccall] bind* (s: SOCKET; VAR name: sockaddr; namelen: socklen_t): INTEGER;
 	PROCEDURE [ccall] connect* (s: SOCKET; VAR name: sockaddr; namelen: socklen_t): INTEGER;
 	PROCEDURE [ccall] listen* (s: SOCKET; backlog: INTEGER): INTEGER;
-	PROCEDURE [ccall] recv* (s: SOCKET; buf: Libc.PtrVoid; len: Libc.size_t; flags: SET): Libc.ssize_t;
-	PROCEDURE [ccall] send* (s: SOCKET; msg: Libc.PtrVoid; len: Libc.size_t; flags: SET): Libc.ssize_t;
+	PROCEDURE [ccall] recv* (s: SOCKET; buf: PtrVoid; len: size_t; flags: SET): ssize_t;
+	PROCEDURE [ccall] send* (s: SOCKET; msg: PtrVoid; len: size_t; flags: SET): ssize_t;
 	PROCEDURE [ccall] shutdown* (s: SOCKET; how: INTEGER): INTEGER;
-	PROCEDURE [ccall] getsockopt* (s: SOCKET; level: INTEGER; optname: SET; optval: Libc.PtrVoid; VAR optlen: socklen_t): INTEGER;
-	PROCEDURE [ccall] setsockopt* (s: SOCKET; level: INTEGER; optname: SET; optval: Libc.PtrVoid; optlen: socklen_t): INTEGER;
+	PROCEDURE [ccall] getsockopt* (s: SOCKET; level: INTEGER; optname: SET; optval: PtrVoid; VAR optlen: socklen_t): INTEGER;
+	PROCEDURE [ccall] setsockopt* (s: SOCKET; level: INTEGER; optname: SET; optval: PtrVoid; optlen: socklen_t): INTEGER;
 
 	PROCEDURE [ccall] htons* (host16: SHORTINT): SHORTINT;
 
+(* deprecated
 	PROCEDURE [ccall] gethostbyname* (name: Libc.PtrSTR): Ptrhostent;
+*)
 	PROCEDURE [ccall] inet_addr* (cp: Libc.PtrSTR): in_addr_t;
 
 	PROCEDURE [ccall] getsockname* (s: SOCKET; VAR name: sockaddr; VAR namelen: socklen_t): INTEGER;
 
+(* deprecated
 	PROCEDURE [ccall] hstrerror* (err: INTEGER): Libc.PtrSTR;
+*)
 
 (*
 	PROCEDURE FD_ZERO (VAR set: Net.fd_set);
@@ -140,4 +155,9 @@ MODULE LinNet ["libc.so.86.0"];
 
 	PROCEDURE [ccall] select* (nfds: INTEGER; VAR [nil] readfds: fd_set; VAR [nil] writefds: fd_set; VAR [nil] exceptfds: fd_set; VAR timeout: timeval): INTEGER;
 
-END LinNet.
+	PROCEDURE [ccall] getaddrinfo* (hostname, servname: Libc.PtrSTR; VAR [nil] hints: addrinfo; VAR res: Ptraddrinfo): int;
+	PROCEDURE [ccall] freeaddrinfo* (ai: Ptraddrinfo);
+
+	PROCEDURE [ccall] gai_strerror* (ecode: int): Libc.PtrSTR;
+
+END LinNet.

+ 0 - 19
BlackBox/_OpenBSD_/Lin/Mod/gen-Net/dumphstrerrno.c

@@ -1,19 +0,0 @@
-#include <netdb.h>
-#include <stdio.h>
-
-static void D (const char *s, int e)
-{
-	printf("%s, %s\n", s, hstrerror(e));
-}
-
-int main (int argc, char *argv[])
-{
-	D("NETDB_INTERNAL", NETDB_INTERNAL);
-	D("NETDB_SUCCESS", NETDB_SUCCESS);
-	D("HOST_NOT_FOUND", HOST_NOT_FOUND);
-	D("TRY_AGAIN", TRY_AGAIN);
-	D("NO_RECOVERY", NO_RECOVERY);
-	D("NO_DATA", NO_DATA);
-
-	return 0;
-}