Ver código fonte

unified LinNet

Alexander Shiryaev 8 anos atrás
pai
commit
2593b02f06
27 arquivos alterados com 495 adições e 540 exclusões
  1. 145 0
      BlackBox/_FreeBSDLinuxOpenBSD_/Lin/Mod/gen-Net/Net.txt.templ
  2. 70 0
      BlackBox/_FreeBSDLinuxOpenBSD_/Lin/Mod/gen-Net/sizeofs.c
  3. 24 9
      BlackBox/_Linux_/Lin/Mod/gen-Net/Makefile
  4. 0 168
      BlackBox/_Linux_/Lin/Mod/gen-Net/Net.txt.templ
  5. 2 0
      BlackBox/_Linux_/Lin/Mod/gen-Net/defs-fd_set-const
  6. 3 0
      BlackBox/_Linux_/Lin/Mod/gen-Net/defs-fd_set-type
  7. 18 0
      BlackBox/_Linux_/Lin/Mod/gen-Net/defs-msg
  8. 0 27
      BlackBox/_Linux_/Lin/Mod/gen-Net/defs-netdb
  9. 0 0
      BlackBox/_Linux_/Lin/Mod/gen-Net/defs-proto
  10. 4 0
      BlackBox/_Linux_/Lin/Mod/gen-Net/defs-shut
  11. 8 7
      BlackBox/_Linux_/Lin/Mod/gen-Net/defs-sock
  12. 3 0
      BlackBox/_Linux_/Lin/Mod/gen-Net/fields-sockaddr
  13. 5 0
      BlackBox/_Linux_/Lin/Mod/gen-Net/fields-sockaddr_in
  14. 1 0
      BlackBox/_Linux_/Lin/Mod/gen-Net/libver
  15. 1 0
      BlackBox/_Linux_/Lin/Mod/gen-Net/machine
  16. 1 0
      BlackBox/_Linux_/Lin/Mod/gen-Net/osname
  17. 150 150
      BlackBox/_OpenBSD_/Lin/Mod/Net.txt
  18. 35 16
      BlackBox/_OpenBSD_/Lin/Mod/gen-Net/Makefile
  19. 0 163
      BlackBox/_OpenBSD_/Lin/Mod/gen-Net/Net.txt.templ
  20. 3 0
      BlackBox/_OpenBSD_/Lin/Mod/gen-Net/defs-fd_set-const
  21. 3 0
      BlackBox/_OpenBSD_/Lin/Mod/gen-Net/defs-fd_set-type
  22. 4 0
      BlackBox/_OpenBSD_/Lin/Mod/gen-Net/fields-sockaddr
  23. 6 0
      BlackBox/_OpenBSD_/Lin/Mod/gen-Net/fields-sockaddr_in
  24. 6 0
      BlackBox/_OpenBSD_/Lin/Mod/gen-Net/fields-sockaddr_storage
  25. 1 0
      BlackBox/_OpenBSD_/Lin/Mod/gen-Net/libver
  26. 1 0
      BlackBox/_OpenBSD_/Lin/Mod/gen-Net/machine
  27. 1 0
      BlackBox/_OpenBSD_/Lin/Mod/gen-Net/osname

+ 145 - 0
BlackBox/_FreeBSDLinuxOpenBSD_/Lin/Mod/gen-Net/Net.txt.templ

@@ -0,0 +1,145 @@
+MODULE LinNet ["libc.so%%libver%%"];
+
+	(*
+		%%osname%%
+		%%machine%%
+	*)
+
+	CONST
+		NULL* = 0H;
+
+		SOCKET_ERROR* = -1;
+		INVALID_SOCKET* = -1;
+
+		INADDR_NONE* = -1;
+		INADDR_ANY* = 0;
+
+		(* socket domains *)
+%%defs-af%%
+		(* socket types *)
+%%defs-sock%%
+		(* socket protocols *)
+%%defs-proto%%
+		(* socket options *)
+%%defs-so%%
+%%defs-shut%%
+%%defs-sol%%
+%%defs-msg%%
+		(* addrinfo.ai_flags *)
+%%defs-ai%%
+		(* getaddrinfo/getnameinfo/gai_strerror error codes *)
+%%defs-eai%%
+%%defs-fd_set-const%%
+	TYPE
+		u_int8_t = SHORTCHAR;
+		int8_t = SHORTCHAR;
+		uint16_t = SHORTINT;
+		(* PtrVoid, int, intFlags, short, socklen_t, size_t, ssize_t, in_addr_t, in_port_t, time_t, suseconds_t, nfds_t, sa_family_t *)
+%%defs-basictypes%%
+		PtrSTR* = POINTER [untagged] TO ARRAY [untagged] OF SHORTCHAR;
+
+		SOCKET* = int;
+
+(*
+		in_addr* = RECORD [untagged]
+			s_addr*: in_addr_t;
+		END;
+*)
+		in_addr* = RECORD [untagged]
+			S_un*: RECORD [union]
+				S_un_b*: RECORD [untagged]
+					s_b1*: SHORTCHAR;
+					s_b2*: SHORTCHAR;
+					s_b3*: SHORTCHAR;
+					s_b4*: SHORTCHAR;
+				END;
+				S_un_w*: RECORD [untagged]
+					s_w1*: SHORTINT;
+					s_w2*: SHORTINT;
+				END;
+				S_addr*: in_addr_t;
+			END;
+		END;
+
+		Ptrsockaddr* = POINTER [untagged] TO sockaddr;
+		sockaddr* = RECORD [untagged]
+%%fields-sockaddr%%
+		END;
+
+		Ptrsockaddr_storage = POINTER [untagged] TO sockaddr_storage;
+		sockaddr_storage* = RECORD [untagged]
+%%fields-sockaddr_storage%%
+		END;
+
+		Ptrsockaddr_in* = POINTER [untagged] TO sockaddr_in;
+		sockaddr_in* = RECORD [untagged]
+%%fields-sockaddr_in%%
+		END;
+
+		Ptraddrinfo* = POINTER [untagged] TO addrinfo;
+		addrinfo* = RECORD [untagged]
+			(* Linux, FreeBSD, OpenBSD *)
+				ai_flags*: intFlags; (* 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*: PtrSTR; (* canonical name for service location (iff req) *)
+				ai_next*: Ptraddrinfo; (* pointer to next in list *)
+		END;
+
+		timeval* = RECORD [untagged]
+			(* Linux, FreeBSD, OpenBSD *)
+				tv_sec*: time_t; (* seconds *)
+				tv_usec*: suseconds_t; (* and microseconds *)
+		END;
+
+		pollfd* = RECORD [untagged]
+			(* Linux, FreeBSD, OpenBSD *)
+				fd*: int;
+				events*: short;
+				revents*: short;
+		END;
+
+%%defs-fd_set-type%%
+	(* POSIX.1 *)
+		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): int;
+		PROCEDURE [ccall] connect* (s: SOCKET; VAR name: sockaddr; namelen: socklen_t): int;
+		PROCEDURE [ccall] getsockname* (s: SOCKET; VAR name: sockaddr; VAR namelen: socklen_t): int;
+		PROCEDURE [ccall] listen* (s: SOCKET; backlog: int): int;
+		PROCEDURE [ccall] recv* (s: SOCKET; buf: PtrVoid; len: size_t; flags: intFlags): ssize_t;
+		PROCEDURE [ccall] send* (s: SOCKET; msg: PtrVoid; len: size_t; flags: intFlags): ssize_t;
+		PROCEDURE [ccall] shutdown* (s: SOCKET; how: int): int;
+		PROCEDURE [ccall] getsockopt* (s: SOCKET; level: int; optname: intFlags; optval: PtrVoid; VAR [nil] optlen: socklen_t): int;
+		PROCEDURE [ccall] setsockopt* (s: SOCKET; level: int; optname: intFlags; optval: PtrVoid; optlen: socklen_t): int;
+
+		PROCEDURE [ccall] inet_addr* (cp: PtrSTR): in_addr_t;
+		PROCEDURE [ccall] htons* (host16: uint16_t): uint16_t;
+
+		PROCEDURE [ccall] select* (nfds: INTEGER; VAR [nil] readfds: fd_set; VAR [nil] writefds: fd_set; VAR [nil] exceptfds: fd_set; VAR timeout: timeval): int;
+
+		PROCEDURE [ccall] poll* (VAR fds: ARRAY [untagged] OF pollfd; nfds: nfds_t; timeout: int): int;
+
+(*
+	PROCEDURE FD_ZERO (VAR set: Net.fd_set);
+		VAR i: INTEGER;
+	BEGIN
+		i := LEN(set); REPEAT DEC(i); set[i] := {} UNTIL i = 0
+	END FD_ZERO;
+
+	PROCEDURE FD_SET (fd: Net.SOCKET; VAR set: Net.fd_set);
+	BEGIN
+		INCL(set[fd DIV 32], fd MOD 32)
+	END FD_SET;
+*)
+
+	(* POSIX.1g *)
+		PROCEDURE [ccall] getaddrinfo* (hostname: PtrSTR; servname: PtrSTR; VAR [nil] hints: addrinfo; VAR res: Ptraddrinfo): int;
+		PROCEDURE [ccall] freeaddrinfo* (ai: Ptraddrinfo);
+
+		PROCEDURE [ccall] gai_strerror* (ecode: int): PtrSTR;
+
+END LinNet.

+ 70 - 0
BlackBox/_FreeBSDLinuxOpenBSD_/Lin/Mod/gen-Net/sizeofs.c

@@ -0,0 +1,70 @@
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <poll.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <time.h>
+
+#define TABS "\t\t"
+
+#define FALSE (0)
+#define TRUE (1)
+
+static void D (const char *s, int sz, int set, int export)
+{
+	int res;
+
+	res = printf("%s%s", TABS, s);
+	if (export) {
+		res = printf("*");
+	}
+	res = printf(" = ");
+	if (sz == 1) {
+		res = printf("SHORTCHAR");
+	} else if (sz == 2) {
+		res = printf("SHORTINT");
+	} else if (sz == 4) {
+		if (set) {
+			res = printf("SET");
+		} else {
+			res = printf("INTEGER");
+		}
+	} else if (sz == 8) {
+		if (set) {
+			res = printf("ARRAY [untagged] 2 OF SET");
+		} else {
+			res = printf("LONGINT");
+		}
+	} else {
+		res = printf("ARRAY [untagged] ");
+		if (sz % 4 == 0) {
+			if (set) {
+				res = printf("%d OF SET", sz / 4);
+			} else {
+				res = printf("%d OF INTEGER", sz / 4);
+			}
+		} else {
+			res = printf("%d OF SHORTCHAR", sz);
+		}
+	}
+	res = printf(";\n");
+}
+
+int main ()
+{\
+	D("PtrVoid", sizeof(void *), FALSE, TRUE);
+	D("short", sizeof(short), FALSE, TRUE);
+	D("int", sizeof(int), FALSE, TRUE);
+	D("intFlags", sizeof(int), TRUE, TRUE);
+	D("size_t", sizeof(size_t), FALSE, TRUE);
+	D("ssize_t", sizeof(ssize_t), FALSE, TRUE);
+	D("time_t", sizeof(time_t), FALSE, TRUE);
+	D("suseconds_t", sizeof(suseconds_t), FALSE, TRUE);
+	D("socklen_t", sizeof(socklen_t), FALSE, TRUE);
+	D("in_addr_t", sizeof(in_addr_t), FALSE, TRUE);
+	D("in_port_t", sizeof(in_port_t), FALSE, TRUE);
+	D("nfds_t", sizeof(nfds_t), FALSE, TRUE);
+	D("sa_family_t", sizeof(sa_family_t), FALSE, TRUE);
+
+	return 0;
+}

+ 24 - 9
BlackBox/_Linux_/Lin/Mod/gen-Net/Makefile

@@ -1,25 +1,40 @@
-# This is GNU Makefile
+# This is BSD Makefile
 #    BSD       GNU
-# ${.TARGET}    $@
+# $@    $@
 # ${.ALLSRC}    $^
 # ${.IMPSRC}    $<
 
 INCDIR ?= /usr/include
 
-all: Net.txt
-
 PY = python2.7
-DEFS = defs-socket defs-so
 
-Net.txt: Net.txt.templ ${DEFS} defs-netdb defs-in defs-sock
+DEFS = defs-basictypes defs-af defs-so defs-sol defs-ai defs-eai
+
+all: Net.txt ${DEFS}
+
+Net.txt: Net.txt.templ ${DEFS} libver osname machine fields-sockaddr fields-sockaddr_in fields-sockaddr_storage defs-fd_set-const defs-fd_set-type
 	${PY} ./untempl.py Net.txt.templ $@
 
-defs-socket:
+defs-basictypes: sizeofs
+	./sizeofs > $@
+
+defs-af:
 	./dumpdefs.py 3 1 i ${INCDIR}/i386-linux-gnu/bits/socket.h | grep "	PF_" > $@
-	./dumpdefs.py 3 1 i ${INCDIR}/i386-linux-gnu/bits/socket.h | grep "	SOMAXCONN" >> $@
+
+defs-sol:
+	./dumpdefs.py 2 1 i ${INCDIR}/asm-generic/socket.h | grep "	SOL_" > $@
+
+#somaxconn:
+#	./dumpdefs.py 3 1 i ${INCDIR}/i386-linux-gnu/bits/socket.h | grep "	SOMAXCONN" > $@
 
 defs-so:
 	./dumpdefs.py 3 1 s ${INCDIR}/asm-generic/socket.h | grep "	SO_" > $@
 
+defs-ai:
+	./dumpdefs.py 3 2 s ${INCDIR}/netdb.h | grep "	AI_" > $@
+
+defs-eai:
+	./dumpdefs.py 3 2 i ${INCDIR}/netdb.h | grep "	EAI_" > $@
+
 clean:
-	rm -f Net.txt ${DEFS}
+	rm -f ${DEFS} Net.txt sizeofs

+ 0 - 168
BlackBox/_Linux_/Lin/Mod/gen-Net/Net.txt.templ

@@ -1,168 +0,0 @@
-MODULE LinNet ["libc.so.6"];
-
-	(*
-		A. V. Shiryaev, 2012.11, 2016.11
-
-		GNU/Linux
-		32-bit
-	*)
-
-	IMPORT Libc := LinLibc;
-
-	CONST
-		INVALID_SOCKET* = -1;
-		SOCKET_ERROR* = -1;
-
-		(* /usr/include/i386-linux-gnu/bits/socket.h *)
-			SHUT_RD* = 0;
-			SHUT_WR* = 1;
-			SHUT_RDWR* = 2;
-%%defs-sock%%
-%%defs-socket%%
-		(* /usr/include/asm-generic/socket.h *)
-%%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 *)
-
-		(* /usr/include/netdb.h *)
-%%defs-netdb%%
-		(* /usr/include/i386-linux-gnu/bits/typesizes.h *)
-			__FD_SETSIZE = 1024;
-
-	TYPE
-		int* = INTEGER;
-
-		SOCKET* = int;
-
-		(* /usr/include/i386-linux-gnu/bits/types.h *)
-			socklen_t* = INTEGER;
-		(* /usr/include/i386-linux-gnu/bits/sockaddr.h *)
-			sa_family_t* = SHORTINT; (* unsigned short int *)
-		(* /usr/include/netinet/in.h *)
-			in_addr_t* = INTEGER;
-			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;
-			END;
-
-		(* /usr/include/linux/in.h *)
-(*
-			in_addr* = INTEGER;
-*)
-			in_addr* = RECORD [untagged]
-				S_un*: RECORD [union]
-					S_un_b*: RECORD [untagged]
-						s_b1*: SHORTCHAR;
-						s_b2*: SHORTCHAR;
-						s_b3*: SHORTCHAR;
-						s_b4*: SHORTCHAR;
-					END;
-					S_un_w*: RECORD [untagged]
-						s_w1*: SHORTINT;
-						s_w2*: SHORTINT;
-					END;
-					S_addr*: in_addr_t;
-				END;
-			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 *)
-				sin_addr*: in_addr; (* internet address *)
-				__pad: ARRAY [untagged] 8 OF SHORTCHAR;
-			END;
-
-		(* /usr/include/netdb.h *)
-(* deprecated
-			Ptrhostent* = POINTER [untagged] TO hostent;
-			hostent* = RECORD [untagged]
-				h_name*: Libc.PtrSTR; (* official name of host *)
-				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 [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 *)
-		(* /usr/include/asm-generic/posix_types.h *)
-			timeval* = RECORD [untagged]
-				tv_sec*: INTEGER; (* seconds *)
-				tv_usec*: INTEGER; (* microseconds *)
-			END;
-
-		(* /usr/include/i386-linux-gnu/sys/select.h *)
-			__fd_mask = SET;
-			fd_set* = ARRAY [untagged] __FD_SETSIZE DIV (SIZE(__fd_mask) * 8) OF __fd_mask;
-
-(* 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;
-	PROCEDURE [ccall] bind* (sockfd: SOCKET; VAR addr: sockaddr; addrlen: socklen_t): INTEGER;
-	PROCEDURE [ccall] connect* (sockfd: SOCKET; VAR addr: sockaddr; addrlen: socklen_t): INTEGER;
-	PROCEDURE [ccall] listen* (sockfd: SOCKET; backlog: INTEGER): INTEGER;
-	PROCEDURE [ccall] recv* (soskfd: SOCKET; buf: Libc.PtrVoid; len: Libc.size_t; flags: SET): Libc.ssize_t;
-	PROCEDURE [ccall] send* (sockfd: SOCKET; buf: Libc.PtrVoid; len: Libc.size_t; flags: SET): Libc.ssize_t;
-	PROCEDURE [ccall] shutdown* (sockfd: SOCKET; how: INTEGER): INTEGER;
-	PROCEDURE [ccall] getsockopt* (sockfd: SOCKET; level: INTEGER; optname: SET; optval: Libc.PtrVoid; VAR optlen: socklen_t): INTEGER;
-	PROCEDURE [ccall] setsockopt* (sockfd: SOCKET; level: INTEGER; optname: SET; optval: Libc.PtrVoid; optlen: socklen_t): INTEGER;
-
-	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);
-		VAR i: INTEGER;
-	BEGIN
-		i := LEN(set); REPEAT DEC(i); set[i] := {} UNTIL i = 0
-	END FD_ZERO;
-
-	PROCEDURE FD_SET (fd: Net.SOCKET; VAR set: Net.fd_set);
-	BEGIN
-		INCL(set[fd DIV 32], fd MOD 32)
-	END FD_SET;
-*)
-
-	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.

+ 2 - 0
BlackBox/_Linux_/Lin/Mod/gen-Net/defs-fd_set-const

@@ -0,0 +1,2 @@
+		(* /usr/include/i386-linux-gnu/bits/typesizes.h *)
+			__FD_SETSIZE = 1024;

+ 3 - 0
BlackBox/_Linux_/Lin/Mod/gen-Net/defs-fd_set-type

@@ -0,0 +1,3 @@
+		(* /usr/include/i386-linux-gnu/sys/select.h *)
+			__fd_mask = SET;
+			fd_set* = ARRAY [untagged] __FD_SETSIZE DIV (SIZE(__fd_mask) * 8) OF __fd_mask;

+ 18 - 0
BlackBox/_Linux_/Lin/Mod/gen-Net/defs-msg

@@ -0,0 +1,18 @@
+				(* /usr/include/i386-linux-gnu/bits/socket.h *)
+					MSG_OOB* = {0};
+					MSG_PEEK* = {1};
+					MSG_DONTROUTE* = {2};
+					MSG_CTRUNC* = {3};
+					MSG_PROXY* = {4};
+					MSG_TRUNC* = {5};
+					MSG_DONTWAIT* = {6};
+					MSG_EOR* = {7};
+					MSG_WAITALL* = {8};
+					MSG_FIN* = {9};
+					MSG_SYN* = {10};
+					MSG_CONFIRM* = {11};
+					MSG_RST* = {12};
+					MSG_ERRQUEUE* = {13};
+					MSG_NOSIGNAL* = {14};
+					MSG_MORE* = {15};
+					MSG_WAITFORONE* = {16};

+ 0 - 27
BlackBox/_Linux_/Lin/Mod/gen-Net/defs-netdb

@@ -1,27 +0,0 @@
-(*
-			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. *)
-*)
-
-			EAI_BADFLAGS* = -1; (* Invalid value for `ai_flags' field *)
-			EAI_NONAME* = -2; (* NAME or SERVICE is unknown *)
-			EAI_AGAIN* = -3; (* Temporary failure in name resolution *)
-			EAI_FAIL* = -4; (* Non-recoverable failure in name res *)
-			EAI_FAMILY* = -6; (* `ai_family' not supported *)
-			EAI_SOCKTYPE* = -7; (* `ai_socktype' not supported *)
-			EAI_SERVICE* = -8; (* SERVICE not supported for `ai_socktype' *)
-			EAI_MEMORY* = -10; (* Memory allocation failure *)
-			EAI_SYSTEM* = -11; (* System error returned in `errno' *)
-			EAI_OVERFLOW* = -12; (* Argument buffer overflow *)
-			EAI_NODATA* = -5; (* No address associated with NAME *)
-			EAI_ADDRFAMILY* = -9; (* Address family for NAME not supported *)
-			EAI_INPROGRESS* = -100; (* Processing request in progress *)
-			EAI_CANCELED* = -101; (* Request canceled *)
-			EAI_NOTCANCELED* = -102; (* Request not canceled *)
-			EAI_ALLDONE* = -103; (* All requests done *)
-			EAI_INTR* = -104; (* Interrupted by a signal *)
-			EAI_IDN_ENCODE* = -105; (* IDN encoding failed *)

+ 0 - 0
BlackBox/_Linux_/Lin/Mod/gen-Net/defs-in → BlackBox/_Linux_/Lin/Mod/gen-Net/defs-proto


+ 4 - 0
BlackBox/_Linux_/Lin/Mod/gen-Net/defs-shut

@@ -0,0 +1,4 @@
+		(* /usr/include/i386-linux-gnu/sys/socket.h *)
+			SHUT_RD* = 0;
+			SHUT_WR* = 1;
+			SHUT_RDWR* = 2;

+ 8 - 7
BlackBox/_Linux_/Lin/Mod/gen-Net/defs-sock

@@ -1,7 +1,8 @@
-			SOCK_STREAM* = 1;
-			SOCK_DGRAM* = 2;
-			SOCK_RAW* = 3;
-			SOCK_RDM* = 4;
-			SOCK_SEQPACKET* = 5;
-			SOCK_DCCP* = 6;
-			SOCK_PACKET* = 10;
+			(* /usr/include/i386-linux-gnu/bits/socket_type.h *)
+				SOCK_STREAM* = 1;
+				SOCK_DGRAM* = 2;
+				SOCK_RAW* = 3;
+				SOCK_RDM* = 4;
+				SOCK_SEQPACKET* = 5;
+				SOCK_DCCP* = 6;
+				SOCK_PACKET* = 10;

+ 3 - 0
BlackBox/_Linux_/Lin/Mod/gen-Net/fields-sockaddr

@@ -0,0 +1,3 @@
+			(* /usr/include/i386-linux-gnu/bits/socket.h *)
+				sa_family: sa_family_t;
+				sa_data: ARRAY [untagged] 14 OF SHORTCHAR;

+ 5 - 0
BlackBox/_Linux_/Lin/Mod/gen-Net/fields-sockaddr_in

@@ -0,0 +1,5 @@
+			(* /usr/include/linux/in.h *)
+				sin_family*: sa_family_t; (* address family *)
+				sin_port*: SHORTINT; (* port number *)
+				sin_addr*: in_addr; (* internet address *)
+				__pad: ARRAY [untagged] 8 OF SHORTCHAR;

+ 1 - 0
BlackBox/_Linux_/Lin/Mod/gen-Net/libver

@@ -0,0 +1 @@
+.6

+ 1 - 0
BlackBox/_Linux_/Lin/Mod/gen-Net/machine

@@ -0,0 +1 @@
+i386

+ 1 - 0
BlackBox/_Linux_/Lin/Mod/gen-Net/osname

@@ -0,0 +1 @@
+Linux

+ 150 - 150
BlackBox/_OpenBSD_/Lin/Mod/Net.txt

@@ -1,24 +1,20 @@
 MODULE LinNet ["libc.so.89.2"];
 
 	(*
-		A. V. Shiryaev, 2012.11, 2013.08, 2015.09, 2016.11
-
 		OpenBSD 6.0
-		32-bit
+		i386
 	*)
 
-	IMPORT Libc := LinLibc;
-
 	CONST
-		INVALID_SOCKET* = -1;
+		NULL* = 0H;
+
 		SOCKET_ERROR* = -1;
+		INVALID_SOCKET* = -1;
 
-		(* /usr/include/sys/socket.h *)
-			SOCK_STREAM* = 1; (* stream socket *)
-			SOCK_DGRAM* = 2; (* datagram socket *)
-			SOCK_RAW* = 3; (* raw-protocol interface *)
-			SOCK_RDM* = 4; (* reliably-delivered message *)
-			SOCK_SEQPACKET* = 5; (* sequenced packet stream *)
+		INADDR_NONE* = -1;
+		INADDR_ANY* = 0;
+
+		(* socket domains *)
 			AF_UNSPEC* = 0; (* unspecified *)
 			AF_LOCAL* = 1; (* local to host (pipes, portals) *)
 			AF_UNIX* = AF_LOCAL; (* backward compatibility *)
@@ -52,51 +48,15 @@ MODULE LinNet ["libc.so.89.2"];
 			AF_BLUETOOTH* = 32; (* Bluetooth *)
 			AF_MPLS* = 33; (* MPLS *)
 			AF_MAX* = 36;
-			SHUT_RD* = 0;
-			SHUT_WR* = 1;
-			SHUT_RDWR* = 2;
-			SOMAXCONN* = 128;
-			SO_DEBUG* = {0}; (* turn on debugging info recording *)
-			SO_ACCEPTCONN* = {1}; (* socket has had listen() *)
-			SO_REUSEADDR* = {2}; (* allow local address reuse *)
-			SO_KEEPALIVE* = {3}; (* keep connections alive *)
-			SO_DONTROUTE* = {4}; (* just use interface addresses *)
-			SO_BROADCAST* = {5}; (* permit sending of broadcast msgs *)
-			SO_USELOOPBACK* = {6}; (* bypass hardware when possible *)
-			SO_LINGER* = {7}; (* linger on close if data present *)
-			SO_OOBINLINE* = {8}; (* leave received OOB data in line *)
-			SO_REUSEPORT* = {9}; (* allow local address & port reuse *)
-			SO_TIMESTAMP* = {11}; (* timestamp received dgram traffic *)
-			SO_BINDANY* = {12}; (* allow bind to any address *)
-			SO_SNDBUF* = {0,12}; (* send buffer size *)
-			SO_RCVBUF* = {1,12}; (* receive buffer size *)
-			SO_SNDLOWAT* = {0,1,12}; (* send low-water mark *)
-			SO_RCVLOWAT* = {2,12}; (* receive low-water mark *)
-			SO_SNDTIMEO* = {0,2,12}; (* send timeout *)
-			SO_RCVTIMEO* = {1,2,12}; (* receive timeout *)
-			SO_ERROR* = {0..2,12}; (* get error status and clear *)
-			SO_TYPE* = {3,12}; (* get socket type *)
-			SO_NETPROC* = {5,12}; (* multiplex; network processing *)
-			SO_RTABLE* = {0,5,12}; (* routing table to be used *)
-			SO_PEERCRED* = {1,5,12}; (* get connect-time credentials *)
-			SO_SPLICE* = {0,1,5,12}; (* splice data to other socket *)
-			SOL_SOCKET* = 0FFFFH; (* {0..15} *) (* options for socket level *)
-			MSG_OOB* = {0}; (* process out-of-band data *)
-			MSG_PEEK* = {1}; (* peek at incoming message *)
-			MSG_DONTROUTE* = {2}; (* send without using routing tables *)
-			MSG_EOR* = {3}; (* data completes record *)
-			MSG_TRUNC* = {4}; (* data discarded before delivery *)
-			MSG_CTRUNC* = {5}; (* control data lost before delivery *)
-			MSG_WAITALL* = {6}; (* wait for full request or error *)
-			MSG_DONTWAIT* = {7}; (* this message should be nonblocking *)
-			MSG_BCAST* = {8}; (* this message rec'd as broadcast *)
-			MSG_MCAST* = {9}; (* this message rec'd as multicast *)
-			MSG_NOSIGNAL* = {10}; (* do not send SIGPIPE *)
-			MSG_CMSG_CLOEXEC* = {11}; (* set FD_CLOEXEC on received fds *)
-
-		(* /usr/include/netinet/in.h *)
-			INADDR_NONE* = -1;
-			INADDR_ANY* = 0;
+
+		(* socket types *)
+			SOCK_STREAM* = 1; (* stream socket *)
+			SOCK_DGRAM* = 2; (* datagram socket *)
+			SOCK_RAW* = 3; (* raw-protocol interface *)
+			SOCK_RDM* = 4; (* reliably-delivered message *)
+			SOCK_SEQPACKET* = 5; (* sequenced packet stream *)
+
+		(* socket protocols *)
 			IPPROTO_IP* = 0; (* dummy for IP *)
 			IPPROTO_HOPOPTS* = IPPROTO_IP; (* Hop-by-hop option header *)
 			IPPROTO_ICMP* = 1; (* control message protocol *)
@@ -136,10 +96,52 @@ MODULE LinNet ["libc.so.89.2"];
 			IPPROTO_DIVERT_RESP* = 01H; (* {0} *) (* divert response packets *)
 			IPPROTO_DIVERT_INIT* = 02H; (* {1} *) (* divert packets initial direction *)
 
-		(* /usr/include/sys/param.h *)
-			MAXHOSTNAMELEN* = 256; (* max hostname length w/ NUL *)
+		(* socket options *)
+			SO_DEBUG* = {0}; (* turn on debugging info recording *)
+			SO_ACCEPTCONN* = {1}; (* socket has had listen() *)
+			SO_REUSEADDR* = {2}; (* allow local address reuse *)
+			SO_KEEPALIVE* = {3}; (* keep connections alive *)
+			SO_DONTROUTE* = {4}; (* just use interface addresses *)
+			SO_BROADCAST* = {5}; (* permit sending of broadcast msgs *)
+			SO_USELOOPBACK* = {6}; (* bypass hardware when possible *)
+			SO_LINGER* = {7}; (* linger on close if data present *)
+			SO_OOBINLINE* = {8}; (* leave received OOB data in line *)
+			SO_REUSEPORT* = {9}; (* allow local address & port reuse *)
+			SO_TIMESTAMP* = {11}; (* timestamp received dgram traffic *)
+			SO_BINDANY* = {12}; (* allow bind to any address *)
+			SO_SNDBUF* = {0,12}; (* send buffer size *)
+			SO_RCVBUF* = {1,12}; (* receive buffer size *)
+			SO_SNDLOWAT* = {0,1,12}; (* send low-water mark *)
+			SO_RCVLOWAT* = {2,12}; (* receive low-water mark *)
+			SO_SNDTIMEO* = {0,2,12}; (* send timeout *)
+			SO_RCVTIMEO* = {1,2,12}; (* receive timeout *)
+			SO_ERROR* = {0..2,12}; (* get error status and clear *)
+			SO_TYPE* = {3,12}; (* get socket type *)
+			SO_NETPROC* = {5,12}; (* multiplex; network processing *)
+			SO_RTABLE* = {0,5,12}; (* routing table to be used *)
+			SO_PEERCRED* = {1,5,12}; (* get connect-time credentials *)
+			SO_SPLICE* = {0,1,5,12}; (* splice data to other socket *)
+
+		SHUT_RD* = 0;
+		SHUT_WR* = 1;
+		SHUT_RDWR* = 2;
+
+		SOL_SOCKET* = 0FFFFH; (* {0..15} *) (* options for socket level *)
 
-		(* /usr/include/netdb.h *)
+		MSG_OOB* = {0}; (* process out-of-band data *)
+		MSG_PEEK* = {1}; (* peek at incoming message *)
+		MSG_DONTROUTE* = {2}; (* send without using routing tables *)
+		MSG_EOR* = {3}; (* data completes record *)
+		MSG_TRUNC* = {4}; (* data discarded before delivery *)
+		MSG_CTRUNC* = {5}; (* control data lost before delivery *)
+		MSG_WAITALL* = {6}; (* wait for full request or error *)
+		MSG_DONTWAIT* = {7}; (* this message should be nonblocking *)
+		MSG_BCAST* = {8}; (* this message rec'd as broadcast *)
+		MSG_MCAST* = {9}; (* this message rec'd as multicast *)
+		MSG_NOSIGNAL* = {10}; (* do not send SIGPIPE *)
+		MSG_CMSG_CLOEXEC* = {11}; (* set FD_CLOEXEC on received fds *)
+
+		(* addrinfo.ai_flags *)
 			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 *)
@@ -147,6 +149,8 @@ MODULE LinNet ["libc.so.89.2"];
 			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 *)
+
+		(* getaddrinfo/getnameinfo/gai_strerror error codes *)
 			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 *)
@@ -162,134 +166,131 @@ MODULE LinNet ["libc.so.89.2"];
 			EAI_PROTOCOL* = -13; (* resolved protocol is unknown *)
 			EAI_OVERFLOW* = -14; (* argument buffer overflow *)
 
-		(* /usr/include/sys/select.h *)
+		(* OpenBSD 6.0 /usr/include/sys/select.h *)
 			FD_SETSIZE = 1024;
 			__NBBY = 8;
 
 	TYPE
+		u_int8_t = SHORTCHAR;
+		int8_t = SHORTCHAR;
+		uint16_t = SHORTINT;
+		(* PtrVoid, int, intFlags, short, socklen_t, size_t, ssize_t, in_addr_t, in_port_t, time_t, suseconds_t, nfds_t, sa_family_t *)
 		PtrVoid* = INTEGER;
+		short* = SHORTINT;
 		int* = INTEGER;
+		intFlags* = SET;
+		size_t* = INTEGER;
+		ssize_t* = INTEGER;
+		time_t* = LONGINT;
+		suseconds_t* = 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;
+		nfds_t* = INTEGER;
+		sa_family_t* = SHORTCHAR;
+
+		PtrSTR* = POINTER [untagged] TO ARRAY [untagged] OF SHORTCHAR;
 
 		SOCKET* = int;
 
-		(* /usr/include/sys/socket.h *)
-			Ptrsockaddr* = POINTER [untagged] TO sockaddr;
-			sockaddr* = RECORD [untagged]
+(*
+		in_addr* = RECORD [untagged]
+			s_addr*: in_addr_t;
+		END;
+*)
+		in_addr* = RECORD [untagged]
+			S_un*: RECORD [union]
+				S_un_b*: RECORD [untagged]
+					s_b1*: SHORTCHAR;
+					s_b2*: SHORTCHAR;
+					s_b3*: SHORTCHAR;
+					s_b4*: SHORTCHAR;
+				END;
+				S_un_w*: RECORD [untagged]
+					s_w1*: SHORTINT;
+					s_w2*: SHORTINT;
+				END;
+				S_addr*: in_addr_t;
+			END;
+		END;
+
+		Ptrsockaddr* = POINTER [untagged] TO sockaddr;
+		sockaddr* = RECORD [untagged]
+			(* OpenBSD /usr/include/sys/socket.h *)
 				sa_len*: SHORTCHAR; (* total length *)
 				sa_family*: sa_family_t; (* address family *)
 				sa_data*: ARRAY [untagged] 14 OF SHORTCHAR; (* actually longer; address value *)
-			END;
-			sockaddr_storage* = RECORD [untagged]
+		END;
+
+		Ptrsockaddr_storage = POINTER [untagged] TO sockaddr_storage;
+		sockaddr_storage* = RECORD [untagged]
+			(* OpenBSD 6.0 /usr/include/sys/socket.h *)
 				ss_len*: SHORTCHAR; (* total length *)
 				ss_family*: sa_family_t; (* address family *)
 				__ss_pad1: ARRAY [untagged] 6 OF SHORTCHAR; (* align to quad *)
 				__ss_pad2: LONGINT; (* force alignment for stupid compilers *)
 				__ss_pad3: ARRAY [untagged] 240 OF SHORTCHAR; (* pad to a total of 256 bytes *)
-			END;
-
-		(* /usr/include/netinet/in.h *)
-(*
-			in_addr* = RECORD [untagged]
-				s_addr*: in_addr_t;
-			END;
-*)
-			in_addr* = RECORD [untagged]
-				S_un*: RECORD [union]
-					S_un_b*: RECORD [untagged]
-						s_b1*: SHORTCHAR;
-						s_b2*: SHORTCHAR;
-						s_b3*: SHORTCHAR;
-						s_b4*: SHORTCHAR;
-					END;
-					S_un_w*: RECORD [untagged]
-						s_w1*: SHORTINT;
-						s_w2*: SHORTINT;
-					END;
-					S_addr*: in_addr_t;
-				END;
-			END;
+		END;
 
-			Ptrsockaddr_in* = POINTER [untagged] TO sockaddr_in;
-			sockaddr_in* = RECORD [untagged]
+		Ptrsockaddr_in* = POINTER [untagged] TO sockaddr_in;
+		sockaddr_in* = RECORD [untagged]
+			(* OpenBSD /usr/include/netinet/in.h *)
 				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 int8_t;
-			END;
+		END;
 
-		(* /usr/include/netdb.h *)
-(* deprecated
-			Ptrhostent* = POINTER [untagged] TO hostent;
-			hostent* = RECORD [untagged]
-				h_name*: Libc.PtrSTR; (* official name of host *)
-				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 [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 *)
+		Ptraddrinfo* = POINTER [untagged] TO addrinfo;
+		addrinfo* = RECORD [untagged]
+			(* Linux, FreeBSD, OpenBSD *)
+				ai_flags*: intFlags; (* 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_canonname*: PtrSTR; (* canonical name for service location (iff req) *)
 				ai_next*: Ptraddrinfo; (* pointer to next in list *)
-			END;
+		END;
 
-		(* /usr/include/sys/time.h *)
-			timeval* = RECORD [untagged]
+		timeval* = RECORD [untagged]
+			(* Linux, FreeBSD, OpenBSD *)
 				tv_sec*: time_t; (* seconds *)
 				tv_usec*: suseconds_t; (* and microseconds *)
-			END;
+		END;
+
+		pollfd* = RECORD [untagged]
+			(* Linux, FreeBSD, OpenBSD *)
+				fd*: int;
+				events*: short;
+				revents*: short;
+		END;
 
-		(* /usr/include/sys/select.h *)
+		(* OpenBSD 6.0 /usr/include/sys/select.h *)
 			__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;
-*)
+	(* POSIX.1 *)
+		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): int;
+		PROCEDURE [ccall] connect* (s: SOCKET; VAR name: sockaddr; namelen: socklen_t): int;
+		PROCEDURE [ccall] getsockname* (s: SOCKET; VAR name: sockaddr; VAR namelen: socklen_t): int;
+		PROCEDURE [ccall] listen* (s: SOCKET; backlog: int): int;
+		PROCEDURE [ccall] recv* (s: SOCKET; buf: PtrVoid; len: size_t; flags: intFlags): ssize_t;
+		PROCEDURE [ccall] send* (s: SOCKET; msg: PtrVoid; len: size_t; flags: intFlags): ssize_t;
+		PROCEDURE [ccall] shutdown* (s: SOCKET; how: int): int;
+		PROCEDURE [ccall] getsockopt* (s: SOCKET; level: int; optname: intFlags; optval: PtrVoid; VAR [nil] optlen: socklen_t): int;
+		PROCEDURE [ccall] setsockopt* (s: SOCKET; level: int; optname: intFlags; optval: PtrVoid; optlen: socklen_t): int;
 
-	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: 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: 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] inet_addr* (cp: PtrSTR): in_addr_t;
+		PROCEDURE [ccall] htons* (host16: uint16_t): uint16_t;
 
-	PROCEDURE [ccall] getsockname* (s: SOCKET; VAR name: sockaddr; VAR namelen: socklen_t): INTEGER;
+		PROCEDURE [ccall] select* (nfds: INTEGER; VAR [nil] readfds: fd_set; VAR [nil] writefds: fd_set; VAR [nil] exceptfds: fd_set; VAR timeout: timeval): int;
 
-(* deprecated
-	PROCEDURE [ccall] hstrerror* (err: INTEGER): Libc.PtrSTR;
-*)
+		PROCEDURE [ccall] poll* (VAR fds: ARRAY [untagged] OF pollfd; nfds: nfds_t; timeout: int): int;
 
 (*
 	PROCEDURE FD_ZERO (VAR set: Net.fd_set);
@@ -304,11 +305,10 @@ MODULE LinNet ["libc.so.89.2"];
 	END FD_SET;
 *)
 
-	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);
+	(* POSIX.1g *)
+		PROCEDURE [ccall] getaddrinfo* (hostname: PtrSTR; servname: PtrSTR; VAR [nil] hints: addrinfo; VAR res: Ptraddrinfo): int;
+		PROCEDURE [ccall] freeaddrinfo* (ai: Ptraddrinfo);
 
-	PROCEDURE [ccall] gai_strerror* (ecode: int): Libc.PtrSTR;
+		PROCEDURE [ccall] gai_strerror* (ecode: int): PtrSTR;
 
 END LinNet.

+ 35 - 16
BlackBox/_OpenBSD_/Lin/Mod/gen-Net/Makefile

@@ -6,28 +6,47 @@
 
 INCDIR ?= /usr/include
 
-all: Net.txt
-
 PY = python2.7
-DEFS = defs-socket defs-in defs-netdb
 
-Net.txt: Net.txt.templ ${DEFS}
+DEFS = defs-basictypes defs-af defs-sock defs-proto defs-shut defs-so defs-sol defs-msg defs-ai defs-eai
+
+all: Net.txt ${DEFS}
+
+Net.txt: Net.txt.templ ${DEFS} libver osname machine fields-sockaddr fields-sockaddr_in fields-sockaddr_storage defs-fd_set-const defs-fd_set-type
 	${PY} ./untempl.py Net.txt.templ ${.TARGET}
 
-defs-socket:
+defs-basictypes: sizeofs
+	./sizeofs > ${.TARGET}
+
+defs-af:
+	./dumpdefs.py 3 1 i ${INCDIR}/sys/socket.h | grep "	AF_" > ${.TARGET}
+
+defs-sock:
 	./dumpdefs.py 3 1 i ${INCDIR}/sys/socket.h | grep "	SOCK_" > ${.TARGET}
-	./dumpdefs.py 3 1 i ${INCDIR}/sys/socket.h | grep "	AF_" >> ${.TARGET}
-	./dumpdefs.py 3 1 i ${INCDIR}/sys/socket.h | grep "	SHUT_" >> ${.TARGET}
-	./dumpdefs.py 3 1 i ${INCDIR}/sys/socket.h | grep "	SOMAXCONN" >> ${.TARGET}
-	./dumpdefs.py 3 1 s ${INCDIR}/sys/socket.h | grep "	SO_" >> ${.TARGET}
-	./dumpdefs.py 3 1 i ${INCDIR}/sys/socket.h | grep "	SOL_" >> ${.TARGET}
-	./dumpdefs.py 3 1 s ${INCDIR}/sys/socket.h | grep "	MSG_" >> ${.TARGET}
-
-defs-in:
+
+defs-proto:
 	./dumpdefs.py 3 1 i ${INCDIR}/netinet/in.h | grep "	IPPROTO_" > ${.TARGET}
 
-defs-netdb:
-	./dumpdefs.py 3 2 i ${INCDIR}/netdb.h > ${.TARGET}
+defs-sol:
+	./dumpdefs.py 2 1 i ${INCDIR}/sys/socket.h | grep "	SOL_" > ${.TARGET}
+
+defs-msg:
+	./dumpdefs.py 2 1 s ${INCDIR}/sys/socket.h | grep "	MSG_" > ${.TARGET}
+
+#somaxconn:
+#	./dumpdefs.py 3 1 i ${INCDIR}/sys/socket.h | grep "	SOMAXCONN" > ${.TARGET}
+
+defs-so:
+	./dumpdefs.py 3 1 s ${INCDIR}/sys/socket.h | grep "	SO_" > ${.TARGET}
+
+defs-shut:
+	./dumpdefs.py 2 1 i ${INCDIR}/sys/socket.h | grep "	SHUT_" > ${.TARGET}
+
+defs-ai:
+	./dumpdefs.py 3 1 s ${INCDIR}/netdb.h | grep "	AI_" > ${.TARGET}
+
+defs-eai:
+	./dumpdefs.py 3 1 i ${INCDIR}/netdb.h | grep "	EAI_" > ${.TARGET}
 
 clean:
-	rm -f Net.txt ${DEFS}
+	rm -f ${DEFS} Net.txt sizeofs

+ 0 - 163
BlackBox/_OpenBSD_/Lin/Mod/gen-Net/Net.txt.templ

@@ -1,163 +0,0 @@
-MODULE LinNet ["libc.so.89.2"];
-
-	(*
-		A. V. Shiryaev, 2012.11, 2013.08, 2015.09, 2016.11
-
-		OpenBSD 6.0
-		32-bit
-	*)
-
-	IMPORT Libc := LinLibc;
-
-	CONST
-		INVALID_SOCKET* = -1;
-		SOCKET_ERROR* = -1;
-
-		(* /usr/include/sys/socket.h *)
-%%defs-socket%%
-		(* /usr/include/netinet/in.h *)
-			INADDR_NONE* = -1;
-			INADDR_ANY* = 0;
-%%defs-in%%
-		(* /usr/include/sys/param.h *)
-%%defs-param%%
-		(* /usr/include/netdb.h *)
-%%defs-netdb%%
-		(* /usr/include/sys/select.h *)
-			FD_SETSIZE = 1024;
-			__NBBY = 8;
-
-	TYPE
-%%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 *)
-				sa_data*: ARRAY [untagged] 14 OF SHORTCHAR; (* actually longer; address value *)
-			END;
-			sockaddr_storage* = RECORD [untagged]
-				ss_len*: SHORTCHAR; (* total length *)
-				ss_family*: sa_family_t; (* address family *)
-				__ss_pad1: ARRAY [untagged] 6 OF SHORTCHAR; (* align to quad *)
-				__ss_pad2: LONGINT; (* force alignment for stupid compilers *)
-				__ss_pad3: ARRAY [untagged] 240 OF SHORTCHAR; (* pad to a total of 256 bytes *)
-			END;
-
-		(* /usr/include/netinet/in.h *)
-(*
-			in_addr* = RECORD [untagged]
-				s_addr*: in_addr_t;
-			END;
-*)
-			in_addr* = RECORD [untagged]
-				S_un*: RECORD [union]
-					S_un_b*: RECORD [untagged]
-						s_b1*: SHORTCHAR;
-						s_b2*: SHORTCHAR;
-						s_b3*: SHORTCHAR;
-						s_b4*: SHORTCHAR;
-					END;
-					S_un_w*: RECORD [untagged]
-						s_w1*: SHORTINT;
-						s_w2*: SHORTINT;
-					END;
-					S_addr*: in_addr_t;
-				END;
-			END;
-
-			Ptrsockaddr_in* = POINTER [untagged] TO sockaddr_in;
-			sockaddr_in* = RECORD [untagged]
-				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 int8_t;
-			END;
-
-		(* /usr/include/netdb.h *)
-(* deprecated
-			Ptrhostent* = POINTER [untagged] TO hostent;
-			hostent* = RECORD [untagged]
-				h_name*: Libc.PtrSTR; (* official name of host *)
-				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 [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 *)
-			timeval* = RECORD [untagged]
-				tv_sec*: time_t; (* seconds *)
-				tv_usec*: suseconds_t; (* and microseconds *)
-			END;
-
-		(* /usr/include/sys/select.h *)
-			__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: 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: 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: 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);
-		VAR i: INTEGER;
-	BEGIN
-		i := LEN(set); REPEAT DEC(i); set[i] := {} UNTIL i = 0
-	END FD_ZERO;
-
-	PROCEDURE FD_SET (fd: Net.SOCKET; VAR set: Net.fd_set);
-	BEGIN
-		INCL(set[fd DIV 32], fd MOD 32)
-	END FD_SET;
-*)
-
-	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.

+ 3 - 0
BlackBox/_OpenBSD_/Lin/Mod/gen-Net/defs-fd_set-const

@@ -0,0 +1,3 @@
+		(* OpenBSD 6.0 /usr/include/sys/select.h *)
+			FD_SETSIZE = 1024;
+			__NBBY = 8;

+ 3 - 0
BlackBox/_OpenBSD_/Lin/Mod/gen-Net/defs-fd_set-type

@@ -0,0 +1,3 @@
+		(* OpenBSD 6.0 /usr/include/sys/select.h *)
+			__fd_mask = SET;
+			fd_set* = ARRAY [untagged] (FD_SETSIZE + (SIZE(__fd_mask) * __NBBY - 1)) DIV (SIZE(__fd_mask) * __NBBY) OF __fd_mask;

+ 4 - 0
BlackBox/_OpenBSD_/Lin/Mod/gen-Net/fields-sockaddr

@@ -0,0 +1,4 @@
+			(* OpenBSD /usr/include/sys/socket.h *)
+				sa_len*: SHORTCHAR; (* total length *)
+				sa_family*: sa_family_t; (* address family *)
+				sa_data*: ARRAY [untagged] 14 OF SHORTCHAR; (* actually longer; address value *)

+ 6 - 0
BlackBox/_OpenBSD_/Lin/Mod/gen-Net/fields-sockaddr_in

@@ -0,0 +1,6 @@
+			(* OpenBSD /usr/include/netinet/in.h *)
+				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 int8_t;

+ 6 - 0
BlackBox/_OpenBSD_/Lin/Mod/gen-Net/fields-sockaddr_storage

@@ -0,0 +1,6 @@
+			(* OpenBSD 6.0 /usr/include/sys/socket.h *)
+				ss_len*: SHORTCHAR; (* total length *)
+				ss_family*: sa_family_t; (* address family *)
+				__ss_pad1: ARRAY [untagged] 6 OF SHORTCHAR; (* align to quad *)
+				__ss_pad2: LONGINT; (* force alignment for stupid compilers *)
+				__ss_pad3: ARRAY [untagged] 240 OF SHORTCHAR; (* pad to a total of 256 bytes *)

+ 1 - 0
BlackBox/_OpenBSD_/Lin/Mod/gen-Net/libver

@@ -0,0 +1 @@
+.89.2

+ 1 - 0
BlackBox/_OpenBSD_/Lin/Mod/gen-Net/machine

@@ -0,0 +1 @@
+i386

+ 1 - 0
BlackBox/_OpenBSD_/Lin/Mod/gen-Net/osname

@@ -0,0 +1 @@
+OpenBSD 6.0