genreport.c 105 KB
Newer Older
Mark Andrews's avatar
Mark Andrews committed
1
/*
Mark Andrews's avatar
Mark Andrews committed
2
 * Copyright (C) 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
Mark Andrews's avatar
Mark Andrews committed
3 4 5 6 7 8
 *
 * This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */

9 10
#define FD_SETSIZE 1600

Mark Andrews's avatar
Mark Andrews committed
11 12 13
#ifndef _BSD_SOURCE
#define _BSD_SOURCE 1
#endif
14

Mark Andrews's avatar
Mark Andrews committed
15
#include <config.h>
Mark Andrews's avatar
Mark Andrews committed
16

Mark Andrews's avatar
Mark Andrews committed
17
#include <stdio.h>
Mark Andrews's avatar
Mark Andrews committed
18 19
#include <string.h>
#include <stdlib.h>
20
#include <stddef.h>
Mark Andrews's avatar
Mark Andrews committed
21
#include <unistd.h>
Mark Andrews's avatar
Mark Andrews committed
22
#include <assert.h>
23
#include <ctype.h>
Mark Andrews's avatar
Mark Andrews committed
24

Mark Andrews's avatar
Mark Andrews committed
25 26 27 28 29 30 31
#include <sys/types.h>
#include <netinet/in.h>
#include <arpa/nameser.h>
#include <sys/select.h>
#include <sys/socket.h>
#include <arpa/inet.h>
#include <sys/time.h>
32 33
#include <sys/ioctl.h>
#include <sys/uio.h>
34 35 36 37 38 39
#include <netinet/ip.h>
#include <netinet/ip_icmp.h>
#include <netinet/ip6.h>
#include <netinet/icmp6.h>
#include <netinet/udp.h>
#include <netinet/tcp.h>
Mark Andrews's avatar
Mark Andrews committed
40 41

#include <errno.h>
42
#include <netdb.h>
Mark Andrews's avatar
Mark Andrews committed
43
#include <resolv.h>
44
#include <signal.h>
Mark Andrews's avatar
Mark Andrews committed
45

Mark Andrews's avatar
Mark Andrews committed
46 47
#include <openssl/hmac.h>

Mark Andrews's avatar
Mark Andrews committed
48 49 50 51 52
#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
#define HMAC_CTX_new() &(_ctx), HMAC_CTX_init(&_ctx)
#define HMAC_CTX_free(ptr) HMAC_CTX_cleanup(ptr)
#endif

Mark Andrews's avatar
Mark Andrews committed
53 54 55
#ifndef HAVE_STRLCPY
#define strlcpy(dst, src, len) snprintf(dst, len, "%s", src)
#endif
Mark Andrews's avatar
Mark Andrews committed
56

57 58 59 60
#ifndef FD_COPY
#define FD_COPY(x, y) memmove(y, x, sizeof(*x))
#endif

Mark Andrews's avatar
Mark Andrews committed
61 62 63 64 65 66
#define ns_t_dname 39
#define ns_t_sink 40
#define ns_t_apl 42
#define ns_t_ds 43
#define ns_t_sshfp 44
#define ns_t_ipseckey 45
67
#define ns_t_rrsig 46
Mark Andrews's avatar
Mark Andrews committed
68
#define ns_t_nsec 47
Mark Andrews's avatar
Mark Andrews committed
69
#define ns_t_dnskey 48
Mark Andrews's avatar
Mark Andrews committed
70 71 72 73
#define ns_t_dhcid 49
#define ns_t_nsec3 50
#define ns_t_nsec3param 51
#define ns_t_tlsa 52
74
#define ns_t_smimea 53
Mark Andrews's avatar
Mark Andrews committed
75 76 77 78 79
#define ns_t_hip 55
#define ns_t_ninfo 56
#define ns_t_talink 58
#define ns_t_cds 59
#define ns_t_cdnskey 60
80
#define ns_t_openpgpkey 61
Mark Andrews's avatar
Mark Andrews committed
81 82 83 84 85 86 87 88 89 90
#define ns_t_csync 62
#define ns_t_spf 99
#define ns_t_nid 104
#define ns_t_l32 105
#define ns_t_l34 106
#define ns_t_lp 107
#define ns_t_eui48 108
#define ns_t_eui64 109
#define ns_t_uri 256
#define ns_t_caa 257
91 92
#define ns_t_avc 258
#define ns_t_doa 259
Mark Andrews's avatar
Mark Andrews committed
93 94
#define ns_t_ta 32768
#define ns_t_dlv 32769
Mark Andrews's avatar
Mark Andrews committed
95

96 97
#define ns_r_badcookie 23

98
static int eof = 0;
Mark Andrews's avatar
Mark Andrews committed
99 100
static int maxfd = -1;
static fd_set rfds, wfds;
Mark Andrews's avatar
Mark Andrews committed
101
static int outstanding = 0;
102
static int maxoutstanding = 100;
Mark Andrews's avatar
Mark Andrews committed
103

chantra's avatar
chantra committed
104
static void(*rhandlers[FD_SETSIZE])(int, int);
Mark Andrews's avatar
Mark Andrews committed
105 106 107 108
static void(*whandlers[FD_SETSIZE])(int);

static int udp4 = -1;
static int udp6 = -1;
109 110
static int icmp4 = -1;
static int icmp6 = -1;
111

Mark Andrews's avatar
Mark Andrews committed
112 113 114
static int ipv4only = 0;
static int ipv6only = 0;

Mark Andrews's avatar
Mark Andrews committed
115
static int allok  = 0;
116
static int bad  = 0;
Mark Andrews's avatar
Mark Andrews committed
117
static int badtag  = 0;
118
static int ednsonly  = 0;
119
static int debug = 0;
Mark Andrews's avatar
Mark Andrews committed
120
static int inorder = 0;
121
static int serial = 0;
122
static int printnsid = 0;
123
static int recursive = 0;
124
static long long sent;
Mark Andrews's avatar
Mark Andrews committed
125
static int json = 0;
126

Mark Andrews's avatar
Mark Andrews committed
127 128
static char *jdata = NULL;
static size_t jdata_len = 0;
129 130

#ifdef HAVE_RES_GETSERVERS
131
static union res_sockaddr_union servers[10];
132 133
#else
static union {
Mark Andrews's avatar
Mark Andrews committed
134 135
	struct sockaddr_in sin;
	struct sockaddr_in6 sin6;
136 137 138
} servers[10];
#endif

139
static int nservers = 0;
140
int ident = 0;
Mark Andrews's avatar
Mark Andrews committed
141

Mark Andrews's avatar
Mark Andrews committed
142 143 144
/*
 * Doubly linked list macros.
 */
Mark Andrews's avatar
Mark Andrews committed
145 146 147 148 149 150 151 152
#define APPEND(list, item, link) do { \
	if ((list).tail) \
		(list).tail->link.next = (item); \
	else \
		(list).head = (item); \
	(item)->link.prev = list.tail; \
	(item)->link.next = NULL; \
	(list).tail = (item); \
Mark Andrews's avatar
Mark Andrews committed
153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175
	(item)->link.linked = 1; \
} while (0)

#define PREPEND(list, item, link) do { \
	if ((list).head) \
		(list).head->link.prev = (item); \
	else \
		(list).tail = (item); \
	(item)->link.prev = NULL; \
	(item)->link.next = list.head; \
	(list).head = (item); \
	(item)->link.linked = 1; \
} while (0)

#define INSERTBEFORE(list, before, item, link) do { \
	assert(LINKED(before, link)); \
	if ((before)->link.prev == NULL) \
		PREPEND(list, item, link); \
	else { \
		(item)->link.prev = (before)->link.prev; \
		(before)->link.prev = (item); \
		(item)->link.prev->link.next = (item); \
		(item)->link.next = (before); \
Mark Andrews's avatar
Mark Andrews committed
176
		(item)->link.linked = 1; \
Mark Andrews's avatar
Mark Andrews committed
177
	} \
Mark Andrews's avatar
Mark Andrews committed
178 179 180 181 182 183 184 185 186 187 188 189
} while (0)

#define UNLINK(list, item, link) do { \
	if ((item)->link.next) \
		(item)->link.next->link.prev = (item)->link.prev; \
	else \
		list.tail = (item)->link.prev; \
	if ((item)->link.prev) \
		(item)->link.prev->link.next = (item)->link.next; \
	else \
		list.head = (item)->link.next; \
	(item)->link.next = (item)->link.prev = NULL; \
190
	(item)->link.linked = 0; \
Mark Andrews's avatar
Mark Andrews committed
191 192 193
} while (0)

#define NEXT(item, link) (item)->link.next
Mark Andrews's avatar
Mark Andrews committed
194
#define PREV(item, link) (item)->link.prev
195
#define LINKED(item, link) (item)->link.linked
Mark Andrews's avatar
Mark Andrews committed
196 197 198 199

#define HEAD(list) (list).head
#define TAIL(list) (list).tail

Mark Andrews's avatar
Mark Andrews committed
200 201 202
#define	HMACSHA256W "\013hmac-sha256"	/* cannonical form */
#define	HMACSHA256  "hmac-sha256"	/* presentation form */

Mark Andrews's avatar
Mark Andrews committed
203 204 205
/*
 * Test groupings
 */
Mark Andrews's avatar
Mark Andrews committed
206
#define NONE 0x00
Mark Andrews's avatar
Mark Andrews committed
207 208 209 210 211 212 213
#define EDNS 0x01
#define COMM 0x02
#define FULL 0x04
#define TYPE 0x08
#define EXPL 0x10

static int what = EDNS;
214

Mark Andrews's avatar
Mark Andrews committed
215
static struct {
Mark Andrews's avatar
Mark Andrews committed
216 217 218 219 220 221 222 223
	const char *name;		/* test nmemonic */
	unsigned int what;		/* select what test to make / report */
	unsigned short rdlen;		/* edns rdata length */
	const char *rdata;		/* edns rdata */
	unsigned short udpsize;		/* edns UDP size (0 == no EDNS) */
	unsigned short flags;		/* edns flags to be set */
	unsigned short version;		/* edns version */
	unsigned int tcp;		/* use tcp */
224
	unsigned int cookie;		/* opt record has cookie */
Mark Andrews's avatar
Mark Andrews committed
225 226 227 228 229 230 231 232 233 234
	unsigned int ignore;		/* ignore tc in response */
	unsigned int tc;		/* set tc in request */
	unsigned int rd;		/* set rd in request */
	unsigned int ra;		/* set ra in request */
	unsigned int cd;		/* set cd in request */
	unsigned int ad;		/* set ad  in request */
	unsigned int aa;		/* set aa in request */
	unsigned int z;			/* set z in request */
	unsigned int opcode;		/* use opcode for request */
	unsigned short type;		/* query type code */
Mark Andrews's avatar
Mark Andrews committed
235
	const char *dig;		/* dig command */
236
} opts[] = {
237
	/*                           size   eflgs vr  T ck ig tc rd ra cd ad aa  z  op  type */
Mark Andrews's avatar
Mark Andrews committed
238 239 240 241 242 243 244
	{ "dns",       EDNS,  0, "",    0, 0x0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_soa,
	  "dig +noedns +noad +norec SOA <zone>"
	},
	{ "aa",        FULL,  0, "",    0, 0x0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0,  0, ns_t_soa,
	  "dig +noedns +noad +norec +aaflag SOA <zone>"
	},
	{ "ad",        FULL,  0, "",    0, 0x0000, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0,  0, ns_t_soa,
Mark Andrews's avatar
Mark Andrews committed
245
	  "dig +noedns +ad +norec SOA <zone>"
Mark Andrews's avatar
Mark Andrews committed
246 247 248 249 250
	},
	{ "cd",        FULL,  0, "",    0, 0x0000, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, ns_t_soa,
	  "dig +noedns +noad +norec +cd SOA <zone>"
	},
	{ "ra",        FULL,  0, "",    0, 0x0000, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0,  0, ns_t_soa,
251
	  "### dig +noedns +noad +norec +raflag SOA <zone> ###"
Mark Andrews's avatar
Mark Andrews committed
252 253 254 255 256
	},
	{ "rd",        FULL,  0, "",    0, 0x0000, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0,  0, ns_t_soa,
	  "dig +noedns +noad +rec SOA <zone>"
	},
	{ "tc",        FULL,  0, "",    0, 0x0000, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0,  0, ns_t_soa,
257
	  "### dig +noedns +noad +norec +tcflag SOA <zone> ###"
Mark Andrews's avatar
Mark Andrews committed
258 259 260 261 262 263 264 265
	},
	{ "zflag",     FULL,  0, "",    0, 0x0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1,  0, ns_t_soa,
	  "dig +noedns +noad +norec +zflag SOA <zone>"
	},
	{ "opcode",    FULL,  0, "",    0, 0x0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 15, 0,
	  "dig +noedns +noad +norec +header-only +opcode=15"
	},
	{ "opcodeflg", FULL,  0, "",    0, 0x0000, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 15, 0,
266
	  "### dig +noedns +header-only +opcode=15 +tcflag +rec +raflag +cd +ad +aaflag +zflag ###"
Mark Andrews's avatar
Mark Andrews committed
267 268 269 270 271 272 273
	},
	{ "type666",   FULL,  0, "",    0, 0x0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, 666,
	  "dig +noedns +noad +norec TYPE666 <zone>"
	},
	{ "tcp",       FULL,  0, "",    0, 0x0000, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_soa,
	  "dig +noedns +noad +norec +tcp SOA <zone>"
	},
274 275

	/*                           size   eflgs vr  T ck ig tc rd ra cd ad aa  z  op  type */
Mark Andrews's avatar
Mark Andrews committed
276 277 278 279 280 281 282 283 284
	{ "edns",      EDNS,  0, "", 4096, 0x0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_soa,
	  "dig +edns=0 +nocookie +noad +norec SOA <zone>"
	},
	{ "edns1",     EDNS,  0, "", 4096, 0x0000, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_soa,
	  "dig +edns=1 +noednsneg +nocookie +noad +norec SOA <zone>"
	},
	{ "edns@512",  EDNS,  0, "",  512, 0x0000, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_dnskey,
	  "dig +edns=0 +nocookie +noad +norec +dnssec +ignoretc +bufsize=512 DNSKEY <zone>"
	},
Mark Andrews's avatar
Mark Andrews committed
285
	{ "ednsopt",   EDNS,  4, "\x00\x64\x00\x00",	/* 100 */
Mark Andrews's avatar
Mark Andrews committed
286 287 288
				     4096, 0x0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_soa,
	  "dig +edns=0 +nocookie +noad +norec +ednsopt=100 SOA <zone>"
	},
Mark Andrews's avatar
Mark Andrews committed
289
	{ "edns1opt",  EDNS,  4, "\x00\x64\x00\x00",	/* 100 */
Mark Andrews's avatar
Mark Andrews committed
290 291 292
				     4096, 0x0000, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_soa,
	  "dig +edns=1 +noednsneg +nocookie +noad +norec +ednsopt=100 SOA <zone>"
	},
293
	{ "do",        EDNS,  0, "",
Mark Andrews's avatar
Mark Andrews committed
294 295 296
				     4096, 0x8000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_soa,
	  "dig +edns=0 +nocookie +noad +norec +dnssec SOA <zone>"
	},
Mark Andrews's avatar
Mark Andrews committed
297 298 299 300
	{ "docd",      FULL,  0, "",
				     4096, 0x8000, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, ns_t_soa,
	  "dig +edns=0 +nocookie +noad +norec +dnssec SOA <zone>"
	},
Mark Andrews's avatar
Mark Andrews committed
301 302 303 304 305 306
	{ "edns1do",   FULL,  0, "", 4096, 0x8000, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_soa,
	  "dig +edns=1 +noednsneg +nocookie +noad +norec +dnssec SOA <zone>"
	},
	{ "ednsflags", EDNS,  0, "", 4096, 0x0080, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_soa,
	  "dig +edns=0 +nocookie +noad +norec +ednsflags=0x0080 SOA <zone>"
	},
307
	{ "optlist",   EDNS,  4 + 8 + 4 + 12,
308 309 310 311
	  "\x00\x03\x00\x00" 		     /* NSID */
	  "\x00\x08\x00\x04\x00\x01\x00\x00" /* ECS */
	  "\x00\x09\x00\x00" 		     /* EXPIRE */
	  "\x00\x0a\x00\x08\x01\x02\x03\x04\x05\x06\x07\x08",	/* COOKIE */
Mark Andrews's avatar
Mark Andrews committed
312 313 314
				     4096, 0x0000, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_soa,
	  "dig +edns=0 +noad +norec +nsid +subnet=0.0.0.0/0 +expire +cookie=0102030405060708 SOA <zone>"
	},
315 316

	/*                           size   eflgs vr  T ck ig tc rd ra cd ad aa  z  op  type */
Mark Andrews's avatar
Mark Andrews committed
317
	{ "ednsnsid", FULL,  4, "\x00\x03\x00\x00",	/* NSID */
Mark Andrews's avatar
Mark Andrews committed
318 319 320
				     4096, 0x0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_soa,
	  "dig +edns=0 +nocookie +noad +norec +nsid SOA <zone>"
	},
Mark Andrews's avatar
Mark Andrews committed
321
	{ "ednscookie", FULL, 12, "\x00\x0a\x00\x08\x01\x02\x03\x04\x05\x06\x07\x08", /* COOKIE */
Mark Andrews's avatar
Mark Andrews committed
322 323 324
				     4096, 0x0000, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_soa,
	  "dig +edns=0 +noad +norec +cookie=0102030405060708 SOA <zone>"
	},
Mark Andrews's avatar
Mark Andrews committed
325
	{ "ednsexpire", FULL, 4, "\x00\x09\x00\x00",	/* EXPIRE */
Mark Andrews's avatar
Mark Andrews committed
326 327 328
				     4096, 0x0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_soa,
	  "dig +edns=0 +nocookie +noad +norec +expire SOA <zone>"
	},
Mark Andrews's avatar
Mark Andrews committed
329
	{ "ednssubnet", FULL,  8, "\x00\x08\x00\x04\x00\x01\x00\x00",	/* ECS */
Mark Andrews's avatar
Mark Andrews committed
330 331 332 333
				     4096, 0x0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_soa,
	  "dig +edns=0 +nocookie +noad +norec +subnet=0.0.0.0/0 SOA <zone>"
	},

Mark Andrews's avatar
Mark Andrews committed
334
	{ "edns1nsid", FULL,  4, "\x00\x03\x00\x00",	/* NSID */
Mark Andrews's avatar
Mark Andrews committed
335 336 337
				     4096, 0x0000, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_soa,
	  "dig +edns=1 +noednsneg +nocookie +noad +norec +nsid SOA <zone>"
	},
Mark Andrews's avatar
Mark Andrews committed
338
	{ "edns1cookie", FULL, 12, "\x00\x0a\x00\x08\x01\x02\x03\x04\x05\x06\x07\x08", /* COOKIE */
Mark Andrews's avatar
Mark Andrews committed
339 340 341
				     4096, 0x0000, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_soa,
	  "dig +edns=1 +noednsneg +noad +norec +cookie=0102030405060708 SOA <zone>"
	},
Mark Andrews's avatar
Mark Andrews committed
342
	{ "edns1expire", FULL, 4, "\x00\x09\x00\x00",	/* EXPIRE */
Mark Andrews's avatar
Mark Andrews committed
343 344 345
				     4096, 0x0000, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_soa,
	  "dig +edns=1 +noednsneg +nocookie +noad +norec +expire SOA <zone>"
	},
Mark Andrews's avatar
Mark Andrews committed
346
	{ "edns1subnet", FULL,  8, "\x00\x08\x00\x04\x00\x01\x00\x00",	/* ECS */
Mark Andrews's avatar
Mark Andrews committed
347 348 349 350 351 352
				     4096, 0x0000, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_soa,
	  "dig +edns=1 +noednsneg +nocookie +noad +norec +subnet=0.0.0.0/0 SOA <zone>"
	},
	{ "ednstcp",   EDNS,  0, "",  512, 0x8000, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_dnskey,
	  "dig +edns=0 +nocookie +noad +norec +dnssec +bufsize=512 +tcp DNSKEY <zone>"
	},
353 354

	/*                           size   eflgs vr  T ck ig tc rd ra cd ad aa  z  op  type */
Mark Andrews's avatar
Mark Andrews committed
355
	{ "bind11",    COMM, 12, "\x00\x0a\x00\x08\x01\x02\x03\x04\x05\x06\x07\x08", /* COOKIE */
Mark Andrews's avatar
Mark Andrews committed
356 357 358
				     4096, 0x8000, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_soa,
	  "dig +edns=0 +cookie=0102030405060708 +noad +norec +dnssec SOA <zone>"
	},
Mark Andrews's avatar
Mark Andrews committed
359
	{ "dig11",     COMM, 12, "\x00\x0a\x00\x08\x01\x02\x03\x04\x05\x06\x07\x08", /* COOKIE */
Mark Andrews's avatar
Mark Andrews committed
360 361 362
				     4096, 0x0000, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 0,  0, ns_t_soa,
	  "dig +edns=0 +cookie=0102030405060708 +ad +rec SOA <zone>"
	},
363

Mark Andrews's avatar
Mark Andrews committed
364 365 366 367
	{ "dnswkk",     NONE,  0, "",    0, 0x0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_soa,
	  "dig +noedns +noad +norec -y hmac-sha256:.:AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= SOA <zone>"
	},

Mark Andrews's avatar
Mark Andrews committed
368 369 370 371
	{ "icmp",	NONE,  0, "",    0, 0x0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, 0,
	  "ping / ping6"
	},

372
	/*                           size   eflgs vr  T ck ig tc rd ra cd ad aa  z  op  type */
Mark Andrews's avatar
Mark Andrews committed
373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414
	{ "A",         TYPE,  0, "",    0, 0x0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_a,
	  "dig +noedns +noad +norec A <zone>"
	},
	{ "NS",        TYPE,  0, "",    0, 0x0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_ns,
	  "dig +noedns +noad +norec NS <zone>"
	},
	{ "MD",        TYPE,  0, "",    0, 0x0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_md,
	  "dig +noedns +noad +norec MD <zone>"
	},
	{ "MF",        TYPE,  0, "",    0, 0x0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_mf,
	  "dig +noedns +noad +norec MF <zone>"
	},
	{ "CNAME",     TYPE,  0, "",    0, 0x0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_cname,
	  "dig +noedns +noad +norec CNAME <zone>"
	},
	{ "SOA",       TYPE,  0, "",    0, 0x0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_soa,
	  "dig +noedns +noad +norec SOA <zone>"
	},
	{ "MB",        TYPE,  0, "",    0, 0x0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_mb,
	  "dig +noedns +noad +norec MB <zone>"
	},
	{ "MG",        TYPE,  0, "",    0, 0x0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_mg,
	  "dig +noedns +noad +norec MG <zone>"
	},
	{ "MR",        TYPE,  0, "",    0, 0x0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_mr,
	  "dig +noedns +noad +norec MR <zone>"
	},
	{ "NULL",      TYPE,  0, "",    0, 0x0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_null,
	  "dig +noedns +noad +norec NULL <zone>"
	},
	{ "WKS",       TYPE,  0, "",    0, 0x0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_wks,
	  "dig +noedns +noad +norec WKS <zone>"
	},
	{ "PTR",       TYPE,  0, "",    0, 0x0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_ptr,
	  "dig +noedns +noad +norec PTR <zone>"
	},
	{ "HINFO",     TYPE,  0, "",    0, 0x0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_hinfo,
	  "dig +noedns +noad +norec HINFO <zone>"
	},
	{ "MINFO",     TYPE,  0, "",    0, 0x0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_minfo,
	  "dig +noedns +noad +norec MINFO <zone>"
	},
415 416

	/*                           size   eflgs vr  T ck ig tc rd ra cd ad aa  z  op  type */
Mark Andrews's avatar
Mark Andrews committed
417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461
	{ "MX",        TYPE,  0, "",    0, 0x0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_mx,
	  "dig +noedns +noad +norec MX <zone>"
	},
	{ "TXT",       TYPE,  0, "",    0, 0x0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_txt,
	  "dig +noedns +noad +norec TXT <zone>"
	},
	{ "RP",        TYPE,  0, "",    0, 0x0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_rp,
	  "dig +noedns +noad +norec RP <zone>"
	},
	{ "AFSDB",     TYPE,  0, "",    0, 0x0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_afsdb,
	  "dig +noedns +noad +norec AFSDB <zone>"
	},
	{ "X25",       TYPE,  0, "",    0, 0x0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_x25,
	  "dig +noedns +noad +norec X25 <zone>"
	},
	{ "ISDN",      TYPE,  0, "",    0, 0x0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_isdn,
	  "dig +noedns +noad +norec ISDN <zone>"
	},
	{ "RT",        TYPE,  0, "",    0, 0x0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_rt,
	  "dig +noedns +noad +norec RT <zone>"
	},
	{ "NSAP",      TYPE,  0, "",    0, 0x0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_nsap,
	  "dig +noedns +noad +norec NSAP <zone>"
	},
	{ "NSAP-PTR",  TYPE,  0, "",    0, 0x0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_nsap_ptr,
	  "dig +noedns +noad +norec NSAP-PTR <zone>"
	},
	{ "SIG",       TYPE,  0, "",    0, 0x0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_sig,
	  "dig +noedns +noad +norec SIG <zone>"
	},
	{ "KEY",       TYPE,  0, "",    0, 0x0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_key,
	  "dig +noedns +noad +norec KEY <zone>"
	},
	{ "PX",        TYPE,  0, "",    0, 0x0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_px,
	  "dig +noedns +noad +norec PX <zone>"
	},
	{ "GPOS",      TYPE,  0, "",    0, 0x0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_gpos,
	  "dig +noedns +noad +norec GPOS <zone>"
	},
	{ "AAAA",      TYPE,  0, "",    0, 0x0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_aaaa,
	  "dig +noedns +noad +norec AAAA <zone>"
	},
	{ "LOC",       TYPE,  0, "",    0, 0x0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_loc,
	  "dig +noedns +noad +norec LOC <zone>"
	},
462 463

	/*                           size   eflgs vr  T ck ig tc rd ra cd ad aa  z  op  type */
Mark Andrews's avatar
Mark Andrews committed
464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502
	{ "NXT",       TYPE,  0, "",    0, 0x0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_nxt,
	  "dig +noedns +noad +norec NXT <zone>"
	},
	{ "SRV",       TYPE,  0, "",    0, 0x0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_srv,
	  "dig +noedns +noad +norec SRV <zone>"
	},
	{ "NAPTR",     TYPE,  0, "",    0, 0x0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_naptr,
	  "dig +noedns +noad +norec NAPTR <zone>"
	},
	{ "KX",        TYPE,  0, "",    0, 0x0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_kx,
	  "dig +noedns +noad +norec KX <zone>"
	},
	{ "CERT",      TYPE,  0, "",    0, 0x0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_cert,
	  "dig +noedns +noad +norec CERT <zone>"
	},
	{ "A6",        TYPE,  0, "",    0, 0x0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_a6,
	  "dig +noedns +noad +norec A6 <zone>"
	},
	{ "DNAME",     TYPE,  0, "",    0, 0x0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_dname,
	  "dig +noedns +noad +norec DNAME <zone>"
	},
	{ "APL",       TYPE,  0, "",    0, 0x0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_apl,
	  "dig +noedns +noad +norec APL <zone>"
	},
	{ "DS",        TYPE,  0, "",    0, 0x0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_ds,
	  "dig +noedns +noad +norec DS <zone>"
	},
	{ "SSHFP",     TYPE,  0, "",    0, 0x0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_sshfp,
	  "dig +noedns +noad +norec SSHFP <zone>"
	},
	{ "IPSECKEY",  TYPE,  0, "",    0, 0x0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_ipseckey,
	  "dig +noedns +noad +norec IPSECKEY <zone>"
	},
	{ "RRSIG",     TYPE,  0, "",    0, 0x0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_rrsig,
	  "dig +noedns +noad +norec RRSIG <zone>"
	},
	{ "NSEC",      TYPE,  0, "",    0, 0x0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_nsec,
	  "dig +noedns +noad +norec NSEC <zone>"
	},
503 504

	/*                           size   eflgs vr  T ck ig tc rd ra cd ad aa  z  op  type */
Mark Andrews's avatar
Mark Andrews committed
505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543
	{ "DNSKEY",    TYPE,  0, "",    0, 0x0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_dnskey,
	  "dig +noedns +noad +norec DNSKEY <zone>"
	},
	{ "DHCID",     TYPE,  0, "",    0, 0x0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_dhcid,
	  "dig +noedns +noad +norec DHCID <zone>"
	},
	{ "NSEC3",     TYPE,  0, "",    0, 0x0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_nsec3,
	  "dig +noedns +noad +norec NSEC3 <zone>"
	},
	{ "NSEC3PARAM",TYPE,  0, "",    0, 0x0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_nsec3param,
	  "dig +noedns +noad +norec NSEC3PARAM <zone>"
	},
	{ "TLSA",      TYPE,  0, "",    0, 0x0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_tlsa,
	  "dig +noedns +noad +norec TLSA <zone>"
	},
	{ "SMIMEA",    TYPE,  0, "",    0, 0x0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_smimea,
	  "dig +noedns +noad +norec SMIMEA <zone>"
	},
	{ "HIP",       TYPE,  0, "",    0, 0x0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_hip,
	  "dig +noedns +noad +norec HIP <zone>"
	},
	{ "CDS",       TYPE,  0, "",    0, 0x0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_cds,
	  "dig +noedns +noad +norec CDS <zone>"
	},
	{ "CDNSKEY",   TYPE,  0, "",    0, 0x0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_cdnskey,
	  "dig +noedns +noad +norec CDNSKEY <zone>"
	},
	{ "OPENPGPKEY",TYPE,  0, "",    0, 0x0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_openpgpkey,
	  "dig +noedns +noad +norec OPENPGPKEY <zone>"
	},
	{ "SPF",       TYPE,  0, "",    0, 0x0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_spf,
	  "dig +noedns +noad +norec SPF <zone>"
	},
	{ "NID",       TYPE,  0, "",    0, 0x0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_nid,
	  "dig +noedns +noad +norec NID <zone>"
	},
	{ "L32",       TYPE,  0, "",    0, 0x0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_l32,
	  "dig +noedns +noad +norec L32 <zone>"
	},
544 545

	/*                           size   eflgs vr  T ck ig tc rd ra cd ad aa  z  op  type */
Mark Andrews's avatar
Mark Andrews committed
546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575
	{ "L64",       TYPE,  0, "",    0, 0x0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_l34,
	  "dig +noedns +noad +norec L64 <zone>"
	},
	{ "LP",        TYPE,  0, "",    0, 0x0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_lp,
	  "dig +noedns +noad +norec LP <zone>"
	},
	{ "EUI48",     TYPE,  0, "",    0, 0x0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_eui48,
	  "dig +noedns +noad +norec EUI48 <zone>"
	},
	{ "EUI64",     TYPE,  0, "",    0, 0x0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_eui64,
	  "dig +noedns +noad +norec EUI64 <zone>"
	},
	{ "URI",       TYPE,  0, "",    0, 0x0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_uri,
	  "dig +noedns +noad +norec URI <zone>"
	},
	{ "CAA",       TYPE,  0, "",    0, 0x0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_caa,
	  "dig +noedns +noad +norec CAA <zone>"
	},
	{ "AVC",       TYPE,  0, "",    0, 0x0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_avc,
	  "dig +noedns +noad +norec AVC <zone>"
	},
	{ "DOA",       TYPE,  0, "",    0, 0x0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_doa,
	  "dig +noedns +noad +norec DOA <zone>"
	},
	{ "DLV",       TYPE,  0, "",    0, 0x0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, ns_t_dlv,
	  "dig +noedns +noad +norec DLV <zone>"
	},
	{ "TYPE1000",  TYPE,  0, "",    0, 0x0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, 1000,
	  "dig +noedns +noad +norec TYPE1000 <zone>"
	}
576 577
};

Mark Andrews's avatar
Mark Andrews committed
578 579 580
/*
 * Summary structure where results from multiple lookups are recorded.
 */
581
struct summary {
Mark Andrews's avatar
Mark Andrews committed
582 583 584 585 586
	struct {
		struct summary *prev;
		struct summary *next;
		int linked;
	} link;
Mark Andrews's avatar
Mark Andrews committed
587 588
	char zone[1024];		/* the zone's name */
	char ns[1024];			/* the server's name */
589
	char target[1024];		/* the server's real name */
Mark Andrews's avatar
Mark Andrews committed
590
	struct sockaddr_storage storage;/* server we are talking to */
Mark Andrews's avatar
Mark Andrews committed
591
	int tests;			/* number of outstanding tests */
Mark Andrews's avatar
Mark Andrews committed
592
	unsigned int last;		/* last test sent */
Mark Andrews's avatar
Mark Andrews committed
593
	int deferred;			/* was the printing deferred */
Mark Andrews's avatar
Mark Andrews committed
594
	int done;			/* we are done */
Mark Andrews's avatar
Mark Andrews committed
595
	int type;			/* recursive query lookup type */
596
	int nodata;			/* recursive query got nodata */
Mark Andrews's avatar
Mark Andrews committed
597 598 599 600 601
	int nodataa;			/* recursive query got nodata */
	int nodataaaaa;			/* recursive query got nodata */
	int nxdomain;			/* recursive query got nxdomain */
	int nxdomaina;			/* recursive query got nxdomain */
	int nxdomainaaaa;		/* recursive query got nxdomain */
602 603
	int faileda;
	int failedaaaa;
Mark Andrews's avatar
Mark Andrews committed
604
	int cname;			/* NS is CNAME */
605 606
	int cnamea;			/* Nameserver is CNAME */
	int cnameaaaa;			/* Nameserver is CNAME */
Mark Andrews's avatar
Mark Andrews committed
607
	int seenrrsig;			/* a rrsig was seen in "do" test */
608 609 610 611 612 613
	int seenopt;			/* see a EDNS response */
	int seenedns;			/* see a EDNS response */
	int seenfailure;		/* see a lookup failure */
	int allok;			/* all answers are current ok */
	int allrefused;			/* all answers are current ok */
	int allservfail;		/* all answers are current ok */
614
	int targetok;			/* target is valid */
Mark Andrews's avatar
Mark Andrews committed
615
	struct summary *xlink;		/* cross link of recursive A/AAAA */
Mark Andrews's avatar
Mark Andrews committed
616
	unsigned int nsidlen;
617
	char nsid[100];			/* nsid if found */
618 619 620
	char results[sizeof(opts)/sizeof(opts[0])][100];
};

Mark Andrews's avatar
Mark Andrews committed
621 622 623 624 625
static struct {
	struct summary *head;
	struct summary *tail;
} summaries;

Mark Andrews's avatar
Mark Andrews committed
626 627 628 629
struct workitem {
	struct {
		struct workitem *next;
		struct workitem *prev;
630
		int linked;
631
	} link, clink, plink, rlink, idlink, seqlink;
Mark Andrews's avatar
Mark Andrews committed
632 633 634
	unsigned short id;		/* the query id we are waiting for */
	struct timeval when;		/* when we will timeout */
	int type;			/* the query type being looked up */
Mark Andrews's avatar
Mark Andrews committed
635 636 637
	int test;			/* test number / server number */
	int sends;			/* number of times this UDP request
					 * has been sent */
Mark Andrews's avatar
Mark Andrews committed
638 639
	int buflen;			/* the size of the request to be sent */
	int tcpfd;			/* the tcp file descriptor */
Mark Andrews's avatar
Mark Andrews committed
640 641
	int outstanding;		/* outstanding has been set */
	int havelen;			/* readlen is tcp message length */
Mark Andrews's avatar
Mark Andrews committed
642 643
	int readlen;			/* how much we need to read */
	int read;			/* how much has been read so far */
Mark Andrews's avatar
Mark Andrews committed
644
	int icmp;			/* this is a icmp echo request */
Mark Andrews's avatar
Mark Andrews committed
645 646
	unsigned char buf[512];		/* the question we sent */
	unsigned char tcpbuf[0x10000];	/* where to accumulate the tcp response */
Mark Andrews's avatar
Mark Andrews committed
647
	unsigned char mac[32];		/* tsig hmac-sha256 mac */
Mark Andrews's avatar
Mark Andrews committed
648
	struct summary *summary;	/* where this test is summaried */
Mark Andrews's avatar
Mark Andrews committed
649 650
};

651
/*
Mark Andrews's avatar
Mark Andrews committed
652
 * Work queues:
653 654 655
 *	'work' udp qeries;
 *	'connecting' tcp qeries;
 *	'reading' tcp qeries;
Mark Andrews's avatar
Mark Andrews committed
656
 *	'pending' deferred work items;
Mark Andrews's avatar
Mark Andrews committed
657 658 659
 *
 * Outstanding queries by qid.
 *	'ids'
660 661 662
 *
 * Outstanding icmp by seq.
 *	'ids'
663
 */
Mark Andrews's avatar
Mark Andrews committed
664 665 666
static struct {
	struct workitem *head;
	struct workitem *tail;
667
} work, connecting, reading, pending, ids[0x10000], seq[0x10000];
Mark Andrews's avatar
Mark Andrews committed
668

Mark Andrews's avatar
Mark Andrews committed
669 670 671
static void
dotest(struct workitem *item);

672 673 674
static void
nextserver(struct workitem *item);

675 676
static void
connecttoserver(struct workitem *item);
Mark Andrews's avatar
Mark Andrews committed
677

Mark Andrews's avatar
Mark Andrews committed
678 679 680
static void
report(struct summary *summary);

Mark Andrews's avatar
Mark Andrews committed
681 682 683 684 685 686 687 688 689 690 691 692 693 694 695
void
jsonadd(char **json, const char *str, size_t *len) {
	if (*json == NULL) {
		*json = calloc(1, 10240);
		if (*json == NULL)
			return;
		*len = 10240;
	}
	if (strlen(*json) + strlen(str) + 1 > *len) {
		char *tmp = realloc(*json, *len + 10240);
		if (tmp == NULL)
			return;
		*json = tmp;
		*len += 10240;
	}
Mark Andrews's avatar
Mark Andrews committed
696
#ifdef HAVE_STRLCAT
Mark Andrews's avatar
Mark Andrews committed
697
	strlcat(*json, str, *len);
Mark Andrews's avatar
Mark Andrews committed
698 699 700
#else
	strncat(*json, str, *len - strlen(*json) - 1);
#endif
Mark Andrews's avatar
Mark Andrews committed
701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765
}

void
jsonsafe(const char *str, char *safe, size_t len) {
	char c;

	while (len > 1) {
		switch ((c = *str++)) {
		case '\\':
			strlcpy(safe, "\\\\", len);
			len -= strlen(safe);
			safe += strlen(safe);
			break;
		case '"':
			strlcpy(safe, "\\\"", len);
			len -= strlen(safe);
			safe += strlen(safe);
			break;
		case '\b':
			strlcpy(safe, "\\b", len);
			len -= strlen(safe);
			safe += strlen(safe);
			break;
		case '\f':
			strlcpy(safe, "\\f", len);
			len -= strlen(safe);
			safe += strlen(safe);
			break;
		case '\n':
			strlcpy(safe, "\\n", len);
			len -= strlen(safe);
			safe += strlen(safe);
			break;
		case '\r':
			strlcpy(safe, "\\r", len);
			len -= strlen(safe);
			safe += strlen(safe);
			break;
		case '\t':
			strlcpy(safe, "\\t", len);
			len -= strlen(safe);
			safe += strlen(safe);
			break;
		case '\0':
			*safe = c;
			len = 0;
			break;
		default:
			if (c > 0 && c < ' ') {
				snprintf(safe, len, "\\u%04x", (c & 0xff));
				len -= strlen(safe);
				safe += strlen(safe);
				break;
			} else {
				*safe++ = c;
				*safe = '\0';
				len--;
			}
			break;
		}
	}
	if (len > 0)
		*safe = '\0';
}

Mark Andrews's avatar
Mark Andrews committed
766 767 768 769 770
static int
storage_equal(struct sockaddr_storage *s1, struct sockaddr_storage *s2) {
	struct sockaddr_in *sin1, *sin2;
	struct sockaddr_in6 *sin61, *sin62;

771
	if (s1->ss_family != s2->ss_family)
Mark Andrews's avatar
Mark Andrews committed
772 773 774 775 776 777
		return (0);

	switch (s1->ss_family) {
	case AF_INET:
		sin1 = (struct sockaddr_in *)s1;
		sin2 = (struct sockaddr_in *)s2;
Mark Andrews's avatar
Mark Andrews committed
778

Mark Andrews's avatar
Mark Andrews committed
779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794
		if (sin1->sin_port != sin2->sin_port ||
		    sin1->sin_addr.s_addr != sin2->sin_addr.s_addr)
			return (0);
		return (1);
	case AF_INET6:
		sin61 = (struct sockaddr_in6 *)s1;
		sin62 = (struct sockaddr_in6 *)s2;

		if (sin61->sin6_port != sin62->sin6_port ||
		    memcmp(&sin61->sin6_addr, &sin62->sin6_addr, 16) != 0)
			return (0);
		return (1);
	}
	return (0);
}

Mark Andrews's avatar
Mark Andrews committed
795 796 797
/*
 * Check if it is safe to use this id to this address.
 */
Mark Andrews's avatar
Mark Andrews committed
798 799 800 801 802 803
static int
checkid(struct sockaddr_storage *storage, int id) {
	struct workitem *item;

	item = HEAD(ids[id]);
	while (item != NULL &&
804
	       !storage_equal(storage, &item->summary->storage))
Mark Andrews's avatar
Mark Andrews committed
805 806 807 808
		item = NEXT(item, idlink);
	return ((item == NULL) ? 1 : 0);
}

809 810 811 812 813 814 815 816 817 818 819 820 821 822 823
/*
 * Check if we have a outstanding icmp with this sequence number
 * to this address.
 */
static int
checkseq(struct sockaddr_storage *storage, int id) {
	struct workitem *item;

	item = HEAD(seq[id]);
	while (item != NULL &&
	       !storage_equal(storage, &item->summary->storage))
		item = NEXT(item, seqlink);
	return ((item == NULL) ? 1 : 0);
}

Mark Andrews's avatar
Mark Andrews committed
824 825 826 827 828 829 830
static void
freesummary(struct summary *summary) {
	if (LINKED(summary, link))
		UNLINK(summaries, summary, link);
	free(summary);
}

Mark Andrews's avatar
Mark Andrews committed
831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858
static void
emiterr(const char *zone, const char *ns, const char *str) {
	char safe[1024];

	if (json) {
		if (jdata)
			jsonadd(&jdata, ", ", &jdata_len);
		jsonsafe(zone[0] ? zone : ".", safe, sizeof(safe));
		jsonadd(&jdata, "{ \"zone\": \"", &jdata_len);
		jsonadd(&jdata, safe, &jdata_len);
		jsonadd(&jdata, "\"", &jdata_len);
	
		if (ns) {
			jsonsafe(ns, safe, sizeof(safe));
			jsonadd(&jdata, ", \"servername\": \"", &jdata_len);
			jsonadd(&jdata, safe, &jdata_len);
			jsonadd(&jdata, "\"", &jdata_len);
		}

		jsonadd(&jdata, ", \"error\": \"", &jdata_len);
		jsonadd(&jdata, str, &jdata_len);
		jsonadd(&jdata, "\" }", &jdata_len);
	} else {
		printf("%s.%s%s: %s\n",
		       zone, ns ? " " : "", ns ? ns : "", str);
	}
}

Mark Andrews's avatar
Mark Andrews committed
859 860 861
/*
 * Generate a report line.
 */
862
static void
Mark Andrews's avatar
Mark Andrews committed
863
printandfree(struct summary *summary) {
864 865 866
	struct sockaddr_in *s = (struct sockaddr_in *)&summary->storage;
	struct sockaddr_in6 *s6 = (struct sockaddr_in6 *)&summary->storage;;
	char addrbuf[64];
Mark Andrews's avatar
Mark Andrews committed
867 868
	char buf[2048];
	char safe[1024];
869 870 871 872 873
	void *addr;
	unsigned int i;
	int x;

	if ((summary->type == ns_t_a || summary->type == ns_t_aaaa) &&
Mark Andrews's avatar
Mark Andrews committed
874
	    summary->nodataa && summary->nodataaaaa) {
Mark Andrews's avatar
Mark Andrews committed
875
		emiterr(summary->zone, summary->ns, "no address records found");
Mark Andrews's avatar
Mark Andrews committed
876
		freesummary(summary);
877 878
		return;
	}
879

880 881
	if ((summary->type == ns_t_a || summary->type == ns_t_aaaa) &&
	    summary->nxdomaina && summary->nxdomainaaaa) {
Mark Andrews's avatar
Mark Andrews committed
882
		emiterr(summary->zone, summary->ns, "no address records found (NXDOMAIN)");
Mark Andrews's avatar
Mark Andrews committed
883
		freesummary(summary);
884 885
		return;
	}
886

887 888
	if ((summary->type == ns_t_a || summary->type == ns_t_aaaa) &&
	    summary->faileda && summary->failedaaaa) {
Mark Andrews's avatar
Mark Andrews committed
889
		emiterr(summary->zone, summary->ns, "address lookups failed");
890 891 892 893
		freesummary(summary);
		return;
	}

894 895
	if ((summary->type == ns_t_a || summary->type == ns_t_aaaa) &&
	    (summary->cnamea || summary->cnameaaaa)) {
Mark Andrews's avatar
Mark Andrews committed
896 897 898 899
		snprintf(buf, sizeof(buf), "nameserver is a CNAME%s%s\n",
			 summary->targetok ? summary->target : "",
			 summary->targetok ? "'" : "");
		emiterr(summary->zone, summary->ns, buf);
900 901 902 903
		freesummary(summary);
		return;
	}

Mark Andrews's avatar
Mark Andrews committed
904
	if ((summary->type == ns_t_ns) && summary->cname) {
Mark Andrews's avatar
Mark Andrews committed
905
		emiterr(summary->zone, summary->ns, "zone is a CNAME");
Mark Andrews's avatar
Mark Andrews committed
906 907 908 909
		freesummary(summary);
		return;
	}

910 911 912
	/*
	 * Do deferred xlink failure reports.
	 */
913 914
	if (summary->type == ns_t_a &&
	    summary->nodataa && summary->failedaaaa) {
Mark Andrews's avatar
Mark Andrews committed
915
		emiterr(summary->zone, summary->ns, "AAAA lookup failed");
916 917 918
		freesummary(summary);
		return;
	}
919 920
	if (summary->type == ns_t_aaaa &&
	    summary->nodataaaaa && summary->faileda) {
Mark Andrews's avatar
Mark Andrews committed
921
		emiterr(summary->zone, summary->ns, "A lookup failed");
922 923 924
		freesummary(summary);
		return;
	}
925 926
	if (summary->type == ns_t_a &&
	    summary->faileda && summary->nxdomainaaaa) {
Mark Andrews's avatar
Mark Andrews committed
927
		emiterr(summary->zone, summary->ns, "AAAA nxdomain");
928 929 930
		freesummary(summary);
		return;
	}
931 932
	if (summary->type == ns_t_aaaa &&
	    summary->failedaaaa && summary->nxdomaina) {
Mark Andrews's avatar
Mark Andrews committed
933
		emiterr(summary->zone, summary->ns, "A nxdomain");
934 935 936
		freesummary(summary);
		return;
	}
937
	if (summary->type == ns_t_ns && summary->nodata) {
Mark Andrews's avatar
Mark Andrews committed
938
		emiterr(summary->zone, NULL, "no NS records found");
939 940 941
		freesummary(summary);
		return;
	}
942

Mark Andrews's avatar
Mark Andrews committed
943
	if (summary->done || summary->nodataa || summary->nodataaaaa) {
Mark Andrews's avatar
Mark Andrews committed
944
		freesummary(summary);
945 946
		return;
	}
Mark Andrews's avatar
Mark Andrews committed
947

948
	if (summary->type != 0 && summary->nxdomain) {
Mark Andrews's avatar
Mark Andrews committed
949 950 951 952 953 954
		if (summary->type == ns_t_a)
			emiterr(summary->zone, NULL, "NS nxdomain");
		if (summary->type == ns_t_a)
			emiterr(summary->zone, summary->ns, "A nxdomain");
		if (summary->type == ns_t_aaaa)
			emiterr(summary->zone, summary->ns, "AAAA nxdomain");
Mark Andrews's avatar
Mark Andrews committed
955
		freesummary(summary);
956 957 958
		return;
	}
	if (summary->type == ns_t_a) {
Mark Andrews's avatar
Mark Andrews committed
959
		emiterr(summary->zone, summary->ns, "A lookup failed");
Mark Andrews's avatar
Mark Andrews committed
960
		freesummary(summary);
961 962 963
		return;
	}
	if (summary->type == ns_t_aaaa) {
Mark Andrews's avatar
Mark Andrews committed
964
		emiterr(summary->zone, summary->ns, "AAAA lookup failed");
Mark Andrews's avatar
Mark Andrews committed
965
		freesummary(summary);
966 967 968
		return;
	}
	if (summary->type == ns_t_ns) {
Mark Andrews's avatar
Mark Andrews committed
969
		emiterr(summary->zone, NULL, "NS lookup failed");
Mark Andrews's avatar
Mark Andrews committed
970
		freesummary(summary);
971 972
		return;
	}
973

974 975 976 977 978
	if (summary->seenopt && (summary->allrefused && summary->allservfail))
		summary->seenedns = 1;

	if (summary->type != 0 || (summary->allok && bad) ||
	    (!summary->seenfailure && !summary->seenedns && ednsonly)) {
Mark Andrews's avatar
Mark Andrews committed
979
		freesummary(summary);
Mark Andrews's avatar
Mark Andrews committed
980 981 982
		return;
	}

983 984 985 986 987
	switch (summary->storage.ss_family) {
	case AF_INET: addr = &s->sin_addr; break;
	case AF_INET6: addr = &s6->sin6_addr; break;
	default: addr = NULL; break;
	}
Mark Andrews's avatar
Mark Andrews committed
988

989
	if (addr == NULL)
990
		strncpy(addrbuf, "<unknown>", sizeof(addrbuf));
991 992 993 994
	else
		inet_ntop(summary->storage.ss_family, addr,
			  addrbuf, sizeof(addrbuf));

995
	x = -1;
Mark Andrews's avatar
Mark Andrews committed
996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015
	if (json) {
		int first = 1;
		if (jdata)
			jsonadd(&jdata, ",\n", &jdata_len);
		jsonsafe(summary->zone[0] ? summary->zone : ".", safe, sizeof(safe));
		snprintf(buf, sizeof(buf), "{ \"zone\": \"%s\"", safe);
		jsonadd(&jdata, buf, &jdata_len);
		snprintf(buf, sizeof(buf), ", \"address\": \"%s\"", addrbuf);
		jsonadd(&jdata, buf, &jdata_len);
		if (strcmp(summary->ns, ".") != 0) {
			jsonsafe(summary->ns, safe, sizeof(safe));
				snprintf(buf, sizeof(buf), ", \"servername\": \"%s\"", safe);
				jsonadd(&jdata, buf, &jdata_len);
		}
		if (allok && summary->allok) {
			jsonadd(&jdata, ", \"summary\": \"all ok\" }", &jdata_len);
			freesummary(summary);
			return;
		}
		jsonadd(&jdata, ", \"tests\": { ", &jdata_len);
Mark Andrews's avatar
Mark Andrews committed
1016
		for (i = 0; i < sizeof(opts)/sizeof(opts[0]); i++) {
1017
			if ((opts[i].what & what) == 0)
Mark Andrews's avatar
Mark Andrews committed
1018
				continue;
Mark Andrews's avatar
Mark Andrews committed
1019
			if (summary->results[i][0] == 0)
Mark Andrews's avatar
Mark Andrews committed
1020 1021
				strncat(summary->results[i], "skipped", 100);
			first = 0;
Mark Andrews's avatar
Mark Andrews committed
1022 1023 1024 1025 1026 1027
			if (strcmp(opts[i].name, "do") == 0)
				x = i;
			if (strcmp(opts[i].name, "ednstcp") == 0 && x != -1 &&
			    (!badtag || (strcmp(summary->results[x], "ok") != 0 &&
					 strncmp(summary->results[x], "ok,", 3) != 0)))
			{
Mark Andrews's avatar
Mark Andrews committed
1028 1029 1030 1031 1032 1033 1034
				if (!first)
					jsonadd(&jdata, ", ", &jdata_len);
				snprintf(buf, sizeof(buf), "\"signed\": \"%s%s\"",
					 summary->results[x],
					 summary->seenrrsig ? ",yes" : "");
				jsonadd(&jdata, buf, &jdata_len);
				first = 0;
Mark Andrews's avatar
Mark Andrews committed
1035 1036 1037 1038 1039 1040
			}
			if (badtag) {
				if (strcmp(summary->results[i], "ok") == 0 ||
				    strncmp(summary->results[i], "ok,", 3) == 0)
					continue;
			}
Mark Andrews's avatar
Mark Andrews committed
1041 1042 1043 1044 1045 1046
			if (!first)
				jsonadd(&jdata, ", ", &jdata_len);
				snprintf(buf, sizeof(buf), "\"%s\": \"%s\"", opts[i].name,
					 summary->results[i]);
			jsonadd(&jdata, buf, &jdata_len);
			first = 0;
Mark Andrews's avatar
Mark Andrews committed
1047
		}
Mark Andrews's avatar
Mark Andrews committed
1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083
		jsonadd(&jdata, " }", &jdata_len);
		if (printnsid && summary->nsidlen != 0U) {
                        jsonsafe(summary->nsid, safe, sizeof(safe));
                        snprintf(buf, sizeof(buf), ", \"nsid\": \"%s\"", safe);
                        jsonadd(&jdata, buf, &jdata_len);
                }
		jsonadd(&jdata, " }", &jdata_len);
		freesummary(summary);
		return;
	}
	printf("%s. @%s (%s.):", summary->zone, addrbuf, summary->ns);
	if (allok && summary->allok)
		printf(" all ok");
	else
		for (i = 0; i < sizeof(opts)/sizeof(opts[0]); i++) {
		if ((opts[i].what & what) == 0)
			continue;
		if (summary->results[i][0] == 0)
			strncpy(summary->results[i], "skipped", 100);
		if (strcmp(opts[i].name, "do") == 0)
			x = i;
		if (strcmp(opts[i].name, "ednstcp") == 0 && x != -1 &&
		    (!badtag || (strcmp(summary->results[x], "ok") != 0 &&
				 strncmp(summary->results[x], "ok,", 3) != 0)))
		{
			printf(" signed=%s", summary->results[x]);
			if (summary->seenrrsig)
				printf(",yes");
		}
		if (badtag) {
			if (strcmp(summary->results[i], "ok") == 0 ||
			    strncmp(summary->results[i], "ok,", 3) == 0)
				continue;
		}
		printf(" %s=%s", opts[i].name, summary->results[i]);
	}
Mark Andrews's avatar
Mark Andrews committed
1084
	if (printnsid && summary->nsidlen != 0U) {
1085 1086 1087 1088 1089 1090 1091 1092 1093
		printf(" (");
		for (i = 0; i < summary->nsidlen; i++) {
			if (isprint(summary->nsid[i] & 0xff))
				putchar(summary->nsid[i]);
			else
				putchar('.');
		}
		printf(")");
	}
1094
	printf("\n");
Mark Andrews's avatar
Mark Andrews committed
1095 1096 1097 1098 1099 1100
	freesummary(summary);
}

static void
report(struct summary *summary) {

Mark Andrews's avatar
Mark Andrews committed
1101 1102 1103 1104
	/*
	 * Send the next test now that we have completed the last test.
	 */
	if (serial && summary->type == 0 && summary->tests == 1) {
1105 1106 1107
		for (summary->last++;
		     summary->last < sizeof(opts)/sizeof(opts[0]);
		     summary->last++) {
Mark Andrews's avatar
Mark Andrews committed
1108
			struct workitem *item;
1109
			if ((opts[summary->last].what & what) == 0)
Mark Andrews's avatar
Mark Andrews committed
1110 1111 1112 1113 1114
				continue;
			item = calloc(1, sizeof(*item));
			if (item == NULL)
				continue;
			item->summary = summary;
1115
			item->test = item->summary->last;
1116
			item->tcpfd = -1;
Mark Andrews's avatar
Mark Andrews committed
1117 1118 1119 1120 1121
			dotest(item);
			return;
		}
	}

Mark Andrews's avatar
Mark Andrews committed
1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133
	/*
	 * Have all the tests completed?
	 */
	summary->tests--;
	if (summary->tests)
		return;

	/*
	 * If we are cross linked record the lookup details on the other
	 * structure.
	 */
	if (summary->xlink) {
1134 1135 1136 1137 1138 1139 1140 1141
		if (summary->cnamea) {
			summary->xlink->cnamea = 1;
			summary->done = 1;
		}
		if (summary->cnameaaaa) {
			summary->xlink->cnameaaaa = 1;
			summary->done = 1;
		}
Mark Andrews's avatar
Mark Andrews committed
1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157
		if (summary->nodataa) {
			summary->xlink->nodataa = 1;
			summary->done = 1;
		}
		if (summary->nodataaaaa) {
			summary->xlink->nodataaaaa = 1;
			summary->done = 1;
		}
		if (summary->nxdomaina) {
			summary->xlink->nxdomaina = 1;
			summary->done = 1;
		}
		if (summary->nxdomainaaaa) {
			summary->xlink->nxdomainaaaa = 1;
			summary->done = 1;
		}
1158 1159 1160 1161 1162 1163 1164 1165 1166 1167
		if (!summary->done) {
			if (summary->type == ns_t_a) {
				summary->xlink->faileda = 1;
				summary->done = 1;
			}
			if (summary->type == ns_t_aaaa) {
				summary->xlink->failedaaaa = 1;
				summary->done = 1;
			}
		}
Mark Andrews's avatar
Mark Andrews committed
1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178

		/*
		 * Remove the cross link.
		 */
		summary->xlink->xlink = NULL;
		summary->xlink = NULL;
		if (summary->done) {
			freesummary(summary);
			goto print_deferred;
		}
	}
1179 1180 1181 1182 1183 1184
	if (!summary->done) {
		if (summary->type == ns_t_a)
			summary->faileda = 1;
		if (summary->type == ns_t_aaaa)
			summary->failedaaaa = 1;
	}
Mark Andrews's avatar
Mark Andrews committed
1185 1186 1187 1188 1189 1190 1191 1192 1193 1194

	if (inorder && PREV(summary, link)) {
		summary->deferred = 1;
		return;
	}
	printandfree(summary);

 print_deferred:
	while ((summary = HEAD(summaries)) && summary->deferred)
		printandfree(summary);
1195 1196
}

Mark Andrews's avatar
Mark Andrews committed
1197 1198 1199
/*
 * Free a work item and unlink.
 */
1200 1201
static void
freeitem(struct workitem * item) {
Mark Andrews's avatar
Mark Andrews committed
1202 1203
	if (item->summary)
		report(item->summary);
1204
	if (item->tcpfd != -1) {
1205 1206 1207 1208 1209 1210 1211 1212 1213 1214
		FD_CLR(item->tcpfd, &rfds);
		FD_CLR(item->tcpfd, &wfds);
		rhandlers[item->tcpfd] = NULL;
		whandlers[item->tcpfd] = NULL;
		close(item->tcpfd);
	}
	if (item->outstanding)
		outstanding--;
	if (LINKED(item, link))
		UNLINK(work, item, link);
Mark Andrews's avatar
Mark Andrews committed
1215 1216
	if (LINKED(item, plink))
		UNLINK(pending, item, plink);
1217 1218 1219 1220 1221 1222
	if (LINKED(item, rlink))
		UNLINK(reading, item, rlink);
	if (LINKED(item, clink))
		UNLINK(connecting, item, clink);
	if (LINKED(item, idlink))
		UNLINK(ids[item->id], item, idlink);
1223 1224
	if (LINKED(item, seqlink))
		UNLINK(seq[item->id], item, seqlink);
1225 1226 1227
	free(item);
}

Mark Andrews's avatar
Mark Andrews committed
1228 1229 1230
/*
 * Add a tag to the report.
 */
1231
static void
1232
addtag(struct workitem *item, const char *tag) {
1233
	char *result = item->summary->results[item->test];
1234 1235
	if (result[0]) strncat(result, ",", 100);
	strncat(result, tag, 100);
1236 1237
}

Mark Andrews's avatar
Mark Andrews committed
1238
/*
Mark Andrews's avatar
Mark Andrews committed
1239
 * Resend a UDP/ICMP request.
Mark Andrews's avatar
Mark Andrews committed
1240
 */
1241 1242 1243
static void
resend(struct workitem *item) {
	int n, fd = -1;
1244
	socklen_t ss_len;
1245 1246 1247

	switch (item->summary->storage.ss_family) {
	case AF_INET:
Mark Andrews's avatar
Mark Andrews committed
1248 1249 1250 1251
		if (item->icmp)
			fd = icmp4;
		else
			fd = udp4;
1252
		ss_len = sizeof(struct sockaddr_in);
1253 1254
		break;
	case AF_INET6:
Mark Andrews's avatar
Mark Andrews committed
1255 1256 1257 1258
		if (item->icmp)
			fd = icmp6;
		else
			fd = udp6;
1259
		ss_len = sizeof(struct sockaddr_in6);
1260 1261 1262 1263 1264
		break;
	}

	if (fd == -1) {
		addtag(item, "skipped");
1265
		item->summary->allok = 0;
1266 1267 1268 1269
		freeitem(item);
		return;
	}

1270
	if (!item->outstanding && outstanding > maxoutstanding) {
1271 1272
		gettimeofday(&item->when, NULL);
		item->when.tv_sec += 1;
Mark Andrews's avatar
Mark Andrews committed
1273 1274 1275
		if (LINKED(item, link))
			UNLINK(work, item, link);
		APPEND(pending, item, plink);
1276 1277 1278 1279
		return;
	}

	n = sendto(fd, item->buf, item->buflen, 0,
1280
		   (struct sockaddr *)&item->summary->storage, ss_len);
1281 1282 1283 1284 1285 1286 1287 1288
	if (n > 0) {
		if (debug)
			printf("resend %s rdlen=%u udpsize=%u flags=%04x "
			       "version=%u tcp=%u ignore=%u id=%u\n",
			       opts[item->test].name, opts[item->test].rdlen,
			       opts[item->test].udpsize, opts[item->test].flags,
			       opts[item->test].version, opts[item->test].tcp,
			       opts[item->test].ignore, item->id);
1289
		sent++;
1290 1291 1292 1293 1294
		if (!item->outstanding++)
			outstanding++;
		gettimeofday(&item->when, NULL);
		item->when.tv_sec += 1;
		item->sends++;
Mark Andrews's avatar
Mark Andrews committed
1295 1296
		if (LINKED(item, link))
			UNLINK(work, item, link);
1297
		APPEND(work, item, link);
1298