mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-24 11:41:07 +00:00
55c14926be
1997-08-04 15:29 Ulrich Drepper <drepper@cygnus.com> * locale/programs/localedef.c (main): Set bit in avail for those categories which are successfully read. * locale/programs/locfile.c (check_all_categories): Don't check categories if they are not available. (write_all_categories): Don't write categories if they are not available. * login/setutent_r.c (setutent_unknown): Change return type to int and return result of called function. * manual/arith.texi: Mark floating-point test macro from ISO C 9X as macros (not functions). * manual/libc.texinfo (UPDATED): Update. * manual/math.texi: Document exceptions, functions to handle exceptions, mathematical constants, FP comparison functions and several new functions from ISO C 9X. Change parameter of drand48, lrand48, and mrand48 to void (not empty). * manual/pattern.texi: Remove paragraph which explained that wordexp is executed by running a shell. * manual/time.texi: Explain difficulties with strftime if the functions returns 0 and no error occurred. * math/math.h: Correct comment for some M_* constants. (isgreater, isgreaterequal, isless, islessequal, islessgreater, inunordered): Rewrite to make sure the arguments are evaluated exactly once. * nis/rpcsvc/nis.x: Undo last change. * nis/rpcsvc/nis.h: Likewise. * nis/rpcsvc/nislib.h: File moved back to here. * posix/sys/types.h: Don't define socklen_t. Pretty print. * socket/sys/socket.h (bind, getsockname, connect, sendto, recvfrom, getsockopt, setsockopt, accept): Change size argument to type socklen_t. Pretty print. * manual/socket.texi: Describe socklen_t and change prototypes of socket functions to use socklen_t. * sysdeps/generic/bits/socket.h: Define socklen_t. (struct msghdr): Correct types to use socklen_t. * sysdeps/unix/sysv/linux/bits/socket.h: Likewise. * sysdeps/unix/sysv/linux/mips/bits/socket.h: Likewise. * stdio-common/printf_fp.c (__printf_fp): Correct rouding of number 1.0 < x < 8.0. * stdio-common/tfformat.c: Add new tests for above bug. * stdlib/strtod.c: Fix typo. * string/Makefile (headers): Add bits/string.h. (CFLAGS-*): Add -D__NO_STRING_INLINES. * string/string.h: Include <bits/string.h> if optimizing and __NO_STRING_INLINES is not defined. * sysdeps/stub/bits/string.h: New file. * sysdeps/powerpc/bits/fenv.h: Fix typos. * sysdeps/unix/sysv/linux/if_index.c: Let functions return ENOSYS if SIOGIFINDEX is not defined. * sysdeps/wordsize-32/inttypes.h: Pretty print. * sysdeps/wordsize-64/inttypes.h: Pretty print. * termios/cfsetspeed.c: Rewrite loop to do what it shall do. * wcsmbs/Makefile (tests): Add tst-wcstof. * wcsmbs/tst-wcstof.c: New file. 1997-08-01 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/m68k/__longjmp.c: Replace call to abort by infinite loop, to avoid dragging stdio into the dynamic linker. 1997-08-02 19:44 H.J. Lu <hjl@gnu.ai.mit.edu> * nis/nis_findserv.c (xid, xid_seed, xid_lookup): Make them u_int32_t. 1997-08-03 Andreas Jaeger <aj@arthur.rhein-neckar.de> * posix/wordexp.c (parse_tilde): Fix calls to __getpwnam_r and __getpwuid_r. Include <stdio.h> to get prototypes of *printf. (exec_comm): Remove unneeded variable *sh. * libc.map: Add wordexp, wordfree. * posix/Makefile (routines): Add wordexp. 1997-08-03 Andreas Jaeger <aj@arthur.rhein-neckar.de> * posix/wordexp.c: Correct typo in comment. (wordexp): Likewise. * manual/errno.texi (Error Codes): Fix typo. 1997-08-03 15:28 Ulrich Drepper <drepper@cygnus.com> * csu/initfini.c (SECTION): Don't put quotes around section name since this is not understood by all assemblers. Patch by Klaus Espenlaub <kespenla@hydra.informatik.uni-ulm.de>.
252 lines
6.9 KiB
C
252 lines
6.9 KiB
C
/* Copyright (C) 1997 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 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 <string.h>
|
|
#include <unistd.h>
|
|
#include <sys/ioctl.h>
|
|
#include <rpc/pmap_prot.h>
|
|
#include <rpc/pmap_clnt.h>
|
|
#include <rpcsvc/nis.h>
|
|
|
|
#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_int32_t 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;
|
|
uint32_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 = (uint32_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)
|
|
{
|
|
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;
|
|
}
|