* fixes solaris and netbsd AF_ and PF_ defines

+ adds preliminary unxsockh.inc to openbsd

git-svn-id: trunk@5441 -

.gitattributes

@@ -5042,6 +5042,7 @@ rtl/openbsd/termiosproc.inc svneol=native#text/plain
 rtl/openbsd/tthread.inc svneol=native#text/plain
 rtl/openbsd/unixsock.inc svneol=native#text/plain
 rtl/openbsd/unixsysc.inc svneol=native#text/plain
+rtl/openbsd/unxsockh.inc svneol=native#text/plain
 rtl/os2/Makefile svneol=native#text/plain
 rtl/os2/Makefile.fpc svneol=native#text/plain
 rtl/os2/classes.pp svneol=native#text/plain

rtl/netbsd/unxsockh.inc

@@ -16,28 +16,124 @@
 {$warning taken from FreeBSD, please check and fix }
 
 Const
-  AF_AX25         = 3;      { Amateur Radio AX.25          }
-  AF_IPX          = 4;      { Novell IPX                   }
-  AF_APPLETALK    = 5;      { Appletalk DDP                }
-  AF_NETROM       = 6;      { Amateur radio NetROM         }
-  AF_BRIDGE       = 7;       { Multiprotocol bridge         }
-  AF_AAL5         = 8;       { Reserved for Werner's ATM    }
-  AF_X25          = 9;       { Reserved for X.25 project    }
-  AF_INET6        = 10;      { IP version 6                 }
-  AF_MAX          = 12;
+  {
+   * Address families.
+    }
 
-  SOCK_PACKET     = 10;
+  { unspecified  }
+     AF_UNSPEC = 0;
+  { local to host (pipes, portals)  }
+     AF_LOCAL = 1;
+  { backward compatibility  }
+     AF_UNIX = AF_LOCAL;
+  { internetwork: UDP, TCP, etc.  }
+     AF_INET = 2;
+  { arpanet imp addresses  }
+     AF_IMPLINK = 3;
+  { pup protocols: e.g. BSP  }
+     AF_PUP = 4;
+  { mit CHAOS protocols  }
+     AF_CHAOS = 5;
+  { XEROX NS protocols  }
+     AF_NS = 6;
+  { ISO protocols  }
+     AF_ISO = 7;
+     AF_OSI = AF_ISO;
+  { european computer manufacturers  }
+     AF_ECMA = 8;
+  { datakit protocols  }
+     AF_DATAKIT = 9;
+  { CCITT protocols, X.25 etc  }
+     AF_CCITT = 10;
+  { IBM SNA  }
+     AF_SNA = 11;
+  { DECnet  }
+     AF_DECnet = 12;
+  { DEC Direct data link interface  }
+     AF_DLI = 13;
+  { LAT  }
+     AF_LAT = 14;
+  { NSC Hyperchannel  }
+     AF_HYLINK = 15;
+  { Apple Talk  }
+     AF_APPLETALK = 16;
+  { Internal Routing Protocol  }
+     AF_ROUTE = 17;
+  { Link layer interface  }
+     AF_LINK = 18;
+  { eXpress Transfer Protocol (no AF)  }
+     pseudo_AF_XTP = 19;
+  { connection-oriented IP, aka ST II  }
+     AF_COIP = 20;
+  { Computer Network Technology  }
+     AF_CNT = 21;
+  { Help Identify RTIP packets  }
+     pseudo_AF_RTIP = 22;
+  { Novell Internet Protocol  }
+     AF_IPX = 23;
+  { IP version 6  }
+     AF_INET6 = 24;
+  { Help Identify PIP packets  }
+     pseudo_AF_PIP = 25;
+  { Integrated Services Digital Network }
+     AF_ISDN = 26;
+  { CCITT E.164 recommendation  }
+     AF_E164 = AF_ISDN;
+  { native ATM access  }
+     AF_NATM = 27;
+  { (rev.) addr. res. prot. (RFC 826)  }
+     AF_ARP = 28;
+  { Internal key management protocol   }
+     pseudo_AF_KEY = 29;
+  { Used by BPF to not rewrite hdrs in interface output routine  }
+     pseudo_AF_HDRCMPLT = 30;
+     AF_BLUETOOTH = 31;
+     AF_MAX = 32;
+
+  {
+   * Protocol families, same as address families for now.
+    }
+     PF_UNSPEC = AF_UNSPEC;
+     PF_LOCAL = AF_LOCAL;
+  { backward compatibility  }
+     PF_UNIX = PF_LOCAL;
+     PF_INET = AF_INET;
+     PF_IMPLINK = AF_IMPLINK;
+     PF_PUP = AF_PUP;
+     PF_CHAOS = AF_CHAOS;
+     PF_NS = AF_NS;
+     PF_ISO = AF_ISO;
+     PF_OSI = AF_ISO;
+     PF_ECMA = AF_ECMA;
+     PF_DATAKIT = AF_DATAKIT;
+     PF_CCITT = AF_CCITT;
+     PF_SNA = AF_SNA;
+     PF_DECnet = AF_DECnet;
+     PF_DLI = AF_DLI;
+     PF_LAT = AF_LAT;
+     PF_HYLINK = AF_HYLINK;
+     PF_APPLETALK = AF_APPLETALK;
+     PF_ROUTE = AF_ROUTE;
+     PF_LINK = AF_LINK;
+  { really just proto family, no AF  }
+     PF_XTP = pseudo_AF_XTP;
+     PF_COIP = AF_COIP;
+     PF_CNT = AF_CNT;
+     PF_INET6 = AF_INET6;
+  { same format as AF_NS  }
+     PF_IPX = AF_IPX;
+     PF_RTIP = pseudo_AF_RTIP;
+     PF_PIP = pseudo_AF_PIP;
+     PF_ISDN = AF_ISDN;
+     PF_E164 = AF_E164;
+     PF_NATM = AF_NATM;
+     PF_ARP = AF_ARP;
+     PF_KEY = pseudo_AF_KEY;
+     PF_BLUETOOTH = AF_BLUETOOTH;
+     PF_MAX = AF_MAX;
 
-  PF_AX25         = AF_AX25;
-  PF_IPX          = AF_IPX;
-  PF_APPLETALK    = AF_APPLETALK;
-  PF_NETROM       = AF_NETROM;
-  PF_BRIDGE       = AF_BRIDGE;
-  PF_AAL5         = AF_AAL5;
-  PF_X25          = AF_X25;
-  PF_INET6        = AF_INET6;
 
-  PF_MAX          = AF_MAX;
+  SOCK_PACKET     = 10;
 
 
 { Maximum queue length specifiable by listen.  }

rtl/openbsd/unxsockh.inc

@@ -0,0 +1,121 @@
+
+const
+  {
+   * Address families.
+    }
+
+  { unspecified  }
+     AF_UNSPEC = 0;
+  { local to host (pipes, portals)  }
+     AF_LOCAL = 1;
+  { backward compatibility  }
+     AF_UNIX = AF_LOCAL;
+  { internetwork: UDP, TCP, etc.  }
+     AF_INET = 2;
+  { arpanet imp addresses  }
+     AF_IMPLINK = 3;
+  { pup protocols: e.g. BSP  }
+     AF_PUP = 4;
+  { mit CHAOS protocols  }
+     AF_CHAOS = 5;
+  { XEROX NS protocols  }
+     AF_NS = 6;
+  { ISO protocols  }
+     AF_ISO = 7;
+     AF_OSI = AF_ISO;
+  { european computer manufacturers  }
+     AF_ECMA = 8;
+  { datakit protocols  }
+     AF_DATAKIT = 9;
+  { CCITT protocols, X.25 etc  }
+     AF_CCITT = 10;
+  { IBM SNA  }
+     AF_SNA = 11;
+  { DECnet  }
+     AF_DECnet = 12;
+  { DEC Direct data link interface  }
+     AF_DLI = 13;
+  { LAT  }
+     AF_LAT = 14;
+  { NSC Hyperchannel  }
+     AF_HYLINK = 15;
+  { Apple Talk  }
+     AF_APPLETALK = 16;
+  { Internal Routing Protocol  }
+     AF_ROUTE = 17;
+  { Link layer interface  }
+     AF_LINK = 18;
+  { eXpress Transfer Protocol (no AF)  }
+     pseudo_AF_XTP = 19;
+  { connection-oriented IP, aka ST II  }
+     AF_COIP = 20;
+  { Computer Network Technology  }
+     AF_CNT = 21;
+  { Help Identify RTIP packets  }
+     pseudo_AF_RTIP = 22;
+  { Novell Internet Protocol  }
+     AF_IPX = 23;
+  { IPv6  }
+     AF_INET6 = 24;
+  { Help Identify PIP packets  }
+     pseudo_AF_PIP = 25;
+  { Integrated Services Digital Network }
+     AF_ISDN = 26;
+  { CCITT E.164 recommendation  }
+     AF_E164 = AF_ISDN;
+  { native ATM access  }
+     AF_NATM = 27;
+     AF_ENCAP = 28;
+  { Simple Internet Protocol  }
+     AF_SIP = 29;
+     AF_KEY = 30;
+  { Used by BPF to not rewrite headers
+  					   in interface output routine  }
+     pseudo_AF_HDRCMPLT = 31;
+  { Bluetooth  }
+     AF_BLUETOOTH = 32;
+     AF_MAX = 33;
+  {
+   * Protocol families, same as address families for now.
+    }
+     PF_UNSPEC = AF_UNSPEC;
+     PF_LOCAL = AF_LOCAL;
+  { backward compatibility  }
+     PF_UNIX = PF_LOCAL;
+     PF_INET = AF_INET;
+     PF_IMPLINK = AF_IMPLINK;
+     PF_PUP = AF_PUP;
+     PF_CHAOS = AF_CHAOS;
+     PF_NS = AF_NS;
+     PF_ISO = AF_ISO;
+     PF_OSI = AF_ISO;
+     PF_ECMA = AF_ECMA;
+     PF_DATAKIT = AF_DATAKIT;
+     PF_CCITT = AF_CCITT;
+     PF_SNA = AF_SNA;
+     PF_DECnet = AF_DECnet;
+     PF_DLI = AF_DLI;
+     PF_LAT = AF_LAT;
+     PF_HYLINK = AF_HYLINK;
+     PF_APPLETALK = AF_APPLETALK;
+     PF_ROUTE = AF_ROUTE;
+     PF_LINK = AF_LINK;
+  { really just proto family, no AF  }
+     PF_XTP = pseudo_AF_XTP;
+     PF_COIP = AF_COIP;
+     PF_CNT = AF_CNT;
+  { same format as AF_NS  }
+     PF_IPX = AF_IPX;
+     PF_INET6 = AF_INET6;
+  { same format as AF_INET  }
+     PF_RTIP = pseudo_AF_RTIP;
+     PF_PIP = pseudo_AF_PIP;
+     PF_ISDN = AF_ISDN;
+     PF_NATM = AF_NATM;
+     PF_ENCAP = AF_ENCAP;
+     PF_SIP = AF_SIP;
+     PF_KEY = AF_KEY;
+     PF_BPF = pseudo_AF_HDRCMPLT;
+     PF_BLUETOOTH = AF_BLUETOOTH;
+     PF_MAX = AF_MAX;
+

rtl/solaris/unxsockh.inc

@@ -13,66 +13,107 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 }
 
-Const
-   AF_IMPLINK    = 3;               { arpanet imp addresses }
-   AF_PUP        = 4;               { pup protocols: e.g. BSP }
-   AF_CHAOS      = 5;               { mit CHAOS protocols }
-   AF_NS         = 6;               { XEROX NS protocols }
-   AF_NBS        = 7;               { nbs protocols }
-   AF_ECMA       = 8;               { european computer manufacturers }
-   AF_DATAKIT    = 9;               { datakit protocols }
-   AF_CCITT      = 10;              { CCITT protocols, X.25 etc }
-   AF_SNA        = 11;              { IBM SNA }
-   AF_DECnet     = 12;              { DECnet }
-   AF_DLI        = 13;              { Direct data link interface }
-   AF_LAT        = 14;              { LAT }
-   AF_HYLINK     = 15;              { NSC Hyperchannel }
-   AF_APPLETALK  = 16;              { Apple Talk }
-   AF_NIT        = 17;              { Network Interface Tap }
-   AF_802        = 18;              { IEEE 802.2, also ISO 8802 }
-   AF_OSI        = 19;              { umbrella for all families used }
-   AF_X25        = 20;              { CCITT X.25 in particular }
-   AF_OSINET     = 21;              { AFI = 47, IDI = 4 }
-   AF_GOSIP      = 22;              { U.S. Government OSI }
-   AF_IPX        = 23;              { Novell Internet Protocol }
-   AF_ROUTE      = 24;              { Internal Routing Protocol }
-   AF_LINK       = 25;              { Link-layer interface }
-   AF_INET6      = 26;              { Internet Protocol, Version 6 }
-   AF_KEY        = 27;              { Security Association DB socket }
-   AF_NCA        = 28;              { NCA socket }
-   AF_POLICY     = 29;
-
-   AF_MAX        = 29;
-
-   PF_IMPLINK    = AF_IMPLINK;
-   PF_PUP        = AF_PUP;
-   PF_CHAOS      = AF_CHAOS;
-   PF_NS         = AF_NS;
-   PF_NBS        = AF_NBS;
-   PF_ECMA       = AF_ECMA;
-   PF_DATAKIT    = AF_DATAKIT;
-   PF_CCITT      = AF_CCITT;
-   PF_SNA        = AF_SNA;
-   PF_DECnet     = AF_DECnet;
-   PF_DLI        = AF_DLI;
-   PF_LAT        = AF_LAT;
-   PF_HYLINK     = AF_HYLINK;
-   PF_APPLETALK  = AF_APPLETALK;
-   PF_NIT        = AF_NIT;
-   PF_802        = AF_802;
-   PF_OSI        = AF_OSI;
-   PF_X25        = AF_X25;
-   PF_OSINET     = AF_OSINET;
-   PF_GOSIP      = AF_GOSIP;
-   PF_IPX        = AF_IPX;
-   PF_ROUTE      = AF_ROUTE;
-   PF_LINK       = AF_LINK;
-   PF_INET6      = AF_INET6;
-   PF_KEY        = AF_KEY;
-   PF_NCA        = AF_NCA;
-
-   PF_MAX        = AF_MAX;
 
+const
+  {
+   * Address families.
+    }
+
+  { unspecified  }
+     AF_UNSPEC = 0;
+  { local to host (pipes, portals)  }
+     AF_UNIX = 1;
+  { internetwork: UDP, TCP, etc.  }
+     AF_INET = 2;
+  { arpanet imp addresses  }
+     AF_IMPLINK = 3;
+  { pup protocols: e.g. BSP  }
+     AF_PUP = 4;
+  { mit CHAOS protocols  }
+     AF_CHAOS = 5;
+  { XEROX NS protocols  }
+     AF_NS = 6;
+  { nbs protocols  }
+     AF_NBS = 7;
+  { european computer manufacturers  }
+     AF_ECMA = 8;
+  { datakit protocols  }
+     AF_DATAKIT = 9;
+  { CCITT protocols, X.25 etc  }
+     AF_CCITT = 10;
+  { IBM SNA  }
+     AF_SNA = 11;
+  { DECnet  }
+     AF_DECnet = 12;
+  { Direct data link interface  }
+     AF_DLI = 13;
+  { LAT  }
+     AF_LAT = 14;
+  { NSC Hyperchannel  }
+     AF_HYLINK = 15;
+  { Apple Talk  }
+     AF_APPLETALK = 16;
+  { Network Interface Tap  }
+     AF_NIT = 17;
+  { IEEE 802.2, also ISO 8802  }
+     AF_802 = 18;
+  { umbrella for all families used  }
+     AF_OSI = 19;
+  { CCITT X.25 in particular  }
+     AF_X25 = 20;
+  { AFI = 47, IDI = 4  }
+     AF_OSINET = 21;
+  { U.S. Government OSI  }
+     AF_GOSIP = 22;
+  { Novell Internet Protocol  }
+     AF_IPX = 23;
+  { Internal Routing Protocol  }
+     AF_ROUTE = 24;
+  { Link-layer interface  }
+     AF_LINK = 25;
+  { Internet Protocol, Version 6  }
+     AF_INET6 = 26;
+  { Security Association DB socket  }
+     AF_KEY = 27;
+  { NCA socket  }
+     AF_NCA = 28;
+  { Security Policy DB socket  }
+     AF_POLICY = 29;
+     AF_MAX = 29;
+  {
+   * Protocol families, same as address families for now.
+    }
+     PF_UNSPEC = AF_UNSPEC;
+     PF_UNIX = AF_UNIX;
+     PF_INET = AF_INET;
+     PF_IMPLINK = AF_IMPLINK;
+     PF_PUP = AF_PUP;
+     PF_CHAOS = AF_CHAOS;
+     PF_NS = AF_NS;
+     PF_NBS = AF_NBS;
+     PF_ECMA = AF_ECMA;
+     PF_DATAKIT = AF_DATAKIT;
+     PF_CCITT = AF_CCITT;
+     PF_SNA = AF_SNA;
+     PF_DECnet = AF_DECnet;
+     PF_DLI = AF_DLI;
+     PF_LAT = AF_LAT;
+     PF_HYLINK = AF_HYLINK;
+     PF_APPLETALK = AF_APPLETALK;
+     PF_NIT = AF_NIT;
+     PF_802 = AF_802;
+     PF_OSI = AF_OSI;
+     PF_X25 = AF_X25;
+     PF_OSINET = AF_OSINET;
+     PF_GOSIP = AF_GOSIP;
+     PF_IPX = AF_IPX;
+     PF_ROUTE = AF_ROUTE;
+     PF_LINK = AF_LINK;
+     PF_INET6 = AF_INET6;
+     PF_KEY = AF_KEY;
+     PF_NCA = AF_NCA;
+     PF_POLICY = AF_POLICY;
+     PF_MAX = AF_MAX;
 
 { Maximum queue length specifiable by listen.  }
   SOMAXCONN     = 128;