mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-20 09:41:18 +00:00
b43b13ac25
1999-12-03 Andreas Jaeger <aj@suse.de> * nss/getXXbyYY.c: Include <resolv.h> (FUNCTION_NAME): Use res_ninit instead of res_init. * nss/getXXbyYY_r.c [NEED__RES]: Include <resolv.h> for _res declaration and prototypes. Remove extra _res declaration. (INTERNAL): Use thread aware res_ninit function. * inet/gethstbyad_r.c: Include <resolv.h>. * resolv/res_data.c: Update from Bind 8.2.2-P5. Moved res_init to res_libc.c. Disabled unneeded functions. * resolv/res_libc.c: New file. * Versions.def: Add version GLIBC_2.2 for libpthread. Add versions GLIBC_2.1 and GLIBC_2.2 for libresolv. * include/resolv.h: Add internal interfaces. * resolv/Makefile (routines): Add new files. (libresolv-routines): Likewise. (distribute): Likewise. * resolv/gethnamaddr.c: Use thread safe resolver functions. * resolv/nss_dns/dns-host.c: Likewise. * resolv/nss_dns/dns-network.c: Likewise. * resolv/arpa/nameser.h: Update from Bind 8.2.2-P5. * resolv/nsap_addr.c: Likewise. * resolv/res_comp.c: Likewise. * resolv/res_debug.c: Likewise. * resolv/res_init.c: Likewise. * resolv/res_mkquery.c: Likewise. * resolv/res_query.c: Likewise. * resolv/res_send.c: Likewise. * resolv/resolv.h: Likewise. * resolv/Versions: Add __res_state and __res_ninit with version GLIBC_2.2 to libc. Add new interfaces with version GLIBC_2.2 to libresolv. * resolv/Banner: Update. * include/arpa/nameser_compat.h: New file. * resolv/ns_name.c: New file from Bind 8.2.2-P5. * resolv/ns_netint.c: Likewise. * resolv/ns_parse.c: Likewise. * resolv/ns_print.c: Likewise. * resolv/ns_samedomain.c: Likewise. * resolv/ns_ttl.c: Likewise. * resolv/arpa/nameser_compat.h: Likewise. * resolv/res_debug.h: Likewise. Some patches are based on work done by Adam D. Bradley <artdodge@cs.bu.edu>. * sysdeps/unix/sysv/linux/configure.in: Remove check for ldconfig, set always use_ldconfig instead.
95 lines
2.2 KiB
C
95 lines
2.2 KiB
C
/*
|
|
* Copyright (c) 1996 by Internet Software Consortium.
|
|
*
|
|
* 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.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
|
|
* ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
|
|
* OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
|
|
* CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
|
|
* DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
|
|
* PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
|
|
* ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
|
|
* SOFTWARE.
|
|
*/
|
|
|
|
#if defined(LIBC_SCCS) && !defined(lint)
|
|
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 <ctype.h>
|
|
#include <resolv.h>
|
|
|
|
static char
|
|
xtob(int c) {
|
|
return (c - (((c >= '0') && (c <= '9')) ? '0' : '7'));
|
|
}
|
|
|
|
u_int
|
|
inet_nsap_addr(const char *ascii, u_char *binary, int maxlen) {
|
|
u_char c, nib;
|
|
u_int len = 0;
|
|
|
|
while ((c = *ascii++) != '\0' && (int) len < maxlen) {
|
|
if (c == '.' || c == '+' || c == '/')
|
|
continue;
|
|
if (!isascii(c))
|
|
return (0);
|
|
c = toupper(c);
|
|
if (isxdigit(c)) {
|
|
nib = xtob(c);
|
|
c = *ascii++;
|
|
if (c != '\0') {
|
|
c = toupper(c);
|
|
if (isxdigit(c)) {
|
|
*binary++ = (nib << 4) | xtob(c);
|
|
len++;
|
|
} else
|
|
return (0);
|
|
}
|
|
else
|
|
return (0);
|
|
}
|
|
else
|
|
return (0);
|
|
}
|
|
return (len);
|
|
}
|
|
|
|
char *
|
|
inet_nsap_ntoa(int binlen, const u_char *binary, char *ascii) {
|
|
int nib;
|
|
int i;
|
|
static char tmpbuf[255*3];
|
|
char *start;
|
|
|
|
if (ascii)
|
|
start = ascii;
|
|
else {
|
|
ascii = tmpbuf;
|
|
start = tmpbuf;
|
|
}
|
|
|
|
if (binlen > 255)
|
|
binlen = 255;
|
|
|
|
for (i = 0; i < binlen; i++) {
|
|
nib = *binary >> 4;
|
|
*ascii++ = nib + (nib < 10 ? '0' : '7');
|
|
nib = *binary++ & 0x0f;
|
|
*ascii++ = nib + (nib < 10 ? '0' : '7');
|
|
if (((i % 2) == 0 && (i + 1) < binlen))
|
|
*ascii++ = '.';
|
|
}
|
|
*ascii = '\0';
|
|
return (start);
|
|
}
|