mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-24 19:51:11 +00:00
76b87c039b
1997-05-29 12:48 Ulrich Drepper <drepper@cygnus.com> * io/ftw.c: Complete rewrite. Add implementation of `nftw'. * io/ftw.h: Update for new implementation and XPG4.2. * login/Makefile: Update for UTMP daemon implementation. Update resolver code to bind-4.9.6-T1A. * resolv/Banner: Update. * nss/digits_dots.c: Adapt text address matching to T1A. * nss/nss_files/files-hosts.c: Always use inet_pton. * resolv/base64.c (b64_pton): Follow T1A but don't use this code since it would lead to warnings. * resolv/gethnamaddr.c (getanswer): Test host name for maximal length at several places. * resolv/inet_net_pton.c (inet_net_pton_ipv4): Correct typo in comment. * resolv/res_comp.c (dn_expand): Check for overflow. (dn_comp): Likewise. * resolv/res_debug.c (precsize_aton): Better implementation. * resolv/res_init.c (res_init): Make `buf' of size MAXDNAME. * resolv/res_send.c (res_send): Check for overflow in descriptor set. * resolv/nss_dns/dns-host.c (getanswer_r): Test host name for maximal length at several places. 1997-05-29 12:51 Mark Kettenis <kettenis@phys.uva.nl> * login/utmp-private.h (struct utfuncs): Add one more parameter to updwtmp function. Declare all three function jump tables. * login/utmp.h: Declare __utmpname. * login/getutent_r.c: Remove db backend and provide support for utmpd backend. * login/login.c: Use `updwtmp' function insteead of writing the record ourself. * login/logwtmp.c: Move `updwtmp' function to... * login/updwtmp.c: ...here. New file. * login/utmp_db.h: Removed. * login/utmp_file.c: Add updwtmp function to write to file. * login/utmp_daemon.c: New file. Daemon backend. * login/utmpname.c: New file. Implementation of utmpname function. * login/utmpdump.c: New file. Tool to dump utmp-like files. * login/utmpd/connection.c: New file. * login/utmpd/database.c: New file. * login/utmpd/error.c: New file. * login/utmpd/request.c: New file. * login/utmpd/utmpd-private.h: New file. * login/utmpd/utmpd.c: New file. * login/utmpd/utmpd.h: New file. * login/utmpd/xtmp.c: New file. * login/utmpd/xtmp.h: New file. 1997-05-29 12:28 Jim Meyering <meyering@eng.ascend.com> * time/strftime.c: Correct/normalize indentation in cpp directives. 1997-05-28 20:43 Philip Blundell <pjb27@cam.ac.uk> * nis/nis_error.c: Include <string.h> to fix warning. * nis/nis_print.c: Likewise. * nis/nss_nisplus/nisplus-hosts.c: Arg 3 of map_v4v6_hostent is int* not size_t*. 1997-05-28 21:56 Andreas Jaeger <aj@arthur.rhein-neckar.de> * math/cmathcalls.h: Correct typo in comment. * inet/netinet/icmp6.h: Include <netinet/in.h> for in6_addr. * sysdeps/unix/sysv/linux/netinet/ip_fw.h: Include <net/if.h> for IFNAMSIZ. * sysdeps/unix/sysv/linux/net/ppp_defs.h: Include <time.h> for time_t. * login/pty.h: Include <ioctl-types.h> for definition of struct winsize. * misc/regexp.h (compile): Correct typo. * argp/argp.h: Put extern before __const in defintion of argp_program_bug_address. 1997-05-29 00:20 Ulrich Drepper <drepper@cygnus.com> * sysdeps/wordsize-32/inttypes.h: Correct names of unsigned fast and least types. Correct names of ?INT_FAST*_{MIN,MAX} macros. * sysdeps/wordsize-64/inttypes.h: Likewise. Reported by Andreas Jaeger <aj@arthur.rhein-neckar.de>. 1997-05-28 22:51 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/Makefile (make-ioctls-CFLAGS): Use generic ttydefaults.h file instead of non-existing version in termios/sys. Reported by Zack Weinberg <zack@rabi.phys.columbia.edu>. * time/strptime.c (strptime_internal, case 'Y'): Restrict year number to four digits and to representable range for 4 byte time_t values. Patch by H.J. Lu <hjl@lucon.org>. 1997-05-28 18:19 Philip Blundell <pjb27@cam.ac.uk> * posix/execl.c: Include <alloca.h> to avoid warning. 1997-05-27 18:19 Andreas Jaeger <aj@arthur.rhein-neckar.de> * math/libm-test.c: Implement testing of inlined functions, make output nicer, update comments. * math/test-idouble.c: New file. Frontend for double tests of inlined functions. * math/test-ildoubl.c: New file. Frontend for long double tests of inlined functions. * math/test-ifloat.c: New file. Frontend for float tests of inlined functions. * math/test-longdouble.c: Rename to... * math/test-ldouble.c: ...this. * math/Makefile: Add rules for new test programs, change rules for renaming of longdouble test. 1997-05-20 15:50 H.J. Lu <hjl@gnu.ai.mit.edu> * sunrpc/rpc/svc.h (__dispatch_fn_t): New. (svc_register): Use __dispatch_fn_t in prototype. 1997-05-28 17:02 Ulrich Drepper <drepper@cygnus.com> * sysdeps/generic/bzero.c (bzero): Fix typo. Patch by Witek Wnuk <spider@pest.waw.ids.edu.pl>. 1997-05-27 12:00 Andreas Jaeger <aj@arthur.rhein-neckar.de> * sysdeps/generic/vtimes.c: Use ISO C declaration style. * sysdeps/unix/bsd/ualarm.c: Include <unistd.h> for prototype. * sysdeps/generic/memccpy.c: Include <string.h> for prototype. * signal/tst-signal.c (handler): Correct function declaration to avoid warning. * stdlib/testsort.c (compare): Likewise. * string/tester.c: Likewise. 1997-05-27 14:16 Miles Bader <miles@gnu.ai.mit.edu> * argp-help.c (argp_args_usage): Supply correct argp to filter_doc. 1997-05-27 17:51 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * db/hash/extern.h, db/hash/hash.c, db/hash/hash.h, db/hash/hash_log2.c: Rename __log2 to __hash_log2 to avoid clash with libm. 1997-05-27 14:47 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/m68k/fpu/e_atan2.c: Fix missing negate. Use __m81_test instead of explicit comparisons. 1997-05-26 18:36 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * inet/netinet/icmp6.h: Remove use of <asm/bitops.h> which has no place in a generic header and is no user include file.
512 lines
12 KiB
C
512 lines
12 KiB
C
/*
|
|
* ++Copyright++ 1985, 1993
|
|
* -
|
|
* Copyright (c) 1985, 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.
|
|
* -
|
|
* Portions Copyright (c) 1993 by Digital Equipment Corporation.
|
|
*
|
|
* 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, and that
|
|
* the name of Digital Equipment Corporation not be used in advertising or
|
|
* publicity pertaining to distribution of the document or software without
|
|
* specific, written prior permission.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
|
|
* WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
|
|
* OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT
|
|
* CORPORATION 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.
|
|
* -
|
|
* --Copyright--
|
|
*/
|
|
|
|
#if defined(LIBC_SCCS) && !defined(lint)
|
|
static char sccsid[] = "@(#)res_comp.c 8.1 (Berkeley) 6/4/93";
|
|
static char rcsid[] = "$Id$";
|
|
#endif /* LIBC_SCCS and not lint */
|
|
|
|
#include <sys/types.h>
|
|
#include <sys/param.h>
|
|
#include <netinet/in.h>
|
|
#include <arpa/nameser.h>
|
|
|
|
#include <stdio.h>
|
|
#include <resolv.h>
|
|
#include <ctype.h>
|
|
|
|
#if defined(BSD) && (BSD >= 199103)
|
|
# include <unistd.h>
|
|
# include <string.h>
|
|
#else
|
|
# include "../conf/portability.h"
|
|
#endif
|
|
|
|
static int dn_find __P((u_char *exp_dn, u_char *msg,
|
|
u_char **dnptrs, u_char **lastdnptr));
|
|
|
|
/*
|
|
* Expand compressed domain name 'comp_dn' to full domain name.
|
|
* 'msg' is a pointer to the begining of the message,
|
|
* 'eomorig' points to the first location after the message,
|
|
* 'exp_dn' is a pointer to a buffer of size 'length' for the result.
|
|
* Return size of compressed name or -1 if there was an error.
|
|
*/
|
|
int
|
|
dn_expand(msg, eomorig, comp_dn, exp_dn, length)
|
|
const u_char *msg, *eomorig, *comp_dn;
|
|
char *exp_dn;
|
|
int length;
|
|
{
|
|
register const u_char *cp;
|
|
register char *dn;
|
|
register int n, c;
|
|
char *eom;
|
|
int len = -1, checked = 0, octets = 0;
|
|
|
|
dn = exp_dn;
|
|
cp = comp_dn;
|
|
eom = exp_dn + length;
|
|
/*
|
|
* fetch next label in domain name
|
|
*/
|
|
while (n = *cp++) {
|
|
/*
|
|
* Check for indirection
|
|
*/
|
|
switch (n & INDIR_MASK) {
|
|
case 0:
|
|
octets += (n + 1);
|
|
if (octets > MAXCDNAME)
|
|
return (-1);
|
|
if (dn != exp_dn) {
|
|
if (dn >= eom)
|
|
return (-1);
|
|
*dn++ = '.';
|
|
}
|
|
if (dn+n >= eom)
|
|
return (-1);
|
|
checked += n + 1;
|
|
while (--n >= 0) {
|
|
if (((c = *cp++) == '.') || (c == '\\')) {
|
|
if (dn + n + 2 >= eom)
|
|
return (-1);
|
|
*dn++ = '\\';
|
|
}
|
|
*dn++ = c;
|
|
if (cp >= eomorig) /* out of range */
|
|
return (-1);
|
|
}
|
|
break;
|
|
|
|
case INDIR_MASK:
|
|
if (len < 0)
|
|
len = cp - comp_dn + 1;
|
|
cp = msg + (((n & 0x3f) << 8) | (*cp & 0xff));
|
|
if (cp < msg || cp >= eomorig) /* out of range */
|
|
return (-1);
|
|
checked += 2;
|
|
/*
|
|
* Check for loops in the compressed name;
|
|
* if we've looked at the whole message,
|
|
* there must be a loop.
|
|
*/
|
|
if (checked >= eomorig - msg)
|
|
return (-1);
|
|
break;
|
|
|
|
default:
|
|
return (-1); /* flag error */
|
|
}
|
|
}
|
|
*dn = '\0';
|
|
if (len < 0)
|
|
len = cp - comp_dn;
|
|
return (len);
|
|
}
|
|
|
|
/*
|
|
* Compress domain name 'exp_dn' into 'comp_dn'.
|
|
* Return the size of the compressed name or -1.
|
|
* 'length' is the size of the array pointed to by 'comp_dn'.
|
|
* 'dnptrs' is a list of pointers to previous compressed names. dnptrs[0]
|
|
* is a pointer to the beginning of the message. The list ends with NULL.
|
|
* 'lastdnptr' is a pointer to the end of the array pointed to
|
|
* by 'dnptrs'. Side effect is to update the list of pointers for
|
|
* labels inserted into the message as we compress the name.
|
|
* If 'dnptr' is NULL, we don't try to compress names. If 'lastdnptr'
|
|
* is NULL, we don't update the list.
|
|
*/
|
|
int
|
|
dn_comp(exp_dn, comp_dn, length, dnptrs, lastdnptr)
|
|
const char *exp_dn;
|
|
u_char *comp_dn, **dnptrs, **lastdnptr;
|
|
int length;
|
|
{
|
|
register u_char *cp, *dn;
|
|
register int c, l;
|
|
u_char **cpp, **lpp, *sp, *eob;
|
|
u_char *msg;
|
|
|
|
dn = (u_char *)exp_dn;
|
|
cp = comp_dn;
|
|
if (length > MAXCDNAME)
|
|
length = MAXCDNAME;
|
|
eob = cp + length;
|
|
lpp = cpp = NULL;
|
|
if (dnptrs != NULL) {
|
|
if ((msg = *dnptrs++) != NULL) {
|
|
for (cpp = dnptrs; *cpp != NULL; cpp++)
|
|
;
|
|
lpp = cpp; /* end of list to search */
|
|
}
|
|
} else
|
|
msg = NULL;
|
|
for (c = *dn++; c != '\0'; ) {
|
|
/* look to see if we can use pointers */
|
|
if (msg != NULL) {
|
|
if ((l = dn_find(dn-1, msg, dnptrs, lpp)) >= 0) {
|
|
if (cp+1 >= eob)
|
|
return (-1);
|
|
*cp++ = (l >> 8) | INDIR_MASK;
|
|
*cp++ = l % 256;
|
|
return (cp - comp_dn);
|
|
}
|
|
/* not found, save it */
|
|
if (lastdnptr != NULL && cpp < lastdnptr-1) {
|
|
*cpp++ = cp;
|
|
*cpp = NULL;
|
|
}
|
|
}
|
|
sp = cp++; /* save ptr to length byte */
|
|
do {
|
|
if (c == '.') {
|
|
c = *dn++;
|
|
break;
|
|
}
|
|
if (c == '\\') {
|
|
if ((c = *dn++) == '\0')
|
|
break;
|
|
}
|
|
if (cp >= eob) {
|
|
if (msg != NULL)
|
|
*lpp = NULL;
|
|
return (-1);
|
|
}
|
|
*cp++ = c;
|
|
} while ((c = *dn++) != '\0');
|
|
/* catch trailing '.'s but not '..' */
|
|
if ((l = cp - sp - 1) == 0 && c == '\0') {
|
|
cp--;
|
|
break;
|
|
}
|
|
if (l <= 0 || l > MAXLABEL) {
|
|
if (msg != NULL)
|
|
*lpp = NULL;
|
|
return (-1);
|
|
}
|
|
*sp = l;
|
|
}
|
|
if (cp >= eob) {
|
|
if (msg != NULL)
|
|
*lpp = NULL;
|
|
return (-1);
|
|
}
|
|
*cp++ = '\0';
|
|
return (cp - comp_dn);
|
|
}
|
|
|
|
/*
|
|
* Skip over a compressed domain name. Return the size or -1.
|
|
*/
|
|
int
|
|
__dn_skipname(comp_dn, eom)
|
|
const u_char *comp_dn, *eom;
|
|
{
|
|
register const u_char *cp;
|
|
register int n;
|
|
|
|
cp = comp_dn;
|
|
while (cp < eom && (n = *cp++)) {
|
|
/*
|
|
* check for indirection
|
|
*/
|
|
switch (n & INDIR_MASK) {
|
|
case 0: /* normal case, n == len */
|
|
cp += n;
|
|
continue;
|
|
case INDIR_MASK: /* indirection */
|
|
cp++;
|
|
break;
|
|
default: /* illegal type */
|
|
return (-1);
|
|
}
|
|
break;
|
|
}
|
|
if (cp > eom)
|
|
return (-1);
|
|
return (cp - comp_dn);
|
|
}
|
|
|
|
static int
|
|
mklower(ch)
|
|
register int ch;
|
|
{
|
|
if (isascii(ch) && isupper(ch))
|
|
return (tolower(ch));
|
|
return (ch);
|
|
}
|
|
|
|
/*
|
|
* Search for expanded name from a list of previously compressed names.
|
|
* Return the offset from msg if found or -1.
|
|
* dnptrs is the pointer to the first name on the list,
|
|
* not the pointer to the start of the message.
|
|
*/
|
|
static int
|
|
dn_find(exp_dn, msg, dnptrs, lastdnptr)
|
|
u_char *exp_dn, *msg;
|
|
u_char **dnptrs, **lastdnptr;
|
|
{
|
|
register u_char *dn, *cp, **cpp;
|
|
register int n;
|
|
u_char *sp;
|
|
|
|
for (cpp = dnptrs; cpp < lastdnptr; cpp++) {
|
|
dn = exp_dn;
|
|
sp = cp = *cpp;
|
|
while (n = *cp++) {
|
|
/*
|
|
* check for indirection
|
|
*/
|
|
switch (n & INDIR_MASK) {
|
|
case 0: /* normal case, n == len */
|
|
while (--n >= 0) {
|
|
if (*dn == '.')
|
|
goto next;
|
|
if (*dn == '\\')
|
|
dn++;
|
|
if (mklower(*dn++) != mklower(*cp++))
|
|
goto next;
|
|
}
|
|
if ((n = *dn++) == '\0' && *cp == '\0')
|
|
return (sp - msg);
|
|
if (n == '.')
|
|
continue;
|
|
goto next;
|
|
|
|
case INDIR_MASK: /* indirection */
|
|
cp = msg + (((n & 0x3f) << 8) | *cp);
|
|
break;
|
|
|
|
default: /* illegal type */
|
|
return (-1);
|
|
}
|
|
}
|
|
if (*dn == '\0')
|
|
return (sp - msg);
|
|
next: ;
|
|
}
|
|
return (-1);
|
|
}
|
|
|
|
/*
|
|
* Verify that a domain name uses an acceptable character set.
|
|
*/
|
|
|
|
/*
|
|
* Note the conspicuous absence of ctype macros in these definitions. On
|
|
* non-ASCII hosts, we can't depend on string literals or ctype macros to
|
|
* tell us anything about network-format data. The rest of the BIND system
|
|
* is not careful about this, but for some reason, we're doing it right here.
|
|
*/
|
|
#define PERIOD 0x2e
|
|
#define hyphenchar(c) ((c) == 0x2d)
|
|
#define bslashchar(c) ((c) == 0x5c)
|
|
#define periodchar(c) ((c) == PERIOD)
|
|
#define asterchar(c) ((c) == 0x2a)
|
|
#define alphachar(c) (((c) >= 0x41 && (c) <= 0x5a) \
|
|
|| ((c) >= 0x61 && (c) <= 0x7a))
|
|
#define digitchar(c) ((c) >= 0x30 && (c) <= 0x39)
|
|
|
|
#define borderchar(c) (alphachar(c) || digitchar(c))
|
|
#define middlechar(c) (borderchar(c) || hyphenchar(c))
|
|
#define domainchar(c) ((c) > 0x20 && (c) < 0x7f)
|
|
|
|
int
|
|
res_hnok(dn)
|
|
const char *dn;
|
|
{
|
|
int ppch = '\0', pch = PERIOD, ch = *dn++;
|
|
|
|
while (ch != '\0') {
|
|
int nch = *dn++;
|
|
|
|
if (periodchar(ch)) {
|
|
/* NULL */;
|
|
} else if (periodchar(pch)) {
|
|
if (!borderchar(ch))
|
|
return (0);
|
|
} else if (periodchar(nch) || nch == '\0') {
|
|
if (!borderchar(ch))
|
|
return (0);
|
|
} else {
|
|
if (!middlechar(ch))
|
|
return (0);
|
|
}
|
|
ppch = pch, pch = ch, ch = nch;
|
|
}
|
|
return (1);
|
|
}
|
|
|
|
/*
|
|
* hostname-like (A, MX, WKS) owners can have "*" as their first label
|
|
* but must otherwise be as a host name.
|
|
*/
|
|
int
|
|
res_ownok(dn)
|
|
const char *dn;
|
|
{
|
|
if (asterchar(dn[0])) {
|
|
if (periodchar(dn[1]))
|
|
return (res_hnok(dn+2));
|
|
if (dn[1] == '\0')
|
|
return (1);
|
|
}
|
|
return (res_hnok(dn));
|
|
}
|
|
|
|
/*
|
|
* SOA RNAMEs and RP RNAMEs can have any printable character in their first
|
|
* label, but the rest of the name has to look like a host name.
|
|
*/
|
|
int
|
|
res_mailok(dn)
|
|
const char *dn;
|
|
{
|
|
int ch, escaped = 0;
|
|
|
|
/* "." is a valid missing representation */
|
|
if (*dn == '\0')
|
|
return(1);
|
|
|
|
/* otherwise <label>.<hostname> */
|
|
while ((ch = *dn++) != '\0') {
|
|
if (!domainchar(ch))
|
|
return (0);
|
|
if (!escaped && periodchar(ch))
|
|
break;
|
|
if (escaped)
|
|
escaped = 0;
|
|
else if (bslashchar(ch))
|
|
escaped = 1;
|
|
}
|
|
if (periodchar(ch))
|
|
return (res_hnok(dn));
|
|
return(0);
|
|
}
|
|
|
|
/*
|
|
* This function is quite liberal, since RFC 1034's character sets are only
|
|
* recommendations.
|
|
*/
|
|
int
|
|
res_dnok(dn)
|
|
const char *dn;
|
|
{
|
|
int ch;
|
|
|
|
while ((ch = *dn++) != '\0')
|
|
if (!domainchar(ch))
|
|
return (0);
|
|
return (1);
|
|
}
|
|
|
|
/*
|
|
* Routines to insert/extract short/long's.
|
|
*/
|
|
|
|
u_int16_t
|
|
_getshort(msgp)
|
|
register const u_char *msgp;
|
|
{
|
|
register u_int16_t u;
|
|
|
|
GETSHORT(u, msgp);
|
|
return (u);
|
|
}
|
|
|
|
#ifdef NeXT
|
|
/*
|
|
* nExt machines have some funky library conventions, which we must maintain.
|
|
*/
|
|
u_int16_t
|
|
res_getshort(msgp)
|
|
register const u_char *msgp;
|
|
{
|
|
return (_getshort(msgp));
|
|
}
|
|
#endif
|
|
|
|
u_int32_t
|
|
_getlong(msgp)
|
|
register const u_char *msgp;
|
|
{
|
|
register u_int32_t u;
|
|
|
|
GETLONG(u, msgp);
|
|
return (u);
|
|
}
|
|
|
|
void
|
|
#if defined(__STDC__) || defined(__cplusplus)
|
|
__putshort(register u_int16_t s, register u_char *msgp) /* must match proto */
|
|
#else
|
|
__putshort(s, msgp)
|
|
register u_int16_t s;
|
|
register u_char *msgp;
|
|
#endif
|
|
{
|
|
PUTSHORT(s, msgp);
|
|
}
|
|
|
|
void
|
|
__putlong(l, msgp)
|
|
register u_int32_t l;
|
|
register u_char *msgp;
|
|
{
|
|
PUTLONG(l, msgp);
|
|
}
|