2000-04-26 18:34:17 +00:00
|
|
|
/*
|
|
|
|
* Copyright (C) 2000 Internet Software Consortium.
|
|
|
|
*
|
|
|
|
* 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.
|
|
|
|
*
|
|
|
|
* THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
|
|
|
|
* ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
|
|
|
|
* OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
|
|
|
|
* CONSORTIUM 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.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <config.h>
|
|
|
|
|
|
|
|
#include <errno.h>
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <unistd.h>
|
|
|
|
|
|
|
|
extern int h_errno;
|
|
|
|
|
|
|
|
#include <isc/types.h>
|
|
|
|
#include <isc/app.h>
|
|
|
|
#include <isc/assertions.h>
|
|
|
|
#include <isc/error.h>
|
|
|
|
#include <isc/mem.h>
|
|
|
|
#include <isc/net.h>
|
|
|
|
#include <isc/netdb.h>
|
|
|
|
#include <isc/result.h>
|
|
|
|
#include <isc/sockaddr.h>
|
|
|
|
#include <isc/socket.h>
|
|
|
|
#include <isc/task.h>
|
|
|
|
#include <isc/timer.h>
|
|
|
|
#include <isc/time.h>
|
|
|
|
#include <isc/buffer.h>
|
|
|
|
#include <isc/list.h>
|
|
|
|
#include <isc/util.h>
|
|
|
|
|
|
|
|
#include <dns/types.h>
|
|
|
|
#include <dns/message.h>
|
|
|
|
#include <dns/name.h>
|
|
|
|
#include <dns/fixedname.h>
|
|
|
|
#include <dns/rdata.h>
|
|
|
|
#include <dns/rdatalist.h>
|
|
|
|
#include <dns/rdataset.h>
|
|
|
|
#include <dns/rdataclass.h>
|
|
|
|
#include <dns/rdatatype.h>
|
|
|
|
#include <dns/result.h>
|
|
|
|
|
|
|
|
#include <dig/dig.h>
|
|
|
|
|
|
|
|
ISC_LIST(dig_lookup_t) lookup_list;
|
|
|
|
ISC_LIST(dig_server_t) server_list;
|
2000-05-02 23:23:12 +00:00
|
|
|
ISC_LIST(dig_searchlist_t) search_list;
|
2000-04-26 18:34:17 +00:00
|
|
|
|
2000-05-03 20:27:13 +00:00
|
|
|
isc_boolean_t tcp_mode = ISC_FALSE, have_ipv6 = ISC_FALSE,
|
2000-05-04 21:40:47 +00:00
|
|
|
free_now = ISC_FALSE, show_details = ISC_FALSE, usesearch=ISC_TRUE,
|
|
|
|
trace = ISC_FALSE;
|
2000-04-29 01:39:32 +00:00
|
|
|
#ifdef TWIDDLE
|
|
|
|
isc_boolean_t twiddle = ISC_FALSE;
|
|
|
|
#endif
|
2000-05-03 20:27:13 +00:00
|
|
|
in_port_t port = 53;
|
|
|
|
unsigned int timeout = 5;
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
isc_mem_t *mctx = NULL;
|
|
|
|
isc_taskmgr_t *taskmgr = NULL;
|
|
|
|
isc_task_t *task = NULL;
|
|
|
|
isc_timermgr_t *timermgr = NULL;
|
|
|
|
isc_socketmgr_t *socketmgr = NULL;
|
2000-04-26 18:34:17 +00:00
|
|
|
dns_messageid_t id;
|
|
|
|
char *rootspace[BUFSIZE];
|
|
|
|
isc_buffer_t rootbuf;
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
int sendcount = 0;
|
2000-05-02 23:23:12 +00:00
|
|
|
int ndots = -1;
|
2000-05-03 20:27:13 +00:00
|
|
|
int tries = 3;
|
|
|
|
char fixeddomain[MXNAME]="";
|
2000-04-26 18:34:17 +00:00
|
|
|
|
|
|
|
static void
|
|
|
|
free_lists(void);
|
|
|
|
|
2000-05-02 23:23:12 +00:00
|
|
|
static int
|
|
|
|
count_dots(char *string) {
|
|
|
|
char *s;
|
|
|
|
int i=0;
|
|
|
|
|
|
|
|
s = string;
|
|
|
|
while (*s != 0) {
|
|
|
|
if (*s == '.')
|
|
|
|
i++;
|
|
|
|
s++;
|
|
|
|
}
|
|
|
|
return (i);
|
|
|
|
}
|
|
|
|
|
2000-04-26 18:34:17 +00:00
|
|
|
static void
|
2000-04-26 19:36:40 +00:00
|
|
|
hex_dump(isc_buffer_t *b) {
|
2000-04-26 18:34:17 +00:00
|
|
|
unsigned int len;
|
|
|
|
isc_region_t r;
|
|
|
|
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
isc_buffer_remainingregion(b, &r);
|
2000-04-26 18:34:17 +00:00
|
|
|
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
printf("Printing a buffer with length %d\n", r.length);
|
2000-04-26 18:34:17 +00:00
|
|
|
for (len = 0 ; len < r.length ; len++) {
|
|
|
|
printf("%02x ", r.base[len]);
|
|
|
|
if (len != 0 && len % 16 == 0)
|
|
|
|
printf("\n");
|
|
|
|
}
|
|
|
|
if (len % 16 != 0)
|
|
|
|
printf("\n");
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
fatal(char *format, ...) {
|
|
|
|
va_list args;
|
|
|
|
|
|
|
|
va_start(args, format);
|
|
|
|
vfprintf(stderr, format, args);
|
|
|
|
va_end(args);
|
|
|
|
fprintf(stderr, "\n");
|
2000-05-02 23:23:12 +00:00
|
|
|
#ifdef NEVER
|
|
|
|
isc_app_shutdown();
|
2000-04-26 18:34:17 +00:00
|
|
|
free_lists();
|
2000-05-02 23:23:12 +00:00
|
|
|
if (mctx != NULL) {
|
|
|
|
#ifdef MEMDEBUG
|
2000-05-03 23:07:30 +00:00
|
|
|
isc_mem_stats(mctx, stderr);
|
2000-05-02 23:23:12 +00:00
|
|
|
#endif
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
isc_mem_destroy(&mctx);
|
2000-05-02 23:23:12 +00:00
|
|
|
}
|
|
|
|
#endif
|
2000-04-26 18:34:17 +00:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
2000-04-29 00:12:56 +00:00
|
|
|
#ifdef DEBUG
|
|
|
|
void
|
|
|
|
debug(char *format, ...) {
|
|
|
|
va_list args;
|
|
|
|
|
|
|
|
va_start(args, format);
|
|
|
|
vfprintf(stderr, format, args);
|
|
|
|
va_end(args);
|
|
|
|
fprintf(stderr, "\n");
|
|
|
|
}
|
|
|
|
#else
|
|
|
|
void
|
|
|
|
debug(char *format, ...) {
|
|
|
|
va_list args;
|
|
|
|
UNUSED(args);
|
|
|
|
UNUSED(format);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2000-04-26 18:34:17 +00:00
|
|
|
inline void
|
|
|
|
check_result(isc_result_t result, char *msg) {
|
|
|
|
if (result != ISC_R_SUCCESS)
|
|
|
|
fatal("%s: %s", msg, isc_result_totext(result));
|
|
|
|
}
|
|
|
|
|
|
|
|
isc_boolean_t
|
|
|
|
isclass(char *text) {
|
|
|
|
/* Tests if a field is a class, without needing isc libs
|
2000-05-03 23:07:30 +00:00
|
|
|
* initialized. This list will have to be manually kept in
|
|
|
|
* sync with what the libs support.
|
|
|
|
*/
|
2000-04-26 18:34:17 +00:00
|
|
|
const char *classlist[] = {"in", "hs", "any"};
|
|
|
|
const int numclasses = 3;
|
|
|
|
int i;
|
|
|
|
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
for (i = 0; i < numclasses; i++)
|
2000-04-26 18:34:17 +00:00
|
|
|
if (strcasecmp(text, classlist[i]) == 0)
|
|
|
|
return ISC_TRUE;
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
|
2000-04-26 18:34:17 +00:00
|
|
|
return ISC_FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
isc_boolean_t
|
|
|
|
istype(char *text) {
|
|
|
|
/* Tests if a field is a type, without needing isc libs
|
2000-05-03 23:07:30 +00:00
|
|
|
* initialized. This list will have to be manually kept in
|
|
|
|
* sync with what the libs support.
|
|
|
|
*/
|
2000-04-26 18:34:17 +00:00
|
|
|
const char *typelist[] = {"a", "ns", "md", "mf", "cname",
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
"soa", "mb", "mg", "mr", "null",
|
|
|
|
"wks", "ptr", "hinfo", "minfo",
|
|
|
|
"mx", "txt", "rp", "afsdb",
|
|
|
|
"x25", "isdn", "rt", "nsap",
|
|
|
|
"nsap_ptr", "sig", "key", "px",
|
|
|
|
"gpos", "aaaa", "loc", "nxt",
|
|
|
|
"srv", "naptr", "kx", "cert",
|
|
|
|
"a6", "dname", "opt", "unspec",
|
|
|
|
"tkey", "tsig", "axfr"};
|
2000-04-26 18:34:17 +00:00
|
|
|
const int numtypes = 41;
|
|
|
|
int i;
|
|
|
|
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
for (i = 0; i < numtypes; i++) {
|
2000-04-26 18:34:17 +00:00
|
|
|
if (strcasecmp(text, typelist[i]) == 0)
|
|
|
|
return ISC_TRUE;
|
|
|
|
}
|
|
|
|
return ISC_FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2000-04-29 01:39:32 +00:00
|
|
|
#ifdef TWIDDLE
|
|
|
|
void
|
|
|
|
twiddlebuf(isc_buffer_t buf) {
|
|
|
|
isc_region_t r;
|
|
|
|
int len, pos, bit;
|
|
|
|
unsigned char bitfield;
|
|
|
|
int i, tw;
|
|
|
|
|
|
|
|
hex_dump(&buf);
|
|
|
|
tw=TWIDDLE;
|
2000-05-03 23:07:30 +00:00
|
|
|
printf ("Twiddling %d bits: ", tw);
|
2000-04-29 01:39:32 +00:00
|
|
|
for (i=0;i<tw;i++) {
|
|
|
|
isc_buffer_usedregion (&buf, &r);
|
|
|
|
len = r.length;
|
|
|
|
pos=(int)random();
|
|
|
|
pos = pos%len;
|
|
|
|
bit = (int)random()%8;
|
|
|
|
bitfield = 1 << bit;
|
2000-05-03 23:07:30 +00:00
|
|
|
printf ("%d@%03x ", bit, pos);
|
2000-04-29 01:39:32 +00:00
|
|
|
r.base[pos] ^= bitfield;
|
|
|
|
}
|
|
|
|
puts ("");
|
|
|
|
hex_dump(&buf);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2000-04-26 18:34:17 +00:00
|
|
|
static void
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
setup_system(void) {
|
2000-04-26 18:34:17 +00:00
|
|
|
char rcinput[MXNAME];
|
|
|
|
FILE *fp;
|
|
|
|
char *ptr;
|
|
|
|
dig_server_t *srv;
|
2000-05-02 23:23:12 +00:00
|
|
|
dig_searchlist_t *search;
|
|
|
|
dig_lookup_t *l;
|
|
|
|
isc_boolean_t get_servers;
|
2000-04-26 18:34:17 +00:00
|
|
|
|
2000-05-03 20:27:13 +00:00
|
|
|
|
|
|
|
if (fixeddomain[0]!=0) {
|
|
|
|
search = isc_mem_allocate( mctx, sizeof(struct dig_server));
|
|
|
|
if (search == NULL)
|
|
|
|
fatal("Memory allocation failure.");
|
|
|
|
strncpy(search->origin, fixeddomain, MXNAME - 1);
|
|
|
|
ISC_LIST_PREPEND(search_list, search, link);
|
|
|
|
}
|
|
|
|
|
2000-04-29 00:12:56 +00:00
|
|
|
debug ("setup_system()");
|
2000-05-02 23:23:12 +00:00
|
|
|
id = getpid() << 8;
|
|
|
|
get_servers = (server_list.head == NULL);
|
|
|
|
fp = fopen (RESOLVCONF, "r");
|
|
|
|
if (fp != NULL) {
|
|
|
|
while (fgets(rcinput, MXNAME, fp) != 0) {
|
|
|
|
ptr = strtok (rcinput, " \t\r\n");
|
|
|
|
if (ptr != NULL) {
|
|
|
|
if (get_servers &&
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
strcasecmp(ptr, "nameserver") == 0) {
|
2000-05-02 23:23:12 +00:00
|
|
|
debug ("Got a nameserver line");
|
|
|
|
ptr = strtok (NULL, " \t\r\n");
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
if (ptr != NULL) {
|
|
|
|
srv = isc_mem_allocate(mctx,
|
2000-05-02 23:23:12 +00:00
|
|
|
sizeof(struct dig_server));
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
if (srv == NULL)
|
|
|
|
fatal("Memory "
|
|
|
|
"allocation "
|
|
|
|
"failure.");
|
2000-05-03 18:25:52 +00:00
|
|
|
strncpy((char *)srv->
|
2000-04-26 19:36:40 +00:00
|
|
|
servername,
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
ptr,
|
|
|
|
MXNAME - 1);
|
2000-04-26 19:36:40 +00:00
|
|
|
ISC_LIST_APPEND
|
|
|
|
(server_list,
|
|
|
|
srv, link);
|
2000-04-26 18:34:17 +00:00
|
|
|
}
|
2000-05-03 23:07:30 +00:00
|
|
|
} else if (strcasecmp(ptr, "options") == 0) {
|
2000-05-02 23:23:12 +00:00
|
|
|
ptr = strtok(NULL, " \t\r\n");
|
|
|
|
if (ptr != NULL) {
|
|
|
|
if ((strncasecmp(ptr, "ndots:",
|
|
|
|
6) == 0) &&
|
|
|
|
(ndots == -1)) {
|
|
|
|
ndots = atoi(
|
|
|
|
&ptr[6]);
|
|
|
|
debug ("ndots is "
|
|
|
|
"%d.",
|
|
|
|
ndots);
|
|
|
|
}
|
|
|
|
}
|
2000-05-03 23:07:30 +00:00
|
|
|
} else if ((strcasecmp(ptr, "search") == 0)
|
2000-05-03 20:27:13 +00:00
|
|
|
&& usesearch){
|
2000-05-02 23:23:12 +00:00
|
|
|
while ((ptr = strtok(NULL, " \t\r\n"))
|
|
|
|
!= NULL) {
|
|
|
|
search = isc_mem_allocate(
|
|
|
|
mctx, sizeof(struct
|
|
|
|
dig_server));
|
|
|
|
if (search == NULL)
|
|
|
|
fatal("Memory "
|
|
|
|
"allocation "
|
|
|
|
"failure.");
|
|
|
|
strncpy(search->
|
|
|
|
origin,
|
|
|
|
ptr,
|
|
|
|
MXNAME - 1);
|
|
|
|
ISC_LIST_APPEND
|
|
|
|
(search_list,
|
|
|
|
search,
|
|
|
|
link);
|
|
|
|
}
|
2000-05-03 23:07:30 +00:00
|
|
|
} else if ((strcasecmp(ptr, "domain") == 0) &&
|
2000-05-03 20:27:13 +00:00
|
|
|
(fixeddomain[0] == 0 )){
|
|
|
|
while ((ptr = strtok(NULL, " \t\r\n"))
|
|
|
|
!= NULL) {
|
|
|
|
search = isc_mem_allocate(
|
|
|
|
mctx, sizeof(struct
|
|
|
|
dig_server));
|
|
|
|
if (search == NULL)
|
|
|
|
fatal("Memory "
|
|
|
|
"allocation "
|
|
|
|
"failure.");
|
|
|
|
strncpy(search->
|
|
|
|
origin,
|
|
|
|
ptr,
|
|
|
|
MXNAME - 1);
|
|
|
|
ISC_LIST_PREPEND
|
|
|
|
(search_list,
|
|
|
|
search,
|
|
|
|
link);
|
|
|
|
}
|
2000-04-26 18:34:17 +00:00
|
|
|
}
|
2000-05-02 23:23:12 +00:00
|
|
|
|
2000-04-26 18:34:17 +00:00
|
|
|
}
|
|
|
|
}
|
2000-05-02 23:23:12 +00:00
|
|
|
fclose (fp);
|
2000-04-26 18:34:17 +00:00
|
|
|
}
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
|
2000-05-02 23:23:12 +00:00
|
|
|
if (ndots == -1)
|
|
|
|
ndots = 1;
|
|
|
|
|
2000-04-26 18:34:17 +00:00
|
|
|
if (server_list.head == NULL) {
|
|
|
|
srv = isc_mem_allocate(mctx, sizeof(dig_server_t));
|
|
|
|
if (srv == NULL)
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
fatal("Memory allocation failure");
|
|
|
|
strcpy(srv->servername, "127.0.0.1");
|
2000-04-26 18:34:17 +00:00
|
|
|
ISC_LIST_APPEND(server_list, srv, link);
|
|
|
|
}
|
2000-05-02 23:23:12 +00:00
|
|
|
|
|
|
|
for (l = ISC_LIST_HEAD(lookup_list) ;
|
|
|
|
l != NULL;
|
|
|
|
l = ISC_LIST_NEXT(l, link) ) {
|
|
|
|
l -> origin = ISC_LIST_HEAD(search_list);
|
|
|
|
}
|
2000-04-26 18:34:17 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
setup_libs(void) {
|
2000-04-26 18:34:17 +00:00
|
|
|
isc_result_t result;
|
|
|
|
isc_buffer_t b;
|
|
|
|
|
2000-04-29 00:12:56 +00:00
|
|
|
debug ("setup_libs()");
|
2000-04-26 18:34:17 +00:00
|
|
|
result = isc_app_start();
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
check_result(result, "isc_app_start");
|
2000-04-26 18:34:17 +00:00
|
|
|
|
|
|
|
result = isc_net_probeipv4();
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
check_result(result, "isc_net_probeipv4");
|
2000-04-26 18:34:17 +00:00
|
|
|
|
|
|
|
result = isc_net_probeipv6();
|
|
|
|
if (result == ISC_R_SUCCESS)
|
|
|
|
have_ipv6=ISC_TRUE;
|
|
|
|
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
result = isc_mem_create(0, 0, &mctx);
|
|
|
|
check_result(result, "isc_mem_create");
|
2000-04-26 18:34:17 +00:00
|
|
|
|
|
|
|
result = isc_taskmgr_create (mctx, 1, 0, &taskmgr);
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
check_result(result, "isc_taskmgr_create");
|
2000-04-26 18:34:17 +00:00
|
|
|
|
|
|
|
result = isc_task_create (taskmgr, 0, &task);
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
check_result(result, "isc_task_create");
|
2000-04-26 18:34:17 +00:00
|
|
|
|
|
|
|
result = isc_timermgr_create (mctx, &timermgr);
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
check_result(result, "isc_timermgr_create");
|
2000-04-26 18:34:17 +00:00
|
|
|
|
|
|
|
result = isc_socketmgr_create (mctx, &socketmgr);
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
check_result(result, "isc_socketmgr_create");
|
|
|
|
isc_buffer_init(&b, ".", 1);
|
|
|
|
isc_buffer_add(&b, 1);
|
2000-04-26 18:34:17 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
add_type(dns_message_t *message, dns_name_t *name, dns_rdataclass_t rdclass,
|
|
|
|
dns_rdatatype_t rdtype)
|
|
|
|
{
|
|
|
|
dns_rdataset_t *rdataset;
|
|
|
|
isc_result_t result;
|
|
|
|
|
2000-04-29 00:12:56 +00:00
|
|
|
debug ("add_type()");
|
2000-04-26 18:34:17 +00:00
|
|
|
rdataset = NULL;
|
|
|
|
result = dns_message_gettemprdataset(message, &rdataset);
|
|
|
|
check_result(result, "dns_message_gettemprdataset()");
|
|
|
|
dns_rdataset_init(rdataset);
|
|
|
|
dns_rdataset_makequestion(rdataset, rdclass, rdtype);
|
|
|
|
ISC_LIST_APPEND(name->list, rdataset, link);
|
|
|
|
}
|
|
|
|
|
2000-04-28 21:53:50 +00:00
|
|
|
static void
|
2000-04-28 21:41:19 +00:00
|
|
|
followup_lookup(dns_message_t *msg, dig_query_t *query) {
|
|
|
|
dig_lookup_t *lookup = NULL;
|
|
|
|
dig_server_t *srv = NULL;
|
|
|
|
dns_rdataset_t *rdataset = NULL;
|
|
|
|
dns_rdata_t rdata;
|
|
|
|
dns_name_t *name = NULL;
|
|
|
|
isc_result_t result, loopresult;
|
|
|
|
isc_buffer_t *b = NULL;
|
|
|
|
isc_region_t r;
|
|
|
|
int len;
|
|
|
|
|
2000-04-29 00:12:56 +00:00
|
|
|
debug ("followup_lookup()");
|
2000-04-28 21:41:19 +00:00
|
|
|
result = dns_message_firstname (msg, DNS_SECTION_ANSWER);
|
|
|
|
if (result != ISC_R_SUCCESS) {
|
2000-04-29 00:12:56 +00:00
|
|
|
debug ("Firstname returned %s",
|
2000-04-28 21:41:19 +00:00
|
|
|
isc_result_totext(result));
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2000-04-29 00:12:56 +00:00
|
|
|
debug ("Following up %s", query->lookup->textname);
|
2000-04-28 21:41:19 +00:00
|
|
|
|
|
|
|
for (;;) {
|
|
|
|
name = NULL;
|
|
|
|
dns_message_currentname(msg, DNS_SECTION_ANSWER,
|
|
|
|
&name);
|
|
|
|
for (rdataset = ISC_LIST_HEAD(name->list);
|
|
|
|
rdataset != NULL;
|
|
|
|
rdataset = ISC_LIST_NEXT(rdataset, link)) {
|
|
|
|
loopresult = dns_rdataset_first(rdataset);
|
|
|
|
while (loopresult == ISC_R_SUCCESS) {
|
|
|
|
dns_rdataset_current(rdataset, &rdata);
|
|
|
|
if (rdata.type == dns_rdatatype_ns) {
|
|
|
|
result = isc_buffer_allocate(mctx, &b,
|
|
|
|
BUFSIZE);
|
|
|
|
check_result (result,
|
|
|
|
"isc_buffer_allocate");
|
|
|
|
result = dns_rdata_totext (&rdata,
|
|
|
|
NULL,
|
|
|
|
b);
|
|
|
|
check_result (result,
|
|
|
|
"dns_rdata_totext");
|
|
|
|
isc_buffer_usedregion(b, &r);
|
|
|
|
len = r.length-1;
|
|
|
|
if (len >= MXNAME)
|
|
|
|
len = MXNAME-1;
|
|
|
|
/* Initialize lookup if we've not yet */
|
2000-04-29 00:12:56 +00:00
|
|
|
debug ("Found NS %d %.*s",
|
2000-04-28 21:41:19 +00:00
|
|
|
(int)r.length, (int)r.length,
|
|
|
|
(char *)r.base);
|
|
|
|
lookup = isc_mem_allocate
|
|
|
|
(mctx,
|
|
|
|
sizeof(struct
|
|
|
|
dig_lookup));
|
|
|
|
if (lookup == NULL)
|
|
|
|
fatal ("Memory "
|
|
|
|
"allocation "
|
|
|
|
"failure.");
|
|
|
|
lookup->pending = ISC_FALSE;
|
|
|
|
strncpy (lookup->textname,
|
|
|
|
query->lookup->
|
|
|
|
textname, MXNAME);
|
|
|
|
strncpy (lookup->rttext,
|
|
|
|
query->lookup->
|
|
|
|
rttext, 32);
|
|
|
|
strncpy (lookup->rctext,
|
|
|
|
query->lookup->
|
|
|
|
rctext, 32);
|
|
|
|
lookup->namespace[0]=0;
|
|
|
|
lookup->sendspace[0]=0;
|
|
|
|
lookup->sendmsg=NULL;
|
|
|
|
lookup->name=NULL;
|
2000-05-02 23:23:12 +00:00
|
|
|
lookup->oname=NULL;
|
2000-04-28 21:41:19 +00:00
|
|
|
lookup->timer = NULL;
|
|
|
|
lookup->xfr_q = NULL;
|
2000-05-04 21:40:47 +00:00
|
|
|
lookup->origin = NULL;
|
2000-04-28 21:41:19 +00:00
|
|
|
lookup->doing_xfr = ISC_FALSE;
|
|
|
|
lookup->identify = ISC_TRUE;
|
2000-05-03 20:27:13 +00:00
|
|
|
lookup->recurse = query->lookup->
|
|
|
|
recurse;
|
2000-04-28 21:41:19 +00:00
|
|
|
lookup->ns_search_only =
|
|
|
|
ISC_FALSE;
|
|
|
|
lookup->use_my_server_list =
|
|
|
|
ISC_TRUE;
|
2000-05-02 23:23:12 +00:00
|
|
|
lookup->retries = tries;
|
|
|
|
lookup->comments =
|
|
|
|
query->lookup->comments;
|
|
|
|
lookup->section_question =
|
|
|
|
query->lookup->
|
|
|
|
section_question;
|
|
|
|
lookup->section_answer =
|
|
|
|
query->lookup->
|
|
|
|
section_answer;
|
|
|
|
lookup->section_authority =
|
|
|
|
query->lookup->
|
|
|
|
section_authority;
|
|
|
|
lookup->section_additional =
|
|
|
|
query->lookup->
|
|
|
|
section_additional;
|
2000-04-28 21:41:19 +00:00
|
|
|
ISC_LIST_INIT(lookup->
|
|
|
|
my_server_list);
|
|
|
|
ISC_LIST_INIT(lookup->q);
|
|
|
|
srv = isc_mem_allocate (mctx,
|
|
|
|
sizeof(
|
|
|
|
struct
|
|
|
|
dig_server));
|
|
|
|
if (srv == NULL)
|
|
|
|
fatal("Memory allocation "
|
|
|
|
"failure.");
|
2000-05-03 23:07:30 +00:00
|
|
|
strncpy(srv->servername,
|
|
|
|
(char *)r.base, len);
|
2000-04-28 21:41:19 +00:00
|
|
|
srv->servername[len]=0;
|
|
|
|
ISC_LIST_APPEND
|
|
|
|
(lookup->my_server_list,
|
|
|
|
srv, link);
|
|
|
|
isc_buffer_free (&b);
|
|
|
|
}
|
2000-05-04 21:40:47 +00:00
|
|
|
debug ("Before insertion, init@%lx "
|
|
|
|
"-> %lx, new@%lx "
|
|
|
|
"-> %lx", (long int)query->lookup,
|
2000-04-28 21:41:19 +00:00
|
|
|
(long int)query->lookup->link.next,
|
|
|
|
(long int)lookup, (long int)lookup->
|
|
|
|
link.next);
|
|
|
|
ISC_LIST_INSERTAFTER(lookup_list, query->
|
|
|
|
lookup, lookup,
|
|
|
|
link);
|
2000-04-29 00:12:56 +00:00
|
|
|
debug ("After insertion, init -> "
|
2000-05-04 21:40:47 +00:00
|
|
|
"%lx, new = %lx, "
|
|
|
|
"new -> %lx", (long int)query->
|
2000-04-28 21:41:19 +00:00
|
|
|
lookup->link.next,
|
|
|
|
(long int)lookup, (long int)lookup->
|
|
|
|
link.next);
|
|
|
|
loopresult = dns_rdataset_next(rdataset);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
result = dns_message_nextname (msg, DNS_SECTION_ANSWER);
|
|
|
|
if (result != ISC_R_SUCCESS)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (lookup == NULL)
|
|
|
|
return; /* We didn't get a NS. Just give up. */
|
|
|
|
}
|
|
|
|
|
2000-05-02 23:23:12 +00:00
|
|
|
static void
|
|
|
|
next_origin(dns_message_t *msg, dig_query_t *query) {
|
|
|
|
dig_lookup_t *lookup;
|
|
|
|
dig_server_t *srv;
|
|
|
|
dig_server_t *s;
|
|
|
|
|
|
|
|
UNUSED (msg);
|
|
|
|
|
|
|
|
debug ("next_origin()");
|
|
|
|
debug ("Following up %s", query->lookup->textname);
|
|
|
|
|
|
|
|
if (query->lookup->origin == NULL) { /*Then we just did rootorg;
|
|
|
|
there's nothing left. */
|
|
|
|
debug ("Made it to the root whith nowhere to go.");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
lookup = isc_mem_allocate
|
|
|
|
(mctx, sizeof(struct dig_lookup));
|
|
|
|
if (lookup == NULL)
|
|
|
|
fatal ("Memory allocation failure.");
|
|
|
|
lookup->pending = ISC_FALSE;
|
|
|
|
strncpy (lookup->textname, query->lookup-> textname, MXNAME);
|
|
|
|
strncpy (lookup->rttext, query->lookup-> rttext, 32);
|
|
|
|
strncpy (lookup->rctext, query->lookup-> rctext, 32);
|
|
|
|
lookup->namespace[0]=0;
|
|
|
|
lookup->sendspace[0]=0;
|
|
|
|
lookup->sendmsg=NULL;
|
|
|
|
lookup->name=NULL;
|
|
|
|
lookup->oname=NULL;
|
|
|
|
lookup->timer = NULL;
|
|
|
|
lookup->xfr_q = NULL;
|
|
|
|
lookup->doing_xfr = ISC_FALSE;
|
|
|
|
lookup->identify = query->lookup->identify;
|
2000-05-03 20:27:13 +00:00
|
|
|
lookup->recurse = query->lookup->recurse;
|
2000-05-02 23:23:12 +00:00
|
|
|
lookup->ns_search_only = query->lookup->ns_search_only;
|
|
|
|
lookup->use_my_server_list = query->lookup->use_my_server_list;
|
2000-05-03 23:07:30 +00:00
|
|
|
lookup->origin = ISC_LIST_NEXT(query->lookup->origin, link);
|
2000-05-02 23:23:12 +00:00
|
|
|
lookup->retries = tries;
|
|
|
|
lookup->comments = query->lookup->comments;
|
|
|
|
lookup->section_question = query->lookup->section_question;
|
|
|
|
lookup->section_answer = query->lookup->section_answer;
|
|
|
|
lookup->section_authority = query->lookup->section_authority;
|
|
|
|
lookup->section_additional = query->lookup->section_additional;
|
|
|
|
ISC_LIST_INIT(lookup->my_server_list);
|
|
|
|
ISC_LIST_INIT(lookup->q);
|
|
|
|
|
|
|
|
if (lookup->use_my_server_list) {
|
|
|
|
s = ISC_LIST_HEAD(query->lookup->my_server_list);
|
|
|
|
while (s != NULL) {
|
|
|
|
srv = isc_mem_allocate (mctx, sizeof(struct
|
|
|
|
dig_server));
|
|
|
|
if (srv == NULL)
|
|
|
|
fatal("Memory allocation failure.");
|
|
|
|
strncpy(srv->servername, s->servername, MXNAME);
|
|
|
|
ISC_LIST_ENQUEUE(lookup->my_server_list, srv,
|
|
|
|
link);
|
|
|
|
s = ISC_LIST_NEXT(s, link);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
debug ("Before insertion, init@%ld "
|
|
|
|
"-> %ld, new@%ld "
|
2000-05-03 23:07:30 +00:00
|
|
|
"-> %ld", (long int)query->lookup,
|
2000-05-02 23:23:12 +00:00
|
|
|
(long int)query->lookup->link.next,
|
|
|
|
(long int)lookup, (long int)lookup->
|
|
|
|
link.next);
|
|
|
|
ISC_LIST_INSERTAFTER(lookup_list, query->
|
|
|
|
lookup, lookup,
|
|
|
|
link);
|
|
|
|
debug ("After insertion, init -> "
|
|
|
|
"%ld, new = %ld, "
|
2000-05-03 23:07:30 +00:00
|
|
|
"new -> %ld", (long int)query->
|
2000-05-02 23:23:12 +00:00
|
|
|
lookup->link.next,
|
|
|
|
(long int)lookup, (long int)lookup->
|
|
|
|
link.next);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2000-04-26 18:34:17 +00:00
|
|
|
void
|
|
|
|
setup_lookup(dig_lookup_t *lookup) {
|
2000-05-02 23:23:12 +00:00
|
|
|
isc_result_t result, res2;
|
2000-04-26 18:34:17 +00:00
|
|
|
int len;
|
|
|
|
dns_rdatatype_t rdtype;
|
|
|
|
dns_rdataclass_t rdclass;
|
|
|
|
dig_server_t *serv;
|
|
|
|
dig_query_t *query;
|
2000-05-02 23:23:12 +00:00
|
|
|
isc_region_t r;
|
|
|
|
isc_textregion_t tr;
|
2000-04-26 18:34:17 +00:00
|
|
|
isc_buffer_t b;
|
2000-05-02 23:23:12 +00:00
|
|
|
char store[MXNAME];
|
2000-04-26 18:34:17 +00:00
|
|
|
|
2000-04-29 00:12:56 +00:00
|
|
|
debug("setup_lookup()");
|
2000-05-04 21:40:47 +00:00
|
|
|
debug("Setting up for looking up %s @%lx->%lx",
|
2000-04-28 21:41:19 +00:00
|
|
|
lookup->textname, (long int)lookup,
|
|
|
|
(long int)lookup->link.next);
|
2000-04-26 18:34:17 +00:00
|
|
|
|
|
|
|
result = dns_message_create(mctx, DNS_MESSAGE_INTENTRENDER,
|
|
|
|
&lookup->sendmsg);
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
check_result(result, "dns_message_create");
|
2000-04-26 18:34:17 +00:00
|
|
|
|
|
|
|
|
|
|
|
result = dns_message_gettempname(lookup->sendmsg, &lookup->name);
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
check_result(result, "dns_message_gettempname");
|
|
|
|
dns_name_init(lookup->name, NULL);
|
2000-04-26 18:34:17 +00:00
|
|
|
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
isc_buffer_init(&lookup->namebuf, lookup->namespace, BUFSIZE);
|
2000-05-02 23:23:12 +00:00
|
|
|
isc_buffer_init(&lookup->onamebuf, lookup->onamespace, BUFSIZE);
|
|
|
|
|
|
|
|
if (count_dots(lookup->textname) >= ndots)
|
|
|
|
lookup->origin = NULL; /* Force root lookup */
|
2000-05-04 21:40:47 +00:00
|
|
|
debug ("lookup->origin = %lx", (long int)lookup->origin);
|
2000-05-02 23:23:12 +00:00
|
|
|
if (lookup->origin != NULL) {
|
2000-05-03 23:07:30 +00:00
|
|
|
debug ("Trying origin %s", lookup->origin->origin);
|
2000-05-02 23:23:12 +00:00
|
|
|
result = dns_message_gettempname(lookup->sendmsg,
|
|
|
|
&lookup->oname);
|
|
|
|
check_result(result, "dns_message_gettempname");
|
|
|
|
dns_name_init(lookup->oname, NULL);
|
|
|
|
len=strlen(lookup->origin->origin);
|
|
|
|
isc_buffer_init(&b, lookup->origin->origin, len);
|
|
|
|
isc_buffer_add(&b, len);
|
2000-05-03 23:07:30 +00:00
|
|
|
result = dns_name_fromtext(lookup->oname, &b, dns_rootname,
|
2000-05-02 23:23:12 +00:00
|
|
|
ISC_FALSE, &lookup->onamebuf);
|
|
|
|
if (result != ISC_R_SUCCESS) {
|
2000-05-03 20:27:13 +00:00
|
|
|
dns_message_puttempname(lookup->sendmsg,
|
2000-05-02 23:23:12 +00:00
|
|
|
&lookup->name);
|
|
|
|
dns_message_puttempname(lookup->sendmsg,
|
|
|
|
&lookup->oname);
|
|
|
|
fatal("Aborting: %s is not a legal name syntax. (%s)",
|
|
|
|
lookup->origin->origin,
|
|
|
|
dns_result_totext(result));
|
|
|
|
}
|
|
|
|
len=strlen(lookup->textname);
|
|
|
|
isc_buffer_init(&b, lookup->textname, len);
|
|
|
|
isc_buffer_add(&b, len);
|
|
|
|
result = dns_name_fromtext(lookup->name, &b, lookup->oname,
|
|
|
|
ISC_FALSE, &lookup->namebuf);
|
|
|
|
if (result != ISC_R_SUCCESS) {
|
|
|
|
dns_message_puttempname(lookup->sendmsg,
|
|
|
|
&lookup->name);
|
|
|
|
dns_message_puttempname(lookup->sendmsg,
|
|
|
|
&lookup->oname);
|
|
|
|
fatal("Aborting: %s is not a legal name syntax. (%s)",
|
|
|
|
lookup->textname, dns_result_totext(result));
|
|
|
|
}
|
|
|
|
dns_message_puttempname(lookup->sendmsg, &lookup->oname);
|
|
|
|
} else {
|
|
|
|
debug ("Using root origin.");
|
|
|
|
len = strlen (lookup->textname);
|
|
|
|
isc_buffer_init(&b, lookup->textname, len);
|
|
|
|
isc_buffer_add(&b, len);
|
2000-05-03 23:07:30 +00:00
|
|
|
result = dns_name_fromtext(lookup->name, &b, dns_rootname,
|
2000-05-02 23:23:12 +00:00
|
|
|
ISC_FALSE, &lookup->namebuf);
|
|
|
|
if (result != ISC_R_SUCCESS) {
|
|
|
|
dns_message_puttempname(lookup->sendmsg,
|
|
|
|
&lookup->name);
|
|
|
|
isc_buffer_init(&b, store, MXNAME);
|
2000-05-03 23:07:30 +00:00
|
|
|
res2 = dns_name_totext(dns_rootname, ISC_FALSE, &b);
|
2000-05-02 23:23:12 +00:00
|
|
|
check_result (res2, "dns_name_totext");
|
|
|
|
isc_buffer_usedregion (&b, &r);
|
|
|
|
fatal("Aborting: %s/%.*s is not a legal name syntax. "
|
|
|
|
"(%s)", lookup->textname, (int)r.length,
|
|
|
|
(char *)r.base, dns_result_totext(result));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
isc_buffer_init (&b, store, MXNAME);
|
|
|
|
dns_name_totext(lookup->name, ISC_FALSE, &b);
|
|
|
|
isc_buffer_usedregion (&b, &r);
|
|
|
|
trying((int)r.length, (char *)r.base, lookup);
|
|
|
|
#ifdef DEBUG
|
|
|
|
if (dns_name_isabsolute(lookup->name))
|
|
|
|
debug ("This is an absolute name.");
|
|
|
|
else
|
|
|
|
debug ("This is a relative name (which is wrong).");
|
|
|
|
#endif
|
2000-04-26 18:34:17 +00:00
|
|
|
|
|
|
|
if (lookup->rctext[0] == 0)
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
strcpy(lookup->rctext, "IN");
|
2000-04-26 18:34:17 +00:00
|
|
|
if (lookup->rttext[0] == 0)
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
strcpy(lookup->rttext, "A");
|
2000-04-26 18:34:17 +00:00
|
|
|
|
|
|
|
lookup->sendmsg->id = id++;
|
|
|
|
lookup->sendmsg->opcode = dns_opcode_query;
|
2000-05-03 20:27:13 +00:00
|
|
|
if (lookup->recurse) {
|
|
|
|
debug ("Recursive query");
|
2000-04-26 18:34:17 +00:00
|
|
|
lookup->sendmsg->flags |= DNS_MESSAGEFLAG_RD;
|
2000-05-03 20:27:13 +00:00
|
|
|
}
|
2000-04-26 18:34:17 +00:00
|
|
|
|
|
|
|
dns_message_addname(lookup->sendmsg, lookup->name,
|
|
|
|
DNS_SECTION_QUESTION);
|
|
|
|
|
|
|
|
|
2000-04-28 21:41:19 +00:00
|
|
|
if (!lookup->ns_search_only) {
|
2000-05-02 23:23:12 +00:00
|
|
|
tr.base=lookup->rttext;
|
|
|
|
tr.length=strlen(lookup->rttext);
|
2000-04-28 21:41:19 +00:00
|
|
|
} else {
|
2000-05-02 23:23:12 +00:00
|
|
|
tr.base="NS";
|
|
|
|
tr.length=2;
|
2000-04-28 21:41:19 +00:00
|
|
|
}
|
2000-05-02 23:23:12 +00:00
|
|
|
result = dns_rdatatype_fromtext(&rdtype, &tr);
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
check_result(result, "dns_rdatatype_fromtext");
|
|
|
|
if (rdtype == dns_rdatatype_axfr) {
|
2000-04-26 18:34:17 +00:00
|
|
|
lookup->doing_xfr = ISC_TRUE;
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
/*
|
|
|
|
* Force TCP mode if we're doing an xfr.
|
|
|
|
*/
|
2000-04-26 18:34:17 +00:00
|
|
|
tcp_mode = ISC_TRUE;
|
|
|
|
}
|
2000-04-28 21:41:19 +00:00
|
|
|
if (!lookup->ns_search_only) {
|
2000-05-02 23:23:12 +00:00
|
|
|
tr.base=lookup->rctext;
|
|
|
|
tr.length=strlen(lookup->rctext);
|
2000-04-28 21:41:19 +00:00
|
|
|
} else {
|
2000-05-02 23:23:12 +00:00
|
|
|
tr.base="IN";
|
|
|
|
tr.length=2;
|
2000-04-28 21:41:19 +00:00
|
|
|
}
|
2000-05-02 23:23:12 +00:00
|
|
|
result = dns_rdataclass_fromtext(&rdclass, &tr);
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
check_result(result, "dns_rdataclass_fromtext");
|
2000-04-26 18:34:17 +00:00
|
|
|
add_type(lookup->sendmsg, lookup->name, rdclass, rdtype);
|
|
|
|
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
isc_buffer_init(&lookup->sendbuf, lookup->sendspace, COMMSIZE);
|
2000-05-02 23:23:12 +00:00
|
|
|
debug ("Starting to render the message");
|
2000-04-26 18:34:17 +00:00
|
|
|
result = dns_message_renderbegin(lookup->sendmsg, &lookup->sendbuf);
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
check_result(result, "dns_message_renderbegin");
|
2000-04-26 18:34:17 +00:00
|
|
|
result = dns_message_rendersection(lookup->sendmsg,
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
DNS_SECTION_QUESTION, 0);
|
|
|
|
check_result(result, "dns_message_rendersection");
|
2000-04-26 18:34:17 +00:00
|
|
|
result = dns_message_renderend(lookup->sendmsg);
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
check_result(result, "dns_message_renderend");
|
2000-05-02 23:23:12 +00:00
|
|
|
debug ("Done rendering.");
|
2000-04-26 18:34:17 +00:00
|
|
|
|
|
|
|
lookup->pending = ISC_FALSE;
|
|
|
|
|
2000-04-28 21:41:19 +00:00
|
|
|
if (lookup->use_my_server_list)
|
2000-04-28 21:53:50 +00:00
|
|
|
serv = ISC_LIST_HEAD(lookup->my_server_list);
|
2000-04-28 21:41:19 +00:00
|
|
|
else
|
2000-04-28 21:53:50 +00:00
|
|
|
serv = ISC_LIST_HEAD(server_list);
|
|
|
|
for (; serv != NULL;
|
2000-04-26 18:34:17 +00:00
|
|
|
serv = ISC_LIST_NEXT(serv, link)) {
|
|
|
|
query = isc_mem_allocate(mctx, sizeof(dig_query_t));
|
|
|
|
if (query == NULL)
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
fatal("Memory allocation failure.");
|
2000-04-26 18:34:17 +00:00
|
|
|
query->lookup = lookup;
|
|
|
|
query->working = ISC_FALSE;
|
|
|
|
query->waiting_connect = ISC_FALSE;
|
|
|
|
query->first_pass = ISC_TRUE;
|
|
|
|
query->first_soa_rcvd = ISC_FALSE;
|
|
|
|
query->servname = serv->servername;
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
ISC_LIST_INIT(query->sendlist);
|
|
|
|
ISC_LIST_INIT(query->recvlist);
|
|
|
|
ISC_LIST_INIT(query->lengthlist);
|
2000-04-26 18:34:17 +00:00
|
|
|
query->sock = NULL;
|
|
|
|
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
isc_buffer_init(&query->recvbuf, query->recvspace, COMMSIZE);
|
|
|
|
isc_buffer_init(&query->lengthbuf, query->lengthspace, 2);
|
|
|
|
isc_buffer_init(&query->slbuf, query->slspace, 2);
|
2000-04-26 18:34:17 +00:00
|
|
|
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
ISC_LIST_ENQUEUE(lookup->q, query, link);
|
2000-04-26 18:34:17 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2000-04-26 19:36:40 +00:00
|
|
|
send_done(isc_task_t *task, isc_event_t *event) {
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
UNUSED(task);
|
|
|
|
isc_event_free(&event);
|
2000-04-29 00:12:56 +00:00
|
|
|
|
|
|
|
debug("send_done()");
|
2000-04-26 18:34:17 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2000-04-26 19:36:40 +00:00
|
|
|
cancel_lookup(dig_lookup_t *lookup) {
|
2000-04-29 01:39:32 +00:00
|
|
|
dig_query_t *query=NULL;
|
2000-04-26 18:34:17 +00:00
|
|
|
|
2000-04-29 00:12:56 +00:00
|
|
|
debug("cancel_lookup()");
|
2000-04-26 18:34:17 +00:00
|
|
|
if (!lookup->pending)
|
|
|
|
return;
|
|
|
|
lookup->pending = ISC_FALSE;
|
2000-05-02 23:23:12 +00:00
|
|
|
lookup->retries = 0;
|
2000-04-26 18:34:17 +00:00
|
|
|
for (query = ISC_LIST_HEAD(lookup->q);
|
|
|
|
query != NULL;
|
|
|
|
query = ISC_LIST_NEXT(query, link)) {
|
|
|
|
if (query->working) {
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
isc_socket_cancel(query->sock, task,
|
|
|
|
ISC_SOCKCANCEL_ALL);
|
2000-04-26 18:34:17 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2000-05-02 23:23:12 +00:00
|
|
|
static void
|
|
|
|
recv_done(isc_task_t *task, isc_event_t *event);
|
|
|
|
|
|
|
|
static void
|
|
|
|
connect_timeout(isc_task_t *task, isc_event_t *event);
|
|
|
|
|
|
|
|
void
|
|
|
|
send_udp(dig_lookup_t *lookup) {
|
|
|
|
dig_query_t *query;
|
|
|
|
isc_result_t result;
|
|
|
|
|
|
|
|
debug ("send_udp()");
|
|
|
|
|
|
|
|
isc_interval_set(&lookup->interval, timeout, 0);
|
|
|
|
result = isc_timer_create(timermgr, isc_timertype_once, NULL,
|
|
|
|
&lookup->interval, task, connect_timeout,
|
|
|
|
lookup, &lookup->timer);
|
|
|
|
check_result(result, "isc_timer_create");
|
|
|
|
for (query = ISC_LIST_HEAD(lookup->q);
|
|
|
|
query != NULL;
|
|
|
|
query = ISC_LIST_NEXT(query, link)) {
|
|
|
|
ISC_LIST_ENQUEUE(query->recvlist, &query->recvbuf, link);
|
|
|
|
query->working = ISC_TRUE;
|
|
|
|
result = isc_socket_recvv(query->sock, &query->recvlist, 1,
|
|
|
|
task, recv_done, query);
|
|
|
|
check_result(result, "isc_socket_recvv");
|
|
|
|
sendcount++;
|
|
|
|
debug("Sent count number %d", sendcount);
|
|
|
|
#ifdef TWIDDLE
|
|
|
|
if (twiddle) {
|
|
|
|
twiddlebuf(lookup->sendbuf);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
ISC_LIST_ENQUEUE(query->sendlist, &lookup->sendbuf, link);
|
|
|
|
debug("Sending a request.");
|
|
|
|
result = isc_time_now(&query->time_sent);
|
|
|
|
check_result(result, "isc_time_now");
|
|
|
|
result = isc_socket_sendtov(query->sock, &query->sendlist,
|
|
|
|
task, send_done, query,
|
|
|
|
&query->sockaddr, NULL);
|
|
|
|
check_result(result, "isc_socket_sendtov");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2000-04-26 18:34:17 +00:00
|
|
|
/* connect_timeout is used for both UDP recieves and TCP connects. */
|
|
|
|
static void
|
2000-04-26 19:36:40 +00:00
|
|
|
connect_timeout(isc_task_t *task, isc_event_t *event) {
|
2000-04-28 21:41:19 +00:00
|
|
|
dig_lookup_t *lookup=NULL;
|
2000-04-26 18:34:17 +00:00
|
|
|
dig_query_t *q=NULL;
|
|
|
|
isc_result_t result;
|
2000-04-28 21:41:19 +00:00
|
|
|
isc_buffer_t *b=NULL;
|
2000-04-26 18:34:17 +00:00
|
|
|
isc_region_t r;
|
|
|
|
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
REQUIRE(event->ev_type == ISC_TIMEREVENT_IDLE);
|
2000-04-26 18:34:17 +00:00
|
|
|
|
2000-04-29 00:12:56 +00:00
|
|
|
debug("connect_timeout()");
|
|
|
|
lookup = event->ev_arg;
|
|
|
|
|
|
|
|
debug ("Buffer Allocate connect_timeout");
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
result = isc_buffer_allocate(mctx, &b, 256);
|
|
|
|
check_result(result, "isc_buffer_allocate");
|
2000-04-26 18:34:17 +00:00
|
|
|
for (q = ISC_LIST_HEAD(lookup->q);
|
|
|
|
q != NULL;
|
|
|
|
q = ISC_LIST_NEXT(q, link)) {
|
|
|
|
if (q->working) {
|
2000-04-28 21:41:19 +00:00
|
|
|
if (!free_now) {
|
|
|
|
isc_buffer_clear(b);
|
|
|
|
result = isc_sockaddr_totext(&q->sockaddr, b);
|
|
|
|
check_result(result, "isc_sockaddr_totext");
|
|
|
|
isc_buffer_usedregion(b, &r);
|
2000-05-02 23:23:12 +00:00
|
|
|
if (q->lookup->retries > 1)
|
|
|
|
printf(";; Connection to server %.*s "
|
|
|
|
"for %s timed out. "
|
2000-05-04 21:40:47 +00:00
|
|
|
"Retrying %d.\n",
|
2000-05-02 23:23:12 +00:00
|
|
|
(int)r.length, r.base,
|
2000-05-04 21:40:47 +00:00
|
|
|
q->lookup->textname,
|
|
|
|
q->lookup->retries-1);
|
2000-05-02 23:23:12 +00:00
|
|
|
else
|
|
|
|
printf(";; Connection to server %.*s "
|
|
|
|
"for %s timed out. "
|
|
|
|
"Giving up.\n",
|
|
|
|
(int)r.length, r.base,
|
|
|
|
q->lookup->textname);
|
2000-04-28 21:41:19 +00:00
|
|
|
}
|
|
|
|
isc_socket_cancel(q->sock, task,
|
|
|
|
ISC_SOCKCANCEL_ALL);
|
2000-04-26 18:34:17 +00:00
|
|
|
}
|
|
|
|
}
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
ENSURE(lookup->timer != NULL);
|
|
|
|
isc_timer_detach(&lookup->timer);
|
|
|
|
isc_buffer_free(&b);
|
|
|
|
isc_event_free(&event);
|
2000-05-02 23:23:12 +00:00
|
|
|
debug ("Done with connect_timeout()");
|
2000-04-26 18:34:17 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2000-04-26 19:36:40 +00:00
|
|
|
tcp_length_done(isc_task_t *task, isc_event_t *event) {
|
2000-04-26 18:34:17 +00:00
|
|
|
isc_socketevent_t *sevent;
|
|
|
|
isc_buffer_t *b=NULL;
|
|
|
|
isc_region_t r;
|
|
|
|
isc_result_t result;
|
|
|
|
dig_query_t *query=NULL;
|
|
|
|
isc_uint16_t length;
|
|
|
|
|
2000-04-29 00:12:56 +00:00
|
|
|
REQUIRE(event->ev_type == ISC_SOCKEVENT_RECVDONE);
|
|
|
|
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
UNUSED(task);
|
2000-04-26 18:34:17 +00:00
|
|
|
|
2000-04-29 00:12:56 +00:00
|
|
|
debug("tcp_length_done()");
|
2000-04-26 18:34:17 +00:00
|
|
|
sevent = (isc_socketevent_t *)event;
|
|
|
|
|
|
|
|
query = event->ev_arg;
|
|
|
|
|
|
|
|
if (sevent->result == ISC_R_CANCELED) {
|
|
|
|
query->working = ISC_FALSE;
|
|
|
|
check_next_lookup(query->lookup);
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
isc_event_free(&event);
|
2000-04-26 18:34:17 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (sevent->result != ISC_R_SUCCESS) {
|
2000-04-29 00:12:56 +00:00
|
|
|
debug ("Buffer Allocate connect_timeout");
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
result = isc_buffer_allocate(mctx, &b, 256);
|
|
|
|
check_result(result, "isc_buffer_allocate");
|
2000-04-26 18:34:17 +00:00
|
|
|
result = isc_sockaddr_totext(&query->sockaddr, b);
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
check_result(result, "isc_sockaddr_totext");
|
|
|
|
isc_buffer_usedregion(b, &r);
|
|
|
|
printf("%.*s: %s\n", (int)r.length, r.base,
|
|
|
|
isc_result_totext(sevent->result));
|
|
|
|
isc_buffer_free(&b);
|
2000-04-26 18:34:17 +00:00
|
|
|
query->working = ISC_FALSE;
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
isc_socket_detach(&query->sock);
|
2000-04-26 18:34:17 +00:00
|
|
|
check_next_lookup(query->lookup);
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
isc_event_free(&event);
|
2000-04-26 18:34:17 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
b = ISC_LIST_HEAD(sevent->bufferlist);
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
ISC_LIST_DEQUEUE(sevent->bufferlist, &query->lengthbuf, link);
|
2000-04-26 18:34:17 +00:00
|
|
|
length = isc_buffer_getuint16(b);
|
2000-04-29 00:12:56 +00:00
|
|
|
if (length > COMMSIZE) {
|
|
|
|
isc_event_free (&event);
|
|
|
|
fatal ("Length of %X was longer than I can handle!",
|
|
|
|
length);
|
|
|
|
}
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
/*
|
|
|
|
* Even though the buffer was already init'ed, we need
|
|
|
|
* to redo it now, to force the length we want.
|
|
|
|
*/
|
|
|
|
isc_buffer_invalidate(&query->recvbuf);
|
|
|
|
isc_buffer_init(&query->recvbuf, query->recvspace, length);
|
|
|
|
ENSURE(ISC_LIST_EMPTY(query->recvlist));
|
|
|
|
ISC_LIST_ENQUEUE(query->recvlist, &query->recvbuf, link);
|
|
|
|
result = isc_socket_recvv(query->sock, &query->recvlist, length, task,
|
|
|
|
recv_done, query);
|
|
|
|
check_result(result, "isc_socket_recvv");
|
2000-04-29 00:12:56 +00:00
|
|
|
debug("Resubmitted recv request with length %d", length);
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
isc_event_free(&event);
|
2000-04-26 18:34:17 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
launch_next_query(dig_query_t *query, isc_boolean_t include_question) {
|
|
|
|
isc_result_t result;
|
|
|
|
|
2000-04-29 00:12:56 +00:00
|
|
|
debug("launch_next_query()");
|
|
|
|
|
2000-04-26 18:34:17 +00:00
|
|
|
if (!query->lookup->pending) {
|
2000-04-29 00:12:56 +00:00
|
|
|
debug("Ignoring launch_next_query because !pending.");
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
isc_socket_detach(&query->sock);
|
2000-04-26 18:34:17 +00:00
|
|
|
query->working = ISC_FALSE;
|
|
|
|
query->waiting_connect = ISC_FALSE;
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
check_next_lookup(query->lookup);
|
2000-04-26 18:34:17 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
isc_buffer_clear(&query->slbuf);
|
|
|
|
isc_buffer_clear(&query->lengthbuf);
|
|
|
|
isc_buffer_putuint16(&query->slbuf, query->lookup->sendbuf.used);
|
|
|
|
ISC_LIST_ENQUEUE(query->sendlist, &query->slbuf, link);
|
2000-04-29 01:39:32 +00:00
|
|
|
if (include_question) {
|
|
|
|
#ifdef TWIDDLE
|
|
|
|
if (twiddle) {
|
|
|
|
twiddlebuf(query->lookup->sendbuf);
|
|
|
|
}
|
|
|
|
#endif
|
2000-04-26 18:34:17 +00:00
|
|
|
ISC_LIST_ENQUEUE(query->sendlist, &query->lookup->sendbuf,
|
|
|
|
link);
|
2000-04-29 01:39:32 +00:00
|
|
|
}
|
2000-04-26 18:34:17 +00:00
|
|
|
ISC_LIST_ENQUEUE(query->lengthlist, &query->lengthbuf, link);
|
|
|
|
|
|
|
|
result = isc_socket_recvv(query->sock, &query->lengthlist, 0, task,
|
|
|
|
tcp_length_done, query);
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
check_result(result, "isc_socket_recvv");
|
2000-04-26 18:34:17 +00:00
|
|
|
sendcount++;
|
2000-04-29 00:12:56 +00:00
|
|
|
if (!query->first_soa_rcvd) {
|
|
|
|
debug("Sending a request.");
|
2000-05-02 23:23:12 +00:00
|
|
|
result = isc_time_now(&query->time_sent);
|
|
|
|
check_result(result, "isc_time_now");
|
2000-04-29 00:12:56 +00:00
|
|
|
result = isc_socket_sendv(query->sock, &query->sendlist, task,
|
|
|
|
send_done, query);
|
|
|
|
check_result(result, "isc_socket_recvv");
|
|
|
|
}
|
2000-04-26 18:34:17 +00:00
|
|
|
query->waiting_connect = ISC_FALSE;
|
|
|
|
check_next_lookup(query->lookup);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2000-04-26 19:36:40 +00:00
|
|
|
connect_done(isc_task_t *task, isc_event_t *event) {
|
2000-04-26 18:34:17 +00:00
|
|
|
isc_result_t result;
|
2000-04-28 21:41:19 +00:00
|
|
|
isc_socketevent_t *sevent=NULL;
|
|
|
|
dig_query_t *query=NULL;
|
|
|
|
isc_buffer_t *b=NULL;
|
2000-04-26 18:34:17 +00:00
|
|
|
isc_region_t r;
|
|
|
|
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
UNUSED(task);
|
2000-04-26 18:34:17 +00:00
|
|
|
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
REQUIRE(event->ev_type == ISC_SOCKEVENT_CONNECT);
|
2000-04-29 00:12:56 +00:00
|
|
|
|
2000-04-26 18:34:17 +00:00
|
|
|
sevent = (isc_socketevent_t *)event;
|
|
|
|
query = sevent->ev_arg;
|
|
|
|
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
REQUIRE(query->waiting_connect);
|
2000-04-26 18:34:17 +00:00
|
|
|
|
|
|
|
query->waiting_connect = ISC_FALSE;
|
|
|
|
|
2000-04-29 00:12:56 +00:00
|
|
|
debug("connect_done()");
|
2000-04-26 18:34:17 +00:00
|
|
|
if (sevent->result != ISC_R_SUCCESS) {
|
2000-04-29 00:12:56 +00:00
|
|
|
debug ("Buffer Allocate connect_timeout");
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
result = isc_buffer_allocate(mctx, &b, 256);
|
|
|
|
check_result(result, "isc_buffer_allocate");
|
2000-04-26 18:34:17 +00:00
|
|
|
result = isc_sockaddr_totext(&query->sockaddr, b);
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
check_result(result, "isc_sockaddr_totext");
|
|
|
|
isc_buffer_usedregion(b, &r);
|
|
|
|
printf(";; Connection to server %.*s for %s failed: %s.\n",
|
|
|
|
(int)r.length, r.base, query->lookup->textname,
|
|
|
|
isc_result_totext(sevent->result));
|
2000-04-26 18:34:17 +00:00
|
|
|
isc_buffer_free(&b);
|
|
|
|
query->working = ISC_FALSE;
|
|
|
|
query->waiting_connect = ISC_FALSE;
|
|
|
|
check_next_lookup(query->lookup);
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
isc_event_free(&event);
|
2000-04-26 18:34:17 +00:00
|
|
|
return;
|
|
|
|
}
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
isc_event_free(&event);
|
|
|
|
launch_next_query(query, ISC_TRUE);
|
2000-04-26 18:34:17 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static isc_boolean_t
|
|
|
|
msg_contains_soa(dns_message_t *msg, dig_query_t *query) {
|
|
|
|
isc_result_t result;
|
|
|
|
dns_name_t *name=NULL;
|
|
|
|
|
2000-04-29 00:12:56 +00:00
|
|
|
debug("msg_contains_soa()");
|
|
|
|
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
result = dns_message_findname(msg, DNS_SECTION_ANSWER,
|
|
|
|
query->lookup->name, dns_rdatatype_soa,
|
|
|
|
0, &name, NULL);
|
2000-04-26 18:34:17 +00:00
|
|
|
if (result == ISC_R_SUCCESS) {
|
2000-04-29 00:12:56 +00:00
|
|
|
debug("Found SOA", stderr);
|
2000-04-26 18:34:17 +00:00
|
|
|
return (ISC_TRUE);
|
|
|
|
} else {
|
2000-04-29 00:12:56 +00:00
|
|
|
debug("Didn't find SOA, result=%d:%s",
|
2000-04-26 18:34:17 +00:00
|
|
|
result, dns_result_totext(result));
|
|
|
|
return (ISC_FALSE);
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
recv_done(isc_task_t *task, isc_event_t *event) {
|
|
|
|
isc_socketevent_t *sevent = NULL;
|
|
|
|
dig_query_t *query = NULL;
|
|
|
|
isc_buffer_t *b = NULL;
|
|
|
|
dns_message_t *msg = NULL;
|
2000-04-26 18:34:17 +00:00
|
|
|
isc_result_t result;
|
|
|
|
isc_buffer_t ab;
|
|
|
|
char abspace[MXNAME];
|
|
|
|
isc_region_t r;
|
|
|
|
|
|
|
|
UNUSED (task);
|
|
|
|
|
2000-04-29 00:12:56 +00:00
|
|
|
debug("recv_done()");
|
|
|
|
|
|
|
|
if (free_now) {
|
|
|
|
debug("Bailing out, since freeing now.");
|
|
|
|
isc_event_free (&event);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2000-04-26 18:34:17 +00:00
|
|
|
sendcount--;
|
2000-04-29 00:12:56 +00:00
|
|
|
debug("In recv_done, counter down to %d", sendcount);
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
REQUIRE(event->ev_type == ISC_SOCKEVENT_RECVDONE);
|
2000-04-26 18:34:17 +00:00
|
|
|
sevent = (isc_socketevent_t *)event;
|
|
|
|
query = event->ev_arg;
|
|
|
|
|
|
|
|
if (!query->lookup->pending) {
|
2000-04-29 00:12:56 +00:00
|
|
|
debug("No longer pending. Got %s",
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
isc_result_totext(sevent->result));
|
2000-04-26 18:34:17 +00:00
|
|
|
query->working = ISC_FALSE;
|
|
|
|
query->waiting_connect = ISC_FALSE;
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
cancel_lookup(query->lookup);
|
2000-04-26 18:34:17 +00:00
|
|
|
check_next_lookup(query->lookup);
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
isc_event_free(&event);
|
2000-04-26 18:34:17 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (sevent->result == ISC_R_SUCCESS) {
|
|
|
|
b = ISC_LIST_HEAD(sevent->bufferlist);
|
|
|
|
ISC_LIST_DEQUEUE(sevent->bufferlist, &query->recvbuf, link);
|
|
|
|
result = dns_message_create(mctx, DNS_MESSAGE_INTENTPARSE,
|
|
|
|
&msg);
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
check_result(result, "dns_message_create");
|
2000-04-26 18:34:17 +00:00
|
|
|
result = dns_message_parse(msg, b, ISC_TRUE);
|
|
|
|
if (result != ISC_R_SUCCESS)
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
hex_dump(b);
|
|
|
|
check_result(result, "dns_message_parse");
|
2000-04-26 18:34:17 +00:00
|
|
|
if (query->lookup->xfr_q == NULL)
|
|
|
|
query->lookup->xfr_q = query;
|
|
|
|
if (query->lookup->xfr_q == query) {
|
2000-05-04 21:40:47 +00:00
|
|
|
if (query->lookup->ns_search_only) {
|
|
|
|
if (show_details) {
|
|
|
|
printmessage(query, msg, ISC_TRUE);
|
|
|
|
}
|
|
|
|
if ((msg->rcode != 0) &&
|
|
|
|
(query->lookup->origin != NULL)) {
|
|
|
|
next_origin(msg, query);
|
|
|
|
} else
|
|
|
|
followup_lookup(msg, query);
|
|
|
|
} else if ((msg->rcode != 0) &&
|
2000-05-02 23:23:12 +00:00
|
|
|
(query->lookup->origin != NULL)) {
|
|
|
|
next_origin(msg, query);
|
|
|
|
if (show_details) {
|
|
|
|
printmessage(query, msg, ISC_TRUE);
|
|
|
|
}
|
|
|
|
} else {
|
2000-04-28 21:41:19 +00:00
|
|
|
if (query->first_soa_rcvd &&
|
|
|
|
query->lookup->doing_xfr)
|
|
|
|
printmessage(query, msg, ISC_FALSE);
|
|
|
|
else
|
|
|
|
printmessage(query, msg, ISC_TRUE);
|
|
|
|
}
|
2000-04-26 18:34:17 +00:00
|
|
|
}
|
|
|
|
#ifdef DEBUG
|
|
|
|
if (query->lookup->pending)
|
2000-04-29 00:12:56 +00:00
|
|
|
debug("Still pending.");
|
2000-04-26 18:34:17 +00:00
|
|
|
#endif
|
|
|
|
if (query->lookup->doing_xfr) {
|
|
|
|
if (!query->first_soa_rcvd) {
|
2000-04-29 00:12:56 +00:00
|
|
|
debug("Not yet got first SOA");
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
if (!msg_contains_soa(msg, query)) {
|
|
|
|
puts("; Transfer failed. "
|
|
|
|
"Didn't start with SOA answer.");
|
2000-04-26 18:34:17 +00:00
|
|
|
query->working = ISC_FALSE;
|
2000-04-27 23:20:29 +00:00
|
|
|
cancel_lookup(query->lookup);
|
|
|
|
check_next_lookup (query->lookup);
|
|
|
|
isc_event_free (&event);
|
|
|
|
dns_message_destroy (&msg);
|
2000-04-26 18:34:17 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
query->first_soa_rcvd = ISC_TRUE;
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
launch_next_query(query, ISC_FALSE);
|
2000-04-26 18:34:17 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
if (msg_contains_soa(msg, query)) {
|
2000-05-02 23:23:12 +00:00
|
|
|
isc_buffer_init(&ab, abspace, MXNAME);
|
|
|
|
check_result(result,
|
|
|
|
"isc_buffer_init");
|
|
|
|
result = isc_sockaddr_totext(&sevent->
|
|
|
|
address,
|
|
|
|
&ab);
|
|
|
|
check_result(result,
|
|
|
|
"isc_sockaddr_totext");
|
|
|
|
isc_buffer_usedregion(&ab, &r);
|
2000-05-03 18:25:52 +00:00
|
|
|
received(b->used, r.length,
|
|
|
|
(char *)r.base, query);
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
cancel_lookup(query->lookup);
|
2000-04-26 18:34:17 +00:00
|
|
|
query->working = ISC_FALSE;
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
check_next_lookup(query->lookup);
|
|
|
|
isc_event_free(&event);
|
2000-04-27 23:20:29 +00:00
|
|
|
dns_message_destroy (&msg);
|
2000-04-26 18:34:17 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
else {
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
launch_next_query(query, ISC_FALSE);
|
2000-04-26 18:34:17 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
2000-05-02 23:23:12 +00:00
|
|
|
if ((msg->rcode == 0) ||
|
|
|
|
(query->lookup->origin == NULL)) {
|
|
|
|
isc_buffer_init(&ab, abspace, MXNAME);
|
|
|
|
check_result(result, "isc_buffer_init");
|
|
|
|
result = isc_sockaddr_totext(&sevent->address,
|
|
|
|
&ab);
|
|
|
|
check_result(result, "isc_sockaddr_totext");
|
|
|
|
isc_buffer_usedregion(&ab, &r);
|
2000-05-03 18:25:52 +00:00
|
|
|
received(b->used, r.length, (char *)r.base,
|
|
|
|
query);
|
2000-05-02 23:23:12 +00:00
|
|
|
}
|
2000-04-26 18:34:17 +00:00
|
|
|
query->working = ISC_FALSE;
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
cancel_lookup(query->lookup);
|
2000-04-26 18:34:17 +00:00
|
|
|
}
|
|
|
|
if (!query->lookup->pending) {
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
check_next_lookup(query->lookup);
|
2000-04-26 18:34:17 +00:00
|
|
|
}
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
dns_message_destroy(&msg);
|
|
|
|
isc_event_free(&event);
|
2000-04-26 18:34:17 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
/* In truth, we should never get into the CANCELED routine, since
|
|
|
|
the cancel_lookup() routine clears the pending flag. */
|
|
|
|
if (sevent->result == ISC_R_CANCELED) {
|
2000-05-02 23:23:12 +00:00
|
|
|
debug ("In cancel handler");
|
2000-04-26 18:34:17 +00:00
|
|
|
query->working = ISC_FALSE;
|
|
|
|
query->waiting_connect = ISC_FALSE;
|
|
|
|
check_next_lookup(query->lookup);
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
isc_event_free(&event);
|
2000-04-26 18:34:17 +00:00
|
|
|
return;
|
|
|
|
}
|
2000-05-02 23:23:12 +00:00
|
|
|
isc_event_free(&event);
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
fatal("recv_done got result %s",
|
|
|
|
isc_result_totext(sevent->result));
|
2000-04-26 18:34:17 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2000-05-02 23:23:12 +00:00
|
|
|
get_address(char *host, in_port_t port, isc_sockaddr_t *sockaddr) {
|
2000-04-26 18:34:17 +00:00
|
|
|
struct in_addr in4;
|
|
|
|
struct in6_addr in6;
|
|
|
|
struct hostent *he;
|
|
|
|
|
2000-04-29 00:12:56 +00:00
|
|
|
debug("get_address()");
|
|
|
|
|
2000-04-29 01:39:32 +00:00
|
|
|
if (have_ipv6 && inet_pton(AF_INET6, host, &in6) == 1)
|
2000-04-26 18:34:17 +00:00
|
|
|
isc_sockaddr_fromin6(sockaddr, &in6, port);
|
2000-04-29 01:39:32 +00:00
|
|
|
else if (inet_pton(AF_INET, host, &in4) == 1)
|
2000-04-26 18:34:17 +00:00
|
|
|
isc_sockaddr_fromin(sockaddr, &in4, port);
|
|
|
|
else {
|
2000-04-29 01:39:32 +00:00
|
|
|
he = gethostbyname(host);
|
2000-04-26 18:34:17 +00:00
|
|
|
if (he == NULL)
|
2000-04-26 19:36:40 +00:00
|
|
|
fatal("Couldn't look up your server host %s. errno=%d",
|
2000-05-02 23:23:12 +00:00
|
|
|
host, h_errno);
|
2000-04-26 18:34:17 +00:00
|
|
|
INSIST(he->h_addrtype == AF_INET);
|
|
|
|
isc_sockaddr_fromin(sockaddr,
|
|
|
|
(struct in_addr *)(he->h_addr_list[0]),
|
|
|
|
port);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2000-04-26 19:36:40 +00:00
|
|
|
do_lookup_tcp(dig_lookup_t *lookup) {
|
2000-04-26 18:34:17 +00:00
|
|
|
dig_query_t *query;
|
|
|
|
isc_result_t result;
|
|
|
|
|
2000-04-29 00:12:56 +00:00
|
|
|
debug("do_lookup_tcp()");
|
2000-04-26 18:34:17 +00:00
|
|
|
lookup->pending = ISC_TRUE;
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
isc_interval_set(&lookup->interval, timeout, 0);
|
|
|
|
result = isc_timer_create(timermgr, isc_timertype_once, NULL,
|
|
|
|
&lookup->interval, task, connect_timeout,
|
|
|
|
lookup, &lookup->timer);
|
|
|
|
check_result(result, "isc_timer_create");
|
2000-04-26 18:34:17 +00:00
|
|
|
|
|
|
|
for (query = ISC_LIST_HEAD(lookup->q);
|
|
|
|
query != NULL;
|
|
|
|
query = ISC_LIST_NEXT(query, link)) {
|
|
|
|
query->working = ISC_TRUE;
|
|
|
|
query->waiting_connect = ISC_TRUE;
|
|
|
|
get_address(query->servname, port, &query->sockaddr);
|
|
|
|
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
result = isc_socket_create(socketmgr,
|
|
|
|
isc_sockaddr_pf(&query->sockaddr),
|
|
|
|
isc_sockettype_tcp, &query->sock) ;
|
|
|
|
check_result(result, "isc_socket_create");
|
|
|
|
result = isc_socket_connect(query->sock, &query->sockaddr,
|
|
|
|
task, connect_done, query);
|
2000-04-26 18:34:17 +00:00
|
|
|
check_result (result, "isc_socket_connect");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2000-04-26 19:36:40 +00:00
|
|
|
do_lookup_udp(dig_lookup_t *lookup) {
|
2000-04-26 18:34:17 +00:00
|
|
|
dig_query_t *query;
|
|
|
|
isc_result_t result;
|
|
|
|
|
|
|
|
#ifdef DEBUG
|
2000-04-29 00:12:56 +00:00
|
|
|
debug("do_lookup_udp()");
|
2000-04-28 21:41:19 +00:00
|
|
|
if (tcp_mode)
|
2000-04-29 00:12:56 +00:00
|
|
|
debug("I'm starting UDP with tcp_mode set!!!");
|
2000-04-26 18:34:17 +00:00
|
|
|
#endif
|
|
|
|
lookup->pending = ISC_TRUE;
|
|
|
|
|
|
|
|
for (query = ISC_LIST_HEAD(lookup->q);
|
|
|
|
query != NULL;
|
|
|
|
query = ISC_LIST_NEXT(query, link)) {
|
|
|
|
query->working = ISC_TRUE;
|
|
|
|
query->waiting_connect = ISC_FALSE;
|
|
|
|
get_address(query->servname, port, &query->sockaddr);
|
|
|
|
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
result = isc_socket_create(socketmgr,
|
|
|
|
isc_sockaddr_pf(&query->sockaddr),
|
|
|
|
isc_sockettype_udp, &query->sock) ;
|
|
|
|
check_result(result, "isc_socket_create");
|
2000-04-26 18:34:17 +00:00
|
|
|
}
|
2000-05-02 23:23:12 +00:00
|
|
|
|
|
|
|
send_udp(lookup);
|
2000-04-26 18:34:17 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
free_lists(void) {
|
|
|
|
void *ptr;
|
|
|
|
dig_lookup_t *l;
|
|
|
|
dig_query_t *q;
|
|
|
|
dig_server_t *s;
|
2000-05-02 23:23:12 +00:00
|
|
|
dig_searchlist_t *o;
|
2000-04-26 18:34:17 +00:00
|
|
|
|
2000-04-29 00:12:56 +00:00
|
|
|
debug("free_lists()");
|
|
|
|
|
2000-05-02 23:23:12 +00:00
|
|
|
if (free_now)
|
|
|
|
return;
|
|
|
|
|
2000-04-29 00:12:56 +00:00
|
|
|
free_now = ISC_TRUE;
|
|
|
|
|
2000-04-26 18:34:17 +00:00
|
|
|
l = ISC_LIST_HEAD(lookup_list);
|
|
|
|
while (l != NULL) {
|
2000-05-02 23:23:12 +00:00
|
|
|
debug ("Freeing the lookup of %s", l->textname);
|
2000-04-26 18:34:17 +00:00
|
|
|
q = ISC_LIST_HEAD(l->q);
|
|
|
|
while (q != NULL) {
|
2000-05-02 23:23:12 +00:00
|
|
|
debug ("Freeing the query of %s", q->servname);
|
2000-04-28 21:41:19 +00:00
|
|
|
if (q->sock != NULL) {
|
|
|
|
isc_socket_cancel(q->sock, NULL,
|
|
|
|
ISC_SOCKCANCEL_ALL);
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
isc_socket_detach(&q->sock);
|
2000-04-28 21:41:19 +00:00
|
|
|
}
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
if (ISC_LINK_LINKED(&q->recvbuf, link))
|
|
|
|
ISC_LIST_DEQUEUE(q->recvlist, &q->recvbuf,
|
|
|
|
link);
|
|
|
|
if (ISC_LINK_LINKED(&q->lengthbuf, link))
|
|
|
|
ISC_LIST_DEQUEUE(q->lengthlist, &q->lengthbuf,
|
|
|
|
link);
|
|
|
|
isc_buffer_invalidate(&q->recvbuf);
|
|
|
|
isc_buffer_invalidate(&q->lengthbuf);
|
2000-04-26 18:34:17 +00:00
|
|
|
ptr = q;
|
|
|
|
q = ISC_LIST_NEXT(q, link);
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
isc_mem_free(mctx, ptr);
|
2000-04-26 18:34:17 +00:00
|
|
|
}
|
2000-04-28 21:41:19 +00:00
|
|
|
if (l->use_my_server_list) {
|
|
|
|
s = ISC_LIST_HEAD(l->my_server_list);
|
|
|
|
while (s != NULL) {
|
2000-05-02 23:23:12 +00:00
|
|
|
debug ("Freeing lookup server %s",
|
|
|
|
s->servername);
|
2000-04-28 21:41:19 +00:00
|
|
|
ptr = s;
|
|
|
|
s = ISC_LIST_NEXT(s, link);
|
|
|
|
isc_mem_free(mctx, ptr);
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
2000-04-26 18:34:17 +00:00
|
|
|
if (l->sendmsg != NULL)
|
2000-04-27 23:20:29 +00:00
|
|
|
dns_message_destroy (&l->sendmsg);
|
2000-04-26 18:34:17 +00:00
|
|
|
if (l->timer != NULL)
|
2000-04-27 23:20:29 +00:00
|
|
|
isc_timer_detach (&l->timer);
|
2000-04-26 18:34:17 +00:00
|
|
|
ptr = l;
|
|
|
|
l = ISC_LIST_NEXT(l, link);
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
isc_mem_free(mctx, ptr);
|
2000-04-26 18:34:17 +00:00
|
|
|
}
|
2000-05-02 23:23:12 +00:00
|
|
|
debug ("Starting to free things globally.");
|
2000-04-26 18:34:17 +00:00
|
|
|
s = ISC_LIST_HEAD(server_list);
|
|
|
|
while (s != NULL) {
|
2000-05-02 23:23:12 +00:00
|
|
|
debug ("Freeing global server list entry %s",
|
|
|
|
s->servername);
|
2000-04-26 18:34:17 +00:00
|
|
|
ptr = s;
|
|
|
|
s = ISC_LIST_NEXT(s, link);
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
isc_mem_free(mctx, ptr);
|
2000-04-26 18:34:17 +00:00
|
|
|
}
|
2000-05-02 23:23:12 +00:00
|
|
|
o = ISC_LIST_HEAD(search_list);
|
|
|
|
while (o != NULL) {
|
|
|
|
debug ("Freeing origin list entry %s",
|
|
|
|
o->origin);
|
|
|
|
ptr = o;
|
|
|
|
o = ISC_LIST_NEXT(o, link);
|
|
|
|
isc_mem_free(mctx, ptr);
|
|
|
|
}
|
2000-04-26 18:34:17 +00:00
|
|
|
if (socketmgr != NULL)
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
isc_socketmgr_destroy(&socketmgr);
|
2000-04-26 18:34:17 +00:00
|
|
|
if (timermgr != NULL)
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
isc_timermgr_destroy(&timermgr);
|
2000-04-26 18:34:17 +00:00
|
|
|
if (task != NULL)
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
isc_task_detach(&task);
|
2000-04-26 18:34:17 +00:00
|
|
|
if (taskmgr != NULL)
|
103. [func] libisc buffer API changes for <isc/buffer.h>:
Added:
isc_buffer_base(b) (pointer)
isc_buffer_current(b) (pointer)
isc_buffer_active(b) (pointer)
isc_buffer_used(b) (pointer)
isc_buffer_length(b) (int)
isc_buffer_usedlength(b) (int)
isc_buffer_consumedlength(b) (int)
isc_buffer_remaininglength(b) (int)
isc_buffer_activelength(b) (int)
isc_buffer_availablelength(b) (int)
Removed:
ISC_BUFFER_USEDCOUNT(b)
ISC_BUFFER_AVAILABLECOUNT(b)
isc_buffer_type(b)
Changed names:
isc_buffer_used(b, r) ->
isc_buffer_usedregion(b, r)
isc_buffer_available(b, r) ->
isc_buffer_available_region(b, r)
isc_buffer_consumed(b, r) ->
isc_buffer_consumedregion(b, r)
isc_buffer_active(b, r) ->
isc_buffer_activeregion(b, r)
isc_buffer_remaining(b, r) ->
isc_buffer_remainingregion(b, r)
Buffer types were removed, so the ISC_BUFFERTYPE_*
macros are no more, and the type argument to
isc_buffer_init and isc_buffer_allocate were removed.
isc_buffer_putstr is now void (instead of isc_result_t)
and requires that the caller ensure that there
is enough available buffer space for the string.
2000-04-27 00:03:12 +00:00
|
|
|
isc_taskmgr_destroy(&taskmgr);
|
2000-05-02 23:23:12 +00:00
|
|
|
|
|
|
|
#ifdef MEMDEBUG
|
|
|
|
isc_mem_stats(mctx, stderr);
|
|
|
|
#endif
|
|
|
|
isc_app_finish();
|
|
|
|
if (mctx != NULL)
|
|
|
|
isc_mem_destroy(&mctx);
|
|
|
|
|
|
|
|
exit(0);
|
2000-04-26 18:34:17 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
int
|
2000-04-26 19:36:40 +00:00
|
|
|
main(int argc, char **argv) {
|
2000-04-26 18:34:17 +00:00
|
|
|
dig_lookup_t *lookup = NULL;
|
2000-04-29 01:39:32 +00:00
|
|
|
#ifdef TWIDDLE
|
|
|
|
FILE *fp;
|
2000-05-03 23:07:30 +00:00
|
|
|
int i, p;
|
2000-04-29 01:39:32 +00:00
|
|
|
#endif
|
2000-04-26 18:34:17 +00:00
|
|
|
|
|
|
|
ISC_LIST_INIT(lookup_list);
|
|
|
|
ISC_LIST_INIT(server_list);
|
2000-05-02 23:23:12 +00:00
|
|
|
ISC_LIST_INIT(search_list);
|
2000-04-26 18:34:17 +00:00
|
|
|
|
2000-04-29 01:39:32 +00:00
|
|
|
#ifdef TWIDDLE
|
2000-05-03 23:07:30 +00:00
|
|
|
fp = fopen("/dev/urandom", "r");
|
2000-04-29 01:39:32 +00:00
|
|
|
if (fp!=NULL) {
|
|
|
|
fread (&i, sizeof(int), 1, fp);
|
|
|
|
srandom(i);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
srandom ((int)&main);
|
|
|
|
}
|
|
|
|
p = getpid()%16+8;
|
|
|
|
for (i=0 ; i<p; i++);
|
|
|
|
#endif
|
2000-04-26 18:34:17 +00:00
|
|
|
setup_libs();
|
|
|
|
parse_args(ISC_FALSE, argc, argv);
|
|
|
|
setup_system();
|
|
|
|
lookup = ISC_LIST_HEAD(lookup_list);
|
|
|
|
setup_lookup(lookup);
|
|
|
|
if (tcp_mode)
|
|
|
|
do_lookup_tcp(lookup);
|
|
|
|
else
|
|
|
|
do_lookup_udp(lookup);
|
|
|
|
isc_app_run();
|
|
|
|
free_lists();
|
2000-05-02 23:23:12 +00:00
|
|
|
exit (1); /* Should never get here. */
|
2000-04-26 18:34:17 +00:00
|
|
|
}
|