From 3996f34b46043ed8ea8fdc6f44377d969d64396b Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Mon, 28 Jul 1997 22:35:20 +0000 Subject: Update. 1997-07-28 23:35 Ulrich Drepper * csu/gmon-start.c (__gmon_start__): Call __monstartup not monstartup. * gmon/gmon.c: Rename moncontrol to __moncontrol and monstartup to __monstartup. * gmon/sys/gmon.h: Fix prototypes. * gmon/sys/gmon_out.h: Pretty print. * gmon/bb_exit_func.c (__bb_exit_func): Use memcpy instead of bcopy. * gmon/gmon.c (__monstartup): Likewise. (write_hist): Remove dependency on 32 int. (_mcleanup): Don't call perror, use fprintf. * elf/dl-load.c: Fix handling of current directory in search path. * elf/Makefile (dl-routines): Add dl-profile. * elf/dl-profile.c: New file. * elf/dl-runtime.c (fixup): Add new parameter with address to store relocation result in to elf_machine_relplt. (profile_fixup): New function. * elf/do-rel.h (elf_dynamic_do_rel): Add new parameter with address to store relocation result in to elf_machine_relplt. * elf/dl-support.c: Define _dl_profile and _dl_profile_map. * elf/dynamic-link.h (ELF_DYNAMIC_RELOCATE): Add new parameter and call elf_machine_runtime_setup with extra argument. * elf/dl-reloc.c (_dl_relocate_object): Add new argument to ELF_DYNAMIC_RELOCATE. * elf/link.h: Add prototypes for new functions and variables. * elf/rtld.c: Parse LD_PROFILE and LD_PROFILE_OUTPUT environment variables and call _dl_start_profile if necessary. * include/sys/gmon_out.h: New file. * sysdeps/alpha/dl-machine.h (elf_machine_runtime_setup): Add new parameter to enable profiling. (elf_machine_rela): Add new parameter to specify place to store result in. * sysdeps/m68k/dl-machine.h: Likewise. * sysdeps/mips/dl-machine.h: Likewise. * sysdeps/mips/mips64/dl-machine.h: Likewise. * sysdeps/powerpc/dl-machine.h: Likewise. * sysdeps/sparc/dl-machine.h: Likewise. * sysdeps/sparc64/dl-machine.h: Likewise. * sysdeps/i386/dl-machine.h: Likewise. (elf_machine_runtime_setup): Setup got[2] to _dl_runtime_resolve if we do profiling. (ELF_MACHINE_RUNTIME_TRAMPOLINE): Add code for _dl_runtime_profile. * nis/nss_compat/compat-grp.c (internal_setgrent): Set FD_CLOEXEC for stream on input file. * nis/nss_compat/compat-pwd.c (internal_setpwent): Likewise. * nis/nss_compat/compat-spwd.c (internal_setspent): Likewise. * nss/nss_db/db-XXX.c (internal_setent): Likewise. * nss/nss_db/db-alias.c (internal_setent): Likewise. * nss/nss_db/db-netgrp.c (internal_setent): Likewise. * nss/nss_files/files-XXX.c (internal_setent): Likewise. * nss/nss_files/files-alias.c (internal_setent): Likewise. * nss/nss_files/files-netgrp.c (internal_setent): Likewise. * string/string.h: Pretty print. * sysdeps/i386/fpu/bits/mathinline.h: Major update by John Bowman. Add float and long double versions. 1997-07-27 Andreas Schwab * elf/rtld.c (print_unresolved): Replace empty object name by main program name. 1997-07-27 Andreas Schwab * sysdeps/generic/htons.c (htons): Renamed from __htons. 1997-07-27 Andreas Schwab * sysdeps/m68k/bits/byteswap.h: New file. 1997-07-27 23:50 Philip Blundell * inet/netinet/icmp6.h: Update for new drafts of POSIX.1g and IPv6 advanced API. * inet/netinet/in.h: Likewise. * inet/netinet/ip6.h: Likewise. * sysdeps/unix/sysv/linux/bits/socket.h: Likewise. * posix/sys/types.h: Add socklen_t. * manual/socket.texi: Document some more IPv6 things. * manual/libc.texinfo: Likewise. 1997-07-26 Andreas Jaeger * libc.map: Define missing symbol. 1997-07-27 14:31 Thorsten Kukuk * nis/Makefile: Add nis_findserv. * nis/lckcache.c: Fix typo. * nis/nis_call.c: Fix problems with multihomed servers. * nis/nis_findserv.c: New file. * nis/nis_intern.h: Add more prototypes. * nis/nis_lookup.c (nis_lookup): Don't try the next server if network is unreachable. * nis/nis_table.c (nis_list): Likewise. * nis/nis_ping.c (nis_ping): Use MASTER_ONLY, don't call abort() in error case. * nis/nis_util.c (__nis_finddirectory): Give the right error code back. * nis/ypclnt.c: Make sure, that all sockets are closed. --- nis/nis_findserv.c | 251 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 251 insertions(+) create mode 100644 nis/nis_findserv.c (limited to 'nis/nis_findserv.c') diff --git a/nis/nis_findserv.c b/nis/nis_findserv.c new file mode 100644 index 0000000..a04abd8 --- /dev/null +++ b/nis/nis_findserv.c @@ -0,0 +1,251 @@ +/* Copyright (C) 1997 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Thorsten Kukuk , 1997. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 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 + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#include +#include +#include +#include +#include +#include + +#include "nis_intern.h" + +/* Private data kept per client handle, from sunrpc/clnt_udp.c */ +struct cu_data + { + int cu_sock; + bool_t cu_closeit; + struct sockaddr_in cu_raddr; + int cu_rlen; + struct timeval cu_wait; + struct timeval cu_total; + struct rpc_err cu_error; + XDR cu_outxdrs; + u_int cu_xdrpos; + u_int cu_sendsz; + char *cu_outbuf; + u_int cu_recvsz; + char cu_inbuf[1]; + }; + + +/* The following is the original routine from sunrpc/pm_getport.c. + The only change is the much shorter timeout. */ +/* + * pmap_getport.c + * Client interface to pmap rpc service. + * + * Copyright (C) 1984, Sun Microsystems, Inc. + */ + +/* + * Find the mapped port for program,version. + * Calls the pmap service remotely to do the lookup. + * Returns 0 if no map exists. + */ +static u_short +__pmap_getport (struct sockaddr_in *address, u_long program, + u_long version, u_int protocol) +{ + const struct timeval timeout = {1, 0}; + const struct timeval tottimeout = {1, 0}; + u_short port = 0; + int socket = -1; + CLIENT *client; + struct pmap parms; + + address->sin_port = htons (PMAPPORT); + client = clntudp_bufcreate (address, PMAPPROG, PMAPVERS, timeout, &socket, + RPCSMALLMSGSIZE, RPCSMALLMSGSIZE); + if (client != (CLIENT *) NULL) + { + parms.pm_prog = program; + parms.pm_vers = version; + parms.pm_prot = protocol; + parms.pm_port = 0; /* not needed or used */ + if (CLNT_CALL (client, PMAPPROC_GETPORT, (xdrproc_t) xdr_pmap, + (caddr_t) & parms, (xdrproc_t) xdr_u_short, + (caddr_t) & port, tottimeout) != RPC_SUCCESS) + { + rpc_createerr.cf_stat = RPC_PMAPFAILURE; + clnt_geterr (client, &rpc_createerr.cf_error); + } + else if (port == 0) + { + rpc_createerr.cf_stat = RPC_PROGNOTREGISTERED; + } + CLNT_DESTROY (client); + } + /* (void)close(socket); CLNT_DESTROY already closed it */ + address->sin_port = 0; + return port; +} + +/* Transmit to NULLPROC, return immediately. */ +static void * +nis_null_3_send (void *argp, CLIENT * clnt) +{ + static char clnt_res; + struct timeval TIMEOUT = {0, 0}; + + memset ((char *) &clnt_res, 0, sizeof (clnt_res)); + if (clnt_call (clnt, NULLPROC, + (xdrproc_t) xdr_void, (caddr_t) argp, + (xdrproc_t) xdr_void, (caddr_t) & clnt_res, + TIMEOUT) != RPC_SUCCESS) + return NULL; + return (void *) &clnt_res; +} + +/* Receive request from NULLPROC asynchronously. */ +static void * +nis_null_3_recv (void *argp, CLIENT * clnt) +{ + static char clnt_res; + struct timeval TIMEOUT = {0, 0}; + + memset ((char *) &clnt_res, 0, sizeof (clnt_res)); + if (clnt_call (clnt, NULLPROC, + (xdrproc_t) NULL, (caddr_t) argp, + (xdrproc_t) xdr_void, (caddr_t) & clnt_res, + TIMEOUT) != RPC_SUCCESS) + return NULL; + return (void *) &clnt_res; +} + +/* This is now the public functions, which should find the fastest server */ + +struct findserv_req +{ + struct sockaddr_in sin; + u_long xid; + u_int server_nr; + u_int server_ep; +}; + +long +__nis_findfastest (dir_binding * bind) +{ + struct timeval TIMEOUT = {5, 0}; + struct findserv_req **pings; + struct sockaddr_in sin; + int found = -1; + time_t xid_seed, xid_lookup; + int sock, dontblock = 1; + CLIENT *clnt; + void *foo = NULL; + u_long i, j, pings_count, pings_max; + struct cu_data *cu; + + pings_max = bind->server_len * 2; /* Reserve a little bit more memory + for multihomed hosts */ + pings_count = 0; + pings = malloc (sizeof (struct findserv_req *) * pings_max); + xid_seed = time (NULL) ^ getpid (); + + memset (&sin, '\0', sizeof (sin)); + sin.sin_family = AF_INET; + for (i = 0; i < bind->server_len; i++) + for (j = 0; j < bind->server_val[i].ep.ep_len; ++j) + if (strcmp (bind->server_val[i].ep.ep_val[j].family, "inet") == 0) + if (strcmp (bind->server_val[i].ep.ep_val[j].proto, "-") == 0) + { + sin.sin_addr.s_addr = + inetstr2int (bind->server_val[i].ep.ep_val[j].uaddr); + if (sin.sin_addr.s_addr == 0) + continue; + sin.sin_port = htons (__pmap_getport (&sin, NIS_PROG, + NIS_VERSION, IPPROTO_UDP)); + if (sin.sin_port == 0) + continue; + + if (pings_count >= pings_max) + { + pings_max += 10; + pings = realloc (pings, sizeof (struct findserv_req) * + pings_max); + } + pings[pings_count] = calloc (1, sizeof (struct findserv_req)); + memcpy ((char *) &pings[pings_count]->sin, (char *) &sin, + sizeof (sin)); + pings[pings_count]->xid = xid_seed; + pings[pings_count]->server_nr = i; + pings[pings_count]->server_ep = j; + ++xid_seed; + ++pings_count; + } + + /* Make sure at least one server was assigned */ + if (pings_count == 0) + { + free (pings); + return -1; + } + + /* Create RPC handle */ + sock = socket (AF_INET, SOCK_DGRAM, IPPROTO_UDP); + clnt = clntudp_create (&sin, NIS_PROG, NIS_VERSION, TIMEOUT, &sock); + if (clnt == NULL) + { + close (sock); + for (i = 0; i < pings_count; ++i) + free (pings[i]); + free (pings); + return -1; + } + clnt->cl_auth = authunix_create_default (); + cu = (struct cu_data *) clnt->cl_private; + TIMEOUT.tv_sec = 0; + clnt_control (clnt, CLSET_TIMEOUT, (char *) &TIMEOUT); + ioctl (sock, FIONBIO, &dontblock); + + /* Send to all servers the NULLPROC */ + for (i = 0; i < pings_count; ++i) + { + /* clntudp_call() will increment, subtract one */ + *((u_int32_t *) (cu->cu_outbuf)) = pings[i]->xid - 1; + bcopy ((char *) &pings[i]->sin, (char *) &cu->cu_raddr, + sizeof (struct sockaddr_in)); + nis_null_3_send (foo, clnt); + } + + /* Receive reply */ + nis_null_3_recv (foo, clnt); + + xid_lookup = *((u_int32_t *) (cu->cu_inbuf)); + for (i = 0; i < pings_count; i++) + { + if (pings[i]->xid == xid_lookup) + { + bind->server_used = pings[i]->server_nr; + bind->current_ep = pings[i]->server_ep; + found = 1; + } + } + + auth_destroy (clnt->cl_auth); + clnt_destroy (clnt); + close (sock); + + for (i = 0; i < pings_count; ++i) + free (pings[i]); + free (pings); + + return found; +} -- cgit v1.1