mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-25 20:21:07 +00:00
0595c98494
mq_notify (in the 1996 edition of POSIX) brings in references to recv and socket (not in POSIX until the 2001 edition). This patch fixes this by using __recv and __socket, exporting them from libc at version GLIBC_PRIVATE. Tested for x86_64 and x86 (testsuite and comparison of installed stripped shared libraries; PLT / dynamic symbol table changes render the comparison not particularly useful for libc). [BZ #18546] * socket/recv.c (__recv): Use libc_hidden_def. * socket/socket.c (__socket): Likewise. * sysdeps/mach/hurd/recv.c (__recv): Likewise. * sysdeps/mach/hurd/socket.c (__socket): Likewise. * sysdeps/unix/sysv/linux/generic/recv.c (__recv): Likewise. * sysdeps/unix/sysv/linux/recv.c (__recv): Use libc_hidden_weak. * sysdeps/unix/sysv/linux/socket.c (__socket): Use libc_hidden_def. * sysdeps/unix/sysv/linux/x86_64/recv.c (__recv): Use libc_hidden_weak. * include/sys/socket.h (__socket): Do not use attribute_hidden. Use libc_hidden_proto. (__recv): Likewise. * socket/Versions (libc): Export __recv and __socket at version GLIBC_PRIVATE. * sysdeps/unix/sysv/linux/mq_notify.c (helper_thread): Call __recv instead of recv. (init_mq_netlink): Call __socket instead of socket. * conform/Makefile (test-xfail-POSIX/mqueue.h/linknamespace): Remove variable.
69 lines
2.2 KiB
C
69 lines
2.2 KiB
C
/* Copyright (C) 1992-2015 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#include <errno.h>
|
|
#include <sys/socket.h>
|
|
#include <hurd.h>
|
|
#include <hurd/socket.h>
|
|
#include <hurd/fd.h>
|
|
#include <fcntl.h>
|
|
|
|
/* Create a new socket of type TYPE in domain DOMAIN, using
|
|
protocol PROTOCOL. If PROTOCOL is zero, one is chosen automatically.
|
|
Returns a file descriptor for the new socket, or -1 for errors. */
|
|
int
|
|
__socket (domain, type, protocol)
|
|
int domain;
|
|
int type;
|
|
int protocol;
|
|
{
|
|
error_t err;
|
|
socket_t sock, server;
|
|
|
|
/* Find the socket server for DOMAIN. */
|
|
server = _hurd_socket_server (domain, 0);
|
|
if (server == MACH_PORT_NULL)
|
|
return -1;
|
|
|
|
err = __socket_create (server, type, protocol, &sock);
|
|
if (err == MACH_SEND_INVALID_DEST || err == MIG_SERVER_DIED
|
|
|| err == MIG_BAD_ID || err == EOPNOTSUPP)
|
|
{
|
|
/* On the first use of the socket server during the operation,
|
|
allow for the old server port dying. */
|
|
server = _hurd_socket_server (domain, 1);
|
|
if (server == MACH_PORT_NULL)
|
|
return -1;
|
|
err = __socket_create (server, type, protocol, &sock);
|
|
}
|
|
|
|
/* These errors all mean that the server node doesn't support the
|
|
socket.defs protocol, which we'll take to mean that the protocol
|
|
isn't supported. */
|
|
if (err == MACH_SEND_INVALID_DEST || err == MIG_SERVER_DIED
|
|
|| err == MIG_BAD_ID || err == EOPNOTSUPP)
|
|
err = EAFNOSUPPORT;
|
|
|
|
if (err)
|
|
return __hurd_fail (err);
|
|
|
|
return _hurd_intern_fd (sock, O_IGNORE_CTTY, 1);
|
|
}
|
|
|
|
libc_hidden_def (__socket)
|
|
weak_alias (__socket, socket)
|