d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update the resolver definitions from bind-4.9.4-P1 to 4.9.5-P1 level.

Browse Source 
(More commits to come)
This commit is contained in:
Peter Wemm 1996-12-30 13:08:54 +00:00
parent 39791ab333
commit 315d6d9c3b
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=21055
2 changed files with 94 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/netdb.h
View File

@ -31,7 +31,8 @@
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* @(#)netdb.h 8.1 (Berkeley) 6/2/93 * @(#)netdb.h 8.1 (Berkeley) 6/2/93
* $Id: netdb.h,v 1.4 1996/01/30 23:30:30 mpp Exp $ * From: Id: netdb.h,v 8.7 1996/05/09 05:59:09 vixie Exp
* $Id: netdb.h,v 1.5 1996/08/29 20:00:56 peter Exp $
* - * -
* Portions Copyright (c) 1993 by Digital Equipment Corporation. * Portions Copyright (c) 1993 by Digital Equipment Corporation.
* *
@ -57,6 +58,8 @@
#ifndef _NETDB_H_ #ifndef _NETDB_H_
#define _NETDB_H_ #define _NETDB_H_
#include <sys/cdefs.h>
#define _PATH_HEQUIV "/etc/hosts.equiv" #define _PATH_HEQUIV "/etc/hosts.equiv"
#define _PATH_HOSTS "/etc/hosts" #define _PATH_HOSTS "/etc/hosts"
#define _PATH_NETWORKS "/etc/networks" #define _PATH_NETWORKS "/etc/networks"
@ -116,8 +119,6 @@ struct protoent {
#define NO_DATA 4 /* Valid name, no data record of requested type */ #define NO_DATA 4 /* Valid name, no data record of requested type */
#define NO_ADDRESS NO_DATA /* no address, look for MX record */ #define NO_ADDRESS NO_DATA /* no address, look for MX record */
#include <sys/cdefs.h>
__BEGIN_DECLS __BEGIN_DECLS
void endhostent __P((void)); void endhostent __P((void));
void endnetent __P((void)); void endnetent __P((void));
@ -127,7 +128,7 @@ struct hostent *gethostbyaddr __P((const char *, int, int));
struct hostent *gethostbyname __P((const char *)); struct hostent *gethostbyname __P((const char *));
struct hostent *gethostbyname2 __P((const char *, int)); struct hostent *gethostbyname2 __P((const char *, int));
struct hostent *gethostent __P((void)); struct hostent *gethostent __P((void));
struct netent *getnetbyaddr __P((long, int)); /* u_long? */ struct netent *getnetbyaddr __P((unsigned long, int));
struct netent *getnetbyname __P((const char *)); struct netent *getnetbyname __P((const char *));
struct netent *getnetent __P((void)); struct netent *getnetent __P((void));
struct protoent *getprotobyname __P((const char *)); struct protoent *getprotobyname __P((const char *));
@ -171,7 +172,6 @@ struct netent * _getnetbydnsaddr __P((unsigned long, int));
struct netent * _getnetbynisaddr __P((unsigned long, int)); struct netent * _getnetbynisaddr __P((unsigned long, int));
void _map_v4v6_address __P((const char *src, char *dst)); void _map_v4v6_address __P((const char *src, char *dst));
void _map_v4v6_hostent __P((struct hostent *hp, char **bp, int *len)); void _map_v4v6_hostent __P((struct hostent *hp, char **bp, int *len));
__END_DECLS __END_DECLS
#endif /* !_NETDB_H_ */ #endif /* !_NETDB_H_ */

137
include/resolv.h
View File

@ -52,8 +52,8 @@
* --Copyright-- * --Copyright--
* *
* @(#)resolv.h 8.1 (Berkeley) 6/2/93 * @(#)resolv.h 8.1 (Berkeley) 6/2/93
* From Id: resolv.h,v 4.9.1.2 1993/05/17 09:59:01 vixie Exp * From Id: resolv.h,v 8.17 1996/11/26 10:11:20 vixie Exp
* $Id: resolv.h,v 1.6 1996/01/30 23:30:34 mpp Exp $ * $Id: resolv.h,v 1.7 1996/08/29 20:00:58 peter Exp $
*/ */
#ifndef _RESOLV_H_ #ifndef _RESOLV_H_
@ -65,14 +65,14 @@
#include <stdio.h> #include <stdio.h>
/* /*
* revision information. this is the release date in YYYYMMDD format. * 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 * It can change every day so the right thing to do with it is use it
* in preprocessor commands such as "#if (__RES > 19931104)". do not * in preprocessor commands such as "#if (__RES > 19931104)". Do not
* compare for equality; rather, use it to determine whether your resolver * compare for equality; rather, use it to determine whether your resolver
* is new enough to contain a certain feature. * is new enough to contain a certain feature.
*/ */
#define __RES 19960229 #define __RES 19960801
/* /*
* Resolver configuration file. * Resolver configuration file.
@ -104,9 +104,9 @@ struct __res_state {
struct sockaddr_in struct sockaddr_in
nsaddr_list[MAXNS]; /* address of name server */ nsaddr_list[MAXNS]; /* address of name server */
#define nsaddr nsaddr_list[0] /* for backward compatibility */ #define nsaddr nsaddr_list[0] /* for backward compatibility */
u_short id; /* current packet id */ u_short id; /* current message id */
char *dnsrch[MAXDNSRCH+1]; /* components of domain to search */ char *dnsrch[MAXDNSRCH+1]; /* components of domain to search */
char defdname[MAXDNAME]; /* default domain */ char defdname[256]; /* default domain (deprecated) */
u_long pfcode; /* RES_PRF_ flags - see below. */ u_long pfcode; /* RES_PRF_ flags - see below. */
unsigned ndots:4; /* threshold for initial abs. query */ unsigned ndots:4; /* threshold for initial abs. query */
unsigned nsort:4; /* number of elements in sort_list[] */ unsigned nsort:4; /* number of elements in sort_list[] */
@ -115,7 +115,7 @@ struct __res_state {
struct in_addr addr; struct in_addr addr;
u_int32_t mask; u_int32_t mask;
} sort_list[MAXRESOLVSORT]; } sort_list[MAXRESOLVSORT];
char pad[72]; /* On an i386 this means 512b total. */ char pad[72]; /* on an i386 this means 512b total */
}; };
/* /*
@ -176,16 +176,30 @@ typedef res_sendhookact (*res_send_rhook)__P((const struct sockaddr_in *ns,
int anssiz, int anssiz,
int *resplen)); int *resplen));
struct res_sym {
int number; /* Identifying number, like T_MX */
char * name; /* Its symbolic name, like "MX" */
char * humanname; /* Its fun name, like "mail exchanger" */
};
extern struct __res_state _res; extern struct __res_state _res;
extern const struct res_sym __p_class_syms[];
extern const struct res_sym __p_type_syms[];
/* Private routines shared between libc/net, named, nslookup and others. */ /* Private routines shared between libc/net, named, nslookup and others. */
#define res_hnok __res_hnok #define res_hnok __res_hnok
#define res_ownok __res_ownok #define res_ownok __res_ownok
#define res_mailok __res_mailok #define res_mailok __res_mailok
#define res_dnok __res_dnok #define res_dnok __res_dnok
#define sym_ston __sym_ston
#define sym_ntos __sym_ntos
#define sym_ntop __sym_ntop
#define b64_ntop __b64_ntop
#define b64_pton __b64_pton
#define loc_ntoa __loc_ntoa #define loc_ntoa __loc_ntoa
#define loc_aton __loc_aton #define loc_aton __loc_aton
#define dn_skipname __dn_skipname #define dn_skipname __dn_skipname
#define fp_resstat __fp_resstat
#define fp_query __fp_query #define fp_query __fp_query
#define fp_nquery __fp_nquery #define fp_nquery __fp_nquery
#define hostalias __hostalias #define hostalias __hostalias
@ -194,56 +208,83 @@ extern struct __res_state _res;
#define p_class __p_class #define p_class __p_class
#define p_time __p_time #define p_time __p_time
#define p_type __p_type #define p_type __p_type
#define p_query __p_query
#define p_cdnname __p_cdnname #define p_cdnname __p_cdnname
#define p_cdname __p_cdname #define p_cdname __p_cdname
#define p_fqnname __p_fqnname
#define p_fqname __p_fqname #define p_fqname __p_fqname
#define p_rr __p_rr #define p_rr __p_rr
#define p_option __p_option #define p_option __p_option
#define p_secstodate __p_secstodate
#define dn_count_labels __dn_count_labels
#define dn_comp __dn_comp
#define res_randomid __res_randomid #define res_randomid __res_randomid
#define res_send __res_send
#define res_isourserver __res_isourserver #define res_isourserver __res_isourserver
#define res_nameinquery __res_nameinquery #define res_nameinquery __res_nameinquery
#define res_queriesmatch __res_queriesmatch #define res_queriesmatch __res_queriesmatch
#define res_close __res_close
#ifdef BIND_RES_POSIX3
#define dn_expand __dn_expand
#define res_init __res_init
#define res_query __res_query
#define res_search __res_search
#define res_querydomain __res_querydomain
#define res_mkquery __res_mkquery
#endif
__BEGIN_DECLS __BEGIN_DECLS
int __res_hnok __P((const char *)); int res_hnok __P((const char *));
int __res_ownok __P((const char *)); int res_ownok __P((const char *));
int __res_mailok __P((const char *)); int res_mailok __P((const char *));
int __res_dnok __P((const char *)); int res_dnok __P((const char *));
int __loc_aton __P((const char *ascii, u_char *binary)); int sym_ston __P((const struct res_sym *, char *, int *));
char * __loc_ntoa __P((const u_char *binary, char *ascii)); const char * sym_ntos __P((const struct res_sym *, int, int *));
int __dn_skipname __P((const u_char *, const u_char *)); const char * sym_ntop __P((const struct res_sym *, int, int *));
void __fp_resstat __P((struct __res_state *, FILE *)); int b64_ntop __P((u_char const *, size_t, char *, size_t));
void __fp_query __P((const u_char *, FILE *)); int b64_pton __P((char const *, u_char *, size_t));
void __fp_nquery __P((const u_char *, int, FILE *)); int loc_aton __P((const char *, u_char *));
char *__hostalias __P((const char *)); const char * loc_ntoa __P((const u_char *, char *));
void __putlong __P((u_int32_t, u_char *)); int dn_skipname __P((const u_char *, const u_char *));
void __putshort __P((u_int16_t, u_char *)); void fp_resstat __P((struct __res_state *, FILE *));
char *__p_time __P((u_int32_t)); void fp_query __P((const u_char *, FILE *));
void __p_query __P((const u_char *)); void fp_nquery __P((const u_char *, int, FILE *));
const u_char *__p_cdnname __P((const u_char *, const u_char *, int, FILE *)); const char * hostalias __P((const char *));
const u_char *__p_cdname __P((const u_char *, const u_char *, FILE *)); void putlong __P((u_int32_t, u_char *));
const u_char *__p_fqname __P((const u_char *, const u_char *, FILE *)); void putshort __P((u_int16_t, u_char *));
const u_char *__p_rr __P((const u_char *, const u_char *, FILE *)); const char * p_class __P((int));
const char *__p_type __P((int)); const char * p_time __P((u_int32_t));
const char *__p_class __P((int)); const char * p_type __P((int));
const char *__p_option __P((u_long option)); void p_query __P((const u_char *));
int dn_comp __P((const char *, u_char *, int, u_char **, u_char **)); const u_char * p_cdnname __P((const u_char *, const u_char *, int, FILE *));
int dn_expand __P((const u_char *, const u_char *, const u_char *, const u_char * p_cdname __P((const u_char *, const u_char *, FILE *));
char *, int)); const u_char * p_fqnname __P((const u_char *, const u_char *,
int res_init __P((void)); int, char *, int));
u_int16_t res_randomid __P((void)); const u_char * p_fqname __P((const u_char *, const u_char *, FILE *));
int res_query __P((const char *, int, int, u_char *, int)); const u_char * p_rr __P((const u_char *, const u_char *, FILE *));
int res_search __P((const char *, int, int, u_char *, int)); const char * p_option __P((u_long));
int res_querydomain __P((const char *, const char *, int, int, char * p_secstodate __P((u_long));
u_char *, int)); int dn_count_labels __P((char *));
int res_mkquery __P((int, const char *, int, int, const u_char *, int, int dn_comp __P((const char *, u_char *, int,
const u_char *, u_char *, int)); u_char **, u_char **));
int res_send __P((const u_char *, int, u_char *, int)); int dn_expand __P((const u_char *, const u_char *, const u_char *,
int res_isourserver __P((const struct sockaddr_in *)); char *, int));
int res_nameinquery __P((const char *, int, int, int res_init __P((void));
const u_char *, const u_char *)); u_int res_randomid __P((void));
int res_queriesmatch __P((const u_char *, const u_char *, int res_query __P((const char *, int, int, u_char *, int));
const u_char *, const u_char *)); int res_search __P((const char *, int, int, u_char *, int));
int res_querydomain __P((const char *, const char *, int, int,
u_char *, int));
int res_mkquery __P((int, const char *, int, int, const u_char *,
int, const u_char *, u_char *, int));
int res_send __P((const u_char *, int, u_char *, int));
int res_isourserver __P((const struct sockaddr_in *));
int res_nameinquery __P((const char *, int, int,
const u_char *, const u_char *));
int res_queriesmatch __P((const u_char *, const u_char *,
const u_char *, const u_char *));
void res_close __P((void));
__END_DECLS __END_DECLS
#endif /* !_RESOLV_H_ */ #endif /* !_RESOLV_H_ */