From 650425ceb40e840b2123b6c8cc65389589f41218 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 24 Sep 1997 23:03:42 +0000 Subject: Update. 1997-09-25 00:23 Ulrich Drepper * elf/dl-profile.c: Correct implementation. * io/ftwtest-sh: Don't depend on TMPDIR == /tmp. * locale/setlocale.c: Rewrite a bit for more clarity. * math/Makefile (libm-calls): Add w_exp2. * math/math_private.h: Add prototypes for __ieee754_exp2{,f,l}. * sysdeps/libm-i387/s_exp2.S: Change name to __ieee754_exp2. * sysdeps/libm-i387/s_exp2f.S: Likewise. * sysdeps/libm-i387/s_exp2l.S: Likewise. * sysdeps/libm-ieee754/k_standard.c: Add error cases for exp2. * string/bits/string2.h (__strcpy_small): Optimize. (__stpcpy_small): Likewise. (strncpy): Use variable for dest argument since it's used more than once. (strncat): Likewise. (strcmp): Add optimization for this function. * sysdeps/i386/i486/string.h (strlen): Correctly use __builtin_strlen. (__strcpy_small): Optimize. (__stpcpy_small): Likewise. (__stpcpy_c): Correctly use __mempcpy_* macros. (__mempcpy_by2, __mempcpy_by4, __mempcpy_byn): Return pointer to byte following last copied. (strncat): Use variable for dest argument since it's used more than once. (strcmp): Add optimization for this function. * sysdeps/i386/dl-machine.h (ELF_MACHINE_RUNTIME_TRAMPOLINE): Use .text and .previous to select correct section. 1997-09-23 19:56 Philip Blundell * configure.in: Add `--disable-versioning' option to suppress the use of symbol versions even if binutils claims to support it. 1997-09-24 20:10 Philip Blundell * csu/Makefile (before-compile): Don't try to build abi-tags.h if not using ELF. 1997-09-21 Andreas Schwab * elf/sofini.c [HAVE_DWARF2_UNWIND_INFO]: Supply termination for the frame unwind info section. * elf/soinit.c [HAVE_DWARF2_UNWIND_INFO]: Register and unregister the frame unwind info. * config.h.in (HAVE_DWARF2_UNWIND_INFO): Add #undef. * configure.in: Check whether gcc supports DWARF2 unwind info. * libc.map: Export frame handling tables. 1997-09-10 06:56 Geoff Keating * sysdeps/unix/sysv/linux/powerpc/bits/kernel_termios.h: Use the size of the kernel's termios structure for ioctls. * sysdeps/powerpc/dl-machine.h: Prepare for library profiling. * sysdeps/powerpc/bits/mathinline.h: Add slightly slower versions of the C9X FP comparison macros. Delete 'fabs' and 'sqrt' inline routines, because gcc has them as internals. * sysdeps/powerpc/Makefile (pic-ccflags): Define this instead of CFLAGS-.os. * sysdeps/powerpc/bzero.S: New file. * sysdeps/powerpc/strcat.c: New file. * sysdeps/powerpc/strcpy.S: New file. * sysdeps/powerpc/stpcpy.S: New file. * math/Makefile: Add atest_exp2, test-reduce. * math/atest_exp2.c: New file. * math/test-reduce.c: New file. * sysdeps/libm-ieee754/Dist: New file. * sysdeps/libm-ieee754/s_exp2.c: New file. * sysdeps/libm-ieee754/s_exp2f.c: New file. * sysdeps/libm-ieee754/t_exp2.h: New file. * sysdeps/libm-ieee754/t_exp2f.h: New file. * math/libm-test.c (exp2_test): Add some more tests. * Rules: Use empty.os instead of empty.o, since it gets linked into libc.so... * configure.in: Add --disable-static to disable building .a files. * config.make.in: Substitute the new variable. * Makeconfig: Don't build .o files if not building .a files. * elf/dl-runtime.c (fixup): Factor out call to elf_machine_relplt. (profile_fixup): Likewise. 1997-09-23 Andreas Schwab * posix/globtest.c (main): Change to directory passed as first argument. * posix/globtest.sh: Don't cd before running the program, instead pass testdir as argument, so that $common_objpfx remains valid. 1997-09-23 18:01 Thorsten Kukuk * nis/nis_call.c (__do_niscall2): Fix multiple Server support. * nis/nis_findserver.c: Save latest working sockaddr_in. 1997-09-17 22:07 Zack Weinberg * configure.in: Automatically determine whether as and ld are the GNU versions. (options): --with-gnu-{as,ld,binutils} replaced by single option --with-binutils=PATH specifying a -B option to gcc. * aclocal.m4: Two new macros defined, LIBC_PROG_FOO_GNU and LIBC_PROG_BINUTILS. * configure.in: Allow the user to force configuration for unsupported platforms with an undocumented option. 1997-09-22 16:55 Thorsten Kukuk * sunrpc/get_myaddr.c (get_myaddress): Avoid loopback interfaces, return loopback address only if there is no other interface. * nis/Makefile: Add nis_callback libnsl-routines. * nis/nis_add.c: Use new __do_niscall* interface. * nis/nis_cache.c: Likewise. * nis/nis_checkpoint.c: Likewise. * nis/nis_lookup.c: Likewise. * nis/nis_mkdir.c: Likewise. * nis/nis_modify.c: Likewise. * nis/nis_ping.c: Likewise. * nis/nis_remove.c: Likewise. * nis/nis_rmdir.c: Likewise. * nis/nis_server.c: Likewise. * nis/nis_util.c: Likewise. * nis/rpcsvc/nis.h: Make C++ safe. * nis/nss_nisplus/nisplus-publickey.c (getsecretkey): Fix use of variables. * nis/nis_findserv.c: Make thread safe. * nis/nis_call.c: Add support for callback, Fix use of variables. * nis/nis_table.c: Add support for callback, FOLLOW_PATH and ALL_RESULTS. * nis/nis_callback.c: New, callback functions. * nis/nis_intern.h: Add callback declarations. 1997-09-20 Andreas Schwab * string/bits/string2.h: Fix logic in preprocessor directive. (__strsep_1c, __strsep_g): Don't declare __retval as pointing to const, to save a cast and a possible warning. 1997-09-22 04:12 Ulrich Drepper * sysdeps/i386/i486/atomicity.h (exchange_and_add): Really address memory in xadd not %1. 1997-09-21 13:56 Ulrich Drepper * manual/maint.texi (Supported Configurations): Add SPARC64 to list of supported platforms. --- nis/nis_findserv.c | 73 +++++++++++++++++++----------------------------------- 1 file changed, 25 insertions(+), 48 deletions(-) (limited to 'nis/nis_findserv.c') diff --git a/nis/nis_findserv.c b/nis/nis_findserv.c index 5ab369c..8450817 100644 --- a/nis/nis_findserv.c +++ b/nis/nis_findserv.c @@ -86,9 +86,10 @@ __pmap_getport (struct sockaddr_in *address, u_long program, rpc_createerr.cf_stat = RPC_PMAPFAILURE; clnt_geterr (client, &rpc_createerr.cf_error); } - else if (port == 0) + else { - rpc_createerr.cf_stat = RPC_PROGNOTREGISTERED; + if (port == 0) + rpc_createerr.cf_stat = RPC_PROGNOTREGISTERED; } CLNT_DESTROY (client); } @@ -97,39 +98,7 @@ __pmap_getport (struct sockaddr_in *address, u_long program, 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 */ +/* This is now the public function, which should find the fastest server */ struct findserv_req { @@ -142,13 +111,15 @@ struct findserv_req long __nis_findfastest (dir_binding * bind) { - struct timeval TIMEOUT = {5, 0}; + const struct timeval TIMEOUT50 = {5, 0}; + const struct timeval TIMEOUT00 = {0, 0}; struct findserv_req **pings; - struct sockaddr_in sin; + struct sockaddr_in sin, saved_sin; int found = -1; - uint32_t xid_seed, xid_lookup; + u_int32_t xid_seed, xid_lookup; int sock, dontblock = 1; CLIENT *clnt; + char clnt_res; void *foo = NULL; u_long i, j, pings_count, pings_max; struct cu_data *cu; @@ -157,14 +128,16 @@ __nis_findfastest (dir_binding * bind) for multihomed hosts */ pings_count = 0; pings = malloc (sizeof (struct findserv_req *) * pings_max); - xid_seed = (uint32_t) (time (NULL) ^ getpid ()); + xid_seed = (u_int32_t) (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) + if ((bind->server_val[i].ep.ep_val[j].proto == NULL) || + (strcmp (bind->server_val[i].ep.ep_val[j].proto, "-") == 0) || + (strlen (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); @@ -184,6 +157,7 @@ __nis_findfastest (dir_binding * bind) pings[pings_count] = calloc (1, sizeof (struct findserv_req)); memcpy ((char *) &pings[pings_count]->sin, (char *) &sin, sizeof (sin)); + memcpy ((char *)&saved_sin, (char *)&sin, sizeof(sin)); pings[pings_count]->xid = xid_seed; pings[pings_count]->server_nr = i; pings[pings_count]->server_ep = j; @@ -200,7 +174,7 @@ __nis_findfastest (dir_binding * bind) /* Create RPC handle */ sock = socket (AF_INET, SOCK_DGRAM, IPPROTO_UDP); - clnt = clntudp_create (&sin, NIS_PROG, NIS_VERSION, TIMEOUT, &sock); + clnt = clntudp_create (&saved_sin, NIS_PROG, NIS_VERSION, TIMEOUT50, &sock); if (clnt == NULL) { close (sock); @@ -211,8 +185,7 @@ __nis_findfastest (dir_binding * bind) } clnt->cl_auth = authunix_create_default (); cu = (struct cu_data *) clnt->cl_private; - TIMEOUT.tv_sec = 0; - clnt_control (clnt, CLSET_TIMEOUT, (char *) &TIMEOUT); + clnt_control (clnt, CLSET_TIMEOUT, (char *) &TIMEOUT00); ioctl (sock, FIONBIO, &dontblock); /* Send to all servers the NULLPROC */ @@ -220,13 +193,17 @@ __nis_findfastest (dir_binding * bind) { /* 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); + memcpy ((char *) &cu->cu_raddr, (char *) &pings[i]->sin, + sizeof (struct sockaddr_in)); + /* Transmit to NULLPROC, return immediately. */ + clnt_call (clnt, NULLPROC, (xdrproc_t) xdr_void, (caddr_t) foo, + (xdrproc_t) xdr_void, (caddr_t) & clnt_res, TIMEOUT00); } - /* Receive reply */ - nis_null_3_recv (foo, clnt); + /* Receive reply from NULLPROC asynchronously */ + memset ((char *) &clnt_res, 0, sizeof (clnt_res)); + clnt_call (clnt, NULLPROC, (xdrproc_t) NULL, (caddr_t) foo, + (xdrproc_t) xdr_void, (caddr_t) &clnt_res, TIMEOUT00); xid_lookup = *((u_int32_t *) (cu->cu_inbuf)); for (i = 0; i < pings_count; i++) -- cgit v1.1