Deleted Added
full compact
res_data.c (156953) res_data.c (156956)
1/*
2 * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
3 * Copyright (c) 1995-1999 by Internet Software Consortium.
4 *
5 * Permission to use, copy, modify, and distribute this software for any
6 * purpose with or without fee is hereby granted, provided that the above
7 * copyright notice and this permission notice appear in all copies.
8 *

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

13 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
14 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
15 * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
16 */
17
18#if defined(LIBC_SCCS) && !defined(lint)
19static const char rcsid[] = "$Id: res_data.c,v 1.1.206.2 2004/03/16 12:34:18 marka Exp $";
20#endif /* LIBC_SCCS and not lint */
1/*
2 * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
3 * Copyright (c) 1995-1999 by Internet Software Consortium.
4 *
5 * Permission to use, copy, modify, and distribute this software for any
6 * purpose with or without fee is hereby granted, provided that the above
7 * copyright notice and this permission notice appear in all copies.
8 *

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

13 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
14 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
15 * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
16 */
17
18#if defined(LIBC_SCCS) && !defined(lint)
19static const char rcsid[] = "$Id: res_data.c,v 1.1.206.2 2004/03/16 12:34:18 marka Exp $";
20#endif /* LIBC_SCCS and not lint */
21#include <sys/cdefs.h>
22__FBSDID("$FreeBSD: head/lib/libc/resolv/res_data.c 156956 2006-03-21 15:37:16Z ume $");
21
22#include "port_before.h"
23
24#include <sys/types.h>
25#include <sys/param.h>
26#include <sys/socket.h>
27#include <sys/time.h>
28
29#include <netinet/in.h>
30#include <arpa/inet.h>
31#include <arpa/nameser.h>
32
33#include <ctype.h>
34#include <netdb.h>
35#include <resolv.h>
23
24#include "port_before.h"
25
26#include <sys/types.h>
27#include <sys/param.h>
28#include <sys/socket.h>
29#include <sys/time.h>
30
31#include <netinet/in.h>
32#include <arpa/inet.h>
33#include <arpa/nameser.h>
34
35#include <ctype.h>
36#include <netdb.h>
37#include <resolv.h>
38#ifndef _LIBC
36#include <res_update.h>
39#include <res_update.h>
40#endif
37#include <stdio.h>
38#include <stdlib.h>
39#include <string.h>
40#include <unistd.h>
41
42#include "port_after.h"
41#include <stdio.h>
42#include <stdlib.h>
43#include <string.h>
44#include <unistd.h>
45
46#include "port_after.h"
43#undef _res
44
45const char *_res_opcodes[] = {
46 "QUERY",
47 "IQUERY",
48 "CQUERYM",
49 "CQUERYU", /* experimental */
50 "NOTIFY", /* experimental */
51 "UPDATE",

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

66 "ZONE",
67 "PREREQUISITES",
68 "UPDATE",
69 "ADDITIONAL",
70};
71#endif
72
73#ifndef __BIND_NOSTATIC
47
48const char *_res_opcodes[] = {
49 "QUERY",
50 "IQUERY",
51 "CQUERYM",
52 "CQUERYU", /* experimental */
53 "NOTIFY", /* experimental */
54 "UPDATE",

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

69 "ZONE",
70 "PREREQUISITES",
71 "UPDATE",
72 "ADDITIONAL",
73};
74#endif
75
76#ifndef __BIND_NOSTATIC
74struct __res_state _res
75# if defined(__BIND_RES_TEXT)
76 = { RES_TIMEOUT, } /* Motorola, et al. */
77# endif
78 ;
79
80/* Proto. */
81
82int res_ourserver_p(const res_state, const struct sockaddr_in *);
83
84int
85res_init(void) {
86 extern int __res_vinit(res_state, int);

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

102 * before res_init() was first called. We can't replicate that semantic
103 * with dynamic initialization (they may have turned bits off that are
104 * set in RES_DEFAULT). Our solution is to declare such applications
105 * "broken". They could fool us by setting RES_INIT but none do (yet).
106 */
107 if (!_res.retrans)
108 _res.retrans = RES_TIMEOUT;
109 if (!_res.retry)
77
78/* Proto. */
79
80int res_ourserver_p(const res_state, const struct sockaddr_in *);
81
82int
83res_init(void) {
84 extern int __res_vinit(res_state, int);

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

100 * before res_init() was first called. We can't replicate that semantic
101 * with dynamic initialization (they may have turned bits off that are
102 * set in RES_DEFAULT). Our solution is to declare such applications
103 * "broken". They could fool us by setting RES_INIT but none do (yet).
104 */
105 if (!_res.retrans)
106 _res.retrans = RES_TIMEOUT;
107 if (!_res.retry)
110 _res.retry = 4;
108 _res.retry = RES_DFLRETRY;
111 if (!(_res.options & RES_INIT))
112 _res.options = RES_DEFAULT;
113
114 /*
115 * This one used to initialize implicitly to zero, so unless the app
116 * has set it to something in particular, we can randomize it now.
117 */
118 if (!_res.id)

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

153 RES_SET_H_ERRNO(&_res, NETDB_INTERNAL);
154 return (-1);
155 }
156 return (res_nmkquery(&_res, op, dname, class, type,
157 data, datalen,
158 newrr_in, buf, buflen));
159}
160
109 if (!(_res.options & RES_INIT))
110 _res.options = RES_DEFAULT;
111
112 /*
113 * This one used to initialize implicitly to zero, so unless the app
114 * has set it to something in particular, we can randomize it now.
115 */
116 if (!_res.id)

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

151 RES_SET_H_ERRNO(&_res, NETDB_INTERNAL);
152 return (-1);
153 }
154 return (res_nmkquery(&_res, op, dname, class, type,
155 data, datalen,
156 newrr_in, buf, buflen));
157}
158
159#ifndef _LIBC
161int
162res_mkupdate(ns_updrec *rrecp_in, u_char *buf, int buflen) {
163 if ((_res.options & RES_INIT) == 0U && res_init() == -1) {
164 RES_SET_H_ERRNO(&_res, NETDB_INTERNAL);
165 return (-1);
166 }
167
168 return (res_nmkupdate(&_res, rrecp_in, buf, buflen));
169}
160int
161res_mkupdate(ns_updrec *rrecp_in, u_char *buf, int buflen) {
162 if ((_res.options & RES_INIT) == 0U && res_init() == -1) {
163 RES_SET_H_ERRNO(&_res, NETDB_INTERNAL);
164 return (-1);
165 }
166
167 return (res_nmkupdate(&_res, rrecp_in, buf, buflen));
168}
169#endif
170
171int
172res_query(const char *name, /* domain name */
173 int class, int type, /* class and type of query */
174 u_char *answer, /* buffer to put answer */
175 int anslen) /* size of answer buffer */
176{
177 if ((_res.options & RES_INIT) == 0U && res_init() == -1) {
178 RES_SET_H_ERRNO(&_res, NETDB_INTERNAL);
179 return (-1);
180 }
181 return (res_nquery(&_res, name, class, type, answer, anslen));
182}
183
170
171int
172res_query(const char *name, /* domain name */
173 int class, int type, /* class and type of query */
174 u_char *answer, /* buffer to put answer */
175 int anslen) /* size of answer buffer */
176{
177 if ((_res.options & RES_INIT) == 0U && res_init() == -1) {
178 RES_SET_H_ERRNO(&_res, NETDB_INTERNAL);
179 return (-1);
180 }
181 return (res_nquery(&_res, name, class, type, answer, anslen));
182}
183
184#ifndef _LIBC
184void
185res_send_setqhook(res_send_qhook hook) {
186 _res.qhook = hook;
187}
188
189void
190res_send_setrhook(res_send_rhook hook) {
191 _res.rhook = hook;
192}
185void
186res_send_setqhook(res_send_qhook hook) {
187 _res.qhook = hook;
188}
189
190void
191res_send_setrhook(res_send_rhook hook) {
192 _res.rhook = hook;
193}
194#endif
193
194int
195res_isourserver(const struct sockaddr_in *inp) {
196 return (res_ourserver_p(&_res, inp));
197}
198
199int
200res_send(const u_char *buf, int buflen, u_char *ans, int anssiz) {
201 if ((_res.options & RES_INIT) == 0U && res_init() == -1) {
202 /* errno should have been set by res_init() in this case. */
203 return (-1);
204 }
205
206 return (res_nsend(&_res, buf, buflen, ans, anssiz));
207}
208
195
196int
197res_isourserver(const struct sockaddr_in *inp) {
198 return (res_ourserver_p(&_res, inp));
199}
200
201int
202res_send(const u_char *buf, int buflen, u_char *ans, int anssiz) {
203 if ((_res.options & RES_INIT) == 0U && res_init() == -1) {
204 /* errno should have been set by res_init() in this case. */
205 return (-1);
206 }
207
208 return (res_nsend(&_res, buf, buflen, ans, anssiz));
209}
210
211#ifndef _LIBC
209int
210res_sendsigned(const u_char *buf, int buflen, ns_tsig_key *key,
211 u_char *ans, int anssiz)
212{
213 if ((_res.options & RES_INIT) == 0U && res_init() == -1) {
214 /* errno should have been set by res_init() in this case. */
215 return (-1);
216 }
217
218 return (res_nsendsigned(&_res, buf, buflen, key, ans, anssiz));
219}
212int
213res_sendsigned(const u_char *buf, int buflen, ns_tsig_key *key,
214 u_char *ans, int anssiz)
215{
216 if ((_res.options & RES_INIT) == 0U && res_init() == -1) {
217 /* errno should have been set by res_init() in this case. */
218 return (-1);
219 }
220
221 return (res_nsendsigned(&_res, buf, buflen, key, ans, anssiz));
222}
223#endif
220
221void
222res_close(void) {
223 res_nclose(&_res);
224}
225
224
225void
226res_close(void) {
227 res_nclose(&_res);
228}
229
230#ifndef _LIBC
226int
227res_update(ns_updrec *rrecp_in) {
228 if ((_res.options & RES_INIT) == 0U && res_init() == -1) {
229 RES_SET_H_ERRNO(&_res, NETDB_INTERNAL);
230 return (-1);
231 }
232
233 return (res_nupdate(&_res, rrecp_in, NULL));
234}
231int
232res_update(ns_updrec *rrecp_in) {
233 if ((_res.options & RES_INIT) == 0U && res_init() == -1) {
234 RES_SET_H_ERRNO(&_res, NETDB_INTERNAL);
235 return (-1);
236 }
237
238 return (res_nupdate(&_res, rrecp_in, NULL));
239}
240#endif
235
236int
237res_search(const char *name, /* domain name */
238 int class, int type, /* class and type of query */
239 u_char *answer, /* buffer to put answer */
240 int anslen) /* size of answer */
241{
242 if ((_res.options & RES_INIT) == 0U && res_init() == -1) {

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

259 return (-1);
260 }
261
262 return (res_nquerydomain(&_res, name, domain,
263 class, type,
264 answer, anslen));
265}
266
241
242int
243res_search(const char *name, /* domain name */
244 int class, int type, /* class and type of query */
245 u_char *answer, /* buffer to put answer */
246 int anslen) /* size of answer */
247{
248 if ((_res.options & RES_INIT) == 0U && res_init() == -1) {

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

265 return (-1);
266 }
267
268 return (res_nquerydomain(&_res, name, domain,
269 class, type,
270 answer, anslen));
271}
272
273int
274res_opt(int n0, u_char *buf, int buflen, int anslen)
275{
276 return (res_nopt(&_res, n0, buf, buflen, anslen));
277}
278
267const char *
268hostalias(const char *name) {
269 static char abuf[MAXDNAME];
270
271 return (res_hostalias(&_res, name, abuf, sizeof abuf));
272}
273
274#ifdef ultrix

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

283 if (len_host > len_domain &&
284 !strcasecmp(hostname + len_host - len_domain, _res.defdname) &&
285 hostname[len_host - len_domain - 1] == '.')
286 return (len_host - len_domain - 1);
287 return (0);
288}
289#endif /*ultrix*/
290
279const char *
280hostalias(const char *name) {
281 static char abuf[MAXDNAME];
282
283 return (res_hostalias(&_res, name, abuf, sizeof abuf));
284}
285
286#ifdef ultrix

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

295 if (len_host > len_domain &&
296 !strcasecmp(hostname + len_host - len_domain, _res.defdname) &&
297 hostname[len_host - len_domain - 1] == '.')
298 return (len_host - len_domain - 1);
299 return (0);
300}
301#endif /*ultrix*/
302
303/*
304 * Weak aliases for applications that use certain private entry points,
305 * and fail to include <resolv.h>.
306 */
307#undef res_init
308__weak_reference(__res_init, res_init);
309#undef p_query
310__weak_reference(__p_query, p_query);
311#undef res_mkquery
312__weak_reference(__res_mkquery, res_mkquery);
313#undef res_query
314__weak_reference(__res_query, res_query);
315#undef res_send
316__weak_reference(__res_send, res_send);
317#undef res_close
318__weak_reference(__res_close, _res_close);
319#undef res_search
320__weak_reference(__res_search, res_search);
321#undef res_querydomain
322__weak_reference(__res_querydomain, res_querydomain);
323
291#endif
324#endif