/* \summary: BIND9 Lightweight Resolver protocol printer */
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
#endif
-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"
#include <stdio.h>
#include <string.h>
#include "nameser.h"
/* BIND9 lib/lwres/include/lwres */
-typedef nd_uint32_t lwres_uint32_t;
-typedef nd_uint16_t lwres_uint16_t;
-typedef nd_uint8_t lwres_uint8_t;
+/*
+ * Use nd_uint16_t for lwres_uint16_t
+ * Use nd_uint32_t for lwres_uint32_t
+*/
struct lwres_lwpacket {
- lwres_uint32_t length;
- lwres_uint16_t version;
- lwres_uint16_t pktflags;
- lwres_uint32_t serial;
- lwres_uint32_t opcode;
- lwres_uint32_t result;
- lwres_uint32_t recvlength;
- lwres_uint16_t authtype;
- lwres_uint16_t authlength;
+ nd_uint32_t length;
+ nd_uint16_t version;
+ nd_uint16_t pktflags;
+ nd_uint32_t serial;
+ nd_uint32_t opcode;
+ nd_uint32_t result;
+ nd_uint32_t recvlength;
+ nd_uint16_t authtype;
+ nd_uint16_t authlength;
};
#define LWRES_LWPACKETFLAG_RESPONSE 0x0001U /* if set, pkt is a response */
typedef struct {
/* public */
- lwres_uint16_t datalength;
+ nd_uint16_t datalength;
/* data follows */
} lwres_nooprequest_t;
typedef struct {
/* public */
- lwres_uint16_t datalength;
+ nd_uint16_t datalength;
/* data follows */
} lwres_noopresponse_t;
typedef struct lwres_addr lwres_addr_t;
struct lwres_addr {
- lwres_uint32_t family;
- lwres_uint16_t length;
+ nd_uint32_t family;
+ nd_uint16_t length;
/* address folows */
};
+#define LWRES_ADDR_LEN 6
typedef struct {
/* public */
- lwres_uint32_t flags;
- lwres_uint32_t addrtypes;
- lwres_uint16_t namelen;
+ nd_uint32_t flags;
+ nd_uint32_t addrtypes;
+ nd_uint16_t namelen;
/* name follows */
} lwres_gabnrequest_t;
+#define LWRES_GABNREQUEST_LEN 10
typedef struct {
/* public */
- lwres_uint32_t flags;
- lwres_uint16_t naliases;
- lwres_uint16_t naddrs;
- lwres_uint16_t realnamelen;
+ nd_uint32_t flags;
+ nd_uint16_t naliases;
+ nd_uint16_t naddrs;
+ nd_uint16_t realnamelen;
/* aliases follows */
/* addrs follows */
/* realname follows */
} lwres_gabnresponse_t;
+#define LWRES_GABNRESPONSE_LEN 10
/*
* get name by address
#define LWRES_OPCODE_GETNAMEBYADDR 0x00010002U
typedef struct {
/* public */
- lwres_uint32_t flags;
- lwres_addr_t addr;
- /* addr body follows */
+ nd_uint32_t flags;
+ /* addr follows */
} lwres_gnbarequest_t;
+#define LWRES_GNBAREQUEST_LEN 4
typedef struct {
/* public */
- lwres_uint32_t flags;
- lwres_uint16_t naliases;
- lwres_uint16_t realnamelen;
+ nd_uint32_t flags;
+ nd_uint16_t naliases;
+ nd_uint16_t realnamelen;
/* aliases follows */
/* realname follows */
} lwres_gnbaresponse_t;
+#define LWRES_GNBARESPONSE_LEN 8
/*
* get rdata by name
typedef struct {
/* public */
- lwres_uint32_t flags;
- lwres_uint16_t rdclass;
- lwres_uint16_t rdtype;
- lwres_uint16_t namelen;
+ nd_uint32_t flags;
+ nd_uint16_t rdclass;
+ nd_uint16_t rdtype;
+ nd_uint16_t namelen;
/* name follows */
} lwres_grbnrequest_t;
+#define LWRES_GRBNREQUEST_LEN 10
typedef struct {
/* public */
- lwres_uint32_t flags;
- lwres_uint16_t rdclass;
- lwres_uint16_t rdtype;
- lwres_uint32_t ttl;
- lwres_uint16_t nrdatas;
- lwres_uint16_t nsigs;
+ nd_uint32_t flags;
+ nd_uint16_t rdclass;
+ nd_uint16_t rdtype;
+ nd_uint32_t ttl;
+ nd_uint16_t nrdatas;
+ nd_uint16_t nsigs;
/* realname here (len + name) */
/* rdata here (len + name) */
/* signatures here (len + name) */
} lwres_grbnresponse_t;
+#define LWRES_GRBNRESPONSE_LEN 16
#define LWRDATA_VALIDATED 0x00000001
static int
lwres_printname(netdissect_options *ndo,
- size_t l, const char *p0)
+ size_t l, const u_char *p0)
{
- const char *p;
+ const u_char *p;
size_t i;
p = p0;
/* + 1 for terminating \0 */
- if (p + l + 1 > (const char *)ndo->ndo_snapend)
+ if (p + l + 1 > ndo->ndo_snapend)
goto trunc;
ND_PRINT(" ");
- for (i = 0; i < l; i++)
- safeputchar(ndo, *p++);
+ for (i = 0; i < l; i++) {
+ fn_print_char(ndo, EXTRACT_U_1(p));
+ p++;
+ }
p++; /* skip terminating \0 */
return p - p0;
static int
lwres_printnamelen(netdissect_options *ndo,
- const char *p)
+ const u_char *p)
{
uint16_t l;
int advance;
- if (p + 2 > (const char *)ndo->ndo_snapend)
+ if (p + 2 > ndo->ndo_snapend)
goto trunc;
l = EXTRACT_BE_U_2(p);
advance = lwres_printname(ndo, l, p + 2);
static int
lwres_printbinlen(netdissect_options *ndo,
- const char *p0)
+ const u_char *p0)
{
- const char *p;
+ const u_char *p;
uint16_t l;
int i;
p = p0;
- if (p + 2 > (const char *)ndo->ndo_snapend)
+ if (p + 2 > ndo->ndo_snapend)
goto trunc;
l = EXTRACT_BE_U_2(p);
- if (p + 2 + l > (const char *)ndo->ndo_snapend)
+ if (p + 2 + l > ndo->ndo_snapend)
goto trunc;
p += 2;
- for (i = 0; i < l; i++)
- ND_PRINT("%02x", *p++);
+ for (i = 0; i < l; i++) {
+ ND_PRINT("%02x", EXTRACT_U_1(p));
+ p++;
+ }
return p - p0;
trunc:
static int
lwres_printaddr(netdissect_options *ndo,
- const lwres_addr_t *ap)
+ const u_char *p0)
{
+ const u_char *p;
+ const lwres_addr_t *ap;
uint16_t l;
- const char *p;
int i;
- ND_TCHECK(ap->length);
+ p = p0;
+ ap = (const lwres_addr_t *)p;
+ ND_TCHECK_2(ap->length);
l = EXTRACT_BE_U_2(ap->length);
- /* XXX ap points to packed struct */
- p = (const char *)&ap->length + sizeof(ap->length);
+ p += LWRES_ADDR_LEN;
ND_TCHECK_LEN(p, l);
switch (EXTRACT_BE_U_4(ap->family)) {
if (l < 4)
return -1;
ND_PRINT(" %s", ipaddr_string(ndo, p));
- p += sizeof(struct in_addr);
+ p += sizeof(nd_ipv4);
break;
case 2: /* IPv6 */
if (l < 16)
return -1;
ND_PRINT(" %s", ip6addr_string(ndo, p));
- p += sizeof(struct in6_addr);
+ p += sizeof(nd_ipv6);
break;
default:
ND_PRINT(" %u/", EXTRACT_BE_U_4(ap->family));
- for (i = 0; i < l; i++)
- ND_PRINT("%02x", *p++);
+ for (i = 0; i < l; i++) {
+ ND_PRINT("%02x", EXTRACT_U_1(p));
+ p++;
+ }
}
- return p - (const char *)ap;
+ return p - p0;
trunc:
return -1;
lwres_print(netdissect_options *ndo,
const u_char *bp, u_int length)
{
+ const u_char *p;
const struct lwres_lwpacket *np;
uint32_t v;
- const char *s;
+ const u_char *s;
int response;
int advance;
int unsupported = 0;
+ ndo->ndo_protocol = "lwres";
np = (const struct lwres_lwpacket *)bp;
- ND_TCHECK(np->authlength);
+ ND_TCHECK_2(np->authlength);
ND_PRINT(" lwres");
v = EXTRACT_BE_U_2(np->version);
if (ndo->ndo_vflag || v != LWRES_LWPACKETVERSION_0)
ND_PRINT(" v%u", v);
if (v != LWRES_LWPACKETVERSION_0) {
- s = (const char *)np + EXTRACT_BE_U_4(np->length);
+ s = bp + EXTRACT_BE_U_4(np->length);
goto tail;
}
/* opcode and pktflags */
v = EXTRACT_BE_U_4(np->opcode);
- s = tok2str(opcode, "#0x%x", v);
- ND_PRINT(" %s%s", s, response ? "" : "?");
+ ND_PRINT(" %s%s", tok2str(opcode, "#0x%x", v), response ? "" : "?");
/* pktflags */
v = EXTRACT_BE_U_2(np->pktflags);
gnba = NULL;
grbn = NULL;
+ p = (const u_char *)(np + 1);
switch (EXTRACT_BE_U_4(np->opcode)) {
case LWRES_OPCODE_NOOP:
+ s = p;
break;
case LWRES_OPCODE_GETADDRSBYNAME:
- gabn = (const lwres_gabnrequest_t *)(np + 1);
- ND_TCHECK(gabn->namelen);
- /* XXX gabn points to packed struct */
- s = (const char *)&gabn->namelen +
- sizeof(gabn->namelen);
- l = EXTRACT_BE_U_2(gabn->namelen);
+ gabn = (const lwres_gabnrequest_t *)p;
+ ND_TCHECK_2(gabn->namelen);
/* BIND910: not used */
if (ndo->ndo_vflag > 2) {
if (v & ~(LWRES_ADDRTYPE_V4 | LWRES_ADDRTYPE_V6))
ND_PRINT("[0x%x]", v);
+ s = p + LWRES_GABNREQUEST_LEN;
+ l = EXTRACT_BE_U_2(gabn->namelen);
advance = lwres_printname(ndo, l, s);
if (advance < 0)
goto trunc;
s += advance;
break;
case LWRES_OPCODE_GETNAMEBYADDR:
- gnba = (const lwres_gnbarequest_t *)(np + 1);
- ND_TCHECK(gnba->addr);
+ gnba = (const lwres_gnbarequest_t *)p;
+ ND_TCHECK_4(gnba->flags);
/* BIND910: not used */
if (ndo->ndo_vflag > 2) {
EXTRACT_BE_U_4(gnba->flags));
}
- s = (const char *)&gnba->addr;
-
- advance = lwres_printaddr(ndo, &gnba->addr);
+ s = p + LWRES_GNBAREQUEST_LEN;
+ advance = lwres_printaddr(ndo, s);
if (advance < 0)
goto trunc;
s += advance;
break;
case LWRES_OPCODE_GETRDATABYNAME:
/* XXX no trace, not tested */
- grbn = (const lwres_grbnrequest_t *)(np + 1);
- ND_TCHECK(grbn->namelen);
+ grbn = (const lwres_grbnrequest_t *)p;
+ ND_TCHECK_2(grbn->namelen);
/* BIND910: not used */
if (ndo->ndo_vflag > 2) {
EXTRACT_BE_U_2(grbn->rdclass)));
}
- /* XXX grbn points to packed struct */
- s = (const char *)&grbn->namelen +
- sizeof(grbn->namelen);
+ s = p + LWRES_GRBNREQUEST_LEN;
l = EXTRACT_BE_U_2(grbn->namelen);
-
advance = lwres_printname(ndo, l, s);
if (advance < 0)
goto trunc;
s += advance;
break;
default:
+ s = p;
unsupported++;
break;
}
gnba = NULL;
grbn = NULL;
+ p = (const u_char *)(np + 1);
switch (EXTRACT_BE_U_4(np->opcode)) {
case LWRES_OPCODE_NOOP:
+ s = p;
break;
case LWRES_OPCODE_GETADDRSBYNAME:
- gabn = (const lwres_gabnresponse_t *)(np + 1);
- ND_TCHECK(gabn->realnamelen);
- /* XXX gabn points to packed struct */
- s = (const char *)&gabn->realnamelen +
- sizeof(gabn->realnamelen);
- l = EXTRACT_BE_U_2(gabn->realnamelen);
+ gabn = (const lwres_gabnresponse_t *)p;
+ ND_TCHECK_2(gabn->realnamelen);
/* BIND910: not used */
if (ndo->ndo_vflag > 2) {
ND_PRINT(" %u/%u", EXTRACT_BE_U_2(gabn->naliases),
EXTRACT_BE_U_2(gabn->naddrs));
+ s = p + LWRES_GABNRESPONSE_LEN;
+ l = EXTRACT_BE_U_2(gabn->realnamelen);
advance = lwres_printname(ndo, l, s);
if (advance < 0)
goto trunc;
/* addrs */
na = EXTRACT_BE_U_2(gabn->naddrs);
for (i = 0; i < na; i++) {
- advance = lwres_printaddr(ndo, (const lwres_addr_t *)s);
+ advance = lwres_printaddr(ndo, s);
if (advance < 0)
goto trunc;
s += advance;
}
break;
case LWRES_OPCODE_GETNAMEBYADDR:
- gnba = (const lwres_gnbaresponse_t *)(np + 1);
- ND_TCHECK(gnba->realnamelen);
- /* XXX gnba points to packed struct */
- s = (const char *)&gnba->realnamelen +
- sizeof(gnba->realnamelen);
- l = EXTRACT_BE_U_2(gnba->realnamelen);
+ gnba = (const lwres_gnbaresponse_t *)p;
+ ND_TCHECK_2(gnba->realnamelen);
/* BIND910: not used */
if (ndo->ndo_vflag > 2) {
ND_PRINT(" %u", EXTRACT_BE_U_2(gnba->naliases));
+ s = p + LWRES_GNBARESPONSE_LEN;
+ l = EXTRACT_BE_U_2(gnba->realnamelen);
advance = lwres_printname(ndo, l, s);
if (advance < 0)
goto trunc;
break;
case LWRES_OPCODE_GETRDATABYNAME:
/* XXX no trace, not tested */
- grbn = (const lwres_grbnresponse_t *)(np + 1);
- ND_TCHECK(grbn->nsigs);
+ grbn = (const lwres_grbnresponse_t *)p;
+ ND_TCHECK_2(grbn->nsigs);
/* BIND910: not used */
if (ndo->ndo_vflag > 2) {
ND_PRINT(" %u/%u", EXTRACT_BE_U_2(grbn->nrdatas),
EXTRACT_BE_U_2(grbn->nsigs));
- /* XXX grbn points to packed struct */
- s = (const char *)&grbn->nsigs+ sizeof(grbn->nsigs);
-
+ s = p + LWRES_GRBNRESPONSE_LEN;
advance = lwres_printnamelen(ndo, s);
if (advance < 0)
goto trunc;
}
break;
default:
+ s = p;
unsupported++;
break;
}
ND_PRINT(" [len: %u != %u]", EXTRACT_BE_U_4(np->length),
length);
}
- if (!unsupported && s < (const char *)np + EXTRACT_BE_U_4(np->length))
+ if (!unsupported && s < bp + EXTRACT_BE_U_4(np->length))
ND_PRINT("[extra]");
return;
trunc:
- ND_PRINT("[|lwres]");
+ nd_print_trunc(ndo);
}
projects / tcpdump / blobdiff