2008-05-20 Thomas Quinot <quinot@adacore.com>

	* Makefile.rtl (GNAT.Sockets.Thin_Common): New unit.

	* g-sttsne-vxworks.adb: Add missing dependency on Sockets.Constants.
	Add missing "with" of Ada.Unchecked_Conversion

	* g-soccon-linux-ppc.ads, g-soccon-linux-64.ads, g-soccon-lynxos.ads, 
	g-soccon-linux-x86.ads, g-soccon-hpux-ia64.ads, 
	g-soccon-solaris-64.ads, g-soccon-tru64.ads, g-soccon-aix.ads, 
	g-soccon-irix.ads, g-soccon-hpux.ads, g-soccon-solaris.ads, 
	g-soccon-vms.ads, g-soccon-mingw.ads, g-soccon-vxworks.ads, 
	g-socthi-vxworks.adb, g-soccon-freebsd.ads, g-soccon.ads: 
	Move common code out of GNAT.Sockets.Thin implementations and into
	Thin_Common.
	New constant SIZEOF_fd_set
	New flag Has_Sockaddr_Len
	New constants SIZEOF_sockaddr_in, SIZEOF_sockaddr_in6

	* g-stsifd-sockets.adb
	(Create): Remove call to Set_Length; use Set_Family to set the family
	and (on appropriate platforms) length fields in struct sockaddr.

	* g-socthi.adb, g-socthi.ads, g-socthi-vms.ads, g-socthi-vms.adb, 
	g-socthi-mingw.adb, g-socthi-mingw.ads, g-socthi-vxworks.adb, 
	g-soccon-darwin.ads, g-soccon-darwin.ads: New constant SIZEOF_fd_set
	Move common code out of GNAT.Sockets.Thin implementations and into
	Thin_Common.

	* g-socket.ads, g-socket.adb: 
	Move common code out of GNAT.Sockets.Thin implementations and into
	Thin_Common.
	(Connect_Socket, Accept_Socket): Provide new versions of these two
	routines that operate with a user specified timeout.
	(Bind_Socket, Connect_Socket, Send_Socket): Remove calls to Set_Length,
	this is now handled automatically by Set_Family on platforms that
	require it.

	* gen-soccon.c: 
	Move common code out of GNAT.Sockets.Thin implementations and into
	Thin_Common.
	(SIZEOF_sockaddr_in6): On platforms where IPv6 is not supported, define
	this constant to 0 (not -1) because we use it to initialize an
	unsigned_char value.
	Align values for numeric constants only.
	Handle the case of systems that do not support AF_INET6.
	New constant SIZEOF_fd_set
	New flag Has_Sockaddr_Len
	New constants SIZEOF_sockaddr_in, SIZEOF_sockaddr_in6

	* gsocket.h: New flag Has_Sockaddr_Len
	New constants SIZEOF_sockaddr_in, SIZEOF_sockaddr_in6



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@135612 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 99 insertions, 87 deletions

diff --git a/gcc/ada/g-soccon.ads b/gcc/ada/g-soccon.ads
index d7556a12a71..b7f8fe4be77 100644
--- a/gcc/ada/g-soccon.ads
+++ b/gcc/ada/g-soccon.ads
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 S p e c                                  --
 --                                                                          --
---          Copyright (C) 2000-2007, Free Software Foundation, Inc.         --
+--          Copyright (C) 2000-2008, Free Software Foundation, Inc.         --
 --                                                                          --
 -- GNAT is free software;  you can  redistribute it  and/or modify it under --
 -- terms of the  GNU General Public License as published  by the Free Soft- --
@@ -46,137 +46,138 @@
 --  This file is generated automatically, do not modify it by hand! Instead,
 --  make changes to gen-soccon.c and re-run it on each target.
 
+with Interfaces.C;
 package GNAT.Sockets.Constants is
 
    --------------
    -- Families --
    --------------
 
-   AF_INET            : constant :=            2; --  IPv4 address family
-   AF_INET6           : constant :=           10; --  IPv6 address family
+   AF_INET             : constant :=          2; --  IPv4 address family
+   AF_INET6            : constant :=         10; --  IPv6 address family
 
    -----------
    -- Modes --
    -----------
 
-   SOCK_STREAM        : constant :=            1; --  Stream socket
-   SOCK_DGRAM         : constant :=            2; --  Datagram socket
+   SOCK_STREAM         : constant :=          1; --  Stream socket
+   SOCK_DGRAM          : constant :=          2; --  Datagram socket
 
    -------------------
    -- Socket errors --
    -------------------
 
-   EACCES             : constant :=           13; --  Permission denied
-   EADDRINUSE         : constant :=           98; --  Address already in use
-   EADDRNOTAVAIL      : constant :=           99; --  Cannot assign address
-   EAFNOSUPPORT       : constant :=           97; --  Addr family not supported
-   EALREADY           : constant :=          114; --  Operation in progress
-   EBADF              : constant :=            9; --  Bad file descriptor
-   ECONNABORTED       : constant :=          103; --  Connection aborted
-   ECONNREFUSED       : constant :=          111; --  Connection refused
-   ECONNRESET         : constant :=          104; --  Connection reset by peer
-   EDESTADDRREQ       : constant :=           89; --  Destination addr required
-   EFAULT             : constant :=           14; --  Bad address
-   EHOSTDOWN          : constant :=          112; --  Host is down
-   EHOSTUNREACH       : constant :=          113; --  No route to host
-   EINPROGRESS        : constant :=          115; --  Operation now in progress
-   EINTR              : constant :=            4; --  Interrupted system call
-   EINVAL             : constant :=           22; --  Invalid argument
-   EIO                : constant :=            5; --  Input output error
-   EISCONN            : constant :=          106; --  Socket already connected
-   ELOOP              : constant :=           40; --  Too many symbolic links
-   EMFILE             : constant :=           24; --  Too many open files
-   EMSGSIZE           : constant :=           90; --  Message too long
-   ENAMETOOLONG       : constant :=           36; --  Name too long
-   ENETDOWN           : constant :=          100; --  Network is down
-   ENETRESET          : constant :=          102; --  Disconn. on network reset
-   ENETUNREACH        : constant :=          101; --  Network is unreachable
-   ENOBUFS            : constant :=          105; --  No buffer space available
-   ENOPROTOOPT        : constant :=           92; --  Protocol not available
-   ENOTCONN           : constant :=          107; --  Socket not connected
-   ENOTSOCK           : constant :=           88; --  Operation on non socket
-   EOPNOTSUPP         : constant :=           95; --  Operation not supported
-   EPFNOSUPPORT       : constant :=           96; --  Unknown protocol family
-   EPROTONOSUPPORT    : constant :=           93; --  Unknown protocol
-   EPROTOTYPE         : constant :=           91; --  Unknown protocol type
-   ESHUTDOWN          : constant :=          108; --  Cannot send once shutdown
-   ESOCKTNOSUPPORT    : constant :=           94; --  Socket type not supported
-   ETIMEDOUT          : constant :=          110; --  Connection timed out
-   ETOOMANYREFS       : constant :=          109; --  Too many references
-   EWOULDBLOCK        : constant :=           11; --  Operation would block
+   EACCES              : constant :=         13; --  Permission denied
+   EADDRINUSE          : constant :=         98; --  Address already in use
+   EADDRNOTAVAIL       : constant :=         99; --  Cannot assign address
+   EAFNOSUPPORT        : constant :=         97; --  Addr family not supported
+   EALREADY            : constant :=        114; --  Operation in progress
+   EBADF               : constant :=          9; --  Bad file descriptor
+   ECONNABORTED        : constant :=        103; --  Connection aborted
+   ECONNREFUSED        : constant :=        111; --  Connection refused
+   ECONNRESET          : constant :=        104; --  Connection reset by peer
+   EDESTADDRREQ        : constant :=         89; --  Destination addr required
+   EFAULT              : constant :=         14; --  Bad address
+   EHOSTDOWN           : constant :=        112; --  Host is down
+   EHOSTUNREACH        : constant :=        113; --  No route to host
+   EINPROGRESS         : constant :=        115; --  Operation now in progress
+   EINTR               : constant :=          4; --  Interrupted system call
+   EINVAL              : constant :=         22; --  Invalid argument
+   EIO                 : constant :=          5; --  Input output error
+   EISCONN             : constant :=        106; --  Socket already connected
+   ELOOP               : constant :=         40; --  Too many symbolic links
+   EMFILE              : constant :=         24; --  Too many open files
+   EMSGSIZE            : constant :=         90; --  Message too long
+   ENAMETOOLONG        : constant :=         36; --  Name too long
+   ENETDOWN            : constant :=        100; --  Network is down
+   ENETRESET           : constant :=        102; --  Disconn. on network reset
+   ENETUNREACH         : constant :=        101; --  Network is unreachable
+   ENOBUFS             : constant :=        105; --  No buffer space available
+   ENOPROTOOPT         : constant :=         92; --  Protocol not available
+   ENOTCONN            : constant :=        107; --  Socket not connected
+   ENOTSOCK            : constant :=         88; --  Operation on non socket
+   EOPNOTSUPP          : constant :=         95; --  Operation not supported
+   EPFNOSUPPORT        : constant :=         96; --  Unknown protocol family
+   EPROTONOSUPPORT     : constant :=         93; --  Unknown protocol
+   EPROTOTYPE          : constant :=         91; --  Unknown protocol type
+   ESHUTDOWN           : constant :=        108; --  Cannot send once shutdown
+   ESOCKTNOSUPPORT     : constant :=         94; --  Socket type not supported
+   ETIMEDOUT           : constant :=        110; --  Connection timed out
+   ETOOMANYREFS        : constant :=        109; --  Too many references
+   EWOULDBLOCK         : constant :=         11; --  Operation would block
 
    -----------------
    -- Host errors --
    -----------------
 
-   HOST_NOT_FOUND     : constant :=            1; --  Unknown host
-   TRY_AGAIN          : constant :=            2; --  Host name lookup failure
-   NO_DATA            : constant :=            4; --  No data record for name
-   NO_RECOVERY        : constant :=            3; --  Non recoverable errors
+   HOST_NOT_FOUND      : constant :=          1; --  Unknown host
+   TRY_AGAIN           : constant :=          2; --  Host name lookup failure
+   NO_DATA             : constant :=          4; --  No data record for name
+   NO_RECOVERY         : constant :=          3; --  Non recoverable errors
 
    -------------------
    -- Control flags --
    -------------------
 
-   FIONBIO            : constant :=        21537; --  Set/clear non-blocking io
-   FIONREAD           : constant :=        21531; --  How many bytes to read
+   FIONBIO             : constant :=      21537; --  Set/clear non-blocking io
+   FIONREAD            : constant :=      21531; --  How many bytes to read
 
    --------------------
    -- Shutdown modes --
    --------------------
 
-   SHUT_RD            : constant :=            0; --  No more recv
-   SHUT_WR            : constant :=            1; --  No more send
-   SHUT_RDWR          : constant :=            2; --  No more recv/send
+   SHUT_RD             : constant :=          0; --  No more recv
+   SHUT_WR             : constant :=          1; --  No more send
+   SHUT_RDWR           : constant :=          2; --  No more recv/send
 
    ---------------------
    -- Protocol levels --
    ---------------------
 
-   SOL_SOCKET         : constant :=            1; --  Options for socket level
-   IPPROTO_IP         : constant :=            0; --  Dummy protocol for IP
-   IPPROTO_UDP        : constant :=           17; --  UDP
-   IPPROTO_TCP        : constant :=            6; --  TCP
+   SOL_SOCKET          : constant :=          1; --  Options for socket level
+   IPPROTO_IP          : constant :=          0; --  Dummy protocol for IP
+   IPPROTO_UDP         : constant :=         17; --  UDP
+   IPPROTO_TCP         : constant :=          6; --  TCP
 
    -------------------
    -- Request flags --
    -------------------
 
-   MSG_OOB            : constant :=            1; --  Process out-of-band data
-   MSG_PEEK           : constant :=            2; --  Peek at incoming data
-   MSG_EOR            : constant :=          128; --  Send end of record
-   MSG_WAITALL        : constant :=          256; --  Wait for full reception
-   MSG_NOSIGNAL       : constant :=        16384; --  No SIGPIPE on send
-   MSG_Forced_Flags   : constant := MSG_NOSIGNAL;
+   MSG_OOB             : constant :=          1; --  Process out-of-band data
+   MSG_PEEK            : constant :=          2; --  Peek at incoming data
+   MSG_EOR             : constant :=        128; --  Send end of record
+   MSG_WAITALL         : constant :=        256; --  Wait for full reception
+   MSG_NOSIGNAL        : constant :=      16384; --  No SIGPIPE on send
+   MSG_Forced_Flags    : constant := MSG_NOSIGNAL;
    --  Flags set on all send(2) calls
 
    --------------------
    -- Socket options --
    --------------------
 
-   TCP_NODELAY        : constant :=            1; --  Do not coalesce packets
-   SO_REUSEADDR       : constant :=            2; --  Bind reuse local address
-   SO_REUSEPORT       : constant :=           -1; --  Bind reuse port number
-   SO_KEEPALIVE       : constant :=            9; --  Enable keep-alive msgs
-   SO_LINGER          : constant :=           13; --  Defer close to flush data
-   SO_BROADCAST       : constant :=            6; --  Can send broadcast msgs
-   SO_SNDBUF          : constant :=            7; --  Set/get send buffer size
-   SO_RCVBUF          : constant :=            8; --  Set/get recv buffer size
-   SO_SNDTIMEO        : constant :=           21; --  Emission timeout
-   SO_RCVTIMEO        : constant :=           20; --  Reception timeout
-   SO_ERROR           : constant :=            4; --  Get/clear error status
-   IP_MULTICAST_IF    : constant :=           32; --  Set/get mcast interface
-   IP_MULTICAST_TTL   : constant :=           33; --  Set/get multicast TTL
-   IP_MULTICAST_LOOP  : constant :=           34; --  Set/get mcast loopback
-   IP_ADD_MEMBERSHIP  : constant :=           35; --  Join a multicast group
-   IP_DROP_MEMBERSHIP : constant :=           36; --  Leave a multicast group
-   IP_PKTINFO         : constant :=            8; --  Get datagram info
+   TCP_NODELAY         : constant :=          1; --  Do not coalesce packets
+   SO_REUSEADDR        : constant :=          2; --  Bind reuse local address
+   SO_REUSEPORT        : constant :=         -1; --  Bind reuse port number
+   SO_KEEPALIVE        : constant :=          9; --  Enable keep-alive msgs
+   SO_LINGER           : constant :=         13; --  Defer close to flush data
+   SO_BROADCAST        : constant :=          6; --  Can send broadcast msgs
+   SO_SNDBUF           : constant :=          7; --  Set/get send buffer size
+   SO_RCVBUF           : constant :=          8; --  Set/get recv buffer size
+   SO_SNDTIMEO         : constant :=         21; --  Emission timeout
+   SO_RCVTIMEO         : constant :=         20; --  Reception timeout
+   SO_ERROR            : constant :=          4; --  Get/clear error status
+   IP_MULTICAST_IF     : constant :=         32; --  Set/get mcast interface
+   IP_MULTICAST_TTL    : constant :=         33; --  Set/get multicast TTL
+   IP_MULTICAST_LOOP   : constant :=         34; --  Set/get mcast loopback
+   IP_ADD_MEMBERSHIP   : constant :=         35; --  Join a multicast group
+   IP_DROP_MEMBERSHIP  : constant :=         36; --  Leave a multicast group
+   IP_PKTINFO          : constant :=          8; --  Get datagram info
 
    -------------------
    -- System limits --
    -------------------
 
-   IOV_MAX            : constant :=   2147483647; --  Maximum writev iovcnt
+   IOV_MAX             : constant := 2147483647; --  Maximum writev iovcnt
 
    ----------------------
    -- Type definitions --
@@ -184,18 +185,29 @@ package GNAT.Sockets.Constants is
 
    --  Sizes (in bytes) of the components of struct timeval
 
-   SIZEOF_tv_sec      : constant :=            4; --  tv_sec
-   SIZEOF_tv_usec     : constant :=            4; --  tv_usec
+   SIZEOF_tv_sec       : constant :=          4; --  tv_sec
+   SIZEOF_tv_usec      : constant :=          4; --  tv_usec
+
+   --  Sizes of protocol specific address types (for sockaddr.sa_len)
+
+   SIZEOF_sockaddr_in  : constant :=         16; --  struct sockaddr_in
+   SIZEOF_sockaddr_in6 : constant :=         28; --  struct sockaddr_in6
+
+   --  Size of file descriptor sets
+
+   SIZEOF_fd_set       : constant :=        128; --  fd_set
+
+   --  Fields of struct hostent
+
+   subtype H_Addrtype_T is Interfaces.C.int;
+   subtype H_Length_T   is Interfaces.C.int;
 
    ----------------------------------------
    -- Properties of supported interfaces --
    ----------------------------------------
 
-   Need_Netdb_Buffer  : constant :=            1; --  Need buffer for Netdb ops
-
-   ----------------------
-   -- Additional flags --
-   ----------------------
+   Need_Netdb_Buffer   : constant :=          1; --  Need buffer for Netdb ops
+   Has_Sockaddr_Len    : constant :=          0; --  Sockaddr has sa_len field
 
    Thread_Blocking_IO : constant Boolean := True;
    --  Set False for contexts where socket i/o are process blocking