2000-12-31 16:34:47 +01:00
|
|
|
#ifndef _RPC_RPC_H
|
1995-02-18 02:27:10 +01:00
|
|
|
#include <sunrpc/rpc/rpc.h>
|
Installed header hygiene (BZ#20366): Test of installed headers.
This adds a test to ensure that the problems fixed in the last several
patches do not recur. Each directory checks the headers that it
installs for two properties: first, each header must be compilable in
isolation, as both C and C++, under a representative combination of
language and library conformance levels; second, there is a blacklist
of identifiers that may not appear in any installed header, currently
consisting of the legacy BSD typedefs. (There is an exemption for the
headers that define those typedefs, and for the RPC headers. It may be
necessary to make this more sophisticated if we add more stuff to the
blacklist in the future.)
In order for this test to work correctly, every wrapper header
that actually defines something must guard those definitions with
#ifndef _ISOMAC. This is the existing mechanism used by the conform/
tests to tell wrapper headers not to define anything that the public
header wouldn't, and not to use anything from libc-symbols.h. conform/
only cares for headers that we need to check for standards conformance,
whereas this test applies to *every* header. (Headers in include/ that
are either installed directly, or are internal-use-only and do *not*
correspond to any installed header, are not affected.)
* scripts/check-installed-headers.sh: New script.
* Rules: In each directory that defines header files to be installed,
run check-installed-headers.sh on them as a special test.
* Makefile: Likewise for the headers installed at top level.
* include/aliases.h, include/alloca.h, include/argz.h
* include/arpa/nameser.h, include/arpa/nameser_compat.h
* include/elf.h, include/envz.h, include/err.h
* include/execinfo.h, include/fpu_control.h, include/getopt.h
* include/gshadow.h, include/ifaddrs.h, include/libintl.h
* include/link.h, include/malloc.h, include/mcheck.h
* include/mntent.h, include/netinet/ether.h
* include/nss.h, include/obstack.h, include/printf.h
* include/pty.h, include/resolv.h, include/rpc/auth.h
* include/rpc/auth_des.h, include/rpc/auth_unix.h
* include/rpc/clnt.h, include/rpc/des_crypt.h
* include/rpc/key_prot.h, include/rpc/netdb.h
* include/rpc/pmap_clnt.h, include/rpc/pmap_prot.h
* include/rpc/pmap_rmt.h, include/rpc/rpc.h
* include/rpc/rpc_msg.h, include/rpc/svc.h
* include/rpc/svc_auth.h, include/rpc/xdr.h
* include/rpcsvc/nis_callback.h, include/rpcsvc/nislib.h
* include/rpcsvc/yp.h, include/rpcsvc/ypclnt.h
* include/rpcsvc/ypupd.h, include/shadow.h
* include/stdio_ext.h, include/sys/epoll.h
* include/sys/file.h, include/sys/gmon.h, include/sys/ioctl.h
* include/sys/prctl.h, include/sys/profil.h
* include/sys/statfs.h, include/sys/sysctl.h
* include/sys/sysinfo.h, include/ttyent.h, include/utmp.h
* sysdeps/arm/nacl/include/bits/setjmp.h
* sysdeps/mips/include/sys/asm.h
* sysdeps/unix/sysv/linux/include/sys/sysinfo.h
* sysdeps/unix/sysv/linux/include/sys/timex.h
* sysdeps/x86/fpu/include/bits/fenv.h:
Add #ifndef _ISOMAC guard around internal declarations.
Add multiple-inclusion guard if not already present.
2016-08-24 03:19:17 +02:00
|
|
|
|
|
|
|
|
# ifndef _ISOMAC
|
|
|
|
|
|
2015-09-03 22:33:46 +02:00
|
|
|
#include <libc-tsd.h>
|
2000-12-31 16:34:47 +01:00
|
|
|
|
|
|
|
|
/* Now define the internal interfaces. */
|
|
|
|
|
extern unsigned long _create_xid (void);
|
|
|
|
|
|
2001-03-20 19:26:06 +01:00
|
|
|
/*
|
|
|
|
|
* Multi-threaded support
|
|
|
|
|
* Group all global and static variables into a single spot.
|
|
|
|
|
* This area is allocated on a per-thread basis
|
|
|
|
|
*/
|
|
|
|
|
struct rpc_thread_variables {
|
|
|
|
|
fd_set svc_fdset_s; /* Global, rpc_common.c */
|
|
|
|
|
struct rpc_createerr rpc_createerr_s; /* Global, rpc_common.c */
|
|
|
|
|
struct pollfd *svc_pollfd_s; /* Global, rpc_common.c */
|
|
|
|
|
int svc_max_pollfd_s; /* Global, rpc_common.c */
|
|
|
|
|
|
2004-02-09 11:47:53 +01:00
|
|
|
char *clnt_perr_buf_s; /* clnt_perr.c */
|
2001-03-20 19:26:06 +01:00
|
|
|
|
2004-02-09 11:47:53 +01:00
|
|
|
struct clntraw_private_s *clntraw_private_s; /* clnt_raw.c */
|
2001-03-20 19:26:06 +01:00
|
|
|
|
2004-02-09 11:47:53 +01:00
|
|
|
struct callrpc_private_s *callrpc_private_s; /* clnt_simp.c */
|
2001-03-20 19:26:06 +01:00
|
|
|
|
2004-02-09 11:47:53 +01:00
|
|
|
struct key_call_private *key_call_private_s; /* key_call.c */
|
2001-03-20 19:26:06 +01:00
|
|
|
|
2004-02-09 11:47:53 +01:00
|
|
|
struct cache_entry *authdes_cache_s; /* svcauth_des.c */
|
|
|
|
|
int *authdes_lru_s; /* svcauth_des.c */
|
2001-03-20 19:26:06 +01:00
|
|
|
|
2004-02-09 11:47:53 +01:00
|
|
|
SVCXPRT **svc_xports_s; /* svc.c */
|
|
|
|
|
struct svc_callout *svc_head_s; /* svc.c */
|
2001-03-20 19:26:06 +01:00
|
|
|
|
2004-02-09 11:47:53 +01:00
|
|
|
struct svcraw_private_s *svcraw_private_s; /* svc_raw.c */
|
2001-03-20 19:26:06 +01:00
|
|
|
|
2004-02-09 11:47:53 +01:00
|
|
|
struct proglst_ *svcsimple_proglst_s; /* svc_simple.c */
|
|
|
|
|
SVCXPRT *svcsimple_transp_s; /* svc_simple.c */
|
2001-03-20 19:26:06 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
extern struct rpc_thread_variables *__rpc_thread_variables(void)
|
2017-10-02 00:54:51 +02:00
|
|
|
__attribute__ ((const)) attribute_hidden;
|
|
|
|
|
extern void __rpc_thread_svc_cleanup (void) attribute_hidden;
|
|
|
|
|
extern void __rpc_thread_clnt_cleanup (void) attribute_hidden;
|
|
|
|
|
extern void __rpc_thread_key_cleanup (void) attribute_hidden;
|
2001-03-20 19:26:06 +01:00
|
|
|
|
2018-06-26 15:13:54 +02:00
|
|
|
extern void __rpc_thread_destroy (void) attribute_hidden;
|
2002-08-03 07:03:14 +02:00
|
|
|
|
* bits/libc-tsd.h (__libc_tsd_define, __libc_tsd_address,
__libc_tsd_get, __libc_tsd_set): Add TYPE argument, use it as the type
of the thread variable instead of void *.
* sysdeps/mach/hurd/bits/libc-tsd.h (__libc_tsd_define,
__libc_tsd_address, __libc_tsd_get, __libc_tsd_set): Likewise.
* include/ctype.h (CTYPE_B, CTYPE_TOUPPER, CTYPE_TOLOWER): Adjust
__libc_tsd_define arguments.
(__ctype_b_loc, __ctype_toupper_loc, __ctype_tolower_loc): Adjust
__libc_tsd_address arguments. Remove union hack.
* include/rpc/rpc.h (RPC_VARS): Adjust __libc_tsd_define arguments.
* sunrpc/rpc_thread.c (RPC_VARS): Likewise.
(__rpc_thread_destroy, rpc_thread_multi, __rpc_thread_variables):
Adjust __libc_tsd_{set,get} arguments.
* ctype/ctype-info.c (CTYPE_B, CTYPE_TOUPPER, CTYPE_TOLOWER): Adjust
__libc_tsd_define arguments.
* locale/uselocale.c (__uselocale): Adjust __libc_tsd_{set,get}
arguments.
* locale/lc-ctype.c (_nl_postload_ctype): Likewise.
* locale/global-locale.c (__libc_tsd_LOCALE): Adjust type.
(LOCALE): Adjust __libc_tsd_define arguments.
* locale/localeinfo.h (_NL_CURRENT_LOCALE): Adjust __libc_tsd_get
arguments.
(LOCALE): Adjust __libc_tsd_define arguments.
* sysdeps/mach/hurd/malloc-machine.h (MALLOC): Adjust __libc_tsd_define
arguments.
(tsd_setspecific, tsd_getspecific): Adjust __libc_tsd_{set,get}
arguments. nptl/
* sysdeps/pthread/malloc-machine.h (MALLOC): Adjust __libc_tsd_define
arguments.
(tsd_setspecific, tsd_getspecific): Adjust __libc_tsd_{set,get}
arguments.
2008-11-07 Jakub Jelinek <jakub@redhat.com>
* bits/libc-tsd.h (__libc_tsd_define, __libc_tsd_address,
__libc_tsd_get, __libc_tsd_set): Add TYPE argument, use it as the type
of the thread variable instead of void *.
* sysdeps/mach/hurd/bits/libc-tsd.h (__libc_tsd_define,
__libc_tsd_address, __libc_tsd_get, __libc_tsd_set): Likewise.
* include/ctype.h (CTYPE_B, CTYPE_TOUPPER, CTYPE_TOLOWER): Adjust
__libc_tsd_define arguments.
(__ctype_b_loc, __ctype_toupper_loc, __ctype_tolower_loc): Adjust
__libc_tsd_address arguments. Remove union hack.
* include/rpc/rpc.h (RPC_VARS): Adjust __libc_tsd_define arguments.
* sunrpc/rpc_thread.c (RPC_VARS): Likewise.
(__rpc_thread_destroy, rpc_thread_multi, __rpc_thread_variables):
Adjust __libc_tsd_{set,get} arguments.
* ctype/ctype-info.c (CTYPE_B, CTYPE_TOUPPER, CTYPE_TOLOWER): Adjust
__libc_tsd_define arguments.
* locale/uselocale.c (__uselocale): Adjust __libc_tsd_{set,get}
arguments.
* locale/lc-ctype.c (_nl_postload_ctype): Likewise.
* locale/global-locale.c (__libc_tsd_LOCALE): Adjust type.
(LOCALE): Adjust __libc_tsd_define arguments.
* locale/localeinfo.h (_NL_CURRENT_LOCALE): Adjust __libc_tsd_get
arguments.
(LOCALE): Adjust __libc_tsd_define arguments.
* sysdeps/mach/hurd/malloc-machine.h (MALLOC): Adjust __libc_tsd_define
arguments.
(tsd_setspecific, tsd_getspecific): Adjust __libc_tsd_{set,get}
arguments.
2008-11-07 16:07:10 +01:00
|
|
|
__libc_tsd_define (extern, struct rpc_thread_variables *, RPC_VARS)
|
2001-03-20 19:26:06 +01:00
|
|
|
|
|
|
|
|
#define RPC_THREAD_VARIABLE(x) (__rpc_thread_variables()->x)
|
|
|
|
|
|
2002-08-05 Jakub Jelinek <jakub@redhat.com>
* include/wchar.h (wcrtomb, wcscmp, wcsftime, wcsspn, wcschr, wcscoll,
wcspbrk): Add libc_hidden_proto.
* time/strftime.c (my_strftime): Add libc_hidden_def.
(strftime): Remove libc_hidden_def.
* wcsmbs/wcschr.c (wcschr): Add libc_hidden_def.
* wcsmbs/wcspbrk.c (wcspbrk): Likewise.
* wcsmbs/wcsspn.c (wcsspn): Likewise.
* wcsmbs/wcscmp.c (wcscmp): Likewise.
* wcsmbs/wcrtomb.c (wcrtomb): Add libc_hidden_weak.
* wcsmbs/wcscoll.c (wcscoll): Likewise.
* include/rpc/rpc.h (__rpc_thread_svc_max_pollfd,
__rpc_thread_svc_pollfd, __rpc_thread_svc_fdset,
__rpc_thread_createerr): Add libc_hidden_proto.
* sunrpc/rpc_thread.c (__rpc_thread_svc_max_pollfd,
__rpc_thread_svc_pollfd, __rpc_thread_svc_fdset,
__rpc_thread_createerr): Add libc_hidden_def.
* include/rpc/clnt.h (clnt_sperrno, clnt_spcreateerror,
clnt_perror, clnt_sperror, _rpc_dtablesize): Add libc_hidden_proto.
* sunrpc/clnt_perr.c (clnt_sperrno, clnt_spcreateerror,
clnt_perror, clnt_sperror): Add libc_hidden_def.
* sunrpc/rpc_dtable.c (_rpc_dtablesize): Likewise.
* include/rpc/des_crypt.h (des_setparity, ecb_crypt, cbc_crypt): Add
libc_hidden_proto.
* sunrpc/des_crypt.c (ecb_crypt, cbc_crypt): Add libc_hidden_proto.
* sunrpc/des_soft.c (des_setparity): Likewise.
* include/rpc/auth.h (key_encryptsession_pk, key_decryptsession_pk):
Add libc_hidden_proto.
* sunrpc/key_call.c (key_encryptsession_pk, key_decryptsession_pk):
Add libc_hidden_def.
2002-08-06 00:11:14 +02:00
|
|
|
libc_hidden_proto (__rpc_thread_svc_max_pollfd)
|
|
|
|
|
libc_hidden_proto (__rpc_thread_svc_pollfd)
|
|
|
|
|
libc_hidden_proto (__rpc_thread_svc_fdset)
|
|
|
|
|
libc_hidden_proto (__rpc_thread_createerr)
|
|
|
|
|
|
sunrpc: Always obtain AF_INET addresses from NSS [BZ #20964]
The new __libc_rpc_gethostbyname function calls gethostbyname2_r
with an AF_INET argument and is therefore not affected by the
RES_USE_INET6 flag.
Validated with the following test program, with and without
RES_OPTIONS=inet6, against a NFS server. (Link with -lrpcsvc.)
#include <rpc/clnt.h>
#include <rpcsvc/mount.h>
#include <stdio.h>
#include <string.h>
static void
usage (char **argv)
{
printf ("usage:\n"
" %1$s HOST getrpcport\n"
" %1$s HOST callrpc\n"
" %1$s HOST clnt_create\n",
argv[0]);
}
static void
dump_exports (struct exportnode *exports)
{
while (exports != NULL)
{
printf ("%s\n", exports->ex_dir);
exports = exports->ex_next;
}
}
int
main (int argc, char **argv)
{
if (argc != 3)
{
usage (argv);
return 1;
}
const char *host = argv[1];
const char *command = argv[2];
if (strcmp (command, "getrpcport") == 0)
{
int port = getrpcport (host, MOUNTPROG, MOUNTVERS, IPPROTO_UDP);
printf ("getrpcport: %d\n", port);
}
else if (strcmp (command, "callrpc") == 0)
{
struct exportnode *exports = NULL;
int ret = callrpc (host, MOUNTPROG, MOUNTVERS, MOUNTPROC_EXPORT,
(xdrproc_t) xdr_void, NULL,
(xdrproc_t) xdr_exports, (char *)&exports);
if (ret != 0)
{
clnt_perrno (ret);
puts ("");
return 1;
}
dump_exports (exports);
}
else if (strcmp (command, "clnt_create") == 0)
{
CLIENT *client = clnt_create
(host, MOUNTPROG, MOUNTVERS, "udp");
if (client == NULL)
{
printf ("error: clnt_create failed\n");
return 1;
}
struct exportnode *exports = NULL;
int ret = CLNT_CALL (client, MOUNTPROC_EXPORT,
(xdrproc_t) xdr_void, NULL,
(xdrproc_t) xdr_exports, (char *)&exports,
((struct timeval) {15, 0}));
if (ret != 0)
{
clnt_perrno (ret);
puts ("");
return 1;
}
dump_exports (exports);
}
else
{
usage (argv);
return 1;
}
return 0;
}
2016-12-27 16:44:15 +01:00
|
|
|
/* Perform a host name lookup for NAME and return the first IPv4
|
|
|
|
|
address in *ADDR. Return 0 on success and -1 on error (and set an
|
|
|
|
|
RPC error). */
|
|
|
|
|
int __libc_rpc_gethostbyname (const char *host, struct sockaddr_in *addr)
|
|
|
|
|
attribute_hidden;
|
|
|
|
|
|
Installed header hygiene (BZ#20366): Test of installed headers.
This adds a test to ensure that the problems fixed in the last several
patches do not recur. Each directory checks the headers that it
installs for two properties: first, each header must be compilable in
isolation, as both C and C++, under a representative combination of
language and library conformance levels; second, there is a blacklist
of identifiers that may not appear in any installed header, currently
consisting of the legacy BSD typedefs. (There is an exemption for the
headers that define those typedefs, and for the RPC headers. It may be
necessary to make this more sophisticated if we add more stuff to the
blacklist in the future.)
In order for this test to work correctly, every wrapper header
that actually defines something must guard those definitions with
#ifndef _ISOMAC. This is the existing mechanism used by the conform/
tests to tell wrapper headers not to define anything that the public
header wouldn't, and not to use anything from libc-symbols.h. conform/
only cares for headers that we need to check for standards conformance,
whereas this test applies to *every* header. (Headers in include/ that
are either installed directly, or are internal-use-only and do *not*
correspond to any installed header, are not affected.)
* scripts/check-installed-headers.sh: New script.
* Rules: In each directory that defines header files to be installed,
run check-installed-headers.sh on them as a special test.
* Makefile: Likewise for the headers installed at top level.
* include/aliases.h, include/alloca.h, include/argz.h
* include/arpa/nameser.h, include/arpa/nameser_compat.h
* include/elf.h, include/envz.h, include/err.h
* include/execinfo.h, include/fpu_control.h, include/getopt.h
* include/gshadow.h, include/ifaddrs.h, include/libintl.h
* include/link.h, include/malloc.h, include/mcheck.h
* include/mntent.h, include/netinet/ether.h
* include/nss.h, include/obstack.h, include/printf.h
* include/pty.h, include/resolv.h, include/rpc/auth.h
* include/rpc/auth_des.h, include/rpc/auth_unix.h
* include/rpc/clnt.h, include/rpc/des_crypt.h
* include/rpc/key_prot.h, include/rpc/netdb.h
* include/rpc/pmap_clnt.h, include/rpc/pmap_prot.h
* include/rpc/pmap_rmt.h, include/rpc/rpc.h
* include/rpc/rpc_msg.h, include/rpc/svc.h
* include/rpc/svc_auth.h, include/rpc/xdr.h
* include/rpcsvc/nis_callback.h, include/rpcsvc/nislib.h
* include/rpcsvc/yp.h, include/rpcsvc/ypclnt.h
* include/rpcsvc/ypupd.h, include/shadow.h
* include/stdio_ext.h, include/sys/epoll.h
* include/sys/file.h, include/sys/gmon.h, include/sys/ioctl.h
* include/sys/prctl.h, include/sys/profil.h
* include/sys/statfs.h, include/sys/sysctl.h
* include/sys/sysinfo.h, include/ttyent.h, include/utmp.h
* sysdeps/arm/nacl/include/bits/setjmp.h
* sysdeps/mips/include/sys/asm.h
* sysdeps/unix/sysv/linux/include/sys/sysinfo.h
* sysdeps/unix/sysv/linux/include/sys/timex.h
* sysdeps/x86/fpu/include/bits/fenv.h:
Add #ifndef _ISOMAC guard around internal declarations.
Add multiple-inclusion guard if not already present.
2016-08-24 03:19:17 +02:00
|
|
|
# endif /* !_ISOMAC */
|
2000-12-31 16:34:47 +01:00
|
|
|
#endif
|
