Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/bsd/libpcap merge conflicts.
details: https://anonhg.NetBSD.org/src/rev/69c9287b713a
branches: trunk
changeset: 821106:69c9287b713a
user: christos <christos%NetBSD.org@localhost>
date: Tue Jan 24 22:29:28 2017 +0000
description:
merge conflicts.
diffstat:
external/bsd/libpcap/dist/Win32/Include/addrinfo.h | 144 -
external/bsd/libpcap/dist/Win32/Include/arpa/nameser.h | 349 -
external/bsd/libpcap/dist/Win32/Include/bittypes.h | 89 -
external/bsd/libpcap/dist/Win32/Include/cdecl_ext.h | 37 -
external/bsd/libpcap/dist/Win32/Include/inetprivate.h | 67 -
external/bsd/libpcap/dist/Win32/Include/ip6_misc.h | 161 -
external/bsd/libpcap/dist/Win32/Include/net/netdb.h | 166 -
external/bsd/libpcap/dist/Win32/Include/net/paths.h | 105 -
external/bsd/libpcap/dist/Win32/Include/sockstorage.h | 38 -
external/bsd/libpcap/dist/Win32/Prj/libpcap.dsp | 168 -
external/bsd/libpcap/dist/Win32/Prj/libpcap.dsw | 29 -
external/bsd/libpcap/dist/Win32/Src/ffs.c | 54 -
external/bsd/libpcap/dist/Win32/Src/gai_strerror.c | 83 -
external/bsd/libpcap/dist/Win32/Src/getaddrinfo.c | 1124 --
external/bsd/libpcap/dist/Win32/Src/getnetbynm.c | 44 -
external/bsd/libpcap/dist/Win32/Src/getnetent.c | 119 -
external/bsd/libpcap/dist/Win32/Src/getopt.c | 121 -
external/bsd/libpcap/dist/Win32/Src/getservent.c | 125 -
external/bsd/libpcap/dist/Win32/Src/inet_aton.c | 54 -
external/bsd/libpcap/dist/Win32/Src/inet_net.c | 101 -
external/bsd/libpcap/dist/Win32/Src/inet_pton.c | 64 -
external/bsd/libpcap/dist/bpf/net/bpf_filter.c | 25 +-
external/bsd/libpcap/dist/bpf_dump.c | 9 +-
external/bsd/libpcap/dist/bpf_image.c | 16 +-
external/bsd/libpcap/dist/configure.in | 1758 ---
external/bsd/libpcap/dist/dlpisubs.c | 35 +-
external/bsd/libpcap/dist/etherent.c | 10 +-
external/bsd/libpcap/dist/ethertype.h | 5 +-
external/bsd/libpcap/dist/fad-getad.c | 80 +-
external/bsd/libpcap/dist/fad-gifc.c | 41 +-
external/bsd/libpcap/dist/fad-glifc.c | 64 +-
external/bsd/libpcap/dist/fad-null.c | 65 -
external/bsd/libpcap/dist/fad-sita.c | 64 -
external/bsd/libpcap/dist/fad-win32.c | 253 -
external/bsd/libpcap/dist/gencode.c | 4643 +++++----
external/bsd/libpcap/dist/gencode.h | 144 +-
external/bsd/libpcap/dist/grammar.y | 251 +-
external/bsd/libpcap/dist/inet.c | 912 +-
external/bsd/libpcap/dist/lbl/os-osf4.h | 6 +-
external/bsd/libpcap/dist/lbl/os-osf5.h | 8 +-
external/bsd/libpcap/dist/lbl/os-solaris2.h | 4 +-
external/bsd/libpcap/dist/lbl/os-sunos4.h | 6 +-
external/bsd/libpcap/dist/lbl/os-ultrix4.h | 3 +-
external/bsd/libpcap/dist/nametoaddr.c | 77 +-
external/bsd/libpcap/dist/optimize.c | 805 +-
external/bsd/libpcap/dist/pcap-bpf.c | 594 +-
external/bsd/libpcap/dist/pcap-bt-linux.c | 60 +-
external/bsd/libpcap/dist/pcap-bt-monitor-linux.c | 52 +-
external/bsd/libpcap/dist/pcap-can-linux.c | 324 -
external/bsd/libpcap/dist/pcap-can-linux.h | 38 -
external/bsd/libpcap/dist/pcap-canusb-linux.c | 479 -
external/bsd/libpcap/dist/pcap-canusb-linux.h | 39 -
external/bsd/libpcap/dist/pcap-common.c | 103 +-
external/bsd/libpcap/dist/pcap-config.1 | 4 +-
external/bsd/libpcap/dist/pcap-dag.c | 215 +-
external/bsd/libpcap/dist/pcap-dag.h | 96 +-
external/bsd/libpcap/dist/pcap-dbus.c | 30 +-
external/bsd/libpcap/dist/pcap-dlpi.c | 468 +-
external/bsd/libpcap/dist/pcap-dos.c | 124 +-
external/bsd/libpcap/dist/pcap-int.h | 124 +-
external/bsd/libpcap/dist/pcap-libdlpi.c | 43 +-
external/bsd/libpcap/dist/pcap-linux.c | 956 +-
external/bsd/libpcap/dist/pcap-netfilter-linux.c | 69 +-
external/bsd/libpcap/dist/pcap-nit.c | 45 +-
external/bsd/libpcap/dist/pcap-null.c | 10 +-
external/bsd/libpcap/dist/pcap-pf.c | 61 +-
external/bsd/libpcap/dist/pcap-septel.c | 36 +-
external/bsd/libpcap/dist/pcap-sita.c | 86 +-
external/bsd/libpcap/dist/pcap-snf.c | 75 +-
external/bsd/libpcap/dist/pcap-snit.c | 55 +-
external/bsd/libpcap/dist/pcap-snoop.c | 93 +-
external/bsd/libpcap/dist/pcap-stdinc.h | 107 +-
external/bsd/libpcap/dist/pcap-usb-linux.c | 116 +-
external/bsd/libpcap/dist/pcap-win32.c | 879 +-
external/bsd/libpcap/dist/pcap.3pcap.in | 2 +-
external/bsd/libpcap/dist/pcap.c | 968 +-
external/bsd/libpcap/dist/pcap/bluetooth.h | 6 +-
external/bsd/libpcap/dist/pcap/bpf.h | 1255 +--
external/bsd/libpcap/dist/pcap/namedb.h | 34 +-
external/bsd/libpcap/dist/pcap/nflog.h | 6 +-
external/bsd/libpcap/dist/pcap/pcap.h | 295 +-
external/bsd/libpcap/dist/pcap/sll.h | 4 +-
external/bsd/libpcap/dist/pcap/usb.h | 6 +-
external/bsd/libpcap/dist/pcap_activate.3pcap | 89 +-
external/bsd/libpcap/dist/pcap_breakloop.3pcap | 4 +-
external/bsd/libpcap/dist/pcap_can_set_rfmon.3pcap | 36 +-
external/bsd/libpcap/dist/pcap_close.3pcap | 4 +-
external/bsd/libpcap/dist/pcap_create.3pcap | 4 +-
external/bsd/libpcap/dist/pcap_datalink_name_to_val.3pcap | 7 +-
external/bsd/libpcap/dist/pcap_datalink_val_to_name.3pcap | 18 +-
external/bsd/libpcap/dist/pcap_dump.3pcap | 4 +-
external/bsd/libpcap/dist/pcap_dump_close.3pcap | 4 +-
external/bsd/libpcap/dist/pcap_dump_file.3pcap | 4 +-
external/bsd/libpcap/dist/pcap_dump_flush.3pcap | 4 +-
external/bsd/libpcap/dist/pcap_dump_ftell.3pcap | 4 +-
external/bsd/libpcap/dist/pcap_dump_open.3pcap.in | 2 +-
external/bsd/libpcap/dist/pcap_file.3pcap | 4 +-
external/bsd/libpcap/dist/pcap_fileno.3pcap | 4 +-
external/bsd/libpcap/dist/pcap_findalldevs.3pcap | 4 +-
external/bsd/libpcap/dist/pcap_freecode.3pcap | 4 +-
external/bsd/libpcap/dist/pcap_get_selectable_fd.3pcap | 4 +-
external/bsd/libpcap/dist/pcap_geterr.3pcap | 6 +-
external/bsd/libpcap/dist/pcap_inject.3pcap | 4 +-
external/bsd/libpcap/dist/pcap_is_swapped.3pcap | 4 +-
external/bsd/libpcap/dist/pcap_lib_version.3pcap | 4 +-
external/bsd/libpcap/dist/pcap_lookupdev.3pcap | 4 +-
external/bsd/libpcap/dist/pcap_lookupnet.3pcap | 4 +-
external/bsd/libpcap/dist/pcap_loop.3pcap | 4 +-
external/bsd/libpcap/dist/pcap_major_version.3pcap | 4 +-
external/bsd/libpcap/dist/pcap_next_ex.3pcap | 4 +-
external/bsd/libpcap/dist/pcap_offline_filter.3pcap | 4 +-
external/bsd/libpcap/dist/pcap_open_live.3pcap | 4 +-
external/bsd/libpcap/dist/pcap_open_offline.3pcap.in | 2 +-
external/bsd/libpcap/dist/pcap_set_buffer_size.3pcap | 4 +-
external/bsd/libpcap/dist/pcap_set_datalink.3pcap | 4 +-
external/bsd/libpcap/dist/pcap_set_immediate_mode.3pcap | 4 +-
external/bsd/libpcap/dist/pcap_set_promisc.3pcap | 4 +-
external/bsd/libpcap/dist/pcap_set_rfmon.3pcap | 4 +-
external/bsd/libpcap/dist/pcap_set_snaplen.3pcap | 4 +-
external/bsd/libpcap/dist/pcap_set_timeout.3pcap | 11 +-
external/bsd/libpcap/dist/pcap_setdirection.3pcap | 4 +-
external/bsd/libpcap/dist/pcap_setfilter.3pcap | 4 +-
external/bsd/libpcap/dist/pcap_setnonblock.3pcap | 4 +-
external/bsd/libpcap/dist/pcap_snapshot.3pcap | 4 +-
external/bsd/libpcap/dist/pcap_stats.3pcap | 4 +-
external/bsd/libpcap/dist/pcap_statustostr.3pcap | 4 +-
external/bsd/libpcap/dist/pcap_strerror.3pcap | 4 +-
external/bsd/libpcap/dist/pcap_tstamp_type_name_to_val.3pcap | 4 +-
external/bsd/libpcap/dist/pcap_tstamp_type_val_to_name.3pcap | 4 +-
external/bsd/libpcap/dist/runlex.sh | 233 -
external/bsd/libpcap/dist/savefile.c | 174 +-
external/bsd/libpcap/dist/scanner.c.top | 3 -
external/bsd/libpcap/dist/scanner.l | 247 +-
external/bsd/libpcap/dist/sf-pcap-ng.c | 392 +-
external/bsd/libpcap/dist/sf-pcap.c | 208 +-
external/bsd/libpcap/dist/tests/capturetest.c | 71 +-
external/bsd/libpcap/dist/tests/filtertest.c | 83 +-
external/bsd/libpcap/dist/tests/findalldevstest.c | 33 +-
external/bsd/libpcap/dist/tests/opentest.c | 81 +-
external/bsd/libpcap/dist/tests/reactivatetest.c | 6 +-
external/bsd/libpcap/dist/tests/selpolltest.c | 77 +-
external/bsd/libpcap/dist/tests/valgrindtest.c | 92 +-
external/bsd/libpcap/include/config.h | 45 +-
external/bsd/libpcap/lib/Makefile | 5 +-
external/bsd/libpcap/lib/pcap_version.c | 3 +
external/bsd/libpcap/lib/pcap_version.h | 3 +
external/bsd/libpcap/lib/shlib_version | 6 +-
external/bsd/libpcap/lib/version.c | 3 -
external/bsd/libpcap/lib/version.h | 3 -
149 files changed, 8584 insertions(+), 13990 deletions(-)
diffs (truncated from 37469 to 300 lines):
diff -r c61c53fcceaa -r 69c9287b713a external/bsd/libpcap/dist/Win32/Include/addrinfo.h
--- a/external/bsd/libpcap/dist/Win32/Include/addrinfo.h Tue Jan 24 22:28:42 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,144 +0,0 @@
-/*
- * Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
- * 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. Neither the name of the project 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 PROJECT 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 PROJECT 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.
- */
-
-#ifndef HAVE_ADDRINFO
-
-/*
- * Error return codes from getaddrinfo()
- */
-#define EAI_ADDRFAMILY 1 /* address family for hostname not supported */
-#define EAI_AGAIN 2 /* temporary failure in name resolution */
-#define EAI_BADFLAGS 3 /* invalid value for ai_flags */
-#define EAI_FAIL 4 /* non-recoverable failure in name resolution */
-#define EAI_FAMILY 5 /* ai_family not supported */
-#define EAI_MEMORY 6 /* memory allocation failure */
-#define EAI_NODATA 7 /* no address associated with hostname */
-#define EAI_NONAME 8 /* hostname nor servname provided, or not known */
-#define EAI_SERVICE 9 /* servname not supported for ai_socktype */
-#define EAI_SOCKTYPE 10 /* ai_socktype not supported */
-#define EAI_SYSTEM 11 /* system error returned in errno */
-#define EAI_BADHINTS 12
-#define EAI_PROTOCOL 13
-#define EAI_MAX 14
-
-/* internal error */
-#define NETDB_INTERNAL -1 /* see errno */
-
-/*
- * Flag values for getaddrinfo()
- */
-#define AI_PASSIVE 0x00000001 /* get address to use bind() */
-#define AI_CANONNAME 0x00000002 /* fill ai_canonname */
-#define AI_NUMERICHOST 0x00000004 /* prevent name resolution */
-/* valid flags for addrinfo */
-#define AI_MASK (AI_PASSIVE | AI_CANONNAME | AI_NUMERICHOST)
-
-#define AI_ALL 0x00000100 /* IPv6 and IPv4-mapped (with AI_V4MAPPED) */
-#define AI_V4MAPPED_CFG 0x00000200 /* accept IPv4-mapped if kernel supports */
-#define AI_ADDRCONFIG 0x00000400 /* only if any address is assigned */
-#define AI_V4MAPPED 0x00000800 /* accept IPv4-mapped IPv6 address */
-/* special recommended flags for getipnodebyname */
-#define AI_DEFAULT (AI_V4MAPPED_CFG | AI_ADDRCONFIG)
-
-struct addrinfo {
- int ai_flags; /* AI_PASSIVE, AI_CANONNAME */
- int ai_family; /* PF_xxx */
- int ai_socktype; /* SOCK_xxx */
- int ai_protocol; /* 0 or IPPROTO_xxx for IPv4 and IPv6 */
- size_t ai_addrlen; /* length of ai_addr */
- char *ai_canonname; /* canonical name for hostname */
- struct sockaddr *ai_addr; /* binary address */
- struct addrinfo *ai_next; /* next structure in linked list */
-};
-
-extern void freeaddrinfo (struct addrinfo *);
-extern void freehostent (struct hostent *);
-extern char *gai_strerror (int);
-extern int getaddrinfo (const char *, const char *,
- const struct addrinfo *, struct addrinfo **);
-extern int getnameinfo (const struct sockaddr *, size_t, char *,
- size_t, char *, size_t, int);
-extern struct hostent *getipnodebyaddr (const void *, size_t, int, int *);
-extern struct hostent *getipnodebyname (const char *, int, int, int *);
-extern int inet_pton (int, const char *, void *);
-extern const char *inet_ntop (int, const void *, char *, size_t);
-#else
-
-#ifndef EAI_BADHINTS
-#define EAI_BADHINTS 12
-#endif
-
-#ifndef EAI_PROTOCOL
-#define EAI_PROTOCOL 13
-#endif
-
-#ifndef EAI_MAX
-#define EAI_MAX 14
-#endif
-
-#ifndef NETDB_INTERNAL
-#define NETDB_INTERNAL -1 /* see errno */
-#endif
-
-#ifndef AI_MASK
-/* valid flags for addrinfo */
-#define AI_MASK (AI_PASSIVE | AI_CANONNAME | AI_NUMERICHOST)
-#endif
-
-#endif /* HAVE_ADDRINFO */
-
-/*
- * Constants for getnameinfo()
- */
-#ifndef NI_MAXHOST
-#define NI_MAXHOST 1025
-#endif
-#ifndef NI_MAXSERV
-#define NI_MAXSERV 32
-#endif
-
-/*
- * Flag values for getnameinfo()
- */
-#ifndef NI_NOFQDN
-#define NI_NOFQDN 0x00000001
-#endif
-#ifndef NI_NUMERICHOST
-#define NI_NUMERICHOST 0x00000002
-#endif
-#ifndef NI_NAMEREQD
-#define NI_NAMEREQD 0x00000004
-#endif
-#ifndef NI_NUMERICSERV
-#define NI_NUMERICSERV 0x00000008
-#endif
-#ifndef NI_DGRAM
-#define NI_DGRAM 0x00000010
-#endif
-
diff -r c61c53fcceaa -r 69c9287b713a external/bsd/libpcap/dist/Win32/Include/arpa/nameser.h
--- a/external/bsd/libpcap/dist/Win32/Include/arpa/nameser.h Tue Jan 24 22:28:42 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,349 +0,0 @@
-/*
- * ++Copyright++ 1983, 1989, 1993
- * -
- * Copyright (c) 1983, 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--
- */
-
-/*
- * @(#)nameser.h 8.1 (Berkeley) 6/2/93
- * nameser.h,v 1.2 1995/05/06 14:23:54 hjl Exp
- */
-
-#ifndef _NAMESER_H_
-#define _NAMESER_H_
-
-#ifndef WIN32
-#include <sys/param.h>
-#if (!defined(BSD)) || (BSD < 199306)
-# include <sys/bitypes.h>
-#else
-# include <sys/types.h>
-#endif
-#include <sys/cdefs.h>
-#else
-#include <pcap-stdinc.h>
-#define __LITTLE_ENDIAN 1
-#define __BYTE_ORDER __LITTLE_ENDIAN
-#endif
-
-/*
- * revision information. this is the release date in YYYYMMDD format.
- * it can change every day so the right thing to do with it is use it
- * in preprocessor commands such as "#if (__BIND > 19931104)". do not
- * compare for equality; rather, use it to determine whether your resolver
- * is new enough to contain a certain feature.
- */
-
-#define __BIND 19940417 /* interface version stamp */
-
-/*
- * Define constants based on rfc883
- */
-#define PACKETSZ 512 /* maximum packet size */
-#define MAXDNAME 256 /* maximum domain name */
-#define MAXCDNAME 255 /* maximum compressed domain name */
-#define MAXLABEL 63 /* maximum length of domain label */
-#define HFIXEDSZ 12 /* #/bytes of fixed data in header */
-#define QFIXEDSZ 4 /* #/bytes of fixed data in query */
-#define RRFIXEDSZ 10 /* #/bytes of fixed data in r record */
-#define INT32SZ 4 /* for systems without 32-bit ints */
-#define INT16SZ 2 /* for systems without 16-bit ints */
-#define INADDRSZ 4 /* for sizeof(struct inaddr) != 4 */
-
-/*
- * Internet nameserver port number
- */
-#define NAMESERVER_PORT 53
-
-/*
- * Currently defined opcodes
- */
-#define QUERY 0x0 /* standard query */
-#define IQUERY 0x1 /* inverse query */
-#define STATUS 0x2 /* nameserver status query */
-/*#define xxx 0x3 *//* 0x3 reserved */
-#define NS_NOTIFY_OP 0x4 /* notify secondary of SOA change */
-#ifdef ALLOW_UPDATES
- /* non standard - supports ALLOW_UPDATES stuff from Mike Schwartz */
-# define UPDATEA 0x9 /* add resource record */
-# define UPDATED 0xa /* delete a specific resource record */
-# define UPDATEDA 0xb /* delete all named resource record */
-# define UPDATEM 0xc /* modify a specific resource record */
-# define UPDATEMA 0xd /* modify all named resource record */
-# define ZONEINIT 0xe /* initial zone transfer */
-# define ZONEREF 0xf /* incremental zone referesh */
-#endif
-
-/*
- * Currently defined response codes
- */
-#ifdef HAVE_ADDRINFO
-#define NOERROR 0 /* no error */
-#endif /* HAVE_ADDRINFO */
-#define FORMERR 1 /* format error */
-#define SERVFAIL 2 /* server failure */
-#define NXDOMAIN 3 /* non existent domain */
-#define NOTIMP 4 /* not implemented */
-#define REFUSED 5 /* query refused */
-#ifdef ALLOW_UPDATES
- /* non standard */
-# define NOCHANGE 0xf /* update failed to change db */
-#endif
-
-/*
- * Type values for resources and queries
- */
-#define T_A 1 /* host address */
-#define T_NS 2 /* authoritative server */
-#define T_MD 3 /* mail destination */
-#define T_MF 4 /* mail forwarder */
Home |
Main Index |
Thread Index |
Old Index