1998-07-28 16:26:04 +00:00
|
|
|
/*
|
2010-08-19 17:38:55 +00:00
|
|
|
* svc_unix.c, Server side for TCP/IP based RPC.
|
1998-07-28 16:26:04 +00:00
|
|
|
*
|
2020-01-01 00:14:33 +00:00
|
|
|
* Copyright (C) 2012-2020 Free Software Foundation, Inc.
|
2012-11-28 21:12:28 +00:00
|
|
|
* 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
|
Prefer https to http for gnu.org and fsf.org URLs
Also, change sources.redhat.com to sourceware.org.
This patch was automatically generated by running the following shell
script, which uses GNU sed, and which avoids modifying files imported
from upstream:
sed -ri '
s,(http|ftp)(://(.*\.)?(gnu|fsf|sourceware)\.org($|[^.]|\.[^a-z])),https\2,g
s,(http|ftp)(://(.*\.)?)sources\.redhat\.com($|[^.]|\.[^a-z]),https\2sourceware.org\4,g
' \
$(find $(git ls-files) -prune -type f \
! -name '*.po' \
! -name 'ChangeLog*' \
! -path COPYING ! -path COPYING.LIB \
! -path manual/fdl-1.3.texi ! -path manual/lgpl-2.1.texi \
! -path manual/texinfo.tex ! -path scripts/config.guess \
! -path scripts/config.sub ! -path scripts/install-sh \
! -path scripts/mkinstalldirs ! -path scripts/move-if-change \
! -path INSTALL ! -path locale/programs/charmap-kw.h \
! -path po/libc.pot ! -path sysdeps/gnu/errlist.c \
! '(' -name configure \
-execdir test -f configure.ac -o -f configure.in ';' ')' \
! '(' -name preconfigure \
-execdir test -f preconfigure.ac ';' ')' \
-print)
and then by running 'make dist-prepare' to regenerate files built
from the altered files, and then executing the following to cleanup:
chmod a+x sysdeps/unix/sysv/linux/riscv/configure
# Omit irrelevant whitespace and comment-only changes,
# perhaps from a slightly-different Autoconf version.
git checkout -f \
sysdeps/csky/configure \
sysdeps/hppa/configure \
sysdeps/riscv/configure \
sysdeps/unix/sysv/linux/csky/configure
# Omit changes that caused a pre-commit check to fail like this:
# remote: *** error: sysdeps/powerpc/powerpc64/ppc-mcount.S: trailing lines
git checkout -f \
sysdeps/powerpc/powerpc64/ppc-mcount.S \
sysdeps/unix/sysv/linux/s390/s390-64/syscall.S
# Omit change that caused a pre-commit check to fail like this:
# remote: *** error: sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S: last line does not end in newline
git checkout -f sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S
2019-09-07 05:40:42 +00:00
|
|
|
* <https://www.gnu.org/licenses/>.
|
2012-11-28 21:12:28 +00:00
|
|
|
*
|
2010-08-19 17:38:55 +00:00
|
|
|
* Copyright (c) 2010, Oracle America, Inc.
|
1998-07-28 16:26:04 +00:00
|
|
|
*
|
2010-08-19 17:38:55 +00:00
|
|
|
* Redistribution and use in source and binary forms, with or without
|
|
|
|
* modification, are permitted provided that the following conditions are
|
|
|
|
* met:
|
1998-07-28 16:26:04 +00:00
|
|
|
*
|
2010-08-19 17:38:55 +00:00
|
|
|
* * Redistributions of source code must retain the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer.
|
|
|
|
* * Redistributions in binary form must reproduce the above
|
|
|
|
* copyright notice, this list of conditions and the following
|
|
|
|
* disclaimer in the documentation and/or other materials
|
|
|
|
* provided with the distribution.
|
|
|
|
* * Neither the name of the "Oracle America, Inc." nor the names of its
|
|
|
|
* contributors may be used to endorse or promote products derived
|
|
|
|
* from this software without specific prior written permission.
|
2010-06-28 02:34:03 +00:00
|
|
|
*
|
2010-08-19 17:38:55 +00:00
|
|
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
|
|
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
|
|
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
|
|
|
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
|
|
|
* COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
|
|
|
|
* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
|
|
|
|
* GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
|
|
|
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
|
|
|
|
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
|
|
|
|
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
|
|
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
1998-07-28 16:26:04 +00:00
|
|
|
*
|
|
|
|
* Actually implements two flavors of transporter -
|
|
|
|
* a unix rendezvouser (a listener and connection establisher)
|
|
|
|
* and a record/unix stream.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <unistd.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <rpc/rpc.h>
|
2000-12-31 15:34:47 +00:00
|
|
|
#include <rpc/svc.h>
|
1998-07-28 16:26:04 +00:00
|
|
|
#include <sys/socket.h>
|
|
|
|
#include <sys/uio.h>
|
1998-11-18 11:05:09 +00:00
|
|
|
#include <sys/poll.h>
|
1998-07-28 16:26:04 +00:00
|
|
|
#include <errno.h>
|
|
|
|
#include <stdlib.h>
|
1999-06-19 09:58:37 +00:00
|
|
|
#include <libintl.h>
|
2011-09-10 18:34:15 +00:00
|
|
|
#include <wchar.h>
|
Include shlib-compat.h in many sunrpc/nis source files.
Every file that uses libc_hidden_nolink_sunrpc or
libnsl_hidden_nolink_def needs to include shlib-compat.h. Currently,
most of them are getting it via stdio.h, because libio.h refers to
SHLIB_COMPAT when _LIBC is defined, so it includes shlib-compat.h. My
experimental patch to not install libio.h breaks that chain; stdio.h
no longer pulls in libio.h even for internal users.
Accordingly, this patch adds #include <shlib-compat.h> to many files
in sunrpc/ and nis/. There are also a small number of really obvious
fixups to includes that caught my eye while proofreading the patch -
not including headers twice in a row, not worrying about portability
to Ultrix anymore, sort of thing.
* nis/nis_add.c, nis/nis_addmember.c, nis/nis_call.c
* nis/nis_checkpoint.c, nis/nis_clone_dir.c, nis/nis_clone_obj.c
* nis/nis_clone_res.c, nis/nis_creategroup.c, nis/nis_defaults.c
* nis/nis_destroygroup.c, nis/nis_domain_of.c
* nis/nis_domain_of_r.c, nis/nis_error.c, nis/nis_file.c
* nis/nis_free.c, nis/nis_getservlist.c, nis/nis_ismember.c
* nis/nis_local_names.c, nis/nis_lookup.c, nis/nis_mkdir.c
* nis/nis_modify.c, nis/nis_ping.c, nis/nis_print.c
* nis/nis_print_group_entry.c, nis/nis_remove.c
* nis/nis_removemember.c, nis/nis_rmdir.c, nis/nis_server.c
* nis/nis_subr.c, nis/nis_table.c, nis/nis_util.c
* nis/nis_verifygroup.c, nis/nis_xdr.c, nis/yp_xdr.c
* nis/ypclnt.c, nis/ypupdate_xdr.c, sunrpc/auth_des.c
* sunrpc/auth_none.c, sunrpc/auth_unix.c, sunrpc/authdes_prot.c
* sunrpc/authuxprot.c, sunrpc/clnt_gen.c, sunrpc/clnt_perr.c
* sunrpc/clnt_raw.c, sunrpc/clnt_simp.c, sunrpc/clnt_tcp.c
* sunrpc/clnt_udp.c, sunrpc/clnt_unix.c, sunrpc/des_crypt.c
* sunrpc/des_soft.c, sunrpc/get_myaddr.c, sunrpc/key_call.c
* sunrpc/key_prot.c, sunrpc/netname.c, sunrpc/pm_getmaps.c
* sunrpc/pm_getport.c, sunrpc/pmap_clnt.c, sunrpc/pmap_prot.c
* sunrpc/pmap_prot2.c, sunrpc/pmap_rmt.c, sunrpc/publickey.c
* sunrpc/rpc_cmsg.c, sunrpc/rpc_dtable.c, sunrpc/rpc_prot.c
* sunrpc/rpc_thread.c, sunrpc/rtime.c, sunrpc/svc.c
* sunrpc/svc_auth.c, sunrpc/svc_raw.c, sunrpc/svc_run.c
* sunrpc/svc_tcp.c, sunrpc/svc_udp.c, sunrpc/svc_unix.c
* sunrpc/svcauth_des.c, sunrpc/xdr.c, sunrpc/xdr_array.c
* sunrpc/xdr_float.c, sunrpc/xdr_intXX_t.c, sunrpc/xdr_mem.c
* sunrpc/xdr_rec.c, sunrpc/xdr_ref.c, sunrpc/xdr_sizeof.c
* sunrpc/xdr_stdio.c: Include shlib-compat.h.
* sunrpc/des_crypt.c, sunrpc/des_soft.c: No need to include
abi-versions.h as well as shlib-compat.h.
* sunrpc/get_myaddr.c: Remove obsolete comment.
* sunrpc/pmap_rmt.c: Remove obsolete comment and #undef.
* sunrpc/rpc_thread.c: Include libc-lock.h only once.
* resolv/res_libc.c: Include shlib-compat.h only once.
2017-06-04 15:14:43 +00:00
|
|
|
#include <shlib-compat.h>
|
2001-08-17 04:49:12 +00:00
|
|
|
|
1998-07-28 16:26:04 +00:00
|
|
|
/*
|
|
|
|
* Ops vector for AF_UNIX based rpc service handle
|
|
|
|
*/
|
|
|
|
static bool_t svcunix_recv (SVCXPRT *, struct rpc_msg *);
|
|
|
|
static enum xprt_stat svcunix_stat (SVCXPRT *);
|
|
|
|
static bool_t svcunix_getargs (SVCXPRT *, xdrproc_t, caddr_t);
|
|
|
|
static bool_t svcunix_reply (SVCXPRT *, struct rpc_msg *);
|
|
|
|
static bool_t svcunix_freeargs (SVCXPRT *, xdrproc_t, caddr_t);
|
|
|
|
static void svcunix_destroy (SVCXPRT *);
|
|
|
|
|
|
|
|
static const struct xp_ops svcunix_op =
|
|
|
|
{
|
|
|
|
svcunix_recv,
|
|
|
|
svcunix_stat,
|
|
|
|
svcunix_getargs,
|
|
|
|
svcunix_reply,
|
|
|
|
svcunix_freeargs,
|
|
|
|
svcunix_destroy
|
|
|
|
};
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Ops vector for AF_UNIX rendezvous handler
|
|
|
|
*/
|
|
|
|
static bool_t rendezvous_request (SVCXPRT *, struct rpc_msg *);
|
|
|
|
static enum xprt_stat rendezvous_stat (SVCXPRT *);
|
2001-12-21 10:16:16 +00:00
|
|
|
static void svcunix_rendezvous_abort (void) __attribute__ ((__noreturn__));
|
2001-07-23 18:14:55 +00:00
|
|
|
|
|
|
|
/* This function makes sure abort() relocation goes through PLT
|
|
|
|
and thus can be lazy bound. */
|
|
|
|
static void
|
|
|
|
svcunix_rendezvous_abort (void)
|
|
|
|
{
|
|
|
|
abort ();
|
|
|
|
};
|
1998-07-28 16:26:04 +00:00
|
|
|
|
|
|
|
static const struct xp_ops svcunix_rendezvous_op =
|
|
|
|
{
|
|
|
|
rendezvous_request,
|
|
|
|
rendezvous_stat,
|
2001-07-23 18:14:55 +00:00
|
|
|
(bool_t (*) (SVCXPRT *, xdrproc_t, caddr_t)) svcunix_rendezvous_abort,
|
|
|
|
(bool_t (*) (SVCXPRT *, struct rpc_msg *)) svcunix_rendezvous_abort,
|
|
|
|
(bool_t (*) (SVCXPRT *, xdrproc_t, caddr_t)) svcunix_rendezvous_abort,
|
1998-07-28 16:26:04 +00:00
|
|
|
svcunix_destroy
|
|
|
|
};
|
|
|
|
|
|
|
|
static int readunix (char*, char *, int);
|
|
|
|
static int writeunix (char *, char *, int);
|
2017-08-31 13:55:36 +00:00
|
|
|
static SVCXPRT *makefd_xprt (int, u_int, u_int);
|
1998-07-28 16:26:04 +00:00
|
|
|
|
|
|
|
struct unix_rendezvous { /* kept in xprt->xp_p1 */
|
|
|
|
u_int sendsize;
|
|
|
|
u_int recvsize;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct unix_conn { /* kept in xprt->xp_p1 */
|
|
|
|
enum xprt_stat strm_stat;
|
|
|
|
u_long x_id;
|
|
|
|
XDR xdrs;
|
|
|
|
char verf_body[MAX_AUTH_BYTES];
|
|
|
|
};
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Usage:
|
|
|
|
* xprt = svcunix_create(sock, send_buf_size, recv_buf_size);
|
|
|
|
*
|
|
|
|
* Creates, registers, and returns a (rpc) unix based transporter.
|
|
|
|
* Once *xprt is initialized, it is registered as a transporter
|
|
|
|
* see (svc.h, xprt_register). This routine returns
|
|
|
|
* a NULL if a problem occurred.
|
|
|
|
*
|
|
|
|
* If sock<0 then a socket is created, else sock is used.
|
|
|
|
* If the socket, sock is not bound to a port then svcunix_create
|
|
|
|
* binds it to an arbitrary port. The routine then starts a unix
|
|
|
|
* listener on the socket's associated port. In any (successful) case,
|
|
|
|
* xprt->xp_sock is the registered socket number and xprt->xp_port is the
|
|
|
|
* associated port number.
|
|
|
|
*
|
|
|
|
* Since unix streams do buffered io similar to stdio, the caller can specify
|
|
|
|
* how big the send and receive buffers are via the second and third parms;
|
|
|
|
* 0 => use the system default.
|
|
|
|
*/
|
|
|
|
SVCXPRT *
|
|
|
|
svcunix_create (int sock, u_int sendsize, u_int recvsize, char *path)
|
|
|
|
{
|
|
|
|
bool_t madesock = FALSE;
|
|
|
|
SVCXPRT *xprt;
|
|
|
|
struct unix_rendezvous *r;
|
|
|
|
struct sockaddr_un addr;
|
|
|
|
socklen_t len = sizeof (struct sockaddr_in);
|
|
|
|
|
|
|
|
if (sock == RPC_ANYSOCK)
|
|
|
|
{
|
|
|
|
if ((sock = __socket (AF_UNIX, SOCK_STREAM, 0)) < 0)
|
|
|
|
{
|
|
|
|
perror (_("svc_unix.c - AF_UNIX socket creation problem"));
|
|
|
|
return (SVCXPRT *) NULL;
|
|
|
|
}
|
|
|
|
madesock = TRUE;
|
|
|
|
}
|
|
|
|
memset (&addr, '\0', sizeof (addr));
|
|
|
|
addr.sun_family = AF_UNIX;
|
1998-07-31 11:14:46 +00:00
|
|
|
len = strlen (path) + 1;
|
1998-07-28 16:26:04 +00:00
|
|
|
memcpy (addr.sun_path, path, len);
|
|
|
|
len += sizeof (addr.sun_family);
|
|
|
|
|
Update.
2002-05-11 Jakub Jelinek <jakub@redhat.com>
* include/netinet/in.h (bindresvport_internal): Add prototype.
* include/rpc/auth.h (authunix_create_internal,
authunix_create_default_internal, authnone_create_internal,
authdes_pk_create_internal): Add prototypes.
* include/rpc/clnt.h (clnt_create_internal, clnttcp_create_internal,
clntudp_create_internal, clntudp_bufcreate_internal,
clntunix_create_internal): Add prototypes.
* include/rpc/svc.h (svc_sendreply_internal, svcerr_decode_internal,
svc_getreq_internal, svc_getreq_common_internal,
svc_getreqset_internal, svc_getreq_poll_internal,
svc_register_internal, svc_unregister_internal,
svcudp_create_internal, svcudp_bufcreate_internal): Add prototypes.
* include/rpc/svc_auth.h (_authenticate_internal): Add prototype.
* include/sys/socket.h (__sendto, __recvfrom, __sendmsg, __recvmsg,
__setsockopt, __getsockname, __bind, __listen): Add prototypes.
* inet/rexec.c (rexec_af): Use __listen and __getsockname.
* inet/rcmd.c (rcmd_af): Use __listen.
(rresvport_af): Use __bind.
* sunrpc/clnt_udp.c: Use INTUSE calls to bindresvport,
authunix_create, authunix_create_default, authnone_create,
authdes_pk_create, clnt_create, clnttcp_create, clntudp_create,
clntudp_bufcreate, clntunix_create svc_sendreply, svcerr_decode,
svc_getreq, svc_getreq_common, svc_getreqset, svc_getreq_poll,
svc_register, svc_unregister, svcudp_create, svcudp_bufcreate,
_authenticate, add INTDEF after such function definitions.
Use __listen, __bind, __sendto, __recvfrom, __sendmsg, __recvmsg,
__setsockopt, __getsockname instead of non-__ variants.
* sunrpc/pmap_rmt.c: Likewise.
* sunrpc/rtime.c: Likewise.
* sunrpc/svc_udp.c: Likewise.
* sunrpc/clnt_unix.c: Likewise.
* sunrpc/svc_unix.c: Likewise.
* sunrpc/bindrsvprt.c: Likewise.
* sunrpc/svc_tcp.c: Likewise.
* sunrpc/auth_none.c: Likewise.
* sunrpc/clnt_raw.c: Likewise.
* sunrpc/clnt_tcp.c: Likewise.
* sunrpc/auth_unix.c: Likewise.
* sunrpc/key_call.c: Likewise.
* sunrpc/clnt_gen.c: Likewise.
* sunrpc/pm_getmaps.c: Likewise.
* sunrpc/clnt_simp.c: Likewise.
* sunrpc/pmap_clnt.c: Likewise.
* sunrpc/svc_run.c: Likewise.
* sunrpc/svc.c: Likewise.
* sunrpc/svc_simple.c: Likewise.
* sunrpc/pm_getport.c: Likewise.
* sunrpc/auth_des.c: Likewise.
* sunrpc/svc_auth.c: Likewise.
* sysdeps/generic/unwind-dw2-fde.c (__register_frame_info_bases,
__register_frame_info_table_bases, __deregister_frame_info_bases):
Add INTDEF.
(__register_frame_info_bases_internal,
__register_frame_info_table_bases_internal,
__deregister_frame_info_bases_internal): Add prototypes.
(__register_frame_info, __register_frame): Use INTUSE in call to
__register_frame_info_bases.
(__register_frame_info_table): Similarly.
(__deregister_frame_info, __deregister_frame): Similarly.
* sysdeps/generic/sendto.c (__sendto): Renamed from sendto, add
sendto as weak alias.
* sysdeps/mach/hurd/sendto.c: Likewise.
* sysdeps/generic/recvfrom.c (__recvfrom): Renamed from recvfrom, add
recvfrom as weak alias.
* sysdeps/mach/hurd/recvfrom.c: Likewise.
* sysdeps/unix/sysv/aix/recvfrom.c: Likewise.
* sysdeps/generic/recvmsg.c (__recvmsg): Renamed from recvmsg, add
recvmsg as weak alias.
* sysdeps/unix/sysv/aix/recvmsg.c: Likewise.
* sysdeps/generic/sendmsg.c (__sendmsg): Renamed from sendmsg, add
sendmsg as weak alias.
* sysdeps/unix/sysv/aix/sendmsg.c: Likewise.
* sysdeps/generic/setsockopt.c (__setsockopt): Renamed from
setsockopt, add setsockopt as weak alias.
* sysdeps/mach/hurd/setsockopt.c: Likewise.
* sysdeps/generic/bind.c (__bind): Renamed from bind, add bind as
weak alias.
* sysdeps/mach/hurd/bind.c: Likewise.
* sysdeps/generic/listen.c (__listen): Renamed from listen, add listen
as weak alias.
* sysdeps/mach/hurd/listen.c: Likewise.
* sysdeps/generic/getsockname.c (__getsockname): Renamed from
getsockname, add getsockname as weak alias.
* sysdeps/mach/hurd/getsockname.c: Likewise.
* sysdeps/unix/sysv/aix/getsockname.c: Likewise.
* sysdeps/mach/hurd/recvmsg.c (__recvmsg): Add weak alias.
* sysdeps/mach/hurd/sendmsg.c (__sendmsg): Add weak alias.
* sysdeps/unix/inet/syscalls.list (__bind, __listen, __recvmsg,
__recvfrom, __sendmsg, __sendto, __setsockopt): Add aliases.
* sysdeps/unix/sysv/linux/alpha/syscalls.list (__recvmsg, __sendmsg):
Add aliases.
* sysdeps/unix/sysv/linux/ia64/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/hppa/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/x86_64/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/recvfrom.S (__recvfrom): Add weak alias.
* sysdeps/unix/sysv/linux/recvmsg.S (__recvmsg): Likewise.
* sysdeps/unix/sysv/linux/sendmsg.S (__sendmsg): Likewise.
* sysdeps/unix/sysv/linux/sendto.S (__sendto): Likewise.
* sysdeps/unix/sysv/linux/setsockopt.S (__setsockopt): Likewise.
* sysdeps/unix/sysv/linux/bind.S (__bind): Likewise.
* sysdeps/unix/sysv/linux/listen.S (__listen): Likewise.
* sysdeps/unix/sysv/linux/getsockname.S (__getsockname): Likewise.
2002-05-10 Jakub Jelinek <jakub@redhat.com>
* locale/programs/localedef.h (show_archive_content): Add verbose
argument.
* locale/programs/localedef.c (main): Adjust caller.
* locale/programs/locarchive.c (struct nameent, struct dataent): New.
(nameentcmp, dataentcmp): New functions.
(xstrcmp): Remove.
(show_archive_content): Print verbose listing with --list-archive -v.
* locale/programs/locarchive.c (open_archive): Take extra argument
readonly. If true open file with O_RDONLY and don't create the
archive if it doesn't exist.
Adapt all callers.
(close_archive): Don't do anything if fd element is -1.
* locale/programs/localedef.h (open_archive): Adjust prototype.
* locale/programs/locfile.c (write_all_categories): Adjust open_archive
call.
* malloc/malloc.c (__posix_memalign): Correct check for size of
alignment value [PR libc/3444].
2002-05-15 00:22:23 +00:00
|
|
|
__bind (sock, (struct sockaddr *) &addr, len);
|
1998-07-28 16:26:04 +00:00
|
|
|
|
Update.
2002-05-11 Jakub Jelinek <jakub@redhat.com>
* include/netinet/in.h (bindresvport_internal): Add prototype.
* include/rpc/auth.h (authunix_create_internal,
authunix_create_default_internal, authnone_create_internal,
authdes_pk_create_internal): Add prototypes.
* include/rpc/clnt.h (clnt_create_internal, clnttcp_create_internal,
clntudp_create_internal, clntudp_bufcreate_internal,
clntunix_create_internal): Add prototypes.
* include/rpc/svc.h (svc_sendreply_internal, svcerr_decode_internal,
svc_getreq_internal, svc_getreq_common_internal,
svc_getreqset_internal, svc_getreq_poll_internal,
svc_register_internal, svc_unregister_internal,
svcudp_create_internal, svcudp_bufcreate_internal): Add prototypes.
* include/rpc/svc_auth.h (_authenticate_internal): Add prototype.
* include/sys/socket.h (__sendto, __recvfrom, __sendmsg, __recvmsg,
__setsockopt, __getsockname, __bind, __listen): Add prototypes.
* inet/rexec.c (rexec_af): Use __listen and __getsockname.
* inet/rcmd.c (rcmd_af): Use __listen.
(rresvport_af): Use __bind.
* sunrpc/clnt_udp.c: Use INTUSE calls to bindresvport,
authunix_create, authunix_create_default, authnone_create,
authdes_pk_create, clnt_create, clnttcp_create, clntudp_create,
clntudp_bufcreate, clntunix_create svc_sendreply, svcerr_decode,
svc_getreq, svc_getreq_common, svc_getreqset, svc_getreq_poll,
svc_register, svc_unregister, svcudp_create, svcudp_bufcreate,
_authenticate, add INTDEF after such function definitions.
Use __listen, __bind, __sendto, __recvfrom, __sendmsg, __recvmsg,
__setsockopt, __getsockname instead of non-__ variants.
* sunrpc/pmap_rmt.c: Likewise.
* sunrpc/rtime.c: Likewise.
* sunrpc/svc_udp.c: Likewise.
* sunrpc/clnt_unix.c: Likewise.
* sunrpc/svc_unix.c: Likewise.
* sunrpc/bindrsvprt.c: Likewise.
* sunrpc/svc_tcp.c: Likewise.
* sunrpc/auth_none.c: Likewise.
* sunrpc/clnt_raw.c: Likewise.
* sunrpc/clnt_tcp.c: Likewise.
* sunrpc/auth_unix.c: Likewise.
* sunrpc/key_call.c: Likewise.
* sunrpc/clnt_gen.c: Likewise.
* sunrpc/pm_getmaps.c: Likewise.
* sunrpc/clnt_simp.c: Likewise.
* sunrpc/pmap_clnt.c: Likewise.
* sunrpc/svc_run.c: Likewise.
* sunrpc/svc.c: Likewise.
* sunrpc/svc_simple.c: Likewise.
* sunrpc/pm_getport.c: Likewise.
* sunrpc/auth_des.c: Likewise.
* sunrpc/svc_auth.c: Likewise.
* sysdeps/generic/unwind-dw2-fde.c (__register_frame_info_bases,
__register_frame_info_table_bases, __deregister_frame_info_bases):
Add INTDEF.
(__register_frame_info_bases_internal,
__register_frame_info_table_bases_internal,
__deregister_frame_info_bases_internal): Add prototypes.
(__register_frame_info, __register_frame): Use INTUSE in call to
__register_frame_info_bases.
(__register_frame_info_table): Similarly.
(__deregister_frame_info, __deregister_frame): Similarly.
* sysdeps/generic/sendto.c (__sendto): Renamed from sendto, add
sendto as weak alias.
* sysdeps/mach/hurd/sendto.c: Likewise.
* sysdeps/generic/recvfrom.c (__recvfrom): Renamed from recvfrom, add
recvfrom as weak alias.
* sysdeps/mach/hurd/recvfrom.c: Likewise.
* sysdeps/unix/sysv/aix/recvfrom.c: Likewise.
* sysdeps/generic/recvmsg.c (__recvmsg): Renamed from recvmsg, add
recvmsg as weak alias.
* sysdeps/unix/sysv/aix/recvmsg.c: Likewise.
* sysdeps/generic/sendmsg.c (__sendmsg): Renamed from sendmsg, add
sendmsg as weak alias.
* sysdeps/unix/sysv/aix/sendmsg.c: Likewise.
* sysdeps/generic/setsockopt.c (__setsockopt): Renamed from
setsockopt, add setsockopt as weak alias.
* sysdeps/mach/hurd/setsockopt.c: Likewise.
* sysdeps/generic/bind.c (__bind): Renamed from bind, add bind as
weak alias.
* sysdeps/mach/hurd/bind.c: Likewise.
* sysdeps/generic/listen.c (__listen): Renamed from listen, add listen
as weak alias.
* sysdeps/mach/hurd/listen.c: Likewise.
* sysdeps/generic/getsockname.c (__getsockname): Renamed from
getsockname, add getsockname as weak alias.
* sysdeps/mach/hurd/getsockname.c: Likewise.
* sysdeps/unix/sysv/aix/getsockname.c: Likewise.
* sysdeps/mach/hurd/recvmsg.c (__recvmsg): Add weak alias.
* sysdeps/mach/hurd/sendmsg.c (__sendmsg): Add weak alias.
* sysdeps/unix/inet/syscalls.list (__bind, __listen, __recvmsg,
__recvfrom, __sendmsg, __sendto, __setsockopt): Add aliases.
* sysdeps/unix/sysv/linux/alpha/syscalls.list (__recvmsg, __sendmsg):
Add aliases.
* sysdeps/unix/sysv/linux/ia64/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/hppa/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/x86_64/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/recvfrom.S (__recvfrom): Add weak alias.
* sysdeps/unix/sysv/linux/recvmsg.S (__recvmsg): Likewise.
* sysdeps/unix/sysv/linux/sendmsg.S (__sendmsg): Likewise.
* sysdeps/unix/sysv/linux/sendto.S (__sendto): Likewise.
* sysdeps/unix/sysv/linux/setsockopt.S (__setsockopt): Likewise.
* sysdeps/unix/sysv/linux/bind.S (__bind): Likewise.
* sysdeps/unix/sysv/linux/listen.S (__listen): Likewise.
* sysdeps/unix/sysv/linux/getsockname.S (__getsockname): Likewise.
2002-05-10 Jakub Jelinek <jakub@redhat.com>
* locale/programs/localedef.h (show_archive_content): Add verbose
argument.
* locale/programs/localedef.c (main): Adjust caller.
* locale/programs/locarchive.c (struct nameent, struct dataent): New.
(nameentcmp, dataentcmp): New functions.
(xstrcmp): Remove.
(show_archive_content): Print verbose listing with --list-archive -v.
* locale/programs/locarchive.c (open_archive): Take extra argument
readonly. If true open file with O_RDONLY and don't create the
archive if it doesn't exist.
Adapt all callers.
(close_archive): Don't do anything if fd element is -1.
* locale/programs/localedef.h (open_archive): Adjust prototype.
* locale/programs/locfile.c (write_all_categories): Adjust open_archive
call.
* malloc/malloc.c (__posix_memalign): Correct check for size of
alignment value [PR libc/3444].
2002-05-15 00:22:23 +00:00
|
|
|
if (__getsockname (sock, (struct sockaddr *) &addr, &len) != 0
|
2005-01-12 03:23:48 +00:00
|
|
|
|| __listen (sock, SOMAXCONN) != 0)
|
1998-07-28 16:26:04 +00:00
|
|
|
{
|
|
|
|
perror (_("svc_unix.c - cannot getsockname or listen"));
|
|
|
|
if (madesock)
|
|
|
|
__close (sock);
|
|
|
|
return (SVCXPRT *) NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
r = (struct unix_rendezvous *) mem_alloc (sizeof (*r));
|
2001-08-17 04:49:12 +00:00
|
|
|
xprt = (SVCXPRT *) mem_alloc (sizeof (SVCXPRT));
|
|
|
|
if (r == NULL || xprt == NULL)
|
1998-07-28 16:26:04 +00:00
|
|
|
{
|
2008-03-29 18:12:46 +00:00
|
|
|
__fxprintf (NULL, "%s: %s", __func__, _("out of memory\n"));
|
2001-08-22 17:00:32 +00:00
|
|
|
mem_free (r, sizeof (*r));
|
|
|
|
mem_free (xprt, sizeof (SVCXPRT));
|
1998-07-28 16:26:04 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
r->sendsize = sendsize;
|
|
|
|
r->recvsize = recvsize;
|
|
|
|
xprt->xp_p2 = NULL;
|
|
|
|
xprt->xp_p1 = (caddr_t) r;
|
|
|
|
xprt->xp_verf = _null_auth;
|
|
|
|
xprt->xp_ops = &svcunix_rendezvous_op;
|
|
|
|
xprt->xp_port = -1;
|
|
|
|
xprt->xp_sock = sock;
|
|
|
|
xprt_register (xprt);
|
|
|
|
return xprt;
|
|
|
|
}
|
2012-05-10 18:16:53 +00:00
|
|
|
libc_hidden_nolink_sunrpc (svcunix_create, GLIBC_2_1)
|
1998-07-28 16:26:04 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Like svunix_create(), except the routine takes any *open* UNIX file
|
|
|
|
* descriptor as its first input.
|
|
|
|
*/
|
|
|
|
SVCXPRT *
|
|
|
|
svcunixfd_create (int fd, u_int sendsize, u_int recvsize)
|
|
|
|
{
|
|
|
|
return makefd_xprt (fd, sendsize, recvsize);
|
|
|
|
}
|
2012-05-10 18:16:53 +00:00
|
|
|
libc_hidden_nolink_sunrpc (svcunixfd_create, GLIBC_2_1)
|
1998-07-28 16:26:04 +00:00
|
|
|
|
|
|
|
static SVCXPRT *
|
|
|
|
makefd_xprt (int fd, u_int sendsize, u_int recvsize)
|
|
|
|
{
|
|
|
|
SVCXPRT *xprt;
|
|
|
|
struct unix_conn *cd;
|
|
|
|
|
|
|
|
xprt = (SVCXPRT *) mem_alloc (sizeof (SVCXPRT));
|
|
|
|
cd = (struct unix_conn *) mem_alloc (sizeof (struct unix_conn));
|
2001-08-17 04:49:12 +00:00
|
|
|
if (xprt == (SVCXPRT *) NULL || cd == (struct unix_conn *) NULL)
|
1998-07-28 16:26:04 +00:00
|
|
|
{
|
2008-03-29 18:12:46 +00:00
|
|
|
(void) __fxprintf (NULL, "%s: %s", "svc_unix: makefd_xprt",
|
|
|
|
_("out of memory\n"));
|
2001-08-22 17:00:32 +00:00
|
|
|
mem_free (xprt, sizeof (SVCXPRT));
|
|
|
|
mem_free (cd, sizeof (struct unix_conn));
|
2001-08-17 04:49:12 +00:00
|
|
|
return NULL;
|
1998-07-28 16:26:04 +00:00
|
|
|
}
|
|
|
|
cd->strm_stat = XPRT_IDLE;
|
2011-04-17 01:59:36 +00:00
|
|
|
xdrrec_create (&(cd->xdrs), sendsize, recvsize,
|
|
|
|
(caddr_t) xprt, readunix, writeunix);
|
1998-07-28 16:26:04 +00:00
|
|
|
xprt->xp_p2 = NULL;
|
|
|
|
xprt->xp_p1 = (caddr_t) cd;
|
|
|
|
xprt->xp_verf.oa_base = cd->verf_body;
|
|
|
|
xprt->xp_addrlen = 0;
|
|
|
|
xprt->xp_ops = &svcunix_op; /* truly deals with calls */
|
|
|
|
xprt->xp_port = 0; /* this is a connection, not a rendezvouser */
|
|
|
|
xprt->xp_sock = fd;
|
|
|
|
xprt_register (xprt);
|
|
|
|
return xprt;
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool_t
|
|
|
|
rendezvous_request (SVCXPRT *xprt, struct rpc_msg *errmsg)
|
|
|
|
{
|
|
|
|
int sock;
|
|
|
|
struct unix_rendezvous *r;
|
|
|
|
struct sockaddr_un addr;
|
|
|
|
struct sockaddr_in in_addr;
|
|
|
|
socklen_t len;
|
|
|
|
|
|
|
|
r = (struct unix_rendezvous *) xprt->xp_p1;
|
|
|
|
again:
|
|
|
|
len = sizeof (struct sockaddr_un);
|
|
|
|
if ((sock = accept (xprt->xp_sock, (struct sockaddr *) &addr, &len)) < 0)
|
|
|
|
{
|
|
|
|
if (errno == EINTR)
|
|
|
|
goto again;
|
2012-11-28 21:12:28 +00:00
|
|
|
__svc_accept_failed ();
|
1998-07-28 16:26:04 +00:00
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
/*
|
|
|
|
* make a new transporter (re-uses xprt)
|
|
|
|
*/
|
|
|
|
memset (&in_addr, '\0', sizeof (in_addr));
|
|
|
|
in_addr.sin_family = AF_UNIX;
|
|
|
|
xprt = makefd_xprt (sock, r->sendsize, r->recvsize);
|
Update.
2000-01-23 Philip Blundell <philb@gnu.org>
Add basic support for RPC over IPv6:
* sunrpc/rpc/svc.h (struct SVCXPRT): Use `struct sockaddr_storage'
for remote address.
(svcudp6_create, svcudp6_bufcreate, svctcp6_create): New
prototypes.
* sunrpc/rpc/clnt.h (clnttcp6_create, clntudp6_create,
clntudp6_bufcreate): New prototypes.
* inet/netinet/in.h (bindresport6): Likewise.
* sunrpc/Makefile (routines): Add svc_tcp6, svc_udp6, bindrsvprt6.
* sunrpc/Versions: Add svcfd6_create, svctcp6_create,
svcudp6_create, svcudp6_bufcreate, svcudp6_enablecache,
bindresvport6 for GLIBC_2.2.
* sunrpc/rpc_main.c: Support `tcp6' and `udp6' transport types.
* sunrpc/rpc_svcout.c: Likewise.
* sunrpc/svc_tcp.c (rendezvous_request): Use memcpy rather than
simple assignment when copying addresses.
* sunrpc/svc_udp.c (cache_get): Likewise.
* sunrpc/svc_unix.c (rendezvous_request): Likewise.
* sunrpc/bindrsvprt6.c, sunrpc/clnt_tcp6.c, sunrpc/clnt_udp6.c,
sunrpc/svc_tcp6.c, sunrpc/svc_udp6.c: New files.
2000-01-05 Philip Blundell <philb@gnu.org>
* sysdeps/unix/sysv/linux/arm/mmap64.S: Correct check for ENOSYS.
2000-01-23 Andreas Jaeger <aj@suse.de>
* sysdeps/unix/sysv/linux/i386/fxstat.c (__fxstat): Pass right
parameter to fstat calls.
2000-01-18 Roland McGrath <roland@baalperazim.frob.com>
* sysdeps/generic/bits/socket.h
(__ss_aligntype, struct sockaddr_storage): Make these like Linux
version, replacing old type name `__ss_align'.
2000-01-05 Roland McGrath <roland@baalperazim.frob.com>
* sysdeps/generic/lseek64.c (__libc_lseek64): Renamed from __lseek64.
(__lseek64, lseek64): Make these weak aliases for __libc_lseek64.
* sysdeps/mach/hurd/lseek.c (__libc_lseek): Renamed from __lseek.
(__lseek, lseek): Make these weak aliases for __libc_lseek.
* sysdeps/mach/hurd/fcntl.c (__libc_fcntl): Renamed from __fcntl.
(__fcntl, fcntl): Make these weak aliases for __libc_fcntl.
* sysdeps/mach/hurd/open.c (__libc_open): Renamed from __open.
(__open, open): Make these weak aliases for __libc_open.
* sysdeps/generic/bits/socket.h (enum __socket_type): Remove
trailing comma.
(anonymous enum for MSG_*): Likewise.
(anonymous enum for SO_*): Likewise.
2000-01-23 Ulrich Drepper <drepper@cygnus.com>
* string/bits/string2.h: Fix typo (__GNU_SOURCE -> __USE_GNU)
(PR libc/1553).
2000-01-24 02:22:13 +00:00
|
|
|
memcpy (&xprt->xp_raddr, &in_addr, sizeof (in_addr));
|
1998-07-28 16:26:04 +00:00
|
|
|
xprt->xp_addrlen = len;
|
|
|
|
return FALSE; /* there is never an rpc msg to be processed */
|
|
|
|
}
|
|
|
|
|
|
|
|
static enum xprt_stat
|
|
|
|
rendezvous_stat (SVCXPRT *xprt)
|
|
|
|
{
|
|
|
|
return XPRT_IDLE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
svcunix_destroy (SVCXPRT *xprt)
|
|
|
|
{
|
|
|
|
struct unix_conn *cd = (struct unix_conn *) xprt->xp_p1;
|
|
|
|
|
|
|
|
xprt_unregister (xprt);
|
|
|
|
__close (xprt->xp_sock);
|
|
|
|
if (xprt->xp_port != 0)
|
|
|
|
{
|
|
|
|
/* a rendezvouser socket */
|
|
|
|
xprt->xp_port = 0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* an actual connection socket */
|
|
|
|
XDR_DESTROY (&(cd->xdrs));
|
|
|
|
}
|
|
|
|
mem_free ((caddr_t) cd, sizeof (struct unix_conn));
|
|
|
|
mem_free ((caddr_t) xprt, sizeof (SVCXPRT));
|
|
|
|
}
|
|
|
|
|
1998-12-20 10:24:39 +00:00
|
|
|
#ifdef SCM_CREDENTIALS
|
1998-07-28 16:26:04 +00:00
|
|
|
struct cmessage {
|
|
|
|
struct cmsghdr cmsg;
|
1998-08-08 20:02:34 +00:00
|
|
|
struct ucred cmcred;
|
1999-03-19 02:01:36 +00:00
|
|
|
/* hack to make sure we have enough memory */
|
|
|
|
char dummy[(CMSG_ALIGN (sizeof (struct ucred)) - sizeof (struct ucred) + sizeof (long))];
|
1998-07-28 16:26:04 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
/* XXX This is not thread safe, but since the main functions in svc.c
|
|
|
|
and the rpcgen generated *_svc functions for the daemon are also not
|
|
|
|
thread safe and uses static global variables, it doesn't matter. */
|
|
|
|
static struct cmessage cm;
|
1998-12-20 10:24:39 +00:00
|
|
|
#endif
|
1998-07-28 16:26:04 +00:00
|
|
|
|
|
|
|
static int
|
1999-03-19 02:01:36 +00:00
|
|
|
__msgread (int sock, void *data, size_t cnt)
|
1998-07-28 16:26:04 +00:00
|
|
|
{
|
1999-03-19 02:01:36 +00:00
|
|
|
struct iovec iov;
|
1998-07-28 16:26:04 +00:00
|
|
|
struct msghdr msg;
|
1999-03-19 02:01:36 +00:00
|
|
|
int len;
|
1998-07-28 16:26:04 +00:00
|
|
|
|
1999-03-19 02:01:36 +00:00
|
|
|
iov.iov_base = data;
|
|
|
|
iov.iov_len = cnt;
|
1998-07-28 16:26:04 +00:00
|
|
|
|
1999-03-19 02:01:36 +00:00
|
|
|
msg.msg_iov = &iov;
|
1998-07-28 16:26:04 +00:00
|
|
|
msg.msg_iovlen = 1;
|
|
|
|
msg.msg_name = NULL;
|
|
|
|
msg.msg_namelen = 0;
|
1998-12-20 10:24:39 +00:00
|
|
|
#ifdef SCM_CREDENTIALS
|
1998-07-28 16:26:04 +00:00
|
|
|
msg.msg_control = (caddr_t) &cm;
|
|
|
|
msg.msg_controllen = sizeof (struct cmessage);
|
1998-12-20 10:24:39 +00:00
|
|
|
#endif
|
1998-07-28 16:26:04 +00:00
|
|
|
msg.msg_flags = 0;
|
|
|
|
|
1998-08-03 16:47:01 +00:00
|
|
|
#ifdef SO_PASSCRED
|
1998-11-29 11:17:25 +00:00
|
|
|
{
|
|
|
|
int on = 1;
|
Update.
2002-05-11 Jakub Jelinek <jakub@redhat.com>
* include/netinet/in.h (bindresvport_internal): Add prototype.
* include/rpc/auth.h (authunix_create_internal,
authunix_create_default_internal, authnone_create_internal,
authdes_pk_create_internal): Add prototypes.
* include/rpc/clnt.h (clnt_create_internal, clnttcp_create_internal,
clntudp_create_internal, clntudp_bufcreate_internal,
clntunix_create_internal): Add prototypes.
* include/rpc/svc.h (svc_sendreply_internal, svcerr_decode_internal,
svc_getreq_internal, svc_getreq_common_internal,
svc_getreqset_internal, svc_getreq_poll_internal,
svc_register_internal, svc_unregister_internal,
svcudp_create_internal, svcudp_bufcreate_internal): Add prototypes.
* include/rpc/svc_auth.h (_authenticate_internal): Add prototype.
* include/sys/socket.h (__sendto, __recvfrom, __sendmsg, __recvmsg,
__setsockopt, __getsockname, __bind, __listen): Add prototypes.
* inet/rexec.c (rexec_af): Use __listen and __getsockname.
* inet/rcmd.c (rcmd_af): Use __listen.
(rresvport_af): Use __bind.
* sunrpc/clnt_udp.c: Use INTUSE calls to bindresvport,
authunix_create, authunix_create_default, authnone_create,
authdes_pk_create, clnt_create, clnttcp_create, clntudp_create,
clntudp_bufcreate, clntunix_create svc_sendreply, svcerr_decode,
svc_getreq, svc_getreq_common, svc_getreqset, svc_getreq_poll,
svc_register, svc_unregister, svcudp_create, svcudp_bufcreate,
_authenticate, add INTDEF after such function definitions.
Use __listen, __bind, __sendto, __recvfrom, __sendmsg, __recvmsg,
__setsockopt, __getsockname instead of non-__ variants.
* sunrpc/pmap_rmt.c: Likewise.
* sunrpc/rtime.c: Likewise.
* sunrpc/svc_udp.c: Likewise.
* sunrpc/clnt_unix.c: Likewise.
* sunrpc/svc_unix.c: Likewise.
* sunrpc/bindrsvprt.c: Likewise.
* sunrpc/svc_tcp.c: Likewise.
* sunrpc/auth_none.c: Likewise.
* sunrpc/clnt_raw.c: Likewise.
* sunrpc/clnt_tcp.c: Likewise.
* sunrpc/auth_unix.c: Likewise.
* sunrpc/key_call.c: Likewise.
* sunrpc/clnt_gen.c: Likewise.
* sunrpc/pm_getmaps.c: Likewise.
* sunrpc/clnt_simp.c: Likewise.
* sunrpc/pmap_clnt.c: Likewise.
* sunrpc/svc_run.c: Likewise.
* sunrpc/svc.c: Likewise.
* sunrpc/svc_simple.c: Likewise.
* sunrpc/pm_getport.c: Likewise.
* sunrpc/auth_des.c: Likewise.
* sunrpc/svc_auth.c: Likewise.
* sysdeps/generic/unwind-dw2-fde.c (__register_frame_info_bases,
__register_frame_info_table_bases, __deregister_frame_info_bases):
Add INTDEF.
(__register_frame_info_bases_internal,
__register_frame_info_table_bases_internal,
__deregister_frame_info_bases_internal): Add prototypes.
(__register_frame_info, __register_frame): Use INTUSE in call to
__register_frame_info_bases.
(__register_frame_info_table): Similarly.
(__deregister_frame_info, __deregister_frame): Similarly.
* sysdeps/generic/sendto.c (__sendto): Renamed from sendto, add
sendto as weak alias.
* sysdeps/mach/hurd/sendto.c: Likewise.
* sysdeps/generic/recvfrom.c (__recvfrom): Renamed from recvfrom, add
recvfrom as weak alias.
* sysdeps/mach/hurd/recvfrom.c: Likewise.
* sysdeps/unix/sysv/aix/recvfrom.c: Likewise.
* sysdeps/generic/recvmsg.c (__recvmsg): Renamed from recvmsg, add
recvmsg as weak alias.
* sysdeps/unix/sysv/aix/recvmsg.c: Likewise.
* sysdeps/generic/sendmsg.c (__sendmsg): Renamed from sendmsg, add
sendmsg as weak alias.
* sysdeps/unix/sysv/aix/sendmsg.c: Likewise.
* sysdeps/generic/setsockopt.c (__setsockopt): Renamed from
setsockopt, add setsockopt as weak alias.
* sysdeps/mach/hurd/setsockopt.c: Likewise.
* sysdeps/generic/bind.c (__bind): Renamed from bind, add bind as
weak alias.
* sysdeps/mach/hurd/bind.c: Likewise.
* sysdeps/generic/listen.c (__listen): Renamed from listen, add listen
as weak alias.
* sysdeps/mach/hurd/listen.c: Likewise.
* sysdeps/generic/getsockname.c (__getsockname): Renamed from
getsockname, add getsockname as weak alias.
* sysdeps/mach/hurd/getsockname.c: Likewise.
* sysdeps/unix/sysv/aix/getsockname.c: Likewise.
* sysdeps/mach/hurd/recvmsg.c (__recvmsg): Add weak alias.
* sysdeps/mach/hurd/sendmsg.c (__sendmsg): Add weak alias.
* sysdeps/unix/inet/syscalls.list (__bind, __listen, __recvmsg,
__recvfrom, __sendmsg, __sendto, __setsockopt): Add aliases.
* sysdeps/unix/sysv/linux/alpha/syscalls.list (__recvmsg, __sendmsg):
Add aliases.
* sysdeps/unix/sysv/linux/ia64/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/hppa/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/x86_64/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/recvfrom.S (__recvfrom): Add weak alias.
* sysdeps/unix/sysv/linux/recvmsg.S (__recvmsg): Likewise.
* sysdeps/unix/sysv/linux/sendmsg.S (__sendmsg): Likewise.
* sysdeps/unix/sysv/linux/sendto.S (__sendto): Likewise.
* sysdeps/unix/sysv/linux/setsockopt.S (__setsockopt): Likewise.
* sysdeps/unix/sysv/linux/bind.S (__bind): Likewise.
* sysdeps/unix/sysv/linux/listen.S (__listen): Likewise.
* sysdeps/unix/sysv/linux/getsockname.S (__getsockname): Likewise.
2002-05-10 Jakub Jelinek <jakub@redhat.com>
* locale/programs/localedef.h (show_archive_content): Add verbose
argument.
* locale/programs/localedef.c (main): Adjust caller.
* locale/programs/locarchive.c (struct nameent, struct dataent): New.
(nameentcmp, dataentcmp): New functions.
(xstrcmp): Remove.
(show_archive_content): Print verbose listing with --list-archive -v.
* locale/programs/locarchive.c (open_archive): Take extra argument
readonly. If true open file with O_RDONLY and don't create the
archive if it doesn't exist.
Adapt all callers.
(close_archive): Don't do anything if fd element is -1.
* locale/programs/localedef.h (open_archive): Adjust prototype.
* locale/programs/locfile.c (write_all_categories): Adjust open_archive
call.
* malloc/malloc.c (__posix_memalign): Correct check for size of
alignment value [PR libc/3444].
2002-05-15 00:22:23 +00:00
|
|
|
if (__setsockopt (sock, SOL_SOCKET, SO_PASSCRED, &on, sizeof (on)))
|
1998-11-29 11:17:25 +00:00
|
|
|
return -1;
|
|
|
|
}
|
1998-08-03 16:47:01 +00:00
|
|
|
#endif
|
1998-07-28 16:26:04 +00:00
|
|
|
|
1999-03-19 02:01:36 +00:00
|
|
|
restart:
|
Update.
2002-05-11 Jakub Jelinek <jakub@redhat.com>
* include/netinet/in.h (bindresvport_internal): Add prototype.
* include/rpc/auth.h (authunix_create_internal,
authunix_create_default_internal, authnone_create_internal,
authdes_pk_create_internal): Add prototypes.
* include/rpc/clnt.h (clnt_create_internal, clnttcp_create_internal,
clntudp_create_internal, clntudp_bufcreate_internal,
clntunix_create_internal): Add prototypes.
* include/rpc/svc.h (svc_sendreply_internal, svcerr_decode_internal,
svc_getreq_internal, svc_getreq_common_internal,
svc_getreqset_internal, svc_getreq_poll_internal,
svc_register_internal, svc_unregister_internal,
svcudp_create_internal, svcudp_bufcreate_internal): Add prototypes.
* include/rpc/svc_auth.h (_authenticate_internal): Add prototype.
* include/sys/socket.h (__sendto, __recvfrom, __sendmsg, __recvmsg,
__setsockopt, __getsockname, __bind, __listen): Add prototypes.
* inet/rexec.c (rexec_af): Use __listen and __getsockname.
* inet/rcmd.c (rcmd_af): Use __listen.
(rresvport_af): Use __bind.
* sunrpc/clnt_udp.c: Use INTUSE calls to bindresvport,
authunix_create, authunix_create_default, authnone_create,
authdes_pk_create, clnt_create, clnttcp_create, clntudp_create,
clntudp_bufcreate, clntunix_create svc_sendreply, svcerr_decode,
svc_getreq, svc_getreq_common, svc_getreqset, svc_getreq_poll,
svc_register, svc_unregister, svcudp_create, svcudp_bufcreate,
_authenticate, add INTDEF after such function definitions.
Use __listen, __bind, __sendto, __recvfrom, __sendmsg, __recvmsg,
__setsockopt, __getsockname instead of non-__ variants.
* sunrpc/pmap_rmt.c: Likewise.
* sunrpc/rtime.c: Likewise.
* sunrpc/svc_udp.c: Likewise.
* sunrpc/clnt_unix.c: Likewise.
* sunrpc/svc_unix.c: Likewise.
* sunrpc/bindrsvprt.c: Likewise.
* sunrpc/svc_tcp.c: Likewise.
* sunrpc/auth_none.c: Likewise.
* sunrpc/clnt_raw.c: Likewise.
* sunrpc/clnt_tcp.c: Likewise.
* sunrpc/auth_unix.c: Likewise.
* sunrpc/key_call.c: Likewise.
* sunrpc/clnt_gen.c: Likewise.
* sunrpc/pm_getmaps.c: Likewise.
* sunrpc/clnt_simp.c: Likewise.
* sunrpc/pmap_clnt.c: Likewise.
* sunrpc/svc_run.c: Likewise.
* sunrpc/svc.c: Likewise.
* sunrpc/svc_simple.c: Likewise.
* sunrpc/pm_getport.c: Likewise.
* sunrpc/auth_des.c: Likewise.
* sunrpc/svc_auth.c: Likewise.
* sysdeps/generic/unwind-dw2-fde.c (__register_frame_info_bases,
__register_frame_info_table_bases, __deregister_frame_info_bases):
Add INTDEF.
(__register_frame_info_bases_internal,
__register_frame_info_table_bases_internal,
__deregister_frame_info_bases_internal): Add prototypes.
(__register_frame_info, __register_frame): Use INTUSE in call to
__register_frame_info_bases.
(__register_frame_info_table): Similarly.
(__deregister_frame_info, __deregister_frame): Similarly.
* sysdeps/generic/sendto.c (__sendto): Renamed from sendto, add
sendto as weak alias.
* sysdeps/mach/hurd/sendto.c: Likewise.
* sysdeps/generic/recvfrom.c (__recvfrom): Renamed from recvfrom, add
recvfrom as weak alias.
* sysdeps/mach/hurd/recvfrom.c: Likewise.
* sysdeps/unix/sysv/aix/recvfrom.c: Likewise.
* sysdeps/generic/recvmsg.c (__recvmsg): Renamed from recvmsg, add
recvmsg as weak alias.
* sysdeps/unix/sysv/aix/recvmsg.c: Likewise.
* sysdeps/generic/sendmsg.c (__sendmsg): Renamed from sendmsg, add
sendmsg as weak alias.
* sysdeps/unix/sysv/aix/sendmsg.c: Likewise.
* sysdeps/generic/setsockopt.c (__setsockopt): Renamed from
setsockopt, add setsockopt as weak alias.
* sysdeps/mach/hurd/setsockopt.c: Likewise.
* sysdeps/generic/bind.c (__bind): Renamed from bind, add bind as
weak alias.
* sysdeps/mach/hurd/bind.c: Likewise.
* sysdeps/generic/listen.c (__listen): Renamed from listen, add listen
as weak alias.
* sysdeps/mach/hurd/listen.c: Likewise.
* sysdeps/generic/getsockname.c (__getsockname): Renamed from
getsockname, add getsockname as weak alias.
* sysdeps/mach/hurd/getsockname.c: Likewise.
* sysdeps/unix/sysv/aix/getsockname.c: Likewise.
* sysdeps/mach/hurd/recvmsg.c (__recvmsg): Add weak alias.
* sysdeps/mach/hurd/sendmsg.c (__sendmsg): Add weak alias.
* sysdeps/unix/inet/syscalls.list (__bind, __listen, __recvmsg,
__recvfrom, __sendmsg, __sendto, __setsockopt): Add aliases.
* sysdeps/unix/sysv/linux/alpha/syscalls.list (__recvmsg, __sendmsg):
Add aliases.
* sysdeps/unix/sysv/linux/ia64/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/hppa/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/x86_64/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/recvfrom.S (__recvfrom): Add weak alias.
* sysdeps/unix/sysv/linux/recvmsg.S (__recvmsg): Likewise.
* sysdeps/unix/sysv/linux/sendmsg.S (__sendmsg): Likewise.
* sysdeps/unix/sysv/linux/sendto.S (__sendto): Likewise.
* sysdeps/unix/sysv/linux/setsockopt.S (__setsockopt): Likewise.
* sysdeps/unix/sysv/linux/bind.S (__bind): Likewise.
* sysdeps/unix/sysv/linux/listen.S (__listen): Likewise.
* sysdeps/unix/sysv/linux/getsockname.S (__getsockname): Likewise.
2002-05-10 Jakub Jelinek <jakub@redhat.com>
* locale/programs/localedef.h (show_archive_content): Add verbose
argument.
* locale/programs/localedef.c (main): Adjust caller.
* locale/programs/locarchive.c (struct nameent, struct dataent): New.
(nameentcmp, dataentcmp): New functions.
(xstrcmp): Remove.
(show_archive_content): Print verbose listing with --list-archive -v.
* locale/programs/locarchive.c (open_archive): Take extra argument
readonly. If true open file with O_RDONLY and don't create the
archive if it doesn't exist.
Adapt all callers.
(close_archive): Don't do anything if fd element is -1.
* locale/programs/localedef.h (open_archive): Adjust prototype.
* locale/programs/locfile.c (write_all_categories): Adjust open_archive
call.
* malloc/malloc.c (__posix_memalign): Correct check for size of
alignment value [PR libc/3444].
2002-05-15 00:22:23 +00:00
|
|
|
len = __recvmsg (sock, &msg, 0);
|
1999-03-19 02:01:36 +00:00
|
|
|
if (len >= 0)
|
|
|
|
{
|
|
|
|
if (msg.msg_flags & MSG_CTRUNC || len == 0)
|
2011-04-17 01:59:36 +00:00
|
|
|
return 0;
|
1999-03-19 02:01:36 +00:00
|
|
|
else
|
2011-04-17 01:59:36 +00:00
|
|
|
return len;
|
1999-03-19 02:01:36 +00:00
|
|
|
}
|
|
|
|
if (errno == EINTR)
|
|
|
|
goto restart;
|
|
|
|
return -1;
|
1998-07-28 16:26:04 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
1999-03-19 02:01:36 +00:00
|
|
|
__msgwrite (int sock, void *data, size_t cnt)
|
1998-07-28 16:26:04 +00:00
|
|
|
{
|
1998-08-08 20:02:34 +00:00
|
|
|
#ifndef SCM_CREDENTIALS
|
1998-07-28 16:26:04 +00:00
|
|
|
/* We cannot implement this reliably. */
|
|
|
|
__set_errno (ENOSYS);
|
1998-07-29 14:52:00 +00:00
|
|
|
return -1;
|
1998-07-28 16:26:04 +00:00
|
|
|
#else
|
1999-03-19 02:01:36 +00:00
|
|
|
struct iovec iov;
|
1998-07-28 16:26:04 +00:00
|
|
|
struct msghdr msg;
|
1999-03-19 02:01:36 +00:00
|
|
|
struct cmsghdr *cmsg = &cm.cmsg;
|
|
|
|
struct ucred cred;
|
|
|
|
int len;
|
|
|
|
|
|
|
|
/* XXX I'm not sure, if gete?id() is always correct, or if we should use
|
|
|
|
get?id(). But since keyserv needs geteuid(), we have no other chance.
|
|
|
|
It would be much better, if the kernel could pass both to the server. */
|
|
|
|
cred.pid = __getpid ();
|
|
|
|
cred.uid = __geteuid ();
|
|
|
|
cred.gid = __getegid ();
|
|
|
|
|
|
|
|
memcpy (CMSG_DATA(cmsg), &cred, sizeof (struct ucred));
|
|
|
|
cmsg->cmsg_level = SOL_SOCKET;
|
|
|
|
cmsg->cmsg_type = SCM_CREDENTIALS;
|
|
|
|
cmsg->cmsg_len = sizeof(*cmsg) + sizeof(struct ucred);
|
|
|
|
|
|
|
|
iov.iov_base = data;
|
|
|
|
iov.iov_len = cnt;
|
|
|
|
|
|
|
|
msg.msg_iov = &iov;
|
1998-07-28 16:26:04 +00:00
|
|
|
msg.msg_iovlen = 1;
|
|
|
|
msg.msg_name = NULL;
|
|
|
|
msg.msg_namelen = 0;
|
1999-03-19 02:01:36 +00:00
|
|
|
msg.msg_control = cmsg;
|
|
|
|
msg.msg_controllen = CMSG_ALIGN(cmsg->cmsg_len);
|
1998-07-28 16:26:04 +00:00
|
|
|
msg.msg_flags = 0;
|
|
|
|
|
1999-03-19 02:01:36 +00:00
|
|
|
restart:
|
Update.
2002-05-11 Jakub Jelinek <jakub@redhat.com>
* include/netinet/in.h (bindresvport_internal): Add prototype.
* include/rpc/auth.h (authunix_create_internal,
authunix_create_default_internal, authnone_create_internal,
authdes_pk_create_internal): Add prototypes.
* include/rpc/clnt.h (clnt_create_internal, clnttcp_create_internal,
clntudp_create_internal, clntudp_bufcreate_internal,
clntunix_create_internal): Add prototypes.
* include/rpc/svc.h (svc_sendreply_internal, svcerr_decode_internal,
svc_getreq_internal, svc_getreq_common_internal,
svc_getreqset_internal, svc_getreq_poll_internal,
svc_register_internal, svc_unregister_internal,
svcudp_create_internal, svcudp_bufcreate_internal): Add prototypes.
* include/rpc/svc_auth.h (_authenticate_internal): Add prototype.
* include/sys/socket.h (__sendto, __recvfrom, __sendmsg, __recvmsg,
__setsockopt, __getsockname, __bind, __listen): Add prototypes.
* inet/rexec.c (rexec_af): Use __listen and __getsockname.
* inet/rcmd.c (rcmd_af): Use __listen.
(rresvport_af): Use __bind.
* sunrpc/clnt_udp.c: Use INTUSE calls to bindresvport,
authunix_create, authunix_create_default, authnone_create,
authdes_pk_create, clnt_create, clnttcp_create, clntudp_create,
clntudp_bufcreate, clntunix_create svc_sendreply, svcerr_decode,
svc_getreq, svc_getreq_common, svc_getreqset, svc_getreq_poll,
svc_register, svc_unregister, svcudp_create, svcudp_bufcreate,
_authenticate, add INTDEF after such function definitions.
Use __listen, __bind, __sendto, __recvfrom, __sendmsg, __recvmsg,
__setsockopt, __getsockname instead of non-__ variants.
* sunrpc/pmap_rmt.c: Likewise.
* sunrpc/rtime.c: Likewise.
* sunrpc/svc_udp.c: Likewise.
* sunrpc/clnt_unix.c: Likewise.
* sunrpc/svc_unix.c: Likewise.
* sunrpc/bindrsvprt.c: Likewise.
* sunrpc/svc_tcp.c: Likewise.
* sunrpc/auth_none.c: Likewise.
* sunrpc/clnt_raw.c: Likewise.
* sunrpc/clnt_tcp.c: Likewise.
* sunrpc/auth_unix.c: Likewise.
* sunrpc/key_call.c: Likewise.
* sunrpc/clnt_gen.c: Likewise.
* sunrpc/pm_getmaps.c: Likewise.
* sunrpc/clnt_simp.c: Likewise.
* sunrpc/pmap_clnt.c: Likewise.
* sunrpc/svc_run.c: Likewise.
* sunrpc/svc.c: Likewise.
* sunrpc/svc_simple.c: Likewise.
* sunrpc/pm_getport.c: Likewise.
* sunrpc/auth_des.c: Likewise.
* sunrpc/svc_auth.c: Likewise.
* sysdeps/generic/unwind-dw2-fde.c (__register_frame_info_bases,
__register_frame_info_table_bases, __deregister_frame_info_bases):
Add INTDEF.
(__register_frame_info_bases_internal,
__register_frame_info_table_bases_internal,
__deregister_frame_info_bases_internal): Add prototypes.
(__register_frame_info, __register_frame): Use INTUSE in call to
__register_frame_info_bases.
(__register_frame_info_table): Similarly.
(__deregister_frame_info, __deregister_frame): Similarly.
* sysdeps/generic/sendto.c (__sendto): Renamed from sendto, add
sendto as weak alias.
* sysdeps/mach/hurd/sendto.c: Likewise.
* sysdeps/generic/recvfrom.c (__recvfrom): Renamed from recvfrom, add
recvfrom as weak alias.
* sysdeps/mach/hurd/recvfrom.c: Likewise.
* sysdeps/unix/sysv/aix/recvfrom.c: Likewise.
* sysdeps/generic/recvmsg.c (__recvmsg): Renamed from recvmsg, add
recvmsg as weak alias.
* sysdeps/unix/sysv/aix/recvmsg.c: Likewise.
* sysdeps/generic/sendmsg.c (__sendmsg): Renamed from sendmsg, add
sendmsg as weak alias.
* sysdeps/unix/sysv/aix/sendmsg.c: Likewise.
* sysdeps/generic/setsockopt.c (__setsockopt): Renamed from
setsockopt, add setsockopt as weak alias.
* sysdeps/mach/hurd/setsockopt.c: Likewise.
* sysdeps/generic/bind.c (__bind): Renamed from bind, add bind as
weak alias.
* sysdeps/mach/hurd/bind.c: Likewise.
* sysdeps/generic/listen.c (__listen): Renamed from listen, add listen
as weak alias.
* sysdeps/mach/hurd/listen.c: Likewise.
* sysdeps/generic/getsockname.c (__getsockname): Renamed from
getsockname, add getsockname as weak alias.
* sysdeps/mach/hurd/getsockname.c: Likewise.
* sysdeps/unix/sysv/aix/getsockname.c: Likewise.
* sysdeps/mach/hurd/recvmsg.c (__recvmsg): Add weak alias.
* sysdeps/mach/hurd/sendmsg.c (__sendmsg): Add weak alias.
* sysdeps/unix/inet/syscalls.list (__bind, __listen, __recvmsg,
__recvfrom, __sendmsg, __sendto, __setsockopt): Add aliases.
* sysdeps/unix/sysv/linux/alpha/syscalls.list (__recvmsg, __sendmsg):
Add aliases.
* sysdeps/unix/sysv/linux/ia64/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/hppa/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/x86_64/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/recvfrom.S (__recvfrom): Add weak alias.
* sysdeps/unix/sysv/linux/recvmsg.S (__recvmsg): Likewise.
* sysdeps/unix/sysv/linux/sendmsg.S (__sendmsg): Likewise.
* sysdeps/unix/sysv/linux/sendto.S (__sendto): Likewise.
* sysdeps/unix/sysv/linux/setsockopt.S (__setsockopt): Likewise.
* sysdeps/unix/sysv/linux/bind.S (__bind): Likewise.
* sysdeps/unix/sysv/linux/listen.S (__listen): Likewise.
* sysdeps/unix/sysv/linux/getsockname.S (__getsockname): Likewise.
2002-05-10 Jakub Jelinek <jakub@redhat.com>
* locale/programs/localedef.h (show_archive_content): Add verbose
argument.
* locale/programs/localedef.c (main): Adjust caller.
* locale/programs/locarchive.c (struct nameent, struct dataent): New.
(nameentcmp, dataentcmp): New functions.
(xstrcmp): Remove.
(show_archive_content): Print verbose listing with --list-archive -v.
* locale/programs/locarchive.c (open_archive): Take extra argument
readonly. If true open file with O_RDONLY and don't create the
archive if it doesn't exist.
Adapt all callers.
(close_archive): Don't do anything if fd element is -1.
* locale/programs/localedef.h (open_archive): Adjust prototype.
* locale/programs/locfile.c (write_all_categories): Adjust open_archive
call.
* malloc/malloc.c (__posix_memalign): Correct check for size of
alignment value [PR libc/3444].
2002-05-15 00:22:23 +00:00
|
|
|
len = __sendmsg (sock, &msg, 0);
|
1999-03-19 02:01:36 +00:00
|
|
|
if (len >= 0)
|
|
|
|
return len;
|
|
|
|
if (errno == EINTR)
|
|
|
|
goto restart;
|
|
|
|
return -1;
|
|
|
|
|
1998-07-28 16:26:04 +00:00
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* reads data from the unix connection.
|
|
|
|
* any error is fatal and the connection is closed.
|
|
|
|
* (And a read of zero bytes is a half closed stream => error.)
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
readunix (char *xprtptr, char *buf, int len)
|
|
|
|
{
|
|
|
|
SVCXPRT *xprt = (SVCXPRT *) xprtptr;
|
|
|
|
int sock = xprt->xp_sock;
|
1998-11-18 11:05:09 +00:00
|
|
|
int milliseconds = 35 * 1000;
|
|
|
|
struct pollfd pollfd;
|
|
|
|
|
|
|
|
do
|
1998-07-28 16:26:04 +00:00
|
|
|
{
|
1998-11-18 11:05:09 +00:00
|
|
|
pollfd.fd = sock;
|
|
|
|
pollfd.events = POLLIN;
|
|
|
|
switch (__poll (&pollfd, 1, milliseconds))
|
1998-07-28 16:26:04 +00:00
|
|
|
{
|
1998-11-18 11:05:09 +00:00
|
|
|
case -1:
|
1998-07-28 16:26:04 +00:00
|
|
|
if (errno == EINTR)
|
|
|
|
continue;
|
1998-11-18 11:05:09 +00:00
|
|
|
/*FALLTHROUGH*/
|
|
|
|
case 0:
|
1998-07-28 16:26:04 +00:00
|
|
|
goto fatal_err;
|
1998-11-18 11:05:09 +00:00
|
|
|
default:
|
1998-11-19 12:52:22 +00:00
|
|
|
if ((pollfd.revents & POLLERR) || (pollfd.revents & POLLHUP)
|
|
|
|
|| (pollfd.revents & POLLNVAL))
|
|
|
|
goto fatal_err;
|
1998-11-18 11:05:09 +00:00
|
|
|
break;
|
1998-07-28 16:26:04 +00:00
|
|
|
}
|
|
|
|
}
|
1998-11-18 11:05:09 +00:00
|
|
|
while ((pollfd.revents & POLLIN) == 0);
|
1998-07-28 16:26:04 +00:00
|
|
|
|
|
|
|
if ((len = __msgread (sock, buf, len)) > 0)
|
|
|
|
return len;
|
|
|
|
|
|
|
|
fatal_err:
|
|
|
|
((struct unix_conn *) (xprt->xp_p1))->strm_stat = XPRT_DIED;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* writes data to the unix connection.
|
|
|
|
* Any error is fatal and the connection is closed.
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
writeunix (char *xprtptr, char * buf, int len)
|
|
|
|
{
|
|
|
|
SVCXPRT *xprt = (SVCXPRT *) xprtptr;
|
|
|
|
int i, cnt;
|
|
|
|
|
|
|
|
for (cnt = len; cnt > 0; cnt -= i, buf += i)
|
|
|
|
{
|
|
|
|
if ((i = __msgwrite (xprt->xp_sock, buf, cnt)) < 0)
|
|
|
|
{
|
|
|
|
((struct unix_conn *) (xprt->xp_p1))->strm_stat = XPRT_DIED;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return len;
|
|
|
|
}
|
|
|
|
|
|
|
|
static enum xprt_stat
|
|
|
|
svcunix_stat (SVCXPRT *xprt)
|
|
|
|
{
|
|
|
|
struct unix_conn *cd =
|
|
|
|
(struct unix_conn *) (xprt->xp_p1);
|
|
|
|
|
|
|
|
if (cd->strm_stat == XPRT_DIED)
|
|
|
|
return XPRT_DIED;
|
2011-04-17 01:59:36 +00:00
|
|
|
if (!xdrrec_eof (&(cd->xdrs)))
|
1998-07-28 16:26:04 +00:00
|
|
|
return XPRT_MOREREQS;
|
|
|
|
return XPRT_IDLE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool_t
|
|
|
|
svcunix_recv (SVCXPRT *xprt, struct rpc_msg *msg)
|
|
|
|
{
|
|
|
|
struct unix_conn *cd = (struct unix_conn *) (xprt->xp_p1);
|
|
|
|
XDR *xdrs = &(cd->xdrs);
|
|
|
|
|
|
|
|
xdrs->x_op = XDR_DECODE;
|
2011-04-17 01:59:36 +00:00
|
|
|
xdrrec_skiprecord (xdrs);
|
|
|
|
if (xdr_callmsg (xdrs, msg))
|
1998-07-28 16:26:04 +00:00
|
|
|
{
|
|
|
|
cd->x_id = msg->rm_xid;
|
|
|
|
/* set up verifiers */
|
1998-12-20 10:24:39 +00:00
|
|
|
#ifdef SCM_CREDENTIALS
|
1999-03-19 02:01:36 +00:00
|
|
|
msg->rm_call.cb_verf.oa_flavor = AUTH_UNIX;
|
1998-07-28 16:26:04 +00:00
|
|
|
msg->rm_call.cb_verf.oa_base = (caddr_t) &cm;
|
|
|
|
msg->rm_call.cb_verf.oa_length = sizeof (cm);
|
1998-12-20 10:24:39 +00:00
|
|
|
#endif
|
1998-07-28 16:26:04 +00:00
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
cd->strm_stat = XPRT_DIED; /* XXXX */
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool_t
|
|
|
|
svcunix_getargs (SVCXPRT *xprt, xdrproc_t xdr_args, caddr_t args_ptr)
|
|
|
|
{
|
|
|
|
return (*xdr_args) (&(((struct unix_conn *) (xprt->xp_p1))->xdrs),
|
|
|
|
args_ptr);
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool_t
|
1998-11-18 11:05:09 +00:00
|
|
|
svcunix_freeargs (SVCXPRT *xprt, xdrproc_t xdr_args, caddr_t args_ptr)
|
1998-07-28 16:26:04 +00:00
|
|
|
{
|
|
|
|
XDR *xdrs = &(((struct unix_conn *) (xprt->xp_p1))->xdrs);
|
|
|
|
|
|
|
|
xdrs->x_op = XDR_FREE;
|
|
|
|
return (*xdr_args) (xdrs, args_ptr);
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool_t
|
1998-11-18 11:05:09 +00:00
|
|
|
svcunix_reply (SVCXPRT *xprt, struct rpc_msg *msg)
|
1998-07-28 16:26:04 +00:00
|
|
|
{
|
|
|
|
struct unix_conn *cd = (struct unix_conn *) (xprt->xp_p1);
|
|
|
|
XDR *xdrs = &(cd->xdrs);
|
|
|
|
bool_t stat;
|
|
|
|
|
|
|
|
xdrs->x_op = XDR_ENCODE;
|
|
|
|
msg->rm_xid = cd->x_id;
|
2011-04-17 01:59:36 +00:00
|
|
|
stat = xdr_replymsg (xdrs, msg);
|
|
|
|
(void) xdrrec_endofrecord (xdrs, TRUE);
|
1998-07-28 16:26:04 +00:00
|
|
|
return stat;
|
|
|
|
}
|