mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-27 03:41:23 +08:00
df21c8581a
Wed Aug 14 21:36:16 1996 Ulrich Drepper <drepper@cygnus.com> * stdlib/strtod.c (STRTOD): Correct assertion about size of wint_t and wchar_t. Reported by David Mosberger-Tang. Mon Aug 12 22:40:16 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * elf/dl-lookup.c (_dl_lookup_symbol): Remove fifth parameter RELOC_ADDR and make NOPLT a set of flags. All callers changed. Delete condition that checks for resolving to the location being filled in. Add condition to skip the executable's symbols if requested. * elf/link.h: Change declaration of _dl_lookup_symbol accordingly. (DL_LOOKUP_NOEXEC, DL_LOOKUP_NOPLT): New definitions. * elf/dl-reloc.c (RESOLVE): Remove second parameter and rename NOPLT to FLAGS. * elf/dl-runtime.c (RESOLVE): Likewise. * elf/rtld.c (RESOLVE): Likewise. * sysdeps/m68k/dl-machine.h (elf_machine_rela): Pass DL_LOOKUP_NOEXEC as second argument to the RESOLVE macro if processing a copy reloc, DL_LOOKUP_NOPLT for a jump slot reloc, zero otherwise. * sysdeps/alpha/dl-machine.h (elf_machine_rela): Likewise. * sysdeps/i386/dl-machine.h (elf_machine_rel): Likewise. * sysdeps/mips/dl-machine.h (elf_machine_rel): Likewise. Wed Aug 14 17:57:08 1996 Ulrich Drepper <drepper@cygnus.com> * MakeTAGS: Clean up use of --omit-header and -n for xgettext. * po/header.pot: Add empty line at end. Sun Aug 11 13:45:33 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * MakeTAGS (all-pot): Remove $P/errlist.pot, all error messages are now in $P/stdio-common.pot. (XGETTEXTFLAGS-errlist.pot): Variable removed. Mon Aug 12 19:25:03 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * Makerules (do-ar, o-iterator-doit): Compute path to autolock script at run time, not configure time. * config.make.in, configure.in: Undo previous change. Wed Aug 14 13:20:02 1996 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/i386/close.S: Push return value of thread on stack as argument for `_exit'. Reported by Andreas Schwab. Mon Aug 12 19:36:25 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/unix/sysv/linux/m68k/clone.S: New file. Wed Aug 14 04:22:35 1996 Richard Henderson <rth@tamu.edu> * elf/dl-load.c (_dl_map_object): Save name in malloced memory. (_dl_map_object_from_fd): Free name on error. Wed Aug 14 13:00:09 1996 Ulrich Drepper <drepper@cygnus.com> * string/strdup.c: Use result of memcpy to avoid reloading. Tue Aug 13 00:55:03 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * shadow/sgetspent_r.c (__sgetspent_r): Copy string to buffer, not the other way round. * resolv/Makefile (libresolv-routines): Add base64, inet_net_ntop, inet_net_pton, inet_net. * resolv/arpa/nameser.h (__BIND): Update version number. Mon Aug 12 19:03:22 1996 Thomas Bushnell n/BSG <thomas@psilocin.gnu.ai.mit.edu> * sysdeps/generic/gnu/types.h: Declare __fd_mask as `unsigned long'. * mach/Makefile (mach/mach_host.uh): Depend on $(objpfx)/mach-syscalls.mk. ($(objpfx)mach-shortcuts.h): Depend on $(objpfx)mach/mach_host.h. (This fixes a make loop; thanks to Marcus Daniels <marcus@sysc.pdx.edu> for the patch.)
289 lines
7.8 KiB
C
289 lines
7.8 KiB
C
/* Copyright (c) 1993 Carlos Leandro and Rui Salgueiro
|
|
* Dep. Matematica Universidade de Coimbra, Portugal, Europe
|
|
*
|
|
* Permission to use, copy, modify, and distribute this software for any
|
|
* purpose with or without fee is hereby granted, provided that the above
|
|
* copyright notice and this permission notice appear in all copies.
|
|
*/
|
|
/*
|
|
* Copyright (c) 1983, 1993
|
|
* The Regents of the University of California. All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
* 3. All advertising materials mentioning features or use of this software
|
|
* must display the following acknowledgement:
|
|
* This product includes software developed by the University of
|
|
* California, Berkeley and its contributors.
|
|
* 4. Neither the name of the University nor the names of its contributors
|
|
* may be used to endorse or promote products derived from this software
|
|
* without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*/
|
|
|
|
#if defined(LIBC_SCCS) && !defined(lint)
|
|
static char sccsid[] = "@(#)getnetbyaddr.c 8.1 (Berkeley) 6/4/93";
|
|
static char sccsid_[] = "from getnetnamadr.c 1.4 (Coimbra) 93/06/03";
|
|
static char rcsid[] = "$Id$";
|
|
#endif /* LIBC_SCCS and not lint */
|
|
|
|
#include <sys/types.h>
|
|
#include <sys/param.h>
|
|
#include <sys/socket.h>
|
|
#include <netinet/in.h>
|
|
#include <arpa/inet.h>
|
|
#include <arpa/nameser.h>
|
|
|
|
#include <stdio.h>
|
|
#include <netdb.h>
|
|
#include <resolv.h>
|
|
#include <ctype.h>
|
|
#include <errno.h>
|
|
#include <string.h>
|
|
|
|
extern int h_errno;
|
|
|
|
#if defined(mips) && defined(SYSTYPE_BSD43)
|
|
extern int errno;
|
|
#endif
|
|
|
|
struct netent *_getnetbyaddr __P((long net, int type));
|
|
struct netent *_getnetbyname __P((const char *name));
|
|
|
|
#define BYADDR 0
|
|
#define BYNAME 1
|
|
#define MAXALIASES 35
|
|
|
|
#if PACKETSZ > 1024
|
|
#define MAXPACKET PACKETSZ
|
|
#else
|
|
#define MAXPACKET 1024
|
|
#endif
|
|
|
|
typedef union {
|
|
HEADER hdr;
|
|
u_char buf[MAXPACKET];
|
|
} querybuf;
|
|
|
|
typedef union {
|
|
long al;
|
|
char ac;
|
|
} align;
|
|
|
|
static struct netent *
|
|
getnetanswer(answer, anslen, net_i)
|
|
querybuf *answer;
|
|
int anslen;
|
|
int net_i;
|
|
{
|
|
|
|
register HEADER *hp;
|
|
register u_char *cp;
|
|
register int n;
|
|
u_char *eom;
|
|
int type, class, buflen, ancount, qdcount, haveanswer, i, nchar;
|
|
char aux1[30], aux2[30], ans[30], *in, *st, *pauxt, *bp, **ap,
|
|
*paux1 = &aux1[0], *paux2 = &aux2[0], flag = 0;
|
|
static struct netent net_entry;
|
|
static char *net_aliases[MAXALIASES], netbuf[BUFSIZ+1];
|
|
|
|
/*
|
|
* find first satisfactory answer
|
|
*
|
|
* answer --> +------------+ ( MESSAGE )
|
|
* | Header |
|
|
* +------------+
|
|
* | Question | the question for the name server
|
|
* +------------+
|
|
* | Answer | RRs answering the question
|
|
* +------------+
|
|
* | Authority | RRs pointing toward an authority
|
|
* | Additional | RRs holding additional information
|
|
* +------------+
|
|
*/
|
|
eom = answer->buf + anslen;
|
|
hp = &answer->hdr;
|
|
ancount = ntohs(hp->ancount); /* #/records in the answer section */
|
|
qdcount = ntohs(hp->qdcount); /* #/entries in the question section */
|
|
bp = netbuf;
|
|
buflen = sizeof(netbuf);
|
|
cp = answer->buf + HFIXEDSZ;
|
|
if (!qdcount) {
|
|
if (hp->aa)
|
|
h_errno = HOST_NOT_FOUND;
|
|
else
|
|
h_errno = TRY_AGAIN;
|
|
return (NULL);
|
|
}
|
|
while (qdcount-- > 0)
|
|
cp += __dn_skipname(cp, eom) + QFIXEDSZ;
|
|
ap = net_aliases;
|
|
*ap = NULL;
|
|
net_entry.n_aliases = net_aliases;
|
|
haveanswer = 0;
|
|
while (--ancount >= 0 && cp < eom) {
|
|
n = dn_expand(answer->buf, eom, cp, bp, buflen);
|
|
if ((n < 0) || !res_dnok(bp))
|
|
break;
|
|
cp += n;
|
|
ans[0] = '\0';
|
|
(void)strcpy(&ans[0], bp);
|
|
GETSHORT(type, cp);
|
|
GETSHORT(class, cp);
|
|
cp += INT32SZ; /* TTL */
|
|
GETSHORT(n, cp);
|
|
if (class == C_IN && type == T_PTR) {
|
|
n = dn_expand(answer->buf, eom, cp, bp, buflen);
|
|
if ((n < 0) || !res_hnok(bp)) {
|
|
cp += n;
|
|
return (NULL);
|
|
}
|
|
cp += n;
|
|
*ap++ = bp;
|
|
bp += strlen(bp) + 1;
|
|
net_entry.n_addrtype =
|
|
(class == C_IN) ? AF_INET : AF_UNSPEC;
|
|
haveanswer++;
|
|
}
|
|
}
|
|
if (haveanswer) {
|
|
*ap = NULL;
|
|
switch (net_i) {
|
|
case BYADDR:
|
|
net_entry.n_name = *net_entry.n_aliases;
|
|
net_entry.n_net = 0L;
|
|
break;
|
|
case BYNAME:
|
|
in = *net_entry.n_aliases;
|
|
net_entry.n_name = &ans[0];
|
|
aux2[0] = '\0';
|
|
for (i = 0; i < 4; i++) {
|
|
for (st = in, nchar = 0;
|
|
*st != '.';
|
|
st++, nchar++)
|
|
;
|
|
if (nchar != 1 || *in != '0' || flag) {
|
|
flag = 1;
|
|
(void)strncpy(paux1,
|
|
(i==0) ? in : in-1,
|
|
(i==0) ?nchar : nchar+1);
|
|
paux1[(i==0) ? nchar : nchar+1] = '\0';
|
|
pauxt = paux2;
|
|
paux2 = strcat(paux1, paux2);
|
|
paux1 = pauxt;
|
|
}
|
|
in = ++st;
|
|
}
|
|
net_entry.n_net = inet_network(paux2);
|
|
break;
|
|
}
|
|
net_entry.n_aliases++;
|
|
return (&net_entry);
|
|
}
|
|
h_errno = TRY_AGAIN;
|
|
return (NULL);
|
|
}
|
|
|
|
struct netent *
|
|
getnetbyaddr(net, net_type)
|
|
register u_long net;
|
|
register int net_type;
|
|
{
|
|
unsigned int netbr[4];
|
|
int nn, anslen;
|
|
querybuf buf;
|
|
char qbuf[MAXDNAME];
|
|
u_int32_t net2; /* Changed from unsigned long --roland */
|
|
struct netent *net_entry;
|
|
|
|
if (net_type != AF_INET)
|
|
return (_getnetbyaddr(net, net_type));
|
|
|
|
for (nn = 4, net2 = net; net2; net2 >>= 8)
|
|
netbr[--nn] = net2 & 0xff;
|
|
switch (nn) {
|
|
case 3: /* Class A */
|
|
sprintf(qbuf, "0.0.0.%u.in-addr.arpa", netbr[3]);
|
|
break;
|
|
case 2: /* Class B */
|
|
sprintf(qbuf, "0.0.%u.%u.in-addr.arpa", netbr[3], netbr[2]);
|
|
break;
|
|
case 1: /* Class C */
|
|
sprintf(qbuf, "0.%u.%u.%u.in-addr.arpa", netbr[3], netbr[2],
|
|
netbr[1]);
|
|
break;
|
|
case 0: /* Class D - E */
|
|
sprintf(qbuf, "%u.%u.%u.%u.in-addr.arpa", netbr[3], netbr[2],
|
|
netbr[1], netbr[0]);
|
|
break;
|
|
}
|
|
anslen = res_query(qbuf, C_IN, T_PTR, (u_char *)&buf, sizeof(buf));
|
|
if (anslen < 0) {
|
|
#ifdef DEBUG
|
|
if (_res.options & RES_DEBUG)
|
|
printf("res_query failed\n");
|
|
#endif
|
|
if (errno == ECONNREFUSED)
|
|
return (_getnetbyaddr(net, net_type));
|
|
return (NULL);
|
|
}
|
|
net_entry = getnetanswer(&buf, anslen, BYADDR);
|
|
if (net_entry) {
|
|
unsigned u_net = net; /* maybe net should be unsigned ? */
|
|
|
|
/* Strip trailing zeros */
|
|
while ((u_net & 0xff) == 0 && u_net != 0)
|
|
u_net >>= 8;
|
|
net_entry->n_net = u_net;
|
|
return (net_entry);
|
|
}
|
|
return (_getnetbyaddr(net, net_type));
|
|
}
|
|
|
|
struct netent *
|
|
getnetbyname(net)
|
|
register const char *net;
|
|
{
|
|
int anslen;
|
|
querybuf buf;
|
|
char qbuf[MAXDNAME];
|
|
struct netent *net_entry;
|
|
|
|
if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
|
|
h_errno = NETDB_INTERNAL;
|
|
return (NULL);
|
|
}
|
|
strcpy(&qbuf[0], net);
|
|
anslen = res_search(qbuf, C_IN, T_PTR, (u_char *)&buf, sizeof(buf));
|
|
if (anslen < 0) {
|
|
#ifdef DEBUG
|
|
if (_res.options & RES_DEBUG)
|
|
printf("res_query failed\n");
|
|
#endif
|
|
if (errno == ECONNREFUSED)
|
|
return (_getnetbyname(net));
|
|
return (_getnetbyname(net));
|
|
}
|
|
net_entry = getnetanswer(&buf, anslen, BYNAME);
|
|
if (net_entry)
|
|
return (net_entry);
|
|
return (_getnetbyname(net));
|
|
}
|