Deleted Added
sdiff udiff text old ( 17902 ) new ( 21055 )
full compact
resolv.h (17902) resolv.h (21055)
1/*-
2 * Copyright (c) 1983, 1987, 1989, 1993
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 38 unchanged lines hidden (view full) ---

47 * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
48 * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
49 * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
50 * SOFTWARE.
51 * -
52 * --Copyright--
53 *
54 * @(#)resolv.h 8.1 (Berkeley) 6/2/93
1/*-
2 * Copyright (c) 1983, 1987, 1989, 1993
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 38 unchanged lines hidden (view full) ---

47 * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
48 * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
49 * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
50 * SOFTWARE.
51 * -
52 * --Copyright--
53 *
54 * @(#)resolv.h 8.1 (Berkeley) 6/2/93
55 * From Id: resolv.h,v 4.9.1.2 1993/05/17 09:59:01 vixie Exp
56 * $Id: resolv.h,v 1.6 1996/01/30 23:30:34 mpp Exp $
55 * From Id: resolv.h,v 8.17 1996/11/26 10:11:20 vixie Exp
56 * $Id: resolv.h,v 1.7 1996/08/29 20:00:58 peter Exp $
57 */
58
59#ifndef _RESOLV_H_
60#define _RESOLV_H_
61
62#include <sys/param.h>
63#include <sys/types.h>
64#include <sys/cdefs.h>
65#include <stdio.h>
66
67/*
57 */
58
59#ifndef _RESOLV_H_
60#define _RESOLV_H_
61
62#include <sys/param.h>
63#include <sys/types.h>
64#include <sys/cdefs.h>
65#include <stdio.h>
66
67/*
68 * revision information. this is the release date in YYYYMMDD format.
69 * it can change every day so the right thing to do with it is use it
70 * in preprocessor commands such as "#if (__RES > 19931104)". do not
68 * Revision information. This is the release date in YYYYMMDD format.
69 * It can change every day so the right thing to do with it is use it
70 * in preprocessor commands such as "#if (__RES > 19931104)". Do not
71 * compare for equality; rather, use it to determine whether your resolver
72 * is new enough to contain a certain feature.
73 */
74
71 * compare for equality; rather, use it to determine whether your resolver
72 * is new enough to contain a certain feature.
73 */
74
75#define __RES 19960229
75#define __RES 19960801
76
77/*
78 * Resolver configuration file.
79 * Normally not present, but may contain the address of the
80 * inital name server(s) to query and the domain search list.
81 */
82
83#ifndef _PATH_RESCONF

--- 15 unchanged lines hidden (view full) ---

99struct __res_state {
100 int retrans; /* retransmition time interval */
101 int retry; /* number of times to retransmit */
102 u_long options; /* option flags - see below. */
103 int nscount; /* number of name servers */
104 struct sockaddr_in
105 nsaddr_list[MAXNS]; /* address of name server */
106#define nsaddr nsaddr_list[0] /* for backward compatibility */
76
77/*
78 * Resolver configuration file.
79 * Normally not present, but may contain the address of the
80 * inital name server(s) to query and the domain search list.
81 */
82
83#ifndef _PATH_RESCONF

--- 15 unchanged lines hidden (view full) ---

99struct __res_state {
100 int retrans; /* retransmition time interval */
101 int retry; /* number of times to retransmit */
102 u_long options; /* option flags - see below. */
103 int nscount; /* number of name servers */
104 struct sockaddr_in
105 nsaddr_list[MAXNS]; /* address of name server */
106#define nsaddr nsaddr_list[0] /* for backward compatibility */
107 u_short id; /* current packet id */
107 u_short id; /* current message id */
108 char *dnsrch[MAXDNSRCH+1]; /* components of domain to search */
108 char *dnsrch[MAXDNSRCH+1]; /* components of domain to search */
109 char defdname[MAXDNAME]; /* default domain */
109 char defdname[256]; /* default domain (deprecated) */
110 u_long pfcode; /* RES_PRF_ flags - see below. */
111 unsigned ndots:4; /* threshold for initial abs. query */
112 unsigned nsort:4; /* number of elements in sort_list[] */
113 char unused[3];
114 struct {
115 struct in_addr addr;
116 u_int32_t mask;
117 } sort_list[MAXRESOLVSORT];
110 u_long pfcode; /* RES_PRF_ flags - see below. */
111 unsigned ndots:4; /* threshold for initial abs. query */
112 unsigned nsort:4; /* number of elements in sort_list[] */
113 char unused[3];
114 struct {
115 struct in_addr addr;
116 u_int32_t mask;
117 } sort_list[MAXRESOLVSORT];
118 char pad[72]; /* On an i386 this means 512b total. */
118 char pad[72]; /* on an i386 this means 512b total */
119};
120
121/*
122 * Resolver options (keep these in synch with res_debug.c, please)
123 */
124#define RES_INIT 0x00000001 /* address initialized */
125#define RES_DEBUG 0x00000002 /* print debug messages */
126#define RES_AAONLY 0x00000004 /* authoritative answers only (!IMPL)*/

--- 44 unchanged lines hidden (view full) ---

171
172typedef res_sendhookact (*res_send_rhook)__P((const struct sockaddr_in *ns,
173 const u_char *query,
174 int querylen,
175 u_char *ans,
176 int anssiz,
177 int *resplen));
178
119};
120
121/*
122 * Resolver options (keep these in synch with res_debug.c, please)
123 */
124#define RES_INIT 0x00000001 /* address initialized */
125#define RES_DEBUG 0x00000002 /* print debug messages */
126#define RES_AAONLY 0x00000004 /* authoritative answers only (!IMPL)*/

--- 44 unchanged lines hidden (view full) ---

171
172typedef res_sendhookact (*res_send_rhook)__P((const struct sockaddr_in *ns,
173 const u_char *query,
174 int querylen,
175 u_char *ans,
176 int anssiz,
177 int *resplen));
178
179struct res_sym {
180 int number; /* Identifying number, like T_MX */
181 char * name; /* Its symbolic name, like "MX" */
182 char * humanname; /* Its fun name, like "mail exchanger" */
183};
184
179extern struct __res_state _res;
185extern struct __res_state _res;
186extern const struct res_sym __p_class_syms[];
187extern const struct res_sym __p_type_syms[];
180
181/* Private routines shared between libc/net, named, nslookup and others. */
182#define res_hnok __res_hnok
183#define res_ownok __res_ownok
184#define res_mailok __res_mailok
185#define res_dnok __res_dnok
188
189/* Private routines shared between libc/net, named, nslookup and others. */
190#define res_hnok __res_hnok
191#define res_ownok __res_ownok
192#define res_mailok __res_mailok
193#define res_dnok __res_dnok
194#define sym_ston __sym_ston
195#define sym_ntos __sym_ntos
196#define sym_ntop __sym_ntop
197#define b64_ntop __b64_ntop
198#define b64_pton __b64_pton
186#define loc_ntoa __loc_ntoa
187#define loc_aton __loc_aton
188#define dn_skipname __dn_skipname
199#define loc_ntoa __loc_ntoa
200#define loc_aton __loc_aton
201#define dn_skipname __dn_skipname
202#define fp_resstat __fp_resstat
189#define fp_query __fp_query
190#define fp_nquery __fp_nquery
191#define hostalias __hostalias
192#define putlong __putlong
193#define putshort __putshort
194#define p_class __p_class
195#define p_time __p_time
196#define p_type __p_type
203#define fp_query __fp_query
204#define fp_nquery __fp_nquery
205#define hostalias __hostalias
206#define putlong __putlong
207#define putshort __putshort
208#define p_class __p_class
209#define p_time __p_time
210#define p_type __p_type
211#define p_query __p_query
197#define p_cdnname __p_cdnname
198#define p_cdname __p_cdname
212#define p_cdnname __p_cdnname
213#define p_cdname __p_cdname
214#define p_fqnname __p_fqnname
199#define p_fqname __p_fqname
200#define p_rr __p_rr
201#define p_option __p_option
215#define p_fqname __p_fqname
216#define p_rr __p_rr
217#define p_option __p_option
218#define p_secstodate __p_secstodate
219#define dn_count_labels __dn_count_labels
220#define dn_comp __dn_comp
202#define res_randomid __res_randomid
221#define res_randomid __res_randomid
222#define res_send __res_send
203#define res_isourserver __res_isourserver
204#define res_nameinquery __res_nameinquery
205#define res_queriesmatch __res_queriesmatch
223#define res_isourserver __res_isourserver
224#define res_nameinquery __res_nameinquery
225#define res_queriesmatch __res_queriesmatch
226#define res_close __res_close
206
227
228#ifdef BIND_RES_POSIX3
229#define dn_expand __dn_expand
230#define res_init __res_init
231#define res_query __res_query
232#define res_search __res_search
233#define res_querydomain __res_querydomain
234#define res_mkquery __res_mkquery
235#endif
236
207__BEGIN_DECLS
237__BEGIN_DECLS
208int __res_hnok __P((const char *));
209int __res_ownok __P((const char *));
210int __res_mailok __P((const char *));
211int __res_dnok __P((const char *));
212int __loc_aton __P((const char *ascii, u_char *binary));
213char * __loc_ntoa __P((const u_char *binary, char *ascii));
214int __dn_skipname __P((const u_char *, const u_char *));
215void __fp_resstat __P((struct __res_state *, FILE *));
216void __fp_query __P((const u_char *, FILE *));
217void __fp_nquery __P((const u_char *, int, FILE *));
218char *__hostalias __P((const char *));
219void __putlong __P((u_int32_t, u_char *));
220void __putshort __P((u_int16_t, u_char *));
221char *__p_time __P((u_int32_t));
222void __p_query __P((const u_char *));
223const u_char *__p_cdnname __P((const u_char *, const u_char *, int, FILE *));
224const u_char *__p_cdname __P((const u_char *, const u_char *, FILE *));
225const u_char *__p_fqname __P((const u_char *, const u_char *, FILE *));
226const u_char *__p_rr __P((const u_char *, const u_char *, FILE *));
227const char *__p_type __P((int));
228const char *__p_class __P((int));
229const char *__p_option __P((u_long option));
230int dn_comp __P((const char *, u_char *, int, u_char **, u_char **));
231int dn_expand __P((const u_char *, const u_char *, const u_char *,
232 char *, int));
233int res_init __P((void));
234u_int16_t res_randomid __P((void));
235int res_query __P((const char *, int, int, u_char *, int));
236int res_search __P((const char *, int, int, u_char *, int));
237int res_querydomain __P((const char *, const char *, int, int,
238 u_char *, int));
239int res_mkquery __P((int, const char *, int, int, const u_char *, int,
240 const u_char *, u_char *, int));
241int res_send __P((const u_char *, int, u_char *, int));
242int res_isourserver __P((const struct sockaddr_in *));
243int res_nameinquery __P((const char *, int, int,
244 const u_char *, const u_char *));
245int res_queriesmatch __P((const u_char *, const u_char *,
246 const u_char *, const u_char *));
238int res_hnok __P((const char *));
239int res_ownok __P((const char *));
240int res_mailok __P((const char *));
241int res_dnok __P((const char *));
242int sym_ston __P((const struct res_sym *, char *, int *));
243const char * sym_ntos __P((const struct res_sym *, int, int *));
244const char * sym_ntop __P((const struct res_sym *, int, int *));
245int b64_ntop __P((u_char const *, size_t, char *, size_t));
246int b64_pton __P((char const *, u_char *, size_t));
247int loc_aton __P((const char *, u_char *));
248const char * loc_ntoa __P((const u_char *, char *));
249int dn_skipname __P((const u_char *, const u_char *));
250void fp_resstat __P((struct __res_state *, FILE *));
251void fp_query __P((const u_char *, FILE *));
252void fp_nquery __P((const u_char *, int, FILE *));
253const char * hostalias __P((const char *));
254void putlong __P((u_int32_t, u_char *));
255void putshort __P((u_int16_t, u_char *));
256const char * p_class __P((int));
257const char * p_time __P((u_int32_t));
258const char * p_type __P((int));
259void p_query __P((const u_char *));
260const u_char * p_cdnname __P((const u_char *, const u_char *, int, FILE *));
261const u_char * p_cdname __P((const u_char *, const u_char *, FILE *));
262const u_char * p_fqnname __P((const u_char *, const u_char *,
263 int, char *, int));
264const u_char * p_fqname __P((const u_char *, const u_char *, FILE *));
265const u_char * p_rr __P((const u_char *, const u_char *, FILE *));
266const char * p_option __P((u_long));
267char * p_secstodate __P((u_long));
268int dn_count_labels __P((char *));
269int dn_comp __P((const char *, u_char *, int,
270 u_char **, u_char **));
271int dn_expand __P((const u_char *, const u_char *, const u_char *,
272 char *, int));
273int res_init __P((void));
274u_int res_randomid __P((void));
275int res_query __P((const char *, int, int, u_char *, int));
276int res_search __P((const char *, int, int, u_char *, int));
277int res_querydomain __P((const char *, const char *, int, int,
278 u_char *, int));
279int res_mkquery __P((int, const char *, int, int, const u_char *,
280 int, const u_char *, u_char *, int));
281int res_send __P((const u_char *, int, u_char *, int));
282int res_isourserver __P((const struct sockaddr_in *));
283int res_nameinquery __P((const char *, int, int,
284 const u_char *, const u_char *));
285int res_queriesmatch __P((const u_char *, const u_char *,
286 const u_char *, const u_char *));
287void res_close __P((void));
247__END_DECLS
248
249#endif /* !_RESOLV_H_ */
288__END_DECLS
289
290#endif /* !_RESOLV_H_ */