5c6e674735
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; }
70 lines
2.0 KiB
C
70 lines
2.0 KiB
C
#ifndef _RPC_RPC_H
|
|
#include <sunrpc/rpc/rpc.h>
|
|
|
|
# ifndef _ISOMAC
|
|
|
|
#include <libc-tsd.h>
|
|
|
|
/* Now define the internal interfaces. */
|
|
extern unsigned long _create_xid (void);
|
|
|
|
/*
|
|
* Multi-threaded support
|
|
* Group all global and static variables into a single spot.
|
|
* This area is allocated on a per-thread basis
|
|
*/
|
|
#ifdef _RPC_THREAD_SAFE_
|
|
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 */
|
|
|
|
char *clnt_perr_buf_s; /* clnt_perr.c */
|
|
|
|
struct clntraw_private_s *clntraw_private_s; /* clnt_raw.c */
|
|
|
|
struct callrpc_private_s *callrpc_private_s; /* clnt_simp.c */
|
|
|
|
struct key_call_private *key_call_private_s; /* key_call.c */
|
|
|
|
struct cache_entry *authdes_cache_s; /* svcauth_des.c */
|
|
int *authdes_lru_s; /* svcauth_des.c */
|
|
|
|
SVCXPRT **svc_xports_s; /* svc.c */
|
|
struct svc_callout *svc_head_s; /* svc.c */
|
|
|
|
struct svcraw_private_s *svcraw_private_s; /* svc_raw.c */
|
|
|
|
struct proglst_ *svcsimple_proglst_s; /* svc_simple.c */
|
|
SVCXPRT *svcsimple_transp_s; /* svc_simple.c */
|
|
};
|
|
|
|
extern struct rpc_thread_variables *__rpc_thread_variables(void)
|
|
__attribute__ ((const));
|
|
extern void __rpc_thread_svc_cleanup (void);
|
|
extern void __rpc_thread_clnt_cleanup (void);
|
|
extern void __rpc_thread_key_cleanup (void);
|
|
|
|
extern void __rpc_thread_destroy (void);
|
|
|
|
__libc_tsd_define (extern, struct rpc_thread_variables *, RPC_VARS)
|
|
|
|
#define RPC_THREAD_VARIABLE(x) (__rpc_thread_variables()->x)
|
|
|
|
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)
|
|
|
|
/* 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;
|
|
|
|
#endif /* _RPC_THREAD_SAFE_ */
|
|
|
|
# endif /* !_ISOMAC */
|
|
#endif
|