genreport.c 106 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;
Mark Andrews's avatar
Mark Andrews committed
126
static int unique = 0;
127

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

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

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

Mark Andrews's avatar
Mark Andrews committed
143 144 145
/*
 * Doubly linked list macros.
 */
Mark Andrews's avatar
Mark Andrews committed
146 147 148 149 150 151 152 153
#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
154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176
	(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
177
		(item)->link.linked = 1; \
Mark Andrews's avatar
Mark Andrews committed
178
	} \
Mark Andrews's avatar
Mark Andrews committed
179 180 181 182 183 184 185 186 187 188 189 190
} 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; \
191
	(item)->link.linked = 0; \
Mark Andrews's avatar
Mark Andrews committed
192 193 194
} while (0)

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

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

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

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

static int what = EDNS;
215

Mark Andrews's avatar
Mark Andrews committed
216
static struct {
Mark Andrews's avatar
Mark Andrews committed
217 218 219 220 221 222 223 224
	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 */
225
	unsigned int cookie;		/* opt record has cookie */
Mark Andrews's avatar
Mark Andrews committed
226 227 228 229 230 231 232 233 234 235
	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
236
	const char *dig;		/* dig command */
237
} opts[] = {
238
	/*                           size   eflgs vr  T ck ig tc rd ra cd ad aa  z  op  type */
Mark Andrews's avatar
Mark Andrews committed
239 240 241 242 243 244 245
	{ "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
246
	  "dig +noedns +ad +norec SOA <zone>"
Mark Andrews's avatar
Mark Andrews committed
247 248 249 250 251
	},
	{ "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,
252
	  "### dig +noedns +noad +norec +raflag SOA <zone> ###"
Mark Andrews's avatar
Mark Andrews committed
253 254 255 256 257
	},
	{ "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,
258
	  "### dig +noedns +noad +norec +tcflag SOA <zone> ###"
Mark Andrews's avatar
Mark Andrews committed
259 260 261 262 263 264 265 266
	},
	{ "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,
267
	  "### dig +noedns +header-only +opcode=15 +tcflag +rec +raflag +cd +ad +aaflag +zflag ###"
Mark Andrews's avatar
Mark Andrews committed
268 269 270 271 272 273 274
	},
	{ "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>"
	},
275 276

	/*                           size   eflgs vr  T ck ig tc rd ra cd ad aa  z  op  type */
Mark Andrews's avatar
Mark Andrews committed
277 278 279 280 281 282 283 284 285
	{ "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
286
	{ "ednsopt",   EDNS,  4, "\x00\x64\x00\x00",	/* 100 */
Mark Andrews's avatar
Mark Andrews committed
287 288 289
				     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
290
	{ "edns1opt",  EDNS,  4, "\x00\x64\x00\x00",	/* 100 */
Mark Andrews's avatar
Mark Andrews committed
291 292 293
				     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>"
	},
294
	{ "do",        EDNS,  0, "",
Mark Andrews's avatar
Mark Andrews committed
295 296 297
				     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
298 299 300 301
	{ "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
302 303 304 305 306 307
	{ "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>"
	},
308
	{ "optlist",   EDNS,  4 + 8 + 4 + 12,
309 310 311 312
	  "\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
313 314 315
				     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>"
	},
316 317

	/*                           size   eflgs vr  T ck ig tc rd ra cd ad aa  z  op  type */
Mark Andrews's avatar
Mark Andrews committed
318
	{ "ednsnsid", FULL,  4, "\x00\x03\x00\x00",	/* NSID */
Mark Andrews's avatar
Mark Andrews committed
319 320 321
				     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
322
	{ "ednscookie", FULL, 12, "\x00\x0a\x00\x08\x01\x02\x03\x04\x05\x06\x07\x08", /* COOKIE */
Mark Andrews's avatar
Mark Andrews committed
323 324 325
				     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
326
	{ "ednsexpire", FULL, 4, "\x00\x09\x00\x00",	/* EXPIRE */
Mark Andrews's avatar
Mark Andrews committed
327 328 329
				     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
330
	{ "ednssubnet", FULL,  8, "\x00\x08\x00\x04\x00\x01\x00\x00",	/* ECS */
Mark Andrews's avatar
Mark Andrews committed
331 332 333 334
				     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
335
	{ "edns1nsid", FULL,  4, "\x00\x03\x00\x00",	/* NSID */
Mark Andrews's avatar
Mark Andrews committed
336 337 338
				     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
339
	{ "edns1cookie", FULL, 12, "\x00\x0a\x00\x08\x01\x02\x03\x04\x05\x06\x07\x08", /* COOKIE */
Mark Andrews's avatar
Mark Andrews committed
340 341 342
				     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
343
	{ "edns1expire", FULL, 4, "\x00\x09\x00\x00",	/* EXPIRE */
Mark Andrews's avatar
Mark Andrews committed
344 345 346
				     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
347
	{ "edns1subnet", FULL,  8, "\x00\x08\x00\x04\x00\x01\x00\x00",	/* ECS */
Mark Andrews's avatar
Mark Andrews committed
348 349 350 351 352 353
				     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>"
	},
354 355

	/*                           size   eflgs vr  T ck ig tc rd ra cd ad aa  z  op  type */
Mark Andrews's avatar
Mark Andrews committed
356
	{ "bind11",    COMM, 12, "\x00\x0a\x00\x08\x01\x02\x03\x04\x05\x06\x07\x08", /* COOKIE */
Mark Andrews's avatar
Mark Andrews committed
357 358 359
				     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
360
	{ "dig11",     COMM, 12, "\x00\x0a\x00\x08\x01\x02\x03\x04\x05\x06\x07\x08", /* COOKIE */
Mark Andrews's avatar
Mark Andrews committed
361 362 363
				     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>"
	},
364

Mark Andrews's avatar
Mark Andrews committed
365 366 367 368
	{ "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
369 370 371 372
	{ "icmp",	NONE,  0, "",    0, 0x0000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,  0, 0,
	  "ping / ping6"
	},

373
	/*                           size   eflgs vr  T ck ig tc rd ra cd ad aa  z  op  type */
Mark Andrews's avatar
Mark Andrews committed
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 415
	{ "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>"
	},
416 417

	/*                           size   eflgs vr  T ck ig tc rd ra cd ad aa  z  op  type */
Mark Andrews's avatar
Mark Andrews committed
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 462
	{ "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>"
	},
463 464

	/*                           size   eflgs vr  T ck ig tc rd ra cd ad aa  z  op  type */
Mark Andrews's avatar
Mark Andrews committed
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 503
	{ "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>"
	},
504 505

	/*                           size   eflgs vr  T ck ig tc rd ra cd ad aa  z  op  type */
Mark Andrews's avatar
Mark Andrews committed
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 544
	{ "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>"
	},
545 546

	/*                           size   eflgs vr  T ck ig tc rd ra cd ad aa  z  op  type */
Mark Andrews's avatar
Mark Andrews committed
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 576
	{ "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>"
	}
577 578
};

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

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

Mark Andrews's avatar
Mark Andrews committed
627 628 629 630
struct workitem {
	struct {
		struct workitem *next;
		struct workitem *prev;
631
		int linked;
632
	} link, clink, plink, rlink, idlink, seqlink;
Mark Andrews's avatar
Mark Andrews committed
633 634 635
	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
636 637 638
	int test;			/* test number / server number */
	int sends;			/* number of times this UDP request
					 * has been sent */
Mark Andrews's avatar
Mark Andrews committed
639 640
	int buflen;			/* the size of the request to be sent */
	int tcpfd;			/* the tcp file descriptor */
Mark Andrews's avatar
Mark Andrews committed
641 642
	int outstanding;		/* outstanding has been set */
	int havelen;			/* readlen is tcp message length */
Mark Andrews's avatar
Mark Andrews committed
643 644
	int readlen;			/* how much we need to read */
	int read;			/* how much has been read so far */
Mark Andrews's avatar
Mark Andrews committed
645
	int icmp;			/* this is a icmp echo request */
Mark Andrews's avatar
Mark Andrews committed
646 647
	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
648
	unsigned char mac[32];		/* tsig hmac-sha256 mac */
Mark Andrews's avatar
Mark Andrews committed
649
	struct summary *summary;	/* where this test is summaried */
Mark Andrews's avatar
Mark Andrews committed
650 651
};

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

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

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

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

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

Mark Andrews's avatar
Mark Andrews committed
682 683 684 685 686 687 688 689 690 691 692 693 694 695 696
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
697
#ifdef HAVE_STRLCAT
Mark Andrews's avatar
Mark Andrews committed
698
	strlcat(*json, str, *len);
Mark Andrews's avatar
Mark Andrews committed
699 700 701
#else
	strncat(*json, str, *len - strlen(*json) - 1);
#endif
Mark Andrews's avatar
Mark Andrews committed
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 766
}

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
767 768 769 770 771
static int
storage_equal(struct sockaddr_storage *s1, struct sockaddr_storage *s2) {
	struct sockaddr_in *sin1, *sin2;
	struct sockaddr_in6 *sin61, *sin62;

772
	if (s1->ss_family != s2->ss_family)
Mark Andrews's avatar
Mark Andrews committed
773 774 775 776 777 778
		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
779

Mark Andrews's avatar
Mark Andrews committed
780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795
		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
796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841
static int
sentto(struct sockaddr_storage *s) {
	struct sockaddr_in *sin;
	struct sockaddr_in6 *sin6;
	static struct listitem {
		struct listitem *next;
		struct sockaddr_storage s;
	} *table[100000] = { NULL }, *item = NULL;
	unsigned int hash = 0;
	
	switch (s->ss_family) {
	case AF_INET:
		sin = (struct sockaddr_in *)s;
		hash = sin->sin_addr.s_addr;
		break;
	case AF_INET6:
		sin6 = (struct sockaddr_in6 *)s;
		
#ifndef s6_addr32
#  if defined(__sun)
#    define s6_addr32   _S6_un._S6_u32
#  elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__)|| defined(__DragonFly__)
#    define s6_addr32   __u6_addr.__u6_addr32
#  else
#    error s6_addr32 needs to be defined.
#  endif
#endif
		hash = sin6->sin6_addr.s6_addr32[0] ^ sin6->sin6_addr.s6_addr32[1] ^
		       sin6->sin6_addr.s6_addr32[2] ^ sin6->sin6_addr.s6_addr32[3];
		break;
	}

	hash %= 100000;
	for (item = table[hash]; item != NULL; item = item->next) {
		if (storage_equal(&item->s, s))
			return (1);
	}
	item = calloc(1, sizeof(*item));
	if (item == NULL)
		return (0);
	item->next = table[hash];
	item->s = *s;
	table[hash] = item;
	return (0);
}

Mark Andrews's avatar
Mark Andrews committed
842 843 844
/*
 * Check if it is safe to use this id to this address.
 */
Mark Andrews's avatar
Mark Andrews committed
845 846 847 848 849 850
static int
checkid(struct sockaddr_storage *storage, int id) {
	struct workitem *item;

	item = HEAD(ids[id]);
	while (item != NULL &&
851
	       !storage_equal(storage, &item->summary->storage))
Mark Andrews's avatar
Mark Andrews committed
852 853 854 855
		item = NEXT(item, idlink);
	return ((item == NULL) ? 1 : 0);
}

856 857 858 859 860 861 862 863 864 865 866 867 868 869 870
/*
 * 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
871 872 873 874 875 876 877
static void
freesummary(struct summary *summary) {
	if (LINKED(summary, link))
		UNLINK(summaries, summary, link);
	free(summary);
}

Mark Andrews's avatar
Mark Andrews committed
878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905
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
906 907 908
/*
 * Generate a report line.
 */
909
static void
Mark Andrews's avatar
Mark Andrews committed
910
printandfree(struct summary *summary) {
911 912 913
	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
914 915
	char buf[2048];
	char safe[1024];
916 917 918 919 920
	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
921
	    summary->nodataa && summary->nodataaaaa) {
Mark Andrews's avatar
Mark Andrews committed
922
		emiterr(summary->zone, summary->ns, "no address records found");
Mark Andrews's avatar
Mark Andrews committed
923
		freesummary(summary);
924 925
		return;
	}
926

927 928
	if ((summary->type == ns_t_a || summary->type == ns_t_aaaa) &&
	    summary->nxdomaina && summary->nxdomainaaaa) {
Mark Andrews's avatar
Mark Andrews committed
929
		emiterr(summary->zone, summary->ns, "no address records found (NXDOMAIN)");
Mark Andrews's avatar
Mark Andrews committed
930
		freesummary(summary);
931 932
		return;
	}
933

934 935
	if ((summary->type == ns_t_a || summary->type == ns_t_aaaa) &&
	    summary->faileda && summary->failedaaaa) {
Mark Andrews's avatar
Mark Andrews committed
936
		emiterr(summary->zone, summary->ns, "address lookups failed");
937 938 939 940
		freesummary(summary);
		return;
	}

941 942
	if ((summary->type == ns_t_a || summary->type == ns_t_aaaa) &&
	    (summary->cnamea || summary->cnameaaaa)) {
Mark Andrews's avatar
Mark Andrews committed
943 944 945 946
		snprintf(buf, sizeof(buf), "nameserver is a CNAME%s%s\n",
			 summary->targetok ? summary->target : "",
			 summary->targetok ? "'" : "");
		emiterr(summary->zone, summary->ns, buf);
947 948 949 950
		freesummary(summary);
		return;
	}

Mark Andrews's avatar
Mark Andrews committed
951
	if ((summary->type == ns_t_ns) && summary->cname) {
Mark Andrews's avatar
Mark Andrews committed
952
		emiterr(summary->zone, summary->ns, "zone is a CNAME");
Mark Andrews's avatar
Mark Andrews committed
953 954 955 956
		freesummary(summary);
		return;
	}

957 958 959
	/*
	 * Do deferred xlink failure reports.
	 */
960 961
	if (summary->type == ns_t_a &&
	    summary->nodataa && summary->failedaaaa) {
Mark Andrews's avatar
Mark Andrews committed
962
		emiterr(summary->zone, summary->ns, "AAAA lookup failed");
963 964 965
		freesummary(summary);
		return;
	}
966 967
	if (summary->type == ns_t_aaaa &&
	    summary->nodataaaaa && summary->faileda) {
Mark Andrews's avatar
Mark Andrews committed
968
		emiterr(summary->zone, summary->ns, "A lookup failed");
969 970 971
		freesummary(summary);
		return;
	}
972 973
	if (summary->type == ns_t_a &&
	    summary->faileda && summary->nxdomainaaaa) {
Mark Andrews's avatar
Mark Andrews committed
974
		emiterr(summary->zone, summary->ns, "AAAA nxdomain");
975 976 977
		freesummary(summary);
		return;
	}
978 979
	if (summary->type == ns_t_aaaa &&
	    summary->failedaaaa && summary->nxdomaina) {
Mark Andrews's avatar
Mark Andrews committed
980
		emiterr(summary->zone, summary->ns, "A nxdomain");
981 982 983
		freesummary(summary);
		return;
	}
984
	if (summary->type == ns_t_ns && summary->nodata) {
Mark Andrews's avatar
Mark Andrews committed
985
		emiterr(summary->zone, NULL, "no NS records found");
986 987 988
		freesummary(summary);
		return;
	}
989

Mark Andrews's avatar
Mark Andrews committed
990
	if (summary->done || summary->nodataa || summary->nodataaaaa) {
Mark Andrews's avatar
Mark Andrews committed
991
		freesummary(summary);
992 993
		return;
	}
Mark Andrews's avatar
Mark Andrews committed
994

995
	if (summary->type != 0 && summary->nxdomain) {
Mark Andrews's avatar
Mark Andrews committed
996 997 998 999 1000 1001
		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
1002
		freesummary(summary);
1003 1004 1005
		return;
	}
	if (summary->type == ns_t_a) {
Mark Andrews's avatar
Mark Andrews committed
1006
		emiterr(summary->zone, summary->ns, "A lookup failed");
Mark Andrews's avatar
Mark Andrews committed
1007
		freesummary(summary);
1008 1009 1010
		return;
	}
	if (summary->type == ns_t_aaaa) {
Mark Andrews's avatar
Mark Andrews committed
1011
		emiterr(summary->zone, summary->ns, "AAAA lookup failed");
Mark Andrews's avatar
Mark Andrews committed
1012
		freesummary(summary);
1013 1014 1015
		return;
	}
	if (summary->type == ns_t_ns) {
Mark Andrews's avatar
Mark Andrews committed
1016
		emiterr(summary->zone, NULL, "NS lookup failed");
Mark Andrews's avatar
Mark Andrews committed
1017
		freesummary(summary);
1018 1019
		return;
	}
1020

1021 1022 1023 1024 1025
	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
1026
		freesummary(summary);
Mark Andrews's avatar
Mark Andrews committed
1027 1028 1029
		return;
	}

1030 1031 1032 1033 1034
	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
1035

1036
	if (addr == NULL)
1037
		strncpy(addrbuf, "<unknown>", sizeof(addrbuf));
1038 1039 1040 1041
	else
		inet_ntop(summary->storage.ss_family, addr,
			  addrbuf, sizeof(addrbuf));

1042
	x = -1;
Mark Andrews's avatar
Mark Andrews committed
1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062
	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
1063
		for (i = 0; i < sizeof(opts)/sizeof(opts[0]); i++) {
1064
			if ((opts[i].what & what) == 0)
Mark Andrews's avatar
Mark Andrews committed
1065
				continue;
Mark Andrews's avatar
Mark Andrews committed
1066
			if (summary->results[i][0] == 0)
Mark Andrews's avatar
Mark Andrews committed
1067 1068
				strncat(summary->results[i], "skipped", 100);
			first = 0;
Mark Andrews's avatar
Mark Andrews committed
1069 1070 1071 1072 1073 1074
			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
1075 1076 1077 1078 1079 1080 1081
				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
1082 1083 1084 1085 1086 1087
			}
			if (badtag) {
				if (strcmp(summary->results[i], "ok") == 0 ||
				    strncmp(summary->results[i], "ok,", 3) == 0)
					continue;
			}
Mark Andrews's avatar
Mark Andrews committed
1088 1089 1090 1091 1092 1093
			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
1094
		}
Mark Andrews's avatar
Mark Andrews committed
1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130
		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
1131
	if (printnsid && summary->nsidlen != 0U) {
1132 1133 1134 1135 1136 1137 1138 1139 1140
		printf(" (");
		for (i = 0; i < summary->nsidlen; i++) {
			if (isprint(summary->nsid[i] & 0xff))
				putchar(summary->nsid[i]);
			else
				putchar('.');
		}
		printf(")");
	}
1141
	printf("\n");
Mark Andrews's avatar
Mark Andrews committed
1142 1143 1144 1145 1146 1147
	freesummary(summary);
}

static void
report(struct summary *summary) {

Mark Andrews's avatar
Mark Andrews committed
1148 1149 1150 1151
	/*
	 * Send the next test now that we have completed the last test.
	 */
	if (serial && summary->type == 0 && summary->tests == 1) {
1152 1153 1154
		for (summary->last++;
		     summary->last < sizeof(opts)/sizeof(opts[0]);
		     summary->last++) {
Mark Andrews's avatar
Mark Andrews committed
1155
			struct workitem *item;
1156
			if ((opts[summary->last].what & what) == 0)
Mark Andrews's avatar
Mark Andrews committed
1157 1158 1159 1160 1161
				continue;
			item = calloc(1, sizeof(*item));
			if (item == NULL)
				continue;
			item->summary = summary;
1162
			item->test = item->summary->last;
1163
			item->tcpfd = -1;
Mark Andrews's avatar
Mark Andrews committed
1164 1165 1166 1167 1168
			dotest(item);
			return;
		}
	}

Mark Andrews's avatar
Mark Andrews committed
1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180
	/*
	 * 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) {
1181 1182 1183 1184 1185 1186 1187 1188
		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
1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204
		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;
		}
1205 1206 1207 1208 1209 1210 1211 1212 1213 1214
		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
1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225

		/*
		 * Remove the cross link.
		 */
		summary->xlink->xlink = NULL;
		summary->xlink = NULL;
		if (summary->done) {
			freesummary(summary);
			goto print_deferred;
		}
	}
1226 1227 1228 1229 1230 1231
	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
1232 1233 1234 1235 1236 1237 1238 1239 1240 1241

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

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

Mark Andrews's avatar
Mark Andrews committed
1244 1245 1246
/*
 * Free a work item and unlink.
 */
1247 1248
static void
freeitem(struct workitem * item) {
Mark Andrews's avatar
Mark Andrews committed
1249 1250
	if (item->summary)
		report(item->summary);
1251
	if (item->tcpfd != -1) {
1252 1253 1254 1255 1256 1257 1258 1259 1260 1261
		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
1262 1263
	if (LINKED(item, plink))
		UNLINK(pending, item, plink);
1264 1265 1266 1267 1268 1269
	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);
1270 1271
	if (LINKED(item, seqlink))
		UNLINK(seq[item->id], item, seqlink);
1272 1273 1274
	free(item);
}

Mark Andrews's avatar
Mark Andrews committed
1275 1276 1277
/*
 * Add a tag to the report.
 */
1278
static void
1279
addtag(struct workitem *item, const char *tag) {
1280
	char *result = item->summary->results[item->test];
1281 1282
	if (result[0]) strncat(result, ",", 100);
	strncat(result, tag, 100);
1283 1284
}

Mark Andrews's avatar
Mark Andrews committed
1285
/*
Mark Andrews's avatar
Mark Andrews committed
1286
 * Resend a UDP/ICMP request.
Mark Andrews's avatar
Mark Andrews committed
1287
 */
1288 1289 1290
static void
resend(struct workitem *item) {
	int n, fd = -1;
1291
	socklen_t ss_len;
1292 1293 1294

	switch (item->summary->storage.ss_family) {
	case AF_INET:
Mark Andrews's avatar
Mark Andrews committed
1295 1296 1297 1298
		if (item->icmp)
			fd = icmp4;
		else
			fd = udp4;
1299
		ss_len = sizeof(struct sockaddr_in);
1300 1301
		break;
	case AF_INET6:
Mark Andrews's avatar
Mark Andrews committed
1302 1303 1304 1305
		if (item->icmp)
			fd = icmp6;
		else
			fd = udp6;
1306
		ss_len = sizeof(struct sockaddr_in6);
1307 1308 1309 1310 1311
		break;
	}

	if (fd == -1) {
		addtag(item, "skipped");
1312
		item->summary->allok = 0;
1313 1314 1315 1316
		freeitem(item);
		return;
	}

1317
	if (!item->outstanding && outstanding > maxoutstanding) {
1318 1319
		gettimeofday(&item->when, NULL);
		item->when.tv_sec += 1;
Mark Andrews's avatar
Mark Andrews committed
1320 1321 1322
		if (LINKED(item, link))
			UNLINK(work, item, link);
		APPEND(pending, item, plink);
1323 1324 1325 1326
		return;
<