mirror of
				https://sourceware.org/git/glibc.git
				synced 2025-11-03 20:53:13 +03:00 
			
		
		
		
	2000-07-18 Mark Kettenis <kettenis@gnu.org> Update resolver code to BIND 8.2.3-T5B. * resolv/Versions [GLIBC_2.2] (libc): Add __res_init and __res_nclose. [GLIBC_2.2] (libresolv): Add __dn_expand, __ns_samename, __res_mkquery, __res_nsend, __res_query, __res_querydomain and __res_search. * resolv/Banner: BIND-8.2.3-T5B. * resolv/base64.c: Update from BIND 8.2.3-T5B. * resolv/herror.c: Likewise. * resolv/inet_addr.c: Likewise. * resolv/inet_net_ntop.c: Likewise. * resolv/inet_net_pton.c: Likewise. * resolv/inet_neta.c: Likewise. * resolv/inet_ntop.c: Likewise. * resolv/nsap_addr.c: Likewise. * resolv/inet_pton.c: Likewise. Reject a few more more invalid IPv6 addresses (ISC bug #520). * resolv/ns_name.c: Avoid emitting RCS ID in object file. * resolv/ns_parse.c: Likewise. * resolv/ns_netint.c: Likewise. * resolv/ns_samedomain.c: Likewise. * resolv/ns_ttl.c: Likewise. * resolv/ns_print.c: Update from BIND 8.2.3-T5B. Avoid emitting RCS ID in object file. * resolv/res_debug.c: Update from BIND 8.2.3-T5B. * resolv/res_mkquery.c: Likewise. * resolv/res_query.c: Likewise. * resolv/res_init.c: Likewise. (res_setoptions): Mark internal. * resolv/res_send.c: Likewise. [_LIBC]: Fully reinstate the code that avoids the FD_SETSIZE limit by using poll instead. * resolv/res_comp.c: Likewise. [SHLIB_COMPAT (libresolv, GLIBC_2_0, GLIBC_2_2)]: Make dn_expand a weak alias for __dn_expand. * resolv/res_data.c: Likewise. (res_close) [_LIBC]: Don't call res_nclose if RES_INIT isn't set in _res.options. Avoids a potential security risk by avoiding a close (0). [SHLIB_COMPAT (libresolv, GLIBC_2_0, GLIBC_2_2)]: Make res_mkquery, res_query, res_querydomain adn res_search weak aliases for __res_mkquery, __res_query, __res_querydomain and __res_search. * resolv/res_libc.c: (_res): Don't initialize. Fix res_close instead to avoid close(0). (res_init): Always use the static resolver context. [SHLIB_COMPAT (libc, GLIBC_2.0, GLIBC_2_2)]: Make res_init a weak alias for __res_init. * resolv/resolv.h: Update from BIND 8.2.3-T5B. Move definition of RES_SET_H_ERRNO and accompanying comment to... * include/resolv.h: ... here. * resolv/arpa/namser.h: Update from BIND 8.2.3-T5B. * resolv/arpa/nameser_compat.h: Likewise.
		
			
				
	
	
		
			156 lines
		
	
	
		
			3.1 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			156 lines
		
	
	
		
			3.1 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * Copyright (c) 1996,1999 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) && !defined(lint)
 | 
						|
static const char rcsid[] = "$BINDId: ns_ttl.c,v 8.8 1999/10/13 16:39:36 vixie Exp $";
 | 
						|
#endif
 | 
						|
 | 
						|
/* Import. */
 | 
						|
 | 
						|
#include <arpa/nameser.h>
 | 
						|
 | 
						|
#include <ctype.h>
 | 
						|
#include <errno.h>
 | 
						|
#include <stdio.h>
 | 
						|
#include <string.h>
 | 
						|
 | 
						|
#ifdef SPRINTF_CHAR
 | 
						|
# define SPRINTF(x) strlen(sprintf/**/x)
 | 
						|
#else
 | 
						|
# define SPRINTF(x) ((size_t)sprintf x)
 | 
						|
#endif
 | 
						|
 | 
						|
/* Forward. */
 | 
						|
 | 
						|
static int	fmt1(int t, char s, char **buf, size_t *buflen);
 | 
						|
 | 
						|
/* Macros. */
 | 
						|
 | 
						|
#define T(x) if ((x) < 0) return (-1); else (void)NULL
 | 
						|
 | 
						|
/* Public. */
 | 
						|
 | 
						|
int
 | 
						|
ns_format_ttl(u_long src, char *dst, size_t dstlen) {
 | 
						|
	char *odst = dst;
 | 
						|
	int secs, mins, hours, days, weeks, x;
 | 
						|
	char *p;
 | 
						|
 | 
						|
	secs = src % 60;   src /= 60;
 | 
						|
	mins = src % 60;   src /= 60;
 | 
						|
	hours = src % 24;  src /= 24;
 | 
						|
	days = src % 7;    src /= 7;
 | 
						|
	weeks = src;       src = 0;
 | 
						|
 | 
						|
	x = 0;
 | 
						|
	if (weeks) {
 | 
						|
		T(fmt1(weeks, 'W', &dst, &dstlen));
 | 
						|
		x++;
 | 
						|
	}
 | 
						|
	if (days) {
 | 
						|
		T(fmt1(days, 'D', &dst, &dstlen));
 | 
						|
		x++;
 | 
						|
	}
 | 
						|
	if (hours) {
 | 
						|
		T(fmt1(hours, 'H', &dst, &dstlen));
 | 
						|
		x++;
 | 
						|
	}
 | 
						|
	if (mins) {
 | 
						|
		T(fmt1(mins, 'M', &dst, &dstlen));
 | 
						|
		x++;
 | 
						|
	}
 | 
						|
	if (secs || !(weeks || days || hours || mins)) {
 | 
						|
		T(fmt1(secs, 'S', &dst, &dstlen));
 | 
						|
		x++;
 | 
						|
	}
 | 
						|
 | 
						|
	if (x > 1) {
 | 
						|
		int ch;
 | 
						|
 | 
						|
		for (p = odst; (ch = *p) != '\0'; p++)
 | 
						|
			if (isascii(ch) && isupper(ch))
 | 
						|
				*p = tolower(ch);
 | 
						|
	}
 | 
						|
 | 
						|
	return (dst - odst);
 | 
						|
}
 | 
						|
 | 
						|
int
 | 
						|
ns_parse_ttl(const char *src, u_long *dst) {
 | 
						|
	u_long ttl, tmp;
 | 
						|
	int ch, digits, dirty;
 | 
						|
 | 
						|
	ttl = 0;
 | 
						|
	tmp = 0;
 | 
						|
	digits = 0;
 | 
						|
	dirty = 0;
 | 
						|
	while ((ch = *src++) != '\0') {
 | 
						|
		if (!isascii(ch) || !isprint(ch))
 | 
						|
			goto einval;
 | 
						|
		if (isdigit(ch)) {
 | 
						|
			tmp *= 10;
 | 
						|
			tmp += (ch - '0');
 | 
						|
			digits++;
 | 
						|
			continue;
 | 
						|
		}
 | 
						|
		if (digits == 0)
 | 
						|
			goto einval;
 | 
						|
		if (islower(ch))
 | 
						|
			ch = toupper(ch);
 | 
						|
		switch (ch) {
 | 
						|
		case 'W':  tmp *= 7;
 | 
						|
		case 'D':  tmp *= 24;
 | 
						|
		case 'H':  tmp *= 60;
 | 
						|
		case 'M':  tmp *= 60;
 | 
						|
		case 'S':  break;
 | 
						|
		default:   goto einval;
 | 
						|
		}
 | 
						|
		ttl += tmp;
 | 
						|
		tmp = 0;
 | 
						|
		digits = 0;
 | 
						|
		dirty = 1;
 | 
						|
	}
 | 
						|
	if (digits > 0) {
 | 
						|
		if (dirty)
 | 
						|
			goto einval;
 | 
						|
		else
 | 
						|
			ttl += tmp;
 | 
						|
	}
 | 
						|
	*dst = ttl;
 | 
						|
	return (0);
 | 
						|
 | 
						|
 einval:
 | 
						|
	__set_errno (EINVAL);
 | 
						|
	return (-1);
 | 
						|
}
 | 
						|
 | 
						|
/* Private. */
 | 
						|
 | 
						|
static int
 | 
						|
fmt1(int t, char s, char **buf, size_t *buflen) {
 | 
						|
	char tmp[50];
 | 
						|
	size_t len;
 | 
						|
 | 
						|
	len = SPRINTF((tmp, "%d%c", t, s));
 | 
						|
	if (len + 1 > *buflen)
 | 
						|
		return (-1);
 | 
						|
	strcpy(*buf, tmp);
 | 
						|
	*buf += len;
 | 
						|
	*buflen -= len;
 | 
						|
	return (0);
 | 
						|
}
 |