mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-09 23:00:07 +00:00
9a0a462ceb
1997-09-11 04:36 Ulrich Drepper <drepper@cygnus.com> * db2/db_int.h: Define __set_errno if not yet available. * db2/btree/bt_rec.c: Use __set_errno to set errno value. * db2/clib/getlong.c: Likewise. * db2/db185/db185.c: Likewise. * db2/db185/db185_int.h: Likewise. * db2/dbm/dbm.c: Likewise. * db2/lock/lock_deadlock.c: Likewise. * db2/log/log_archive.c: Likewise. * elf/dl-profile.c: Implement mcount function. * gmon/gmon.c: Use __profil not profil because of namespace pollution. * gmon/mcount.c: Remove BSD kernel code. Use compare&swap instruction if possible to change state variable. Optimize frompc folding. * gmon/sys/gmon.h (struct gmonparam): Change state field to long int. * sysdeps/i386/i486/atomicity.h: New file. * sysdeps/stub/atomicity.h: New file. * sysdeps/mach/hurd/profil.c: Define function as __profil and make profil weak alias. * sysdeps/posix/profil.c: Likewise. * string/bits/string2.h: New file. * include/bits/string2.h: New file. * string/Makefile (routines): Add mempcpy. (tests): Add inl-tester. Remove _D__NO_STRING_INLINES from CFLAGS-* variables. * sysdeps/generic/mempcpy.c: New file. * sysdeps/generic/memccpy.c: Undef function name to enable definition as macro. * sysdeps/generic/memchr.c: Likewise. * sysdeps/generic/memcmp.c: Likewise. * sysdeps/generic/memmem.c: Likewise. * sysdeps/generic/memmove.c: Likewise. * sysdeps/generic/strcat.c: Likewise. * sysdeps/generic/strchr.c: Likewise. * sysdeps/generic/strcmp.c: Likewise. * sysdeps/generic/strcpy.c: Likewise. * sysdeps/generic/strcspn.c: Likewise. * sysdeps/generic/strlen.c: Likewise. * sysdeps/generic/strncat.c: Likewise. * sysdeps/generic/strncmp.c: Likewise. * sysdeps/generic/strncpy.c: Likewise. * sysdeps/generic/strpbrk.c: Likewise. * sysdeps/generic/strrchr.c: Likewise. * sysdeps/generic/strsep.c: Likewise. * sysdeps/generic/strspn.c: Likewise. * sysdeps/generic/strstr.c: Likewise. * sysdeps/generic/strtok.c: Likewise. * sysdeps/generic/strtok_r.c: Likewise. * sysdeps/i386/memset.c: Likewise. * sysdeps/i386/bits/string.h: Correct a few types and constraints. * sysdeps/i386/i486/bits/string.h: Heavy rewrites and optimizations. * string/stratcliff.c: Undefine __USE_STRING_INLINES. * string/tst-strlen.c: Likewise. * string/string.h: Add prototype for mempcpy. Include bits/string2.h header always if optimizing. * intl/dcgettext.c: Don't unconditionally define stpcpy, only if not yet defined. * intl/l10nflist.c: Likewise. * string/tester.c: Add copyright and make little cleanups. * inet/test_ifindex.c: Change type of ni variable to unsigned int. * locale/programs/ld-ctype.c (struct locale_ctype_t): Change type of fields map_collection_max and map_collection_act to size_t. * nss/libnss_files.map: Group entries. * posix/unistd.h: Add prototype for __setpgid and __profil. * sysdeps/generic/crypt.h: Declare __crypt_r. * sysdeps/i386/bits/select.h: Fix fatal bugs, use correct casts now. * sysdeps/i386/fpu/bits/mathinline.h (isgreater, isgreaterequal, isless, islessequal, islessgreater, isunordered): Optimize a bit. * sysdeps/stub/ftruncate.c: Include missing header for prototype. * sysdeps/stub/getdents.c: Likewise. * sysdeps/stub/reboot.c: Likewise. * sysdeps/stub/swapon.c: Likewise. * sysdeps/stub/syscall.c: Likewise. * sysdeps/stub/ualarm.c: Likewise. * sysdeps/stub/usleep.c: Likewise. * sysdeps/unix/sysv/linux/if_index.c: Don't compile or use opensock if SIOGIFINDEX and SIOGIFNAME are not defined. * sysdeps/unix/sysv/linux/net/if.h: Add IFF_PORTSEL and IFF_AUTOMEDIA according to recent kernel changes. 1997-09-10 21:32 Klaus Espenlaub <kespenla@student.informatik.uni-ulm.de> * Makeconfig: Use $(have-initfini) instead of $(elf) to figure out the installed name of the startup code. (common-generated): Add version.mk. * Makefile (distclean-1): Add glibcbug. * Makerules: Replace -lgcc by $(gnulib). * catgets/Makefile (generated): Add xmalloc.o. * csu/Makefile (generated): Replace align.h and end.h by defs.h to match the generated file. * manual/Makefile (mostlyclean): Add stub-manual and stamp.o. (realclean): Changed to remove chapters-incl[12]. * po/Makefile (realclean): New rule to remove the generated .mo files. * time/Makefile: Only include zonefile dependencies if $(no_deps) is not true to avoid make clean failure when directory time doesn't exist yet. (generated): Add tzselect. * stdio/fgets.c (fgets): Add casts to reduce gcc warning noise. * stdio/internals.c (flushbuf): Likewise. * stdio/linewrap.c (lwupdate): Likewise. * stdio/memstream.c (enlarge_buffer): Likewise. * stdio-common/vfscanf.c (_IO_vfscanf): Likewise. * time/tzset.c (compute_change): Likewise. * misc/init-misc.c (__init_misc): Only declare static if HAVE_GNU_LD is defined. * sysdeps/posix/pipestream.c (FUNC): Change to generate ANSI C style functions. * sysdeps/stub/init-posix.c: Likewise. * sysdeps/stub/profil.c: Likewise. * munch-tmpl.c (__libc_init): Convert to ANSI C style declaration to reduce gcc warning noise. * stdio/glue.c (_filbuf, _flsbuf): Likewise. * stdio/obstream.c (grow, seek, input, init_obstream): Likewise. * stdio/vasprintf.c (enlarge_buffer): Likewise. * sysdeps/generic/sysd-stdio.c (__stdio_read, __stdio_write, __stdio_seek, __stdio_close, __stdio_fileno, __stdio_open, __stdio_reopen): Likewise. * sysdeps/posix/defs.c (_cleanup): Likewise. * time/offtime.c (__offtime): Add cast. * posix/getopt.c: Don't use text_set_element if not defined. * configure.in: Provide a check for underscores before user labels that works even when the compiler used for building doesn't work (like when there is no C library). Use the old way if the compiler works. 1997-09-10 05:08 David S. Miller <davem@caip.rutgers.edu> * sysdeps/unix/sysv/linux/sparc/bits/ioctls.h: The TC* ioctls use 'T' not 't' on SparcLinux. * sysdeps/unix/sysv/linux/sparc/bits/termios.h: tcflag_t is 32 bits. * sysdeps/unix/sysv/linux/sparc/sparc64/longjmp.S: Add aliases for _longjmp and siglongjmp. 1997-09-09 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * libio/stdio.h: Add format attributes to the extra printf and scanf like functions. * stdio/stdio.h: Likewise. 1997-09-09 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * nis/nss_nisplus/nisplus-network.c (_nss_nisplus_getnetbyaddr_r): Print tablename_val, not tablename_len. * nis/nss_nisplus/nisplus-ethers.c (_nss_nisplus_getntohost_r): Use sprintf instead of sprintf, the string always fits. * nis/nss_nisplus/nisplus-hosts.c (_nss_nisplus_gethostbyaddr_r): Likewise. * nis/nss_nisplus/nisplus-network.c (_nss_nisplus_getnetbyaddr_r): Likewise. * nis/nss_nisplus/nisplus-proto.c (_nss_nisplus_getprotobynumber_r): Likewise. * nis/nss_nisplus/nisplus-rpc.c (_nss_nisplus_getrpcbynumber_r): Likewise. * nis/nss_nisplus/nisplus-service.c (_nss_nisplus_getservbynumber_r): Likewise. * nis/nss_nisplus/nisplus-alias.c (_nss_create_tablename): Use __stpcpy, __stpncpy and __strdup instead of public names. * nis/nss_nisplus/nisplus-ethers.c (_nss_create_tablename): Likewise. * nis/nss_nisplus/nisplus-grp.c (_nss_create_tablename): Likewise. * nis/nss_nisplus/nisplus-hosts.c (_nss_create_tablename): Likewise. * nis/nss_nisplus/nisplus-netgrp.c (_nss_nisplus_parse_netgroup): Likewise. * nis/nss_nisplus/nisplus-network.c (_nss_nisplus_parse_netent): Likewise. (_nss_create_tablename): Likewise. * nis/nss_nisplus/nisplus-proto.c (_nss_nisplus_parse_protoent): Likewise. (_nss_create_tablename): Likewise. * nis/nss_nisplus/nisplus-pwd.c (_nss_create_tablename): Likewise. * nis/nss_nisplus/nisplus-rpc.c (_nss_nisplus_parse_rpcent): Likewise. (_nss_create_tablename): Likewise. * nis/nss_nisplus/nisplus-service.c (_nss_nisplus_parse_servent): Likewise. (_nss_create_tablename): Likewise. * nis/nss_nisplus/nisplus-spwd.c (_nss_create_tablename): Likewise. * libc.map: Export __stpcpy and __strdup. 1997-09-09 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * math/Makefile (CFLAGS-test-float.c, CFLAGS-test-double.c, CFLAGS-test-ldouble.c): Pass -ffloat-store to avoid excessive precision. 1997-09-09 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * include/rpc/auth_des.h: New file. 1997-09-09 Paul Eggert <eggert@twinsun.com> * time/mktime.c (__mktime_internal): Declare sec_requested even if !LEAP_SECONDS_POSSIBLE, since it's needed at the end when checking for time_t overflow. 1997-09-09 22:11 Ulrich Drepper <drepper@cygnus.com> * sysdeps/posix/getcwd.c: Correct test for too small buffer. Reported by Erik Troan <ewt@redhat.com>. * elf/dl-close.c: Include <bits/libc-lock.h>, not <libc-lock.h>. * elf/dl-open.c: Likewise. 1997-09-07 17:09 Richard Henderson <rth@cygnus.com> * sysdeps/alpha/Makefile: Kill setjmp_aux. * sysdeps/alpha/bits/setjmp.h: Rewrite in terms of an array. * sysdeps/alpha/__longjmp.c: Remove. * sysdeps/alpha/setjmp_aux.c: Remove. * sysdeps/alpha/__longjmp.S: New file. * sysdeps/alpha/bsd-_setjmp.S: Stub out. * sysdeps/alpha/bsd-setjmp.S: Likewise. * sysdeps/alpha/setjmp.S: Do the work; don't call __setjmp_aux. Move _setjmp and setjmp from bsd-*.S. 1997-09-06 20:20 Ulrich Drepper <drepper@cygnus.com> * include/rpc/auth.h: New file. * include/rpc/auth_unix.h: New file. 1997-09-06 Paul Eggert <eggert@twinsun.com> Fix gmtime so that it reports leap seconds when TZ indicates that leap seconds are desired. * time/gmtime.c (<stddef.h>): Remove unnecessary include. (gmtime): Put after gmtime_r, to help the compiler inline. (__tz_convert): New decl. (gmtime_r): Use __tz_convert instead of __offtime, so that leap seconds are handled correctly. * time/localtime.c (<errno.h>, <libc-lock.h>): Remove includes that are now unnecessary. (__tzset_internal, __tz_compute, __tzfile_compute, __use_tzfile, __tzset_lock): Remove extern decls that are now unnecessary. (localtime_internal): Moved to __tz_convert in tzset.c. so that localtime and gmtime can both use it easily. (localtime): Put after localtime_r, to help the compiler inline. (localtime_r): Use __tz_convert instead of localtime_internal. * time/strftime.c (__tz_compute): Remove unused (and now incorrect) decl. * time/tzfile.c (__tzfile_compute): New arg USE_LOCALTIME. * time/tzset.c (<errno.h>): Include. (_tmbuf): New decl. (__tzfile_compute): New function. (tz_compute): Renamed from __tz_compute. No longer extern. Remove redundant call to tzset_internal. (tzset_internal): Renamed from __tzset_internal. No longer extern. (tzset_lock): Renamed from __tzset_lock. No longer extern. (__tz_convert): New function, containing functionality of old localtime_internal function, plus locking and optional UTC. 1997-09-06 Paul Eggert <eggert@twinsun.com> * time/tzfile.c (__tzfile_read): Don't read a file if TZ is the empty string, just use UTC without leap seconds. This is for compatibility with the Olson code. 1997-09-06 Paul Eggert <eggert@twinsun.com> * time/tzset.c (__tzname_max): Lock tz data structures before invoking tzset_internal. * time/tzfile.c: Define compute_tzname_max statically. 1997-09-07 10:57 Thorsten Kukuk <kukuk@vt.uni-paderborn.de> * nis/nis_call.c: Remove not longer necessary HAVE_SECURE_RPC ifdefs. * nis/nis_intern.h: Likewise. * nis/nss_nis/nis-publickey.c: Likewise. * nis/nss_nisplus/nisplus-publickey.c: Likewise. * nis/ypclnt.c: Likewise. * sunrpc/auth_des.c: Don't dereference NULL pointer, initialize ad->ad_timediff. * sunrpc/auth_none.c: Don't define our own prototypes, use the one from the header files. * sunrpc/auth_unix.c: Likewise. * sunrpc/clnt_raw.c: Likewise. * sunrpc/clnt_tcp.c: Likewise. * sunrpc/rpc_cmsg.c: Likewise. * sunrpc/key_call.c: Fix signal handling. * sunrpc/openchild.c: Don't use /bin/sh to start /usr/etc/keyenvoy, or we will get a deadlock with NIS+. * sunrpc/rpc/auth.h: Add prototype for xdr_opaque_auth, don't define HAVE_SECURE_RPC. 1997-09-07 15:51 Ulrich Drepper <drepper@cygnus.com> * sysdeps/i386/bits/select.h [__GNUC__] (__FD_ZERO, __FD_SET, __FD_CLR, __FD_ISSET): Use correct casts to address array correctly. Reported by urbanw@cs.umu.se. 1997-09-07 05:07 Ulrich Drepper <drepper@cygnus.com> * elf/dl-close.c: Include <bits/libc-lock.h>, not <libc-lock.h>. * elf/dl-open.c: Likewise. * sysdeps/i386/memset.c: Undefine memset in case the header with the optimized functions is included. Patches by NIIBE Yutaka <gniibe@mri.co.jp>. * sysdeps/i386/bits/string.h [__PIC__] (strcspn, strspn, strpbrk, strsep): Use register for second parameter. * sysdeps/i386/i486/bits/string.h: Likewise. Reported by NIIBE Yutaka <gniibe@mri.co.jp>. 1997-09-03 09:48 Geoff Keating <geoffk@ozemail.com.au> * math/libm-test.c: Change various tolerances to match what the tested routines can actually provide. * math/Makefile: Add new tests. * math/atest-sincos.c: New file. * math/atest-exp.c: New file. * csu/Makefile: Give initfini.s and initfiniS.s their own CFLAGS-* macros so they can be overridden. * sysdeps/powerpc/Makefile [subdir=csu]: Override flags for initfiniS.s to use -fpic instead of -fPIC, because the sed script breaks otherwise. * sysdeps/powerpc/Makefile [build-shared]: Use -fpic not -fPIC for efficiency. * sysdeps/powerpc/dl-machine.h (ELF_MACHINE_RUNTIME_TRAMPOLINE): Don't use register 0, to let _mcount be in a shared object. * sysdeps/powerpc/dl-machine.h: Use full sentences in comments. Generally clean up. Suppress some code we don't need when relocating ld.so. * sysdeps/powerpc/test-arith.c: Change loop indices to size_t when appropriate to suppress gcc warning. * resolv/res_send.c: Suppress warning. * sunrpc/xdr_sizeof.c: Suppress warning. * FAQ: Add ppc-linux. * manual/maint.texi: Add ppc-linux. Explain that gcc can't build it yet. * sysdeps/unix/sysv/linux/powerpc/profil-counter.h: Correct for current kernels. 1997-08-15 07:45 Geoff Keating <geoffk@ozemail.com.au> * stdlib/fmtmsg.c: Use two parameters for __libc_once_define. * sysdeps/i386/machine-gmon.h: Correct typo. * sysdeps/unix/sysv/linux/powerpc/bits/mman.h: Change to match kernel. * sysdeps/generic/dl-sysdep.c: Add hook for bizzare PPC argument hack. * sysdeps/unix/sysv/linux/powerpc/dl-sysdep.c: Rewrite to use sysdeps/linux/dl-sysdep.c. * sysdeps/powerpc/Makefile [subdir=gmon]: Compile ppc-mcount. * sysdeps/powerpc/machine-gmon.h: Use ppc-mcount. * sysdeps/powerpc/ppc-mcount: New file. The following are mostly changes to allow profiling: * sysdeps/powerpc/add_n.S: Added. * sysdeps/powerpc/add_n.s: Removed. * sysdeps/powerpc/addmul_1.S: Added. * sysdeps/powerpc/addmul_1.s: Removed. * sysdeps/powerpc/bsd-_setjmp.S: Use JUMPTARGET macro. * sysdeps/powerpc/bsd-setjmp.S: Use JUMPTARGET macro. * sysdeps/powerpc/lshift.S: Added. * sysdeps/powerpc/lshift.s: Removed. * sysdeps/powerpc/memset.S: Added. * sysdeps/powerpc/memset.s: Removed. * sysdeps/powerpc/mul_1.S: Added. * sysdeps/powerpc/mul_1.s: Removed. * sysdeps/powerpc/rshift.S: Added. * sysdeps/powerpc/rshift.s: Removed. * sysdeps/powerpc/s_copysign.S: Use ENTRY, END, weak_alias macros. * sysdeps/powerpc/s_fabs.S: Use ENTRY, END, weak_alias macros. * sysdeps/powerpc/setjmp.S: Use JUMPTARGET macro. * sysdeps/powerpc/strchr.S: Added. * sysdeps/powerpc/strchr.s: Removed. * sysdeps/powerpc/strcmp.S: Added. * sysdeps/powerpc/strcmp.s: Removed. * sysdeps/powerpc/strlen.S: Added. * sysdeps/powerpc/strlen.s: Removed. * sysdeps/powerpc/sub_n.S: Added. * sysdeps/powerpc/sub_n.s: Removed. * sysdeps/powerpc/submul_1.S: Added. * sysdeps/powerpc/submul_1.s: Removed. * sysdeps/unix/sysv/linux/powerpc/_exit.S: Removed. * sysdeps/unix/sysv/linux/powerpc/brk.S: Added. * sysdeps/unix/sysv/linux/powerpc/brk.c: Removed. * sysdeps/unix/sysv/linux/powerpc/clone.S: Use new macros. Fix various bugs. Document that it isn't tested. * sysdeps/unix/sysv/linux/powerpc/sigreturn.S: Make look like sysdeps/unix/_exit.S. * sysdeps/unix/sysv/linux/powerpc/socket.S: Use new macros. * sysdeps/unix/sysv/linux/powerpc/syscall.S: Use new macros. * sysdeps/unix/sysv/linux/powerpc/sysdep.h: Define some new macros to make assembler (possibly) more portable, allow profiling, etc.
810 lines
20 KiB
C
810 lines
20 KiB
C
/*
|
|
* ++Copyright++ 1985, 1989, 1993
|
|
* -
|
|
* Copyright (c) 1985, 1989, 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_send.c 8.1 (Berkeley) 6/4/93";
|
|
static char rcsid[] = "$Id$";
|
|
#endif /* LIBC_SCCS and not lint */
|
|
|
|
/* change this to "0"
|
|
* if you talk to a lot
|
|
* of multi-homed SunOS
|
|
* ("broken") name servers.
|
|
*/
|
|
#define CHECK_SRVR_ADDR 1 /* XXX - should be in options.h */
|
|
|
|
/*
|
|
* Send query to name server and wait for reply.
|
|
*/
|
|
|
|
#include <sys/types.h>
|
|
#include <sys/param.h>
|
|
#include <sys/time.h>
|
|
#include <sys/socket.h>
|
|
#include <sys/uio.h>
|
|
#include <netinet/in.h>
|
|
#include <arpa/nameser.h>
|
|
#include <arpa/inet.h>
|
|
|
|
#include <stdio.h>
|
|
#include <netdb.h>
|
|
#include <errno.h>
|
|
#include <resolv.h>
|
|
#if defined(BSD) && (BSD >= 199306)
|
|
# include <stdlib.h>
|
|
# include <string.h>
|
|
# include <unistd.h>
|
|
#else
|
|
# include "../conf/portability.h"
|
|
#endif
|
|
|
|
#if defined(USE_OPTIONS_H)
|
|
# include <../conf/options.h>
|
|
#endif
|
|
|
|
static int s = -1; /* socket used for communications */
|
|
static int connected = 0; /* is the socket connected */
|
|
static int vc = 0; /* is the socket a virtual circuit? */
|
|
|
|
#ifndef FD_SET
|
|
/* XXX - should be in portability.h */
|
|
#define NFDBITS 32
|
|
#define FD_SETSIZE 32
|
|
#define FD_SET(n, p) ((p)->fds_bits[(n)/NFDBITS] |= (1 << ((n) % NFDBITS)))
|
|
#define FD_CLR(n, p) ((p)->fds_bits[(n)/NFDBITS] &= ~(1 << ((n) % NFDBITS)))
|
|
#define FD_ISSET(n, p) ((p)->fds_bits[(n)/NFDBITS] & (1 << ((n) % NFDBITS)))
|
|
#define FD_ZERO(p) bzero((char *)(p), sizeof(*(p)))
|
|
#endif
|
|
|
|
/* XXX - this should be done in portability.h */
|
|
#if (defined(BSD) && (BSD >= 199103)) || defined(linux)
|
|
# define CAN_RECONNECT 1
|
|
#else
|
|
# define CAN_RECONNECT 0
|
|
#endif
|
|
|
|
#ifndef DEBUG
|
|
# define Dprint(cond, args) /*empty*/
|
|
# define DprintQ(cond, args, query, size) /*empty*/
|
|
# define Aerror(file, string, error, address) /*empty*/
|
|
# define Perror(file, string, error) /*empty*/
|
|
#else
|
|
# define Dprint(cond, args) if (cond) {fprintf args;} else {}
|
|
# define DprintQ(cond, args, query, size) if (cond) {\
|
|
fprintf args;\
|
|
__fp_nquery(query, size, stdout);\
|
|
} else {}
|
|
static void
|
|
Aerror(file, string, error, address)
|
|
FILE *file;
|
|
char *string;
|
|
int error;
|
|
struct sockaddr_in address;
|
|
{
|
|
int save = errno;
|
|
|
|
if (_res.options & RES_DEBUG) {
|
|
fprintf(file, "res_send: %s ([%s].%u): %s\n",
|
|
string,
|
|
inet_ntoa(address.sin_addr),
|
|
ntohs(address.sin_port),
|
|
strerror(error));
|
|
}
|
|
__set_errno (save);
|
|
}
|
|
static void
|
|
Perror(file, string, error)
|
|
FILE *file;
|
|
char *string;
|
|
int error;
|
|
{
|
|
int save = errno;
|
|
|
|
if (_res.options & RES_DEBUG) {
|
|
fprintf(file, "res_send: %s: %s\n",
|
|
string, strerror(error));
|
|
}
|
|
__set_errno (save);
|
|
}
|
|
#endif
|
|
|
|
static res_send_qhook Qhook = NULL;
|
|
static res_send_rhook Rhook = NULL;
|
|
|
|
void
|
|
res_send_setqhook(hook)
|
|
res_send_qhook hook;
|
|
{
|
|
|
|
Qhook = hook;
|
|
}
|
|
|
|
void
|
|
res_send_setrhook(hook)
|
|
res_send_rhook hook;
|
|
{
|
|
|
|
Rhook = hook;
|
|
}
|
|
|
|
/* int
|
|
* res_isourserver(ina)
|
|
* looks up "ina" in _res.ns_addr_list[]
|
|
* returns:
|
|
* 0 : not found
|
|
* >0 : found
|
|
* author:
|
|
* paul vixie, 29may94
|
|
*/
|
|
int
|
|
res_isourserver(inp)
|
|
const struct sockaddr_in *inp;
|
|
{
|
|
struct sockaddr_in ina;
|
|
register int ns, ret;
|
|
|
|
ina = *inp;
|
|
ret = 0;
|
|
for (ns = 0; ns < _res.nscount; ns++) {
|
|
register const struct sockaddr_in *srv = &_res.nsaddr_list[ns];
|
|
|
|
if (srv->sin_family == ina.sin_family &&
|
|
srv->sin_port == ina.sin_port &&
|
|
(srv->sin_addr.s_addr == INADDR_ANY ||
|
|
srv->sin_addr.s_addr == ina.sin_addr.s_addr)) {
|
|
ret++;
|
|
break;
|
|
}
|
|
}
|
|
return (ret);
|
|
}
|
|
|
|
/* int
|
|
* res_nameinquery(name, type, class, buf, eom)
|
|
* look for (name,type,class) in the query section of packet (buf,eom)
|
|
* returns:
|
|
* -1 : format error
|
|
* 0 : not found
|
|
* >0 : found
|
|
* author:
|
|
* paul vixie, 29may94
|
|
*/
|
|
int
|
|
res_nameinquery(name, type, class, buf, eom)
|
|
const char *name;
|
|
register int type, class;
|
|
const u_char *buf, *eom;
|
|
{
|
|
register const u_char *cp = buf + HFIXEDSZ;
|
|
int qdcount = ntohs(((HEADER*)buf)->qdcount);
|
|
|
|
while (qdcount-- > 0) {
|
|
char tname[MAXDNAME+1];
|
|
register int n, ttype, tclass;
|
|
|
|
n = dn_expand(buf, eom, cp, tname, sizeof tname);
|
|
if (n < 0)
|
|
return (-1);
|
|
cp += n;
|
|
ttype = _getshort(cp); cp += INT16SZ;
|
|
tclass = _getshort(cp); cp += INT16SZ;
|
|
if (ttype == type &&
|
|
tclass == class &&
|
|
strcasecmp(tname, name) == 0)
|
|
return (1);
|
|
}
|
|
return (0);
|
|
}
|
|
|
|
/* int
|
|
* res_queriesmatch(buf1, eom1, buf2, eom2)
|
|
* is there a 1:1 mapping of (name,type,class)
|
|
* in (buf1,eom1) and (buf2,eom2)?
|
|
* returns:
|
|
* -1 : format error
|
|
* 0 : not a 1:1 mapping
|
|
* >0 : is a 1:1 mapping
|
|
* author:
|
|
* paul vixie, 29may94
|
|
*/
|
|
int
|
|
res_queriesmatch(buf1, eom1, buf2, eom2)
|
|
const u_char *buf1, *eom1;
|
|
const u_char *buf2, *eom2;
|
|
{
|
|
register const u_char *cp = buf1 + HFIXEDSZ;
|
|
int qdcount = ntohs(((HEADER*)buf1)->qdcount);
|
|
|
|
if (qdcount != ntohs(((HEADER*)buf2)->qdcount))
|
|
return (0);
|
|
while (qdcount-- > 0) {
|
|
char tname[MAXDNAME+1];
|
|
register int n, ttype, tclass;
|
|
|
|
n = dn_expand(buf1, eom1, cp, tname, sizeof tname);
|
|
if (n < 0)
|
|
return (-1);
|
|
cp += n;
|
|
ttype = _getshort(cp); cp += INT16SZ;
|
|
tclass = _getshort(cp); cp += INT16SZ;
|
|
if (!res_nameinquery(tname, ttype, tclass, buf2, eom2))
|
|
return (0);
|
|
}
|
|
return (1);
|
|
}
|
|
|
|
int
|
|
res_send(buf, buflen, ans, anssiz)
|
|
const u_char *buf;
|
|
int buflen;
|
|
u_char *ans;
|
|
int anssiz;
|
|
{
|
|
HEADER *hp = (HEADER *) buf;
|
|
HEADER *anhp = (HEADER *) ans;
|
|
int gotsomewhere, connreset, terrno, try, v_circuit, resplen, ns;
|
|
register int n;
|
|
u_int badns; /* XXX NSMAX can't exceed #/bits in this var */
|
|
|
|
if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
|
|
/* errno should have been set by res_init() in this case. */
|
|
return (-1);
|
|
}
|
|
DprintQ((_res.options & RES_DEBUG) || (_res.pfcode & RES_PRF_QUERY),
|
|
(stdout, ";; res_send()\n"), buf, buflen);
|
|
v_circuit = (_res.options & RES_USEVC) || buflen > PACKETSZ;
|
|
gotsomewhere = 0;
|
|
connreset = 0;
|
|
terrno = ETIMEDOUT;
|
|
badns = 0;
|
|
|
|
/*
|
|
* Send request, RETRY times, or until successful
|
|
*/
|
|
for (try = 0; try < _res.retry; try++) {
|
|
for (ns = 0; ns < _res.nscount; ns++) {
|
|
struct sockaddr_in *nsap = &_res.nsaddr_list[ns];
|
|
same_ns:
|
|
if (badns & (1 << ns)) {
|
|
res_close();
|
|
goto next_ns;
|
|
}
|
|
|
|
if (Qhook) {
|
|
int done = 0, loops = 0;
|
|
|
|
do {
|
|
res_sendhookact act;
|
|
|
|
act = (*Qhook)(&nsap, &buf, &buflen,
|
|
ans, anssiz, &resplen);
|
|
switch (act) {
|
|
case res_goahead:
|
|
done = 1;
|
|
break;
|
|
case res_nextns:
|
|
res_close();
|
|
goto next_ns;
|
|
case res_done:
|
|
return (resplen);
|
|
case res_modified:
|
|
/* give the hook another try */
|
|
if (++loops < 42) /*doug adams*/
|
|
break;
|
|
/*FALLTHROUGH*/
|
|
case res_error:
|
|
/*FALLTHROUGH*/
|
|
default:
|
|
return (-1);
|
|
}
|
|
} while (!done);
|
|
}
|
|
|
|
Dprint(_res.options & RES_DEBUG,
|
|
(stdout, ";; Querying server (# %d) address = %s\n",
|
|
ns + 1, inet_ntoa(nsap->sin_addr)));
|
|
|
|
if (v_circuit) {
|
|
int truncated;
|
|
struct iovec iov[2];
|
|
u_short len;
|
|
u_char *cp;
|
|
|
|
/*
|
|
* Use virtual circuit;
|
|
* at most one attempt per server.
|
|
*/
|
|
try = _res.retry;
|
|
truncated = 0;
|
|
if ((s < 0) || (!vc)) {
|
|
if (s >= 0)
|
|
res_close();
|
|
|
|
s = socket(PF_INET, SOCK_STREAM, 0);
|
|
if (s < 0) {
|
|
terrno = errno;
|
|
Perror(stderr, "socket(vc)", errno);
|
|
return (-1);
|
|
}
|
|
__set_errno (0);
|
|
if (connect(s, (struct sockaddr *)nsap,
|
|
sizeof(struct sockaddr)) < 0) {
|
|
terrno = errno;
|
|
Aerror(stderr, "connect/vc",
|
|
errno, *nsap);
|
|
badns |= (1 << ns);
|
|
res_close();
|
|
goto next_ns;
|
|
}
|
|
vc = 1;
|
|
}
|
|
/*
|
|
* Send length & message
|
|
*/
|
|
putshort((u_short)buflen, (u_char*)&len);
|
|
iov[0].iov_base = (caddr_t)&len;
|
|
iov[0].iov_len = INT16SZ;
|
|
iov[1].iov_base = (caddr_t)buf;
|
|
iov[1].iov_len = buflen;
|
|
if (writev(s, iov, 2) != (INT16SZ + buflen)) {
|
|
terrno = errno;
|
|
Perror(stderr, "write failed", errno);
|
|
badns |= (1 << ns);
|
|
res_close();
|
|
goto next_ns;
|
|
}
|
|
/*
|
|
* Receive length & response
|
|
*/
|
|
read_len:
|
|
cp = ans;
|
|
len = INT16SZ;
|
|
while ((n = read(s, (char *)cp, (int)len)) > 0) {
|
|
cp += n;
|
|
if ((len -= n) <= 0)
|
|
break;
|
|
}
|
|
if (n <= 0) {
|
|
terrno = errno;
|
|
Perror(stderr, "read failed", errno);
|
|
res_close();
|
|
/*
|
|
* A long running process might get its TCP
|
|
* connection reset if the remote server was
|
|
* restarted. Requery the server instead of
|
|
* trying a new one. When there is only one
|
|
* server, this means that a query might work
|
|
* instead of failing. We only allow one reset
|
|
* per query to prevent looping.
|
|
*/
|
|
if (terrno == ECONNRESET && !connreset) {
|
|
connreset = 1;
|
|
res_close();
|
|
goto same_ns;
|
|
}
|
|
res_close();
|
|
goto next_ns;
|
|
}
|
|
resplen = _getshort(ans);
|
|
if (resplen > anssiz) {
|
|
Dprint(_res.options & RES_DEBUG,
|
|
(stdout, ";; response truncated\n")
|
|
);
|
|
truncated = 1;
|
|
len = anssiz;
|
|
} else
|
|
len = resplen;
|
|
cp = ans;
|
|
while (len != 0 &&
|
|
(n = read(s, (char *)cp, (int)len)) > 0) {
|
|
cp += n;
|
|
len -= n;
|
|
}
|
|
if (n <= 0) {
|
|
terrno = errno;
|
|
Perror(stderr, "read(vc)", errno);
|
|
res_close();
|
|
goto next_ns;
|
|
}
|
|
if (truncated) {
|
|
/*
|
|
* Flush rest of answer
|
|
* so connection stays in synch.
|
|
*/
|
|
anhp->tc = 1;
|
|
len = resplen - anssiz;
|
|
while (len != 0) {
|
|
char junk[PACKETSZ];
|
|
|
|
n = ((size_t) len > sizeof(junk)
|
|
? sizeof(junk)
|
|
: len);
|
|
if ((n = read(s, junk, n)) > 0)
|
|
len -= n;
|
|
else
|
|
break;
|
|
}
|
|
}
|
|
/*
|
|
* The calling applicating has bailed out of
|
|
* a previous call and failed to arrange to have
|
|
* the circuit closed or the server has got
|
|
* itself confused. Anyway drop the packet and
|
|
* wait for the correct one.
|
|
*/
|
|
if (hp->id != anhp->id) {
|
|
DprintQ((_res.options & RES_DEBUG) ||
|
|
(_res.pfcode & RES_PRF_REPLY),
|
|
(stdout, ";; old answer (unexpected):\n"),
|
|
ans, (resplen>anssiz)?anssiz:resplen);
|
|
goto read_len;
|
|
}
|
|
} else {
|
|
/*
|
|
* Use datagrams.
|
|
*/
|
|
struct timeval timeout;
|
|
fd_set dsmask;
|
|
struct sockaddr_in from;
|
|
size_t fromlen;
|
|
|
|
if ((s < 0) || vc) {
|
|
if (vc)
|
|
res_close();
|
|
s = socket(PF_INET, SOCK_DGRAM, 0);
|
|
if (s < 0) {
|
|
#if !CAN_RECONNECT
|
|
bad_dg_sock:
|
|
#endif
|
|
terrno = errno;
|
|
Perror(stderr, "socket(dg)", errno);
|
|
return (-1);
|
|
}
|
|
connected = 0;
|
|
}
|
|
/*
|
|
* On a 4.3BSD+ machine (client and server,
|
|
* actually), sending to a nameserver datagram
|
|
* port with no nameserver will cause an
|
|
* ICMP port unreachable message to be returned.
|
|
* If our datagram socket is "connected" to the
|
|
* server, we get an ECONNREFUSED error on the next
|
|
* socket operation, and select returns if the
|
|
* error message is received. We can thus detect
|
|
* the absence of a nameserver without timing out.
|
|
* If we have sent queries to at least two servers,
|
|
* however, we don't want to remain connected,
|
|
* as we wish to receive answers from the first
|
|
* server to respond.
|
|
*/
|
|
if (_res.nscount == 1 || (try == 0 && ns == 0)) {
|
|
/*
|
|
* Connect only if we are sure we won't
|
|
* receive a response from another server.
|
|
*/
|
|
if (!connected) {
|
|
if (connect(s, (struct sockaddr *)nsap,
|
|
sizeof(struct sockaddr)
|
|
) < 0) {
|
|
Aerror(stderr,
|
|
"connect(dg)",
|
|
errno, *nsap);
|
|
badns |= (1 << ns);
|
|
res_close();
|
|
goto next_ns;
|
|
}
|
|
connected = 1;
|
|
}
|
|
if (send(s, (char*)buf, buflen, 0) != buflen) {
|
|
Perror(stderr, "send", errno);
|
|
badns |= (1 << ns);
|
|
res_close();
|
|
goto next_ns;
|
|
}
|
|
} else {
|
|
/*
|
|
* Disconnect if we want to listen
|
|
* for responses from more than one server.
|
|
*/
|
|
if (connected) {
|
|
#if CAN_RECONNECT
|
|
struct sockaddr_in no_addr;
|
|
|
|
no_addr.sin_family = AF_INET;
|
|
no_addr.sin_addr.s_addr = INADDR_ANY;
|
|
no_addr.sin_port = 0;
|
|
(void) connect(s,
|
|
(struct sockaddr *)
|
|
&no_addr,
|
|
sizeof(no_addr));
|
|
#else
|
|
int s1 = socket(PF_INET, SOCK_DGRAM,0);
|
|
if (s1 < 0)
|
|
goto bad_dg_sock;
|
|
(void) dup2(s1, s);
|
|
(void) close(s1);
|
|
Dprint(_res.options & RES_DEBUG,
|
|
(stdout, ";; new DG socket\n"))
|
|
#endif
|
|
connected = 0;
|
|
__set_errno (0);
|
|
}
|
|
if (sendto(s, (char*)buf, buflen, 0,
|
|
(struct sockaddr *)nsap,
|
|
sizeof(struct sockaddr))
|
|
!= buflen) {
|
|
Aerror(stderr, "sendto", errno, *nsap);
|
|
badns |= (1 << ns);
|
|
res_close();
|
|
goto next_ns;
|
|
}
|
|
}
|
|
|
|
/*
|
|
* Wait for reply
|
|
*/
|
|
timeout.tv_sec = (_res.retrans << try);
|
|
if (try > 0)
|
|
timeout.tv_sec /= _res.nscount;
|
|
if ((long) timeout.tv_sec <= 0)
|
|
timeout.tv_sec = 1;
|
|
timeout.tv_usec = 0;
|
|
if (s+1 > FD_SETSIZE) {
|
|
Perror(stderr, "s+1 > FD_SETSIZE", EMFILE);
|
|
res_close();
|
|
goto next_ns;
|
|
}
|
|
wait:
|
|
FD_ZERO(&dsmask);
|
|
FD_SET(s, &dsmask);
|
|
n = select(s+1, &dsmask, (fd_set *)NULL,
|
|
(fd_set *)NULL, &timeout);
|
|
if (n < 0) {
|
|
if (errno == EINTR)
|
|
goto wait;
|
|
Perror(stderr, "select", errno);
|
|
res_close();
|
|
goto next_ns;
|
|
}
|
|
if (n == 0) {
|
|
/*
|
|
* timeout
|
|
*/
|
|
Dprint(_res.options & RES_DEBUG,
|
|
(stdout, ";; timeout\n"));
|
|
gotsomewhere = 1;
|
|
res_close();
|
|
goto next_ns;
|
|
}
|
|
__set_errno (0);
|
|
fromlen = sizeof(struct sockaddr_in);
|
|
resplen = recvfrom(s, (char*)ans, anssiz, 0,
|
|
(struct sockaddr *)&from, &fromlen);
|
|
if (resplen <= 0) {
|
|
Perror(stderr, "recvfrom", errno);
|
|
res_close();
|
|
goto next_ns;
|
|
}
|
|
gotsomewhere = 1;
|
|
if (hp->id != anhp->id) {
|
|
/*
|
|
* response from old query, ignore it.
|
|
* XXX - potential security hazard could
|
|
* be detected here.
|
|
*/
|
|
DprintQ((_res.options & RES_DEBUG) ||
|
|
(_res.pfcode & RES_PRF_REPLY),
|
|
(stdout, ";; old answer:\n"),
|
|
ans, (resplen>anssiz)?anssiz:resplen);
|
|
goto wait;
|
|
}
|
|
#if CHECK_SRVR_ADDR
|
|
if (!(_res.options & RES_INSECURE1) &&
|
|
!res_isourserver(&from)) {
|
|
/*
|
|
* response from wrong server? ignore it.
|
|
* XXX - potential security hazard could
|
|
* be detected here.
|
|
*/
|
|
DprintQ((_res.options & RES_DEBUG) ||
|
|
(_res.pfcode & RES_PRF_REPLY),
|
|
(stdout, ";; not our server:\n"),
|
|
ans, (resplen>anssiz)?anssiz:resplen);
|
|
goto wait;
|
|
}
|
|
#endif
|
|
if (!(_res.options & RES_INSECURE2) &&
|
|
!res_queriesmatch(buf, buf + buflen,
|
|
ans, ans + anssiz)) {
|
|
/*
|
|
* response contains wrong query? ignore it.
|
|
* XXX - potential security hazard could
|
|
* be detected here.
|
|
*/
|
|
DprintQ((_res.options & RES_DEBUG) ||
|
|
(_res.pfcode & RES_PRF_REPLY),
|
|
(stdout, ";; wrong query name:\n"),
|
|
ans, (resplen>anssiz)?anssiz:resplen);
|
|
goto wait;
|
|
}
|
|
if (anhp->rcode == SERVFAIL ||
|
|
anhp->rcode == NOTIMP ||
|
|
anhp->rcode == REFUSED) {
|
|
DprintQ(_res.options & RES_DEBUG,
|
|
(stdout, "server rejected query:\n"),
|
|
ans, (resplen>anssiz)?anssiz:resplen);
|
|
badns |= (1 << ns);
|
|
res_close();
|
|
/* don't retry if called from dig */
|
|
if (!_res.pfcode)
|
|
goto next_ns;
|
|
}
|
|
if (!(_res.options & RES_IGNTC) && anhp->tc) {
|
|
/*
|
|
* get rest of answer;
|
|
* use TCP with same server.
|
|
*/
|
|
Dprint(_res.options & RES_DEBUG,
|
|
(stdout, ";; truncated answer\n"));
|
|
v_circuit = 1;
|
|
res_close();
|
|
goto same_ns;
|
|
}
|
|
} /*if vc/dg*/
|
|
Dprint((_res.options & RES_DEBUG) ||
|
|
((_res.pfcode & RES_PRF_REPLY) &&
|
|
(_res.pfcode & RES_PRF_HEAD1)),
|
|
(stdout, ";; got answer:\n"));
|
|
DprintQ((_res.options & RES_DEBUG) ||
|
|
(_res.pfcode & RES_PRF_REPLY),
|
|
(stdout, ""),
|
|
ans, (resplen>anssiz)?anssiz:resplen);
|
|
/*
|
|
* If using virtual circuits, we assume that the first server
|
|
* is preferred over the rest (i.e. it is on the local
|
|
* machine) and only keep that one open.
|
|
* If we have temporarily opened a virtual circuit,
|
|
* or if we haven't been asked to keep a socket open,
|
|
* close the socket.
|
|
*/
|
|
if ((v_circuit && (!(_res.options & RES_USEVC) || ns != 0)) ||
|
|
!(_res.options & RES_STAYOPEN)) {
|
|
res_close();
|
|
}
|
|
if (Rhook) {
|
|
int done = 0, loops = 0;
|
|
|
|
do {
|
|
res_sendhookact act;
|
|
|
|
act = (*Rhook)(nsap, buf, buflen,
|
|
ans, anssiz, &resplen);
|
|
switch (act) {
|
|
case res_goahead:
|
|
case res_done:
|
|
done = 1;
|
|
break;
|
|
case res_nextns:
|
|
res_close();
|
|
goto next_ns;
|
|
case res_modified:
|
|
/* give the hook another try */
|
|
if (++loops < 42) /*doug adams*/
|
|
break;
|
|
/*FALLTHROUGH*/
|
|
case res_error:
|
|
/*FALLTHROUGH*/
|
|
default:
|
|
return (-1);
|
|
}
|
|
} while (!done);
|
|
|
|
}
|
|
return (resplen);
|
|
next_ns: ;
|
|
} /*foreach ns*/
|
|
} /*foreach retry*/
|
|
res_close();
|
|
if (!v_circuit)
|
|
if (!gotsomewhere)
|
|
__set_errno (ECONNREFUSED); /* no nameservers found */
|
|
else
|
|
__set_errno (ETIMEDOUT); /* no answer obtained */
|
|
else
|
|
__set_errno (terrno);
|
|
return (-1);
|
|
}
|
|
|
|
/*
|
|
* This routine is for closing the socket if a virtual circuit is used and
|
|
* the program wants to close it. This provides support for endhostent()
|
|
* which expects to close the socket.
|
|
*
|
|
* This routine is not expected to be user visible.
|
|
*/
|
|
void
|
|
res_close()
|
|
{
|
|
if (s >= 0) {
|
|
(void) close(s);
|
|
s = -1;
|
|
connected = 0;
|
|
vc = 0;
|
|
}
|
|
}
|
|
|
|
#ifdef ultrix
|
|
/* ultrix 4.0 had some icky packaging in its libc.a. alias for it here.
|
|
* there is more gunk of this kind over in res_debug.c.
|
|
*/
|
|
|
|
void
|
|
_res_close()
|
|
{
|
|
res_close();
|
|
}
|
|
|
|
#undef res_send
|
|
int
|
|
res_send(buf, buflen, ans, anssiz)
|
|
const u_char *buf;
|
|
int buflen;
|
|
u_char *ans;
|
|
int anssiz;
|
|
{
|
|
return (__res_send(buf, buflen, ans, anssiz));
|
|
}
|
|
#endif /* Ultrix 4.0 hackery */
|