mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-17 01:00:20 +02:00
Code Activity

Add accept4 support

Browse source 
* doc/ref/posix.texi (Network Sockets and Communication): Add
  documentation.
* libguile/socket.c (scm_accept4): New function, replaces accept
  implementation.
  (scm_accept): Call scm_accept4.
  (scm_init_socket): Define SOCK_CLOEXEC and SOCK_NONBLOCK.
* libguile/socket.h: Add private scm_accept4 decl.
* module/ice-9/suspendable-ports.scm (accept): Update.
This commit is contained in:
Andy Wingo 2017-02-15 22:01:51 +01:00
parent 9399c13479
commit 6e0965104c
4 changed files with 28 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

26
libguile/socket.c
View file

@ -1243,8 +1243,8 @@ SCM_DEFINE (scm_make_socket_address, "make-socket-address", 2, 0, 1,
#undef FUNC_NAME
SCM_DEFINE (scm_accept, "accept", 1, 0, 0,
(SCM sock),
SCM_DEFINE (scm_accept4, "accept", 1, 1, 0,
(SCM sock, SCM flags),
"Accept a connection on a bound, listening socket. If there\n"
"are no pending connections in the queue, there are two\n"
"possibilities: if the socket has been configured as\n"
@ -1256,10 +1256,11 @@ SCM_DEFINE (scm_accept, "accept", 1, 0, 0,
"initiated the connection.\n\n"
"@var{sock} does not become part of the\n"
"connection and will continue to accept new requests.")
#define FUNC_NAME s_scm_accept
#define FUNC_NAME s_scm_accept4
{
int fd;
int newfd;
int c_flags;
SCM address;
SCM newsock;
socklen_t addr_size = MAX_ADDR_SIZE;
@ -1267,8 +1268,11 @@ SCM_DEFINE (scm_accept, "accept", 1, 0, 0,
sock = SCM_COERCE_OUTPORT (sock);
SCM_VALIDATE_OPFPORT (1, sock);
c_flags = SCM_UNBNDP (flags) ? 0 : scm_to_int (flags);
fd = SCM_FPORT_FDES (sock);
SCM_SYSCALL (newfd = accept4 (fd, (struct sockaddr *) &addr, &addr_size, 0));
SCM_SYSCALL (newfd = accept4 (fd, (struct sockaddr *) &addr, &addr_size,
c_flags));
if (newfd == -1)
{
if (errno == EAGAIN || errno == EWOULDBLOCK)
@ -1276,13 +1280,18 @@ SCM_DEFINE (scm_accept, "accept", 1, 0, 0,
SCM_SYSERROR;
}
newsock = scm_socket_fd_to_port (newfd);
address = _scm_from_sockaddr (&addr, addr_size,
FUNC_NAME);
address = _scm_from_sockaddr (&addr, addr_size, FUNC_NAME);
return scm_cons (newsock, address);
}
#undef FUNC_NAME
SCM
scm_accept (SCM sock)
{
return scm_accept4 (sock, SCM_UNDEFINED);
}
SCM_DEFINE (scm_getsockname, "getsockname", 1, 0, 0,
(SCM sock),
"Return the address of @var{sock}, in the same form as the\n"
@ -1644,6 +1653,11 @@ scm_init_socket ()
scm_c_define ("SOCK_RDM", scm_from_int (SOCK_RDM));
#endif
/* accept4 flags. No ifdef as accept4 has a gnulib
implementation. */
scm_c_define ("SOCK_CLOEXEC", scm_from_int (SOCK_CLOEXEC));
scm_c_define ("SOCK_NONBLOCK", scm_from_int (SOCK_NONBLOCK));
/* setsockopt level.
SOL_IP, SOL_TCP and SOL_UDP are defined on gnu/linux, but not on for