#include <string.h>
+#include "netdissect-ctype.h"
+
#include "netdissect.h"
#include "addrtoname.h"
#include "extract.h"
#define MAXINITIATORS 20
static int ninitiator = 0;
union inaddr_u {
- struct in_addr in4;
- struct in6_addr in6;
+ nd_ipv4 in4;
+ nd_ipv6 in6;
};
static struct {
cookie_t initiator;
/* record initiator */
static void
-cookie_record(const cookie_t *in, const u_char *bp2)
+cookie_record(netdissect_options *ndo, const cookie_t *in, const u_char *bp2)
{
int i;
const struct ip *ip;
ninitiator = (ninitiator + 1) % MAXINITIATORS;
}
-#define cookie_isinitiator(x, y) cookie_sidecheck((x), (y), 1)
-#define cookie_isresponder(x, y) cookie_sidecheck((x), (y), 0)
+#define cookie_isinitiator(ndo, x, y) cookie_sidecheck(ndo, (x), (y), 1)
+#define cookie_isresponder(ndo, x, y) cookie_sidecheck(ndo, (x), (y), 0)
static int
-cookie_sidecheck(int i, const u_char *bp2, int initiator)
+cookie_sidecheck(netdissect_options *ndo, int i, const u_char *bp2, int initiator)
{
const struct ip *ip;
const struct ip6_hdr *ip6;
u_int totlen;
uint32_t t, v;
- ND_TCHECK_1(p);
- if (EXTRACT_U_1(p) & 0x80)
+ if (GET_U_1(p) & 0x80)
totlen = 4;
else {
- ND_TCHECK_2(p + 2);
- totlen = 4 + EXTRACT_BE_U_2(p + 2);
+ totlen = 4 + GET_BE_U_2(p + 2);
}
if (ep2 < p + totlen) {
ND_PRINT("[|attr]");
return ep2 + 1;
}
- ND_TCHECK_2(p);
ND_PRINT("(");
- t = EXTRACT_BE_U_2(p) & 0x7fff;
+ t = GET_BE_U_2(p) & 0x7fff;
if (map && t < nmap && map[t].type)
ND_PRINT("type=%s ", map[t].type);
else
ND_PRINT("type=#%u ", t);
- if (EXTRACT_U_1(p) & 0x80) {
+ if (GET_U_1(p) & 0x80) {
ND_PRINT("value=");
- ND_TCHECK_2(p + 2);
- v = EXTRACT_BE_U_2(p + 2);
+ v = GET_BE_U_2(p + 2);
if (map && t < nmap && v < map[t].nvalue && map[t].value[v])
ND_PRINT("%s", map[t].value[v]);
else {
u_int totlen;
uint32_t t;
- ND_TCHECK_1(p);
- if (EXTRACT_U_1(p) & 0x80)
+ if (GET_U_1(p) & 0x80)
totlen = 4;
else {
- ND_TCHECK_2(p + 2);
- totlen = 4 + EXTRACT_BE_U_2(p + 2);
+ totlen = 4 + GET_BE_U_2(p + 2);
}
if (ep2 < p + totlen) {
ND_PRINT("[|attr]");
return ep2 + 1;
}
- ND_TCHECK_2(p);
ND_PRINT("(");
- t = EXTRACT_BE_U_2(p) & 0x7fff;
+ t = GET_BE_U_2(p) & 0x7fff;
ND_PRINT("type=#%u ", t);
- if (EXTRACT_U_1(p) & 0x80) {
+ if (GET_U_1(p) & 0x80) {
ND_PRINT("value=");
- t = EXTRACT_U_1(p + 2);
+ t = GET_U_1(p + 2);
if (!rawprint(ndo, (const uint8_t *)(p + 2), 2)) {
ND_PRINT(")");
goto trunc;
p = (const struct ikev1_pl_sa *)ext;
ND_TCHECK_SIZE(p);
- doi = EXTRACT_BE_U_4(p->doi);
- sit = EXTRACT_BE_U_4(p->sit);
+ doi = GET_BE_U_4(p->doi);
+ sit = GET_BE_U_4(p->sit);
if (doi != 1) {
ND_PRINT(" doi=%u", doi);
ND_PRINT(" situation=%u", sit);
np = (const u_char *)ext + sizeof(struct ikev1_pl_sa);
if (sit != 0x01) {
- ND_TCHECK_4(ext + 1);
- ident = EXTRACT_BE_U_4(ext + 1);
+ ident = GET_BE_U_4(ext + 1);
ND_PRINT(" ident=%u", ident);
np += sizeof(ident);
}
p = (const struct ikev1_pl_p *)ext;
ND_TCHECK_SIZE(p);
ND_PRINT(" #%u protoid=%s transform=%u",
- EXTRACT_U_1(p->p_no), PROTOIDSTR(EXTRACT_U_1(p->prot_id)),
- EXTRACT_U_1(p->num_t));
- spi_size = EXTRACT_U_1(p->spi_size);
+ GET_U_1(p->p_no), PROTOIDSTR(GET_U_1(p->prot_id)),
+ GET_U_1(p->num_t));
+ spi_size = GET_U_1(p->spi_size);
if (spi_size) {
ND_PRINT(" spi=");
if (!rawprint(ndo, (const uint8_t *)(p + 1), spi_size))
ND_TCHECK_SIZE(ext);
cp = ikev1_sub_print(ndo, ISAKMP_NPTYPE_T, ext, ep, phase, doi0,
- EXTRACT_U_1(p->prot_id), depth);
+ GET_U_1(p->prot_id), depth);
return cp;
trunc:
};
static const struct attrmap encr_t_map[] = {
- { NULL, 0, { NULL } }, { NULL, 0, { NULL } }, /* 0, 1 */
+ { NULL, 0, { NULL } }, { NULL, 0, { NULL } }, /* 0, 1 */
{ NULL, 0, { NULL } }, { NULL, 0, { NULL } }, /* 2, 3 */
{ NULL, 0, { NULL } }, { NULL, 0, { NULL } }, /* 4, 5 */
{ NULL, 0, { NULL } }, { NULL, 0, { NULL } }, /* 6, 7 */
static const struct attrmap oakley_t_map[] = {
{ NULL, 0, { NULL } },
{ "enc", 8, { NULL, "1des", "idea", "blowfish", "rc5",
- "3des", "cast", "aes", }, },
+ "3des", "cast", "aes", }, },
{ "hash", 7, { NULL, "md5", "sha1", "tiger",
"sha2-256", "sha2-384", "sha2-512", }, },
{ "auth", 6, { NULL, "preshared", "dss", "rsa sig", "rsa enc",
switch (proto) {
case 1:
- idstr = STR_OR_ID(EXTRACT_U_1(p->t_id), ikev1_p_map);
+ idstr = STR_OR_ID(GET_U_1(p->t_id), ikev1_p_map);
map = oakley_t_map;
nmap = sizeof(oakley_t_map)/sizeof(oakley_t_map[0]);
break;
case 2:
- idstr = STR_OR_ID(EXTRACT_U_1(p->t_id), ah_p_map);
+ idstr = STR_OR_ID(GET_U_1(p->t_id), ah_p_map);
map = ipsec_t_map;
nmap = sizeof(ipsec_t_map)/sizeof(ipsec_t_map[0]);
break;
case 3:
- idstr = STR_OR_ID(EXTRACT_U_1(p->t_id), esp_p_map);
+ idstr = STR_OR_ID(GET_U_1(p->t_id), esp_p_map);
map = ipsec_t_map;
nmap = sizeof(ipsec_t_map)/sizeof(ipsec_t_map[0]);
break;
case 4:
- idstr = STR_OR_ID(EXTRACT_U_1(p->t_id), ipcomp_p_map);
+ idstr = STR_OR_ID(GET_U_1(p->t_id), ipcomp_p_map);
map = ipsec_t_map;
nmap = sizeof(ipsec_t_map)/sizeof(ipsec_t_map[0]);
break;
}
if (idstr)
- ND_PRINT(" #%u id=%s ", EXTRACT_U_1(p->t_no), idstr);
+ ND_PRINT(" #%u id=%s ", GET_U_1(p->t_no), idstr);
else
- ND_PRINT(" #%u id=%u ", EXTRACT_U_1(p->t_no), EXTRACT_U_1(p->t_id));
+ ND_PRINT(" #%u id=%u ", GET_U_1(p->t_no), GET_U_1(p->t_id));
cp = (const u_char *)(p + 1);
ep2 = (const u_char *)p + item_len;
while (cp < ep && cp < ep2) {
case 1:
#endif
default:
- ND_PRINT(" idtype=%s", STR_OR_ID(EXTRACT_U_1(p->d.id_type), idtypestr));
+ ND_PRINT(" idtype=%s",
+ STR_OR_ID(GET_U_1(p->d.id_type), idtypestr));
ND_PRINT(" doi_data=%u",
- EXTRACT_BE_U_4(p->d.doi_data) & 0xffffff);
+ GET_BE_U_4(p->d.doi_data) & 0xffffff);
break;
#ifdef USE_IPSECDOI_IN_PHASE1
doi_p = (const struct ipsecdoi_id *)ext;
ND_TCHECK_SIZE(doi_p);
- type = EXTRACT_U_1(doi_p->type);
+ type = GET_U_1(doi_p->type);
ND_PRINT(" idtype=%s", STR_OR_ID(type, ipsecidtypestr));
/* A protocol ID of 0 DOES NOT mean IPPROTO_IP! */
- proto_id = EXTRACT_U_1(doi_p->proto_id);
+ proto_id = GET_U_1(doi_p->proto_id);
if (!ndo->ndo_nflag && proto_id && (p_name = netdb_protoname(proto_id)) != NULL)
ND_PRINT(" protoid=%s", p_name);
else
ND_PRINT(" protoid=%u", proto_id);
- ND_PRINT(" port=%u", EXTRACT_BE_U_2(doi_p->port));
+ ND_PRINT(" port=%u", GET_BE_U_2(doi_p->port));
if (!len)
break;
if (data == NULL)
if (len < 4)
ND_PRINT(" len=%u [bad: < 4]", len);
else
- ND_PRINT(" len=%u %s", len, ipaddr_string(ndo, data));
+ ND_PRINT(" len=%u %s", len, GET_IPADDR_STRING(data));
len = 0;
break;
case IPSECDOI_ID_FQDN:
u_int i;
ND_PRINT(" len=%u ", len);
for (i = 0; i < len; i++)
- safeputchar(ndo, EXTRACT_U_1(data + i));
+ fn_print_char(ndo, GET_U_1(data + i));
len = 0;
break;
}
else {
mask = data + sizeof(nd_ipv4);
ND_PRINT(" len=%u %s/%u.%u.%u.%u", len,
- ipaddr_string(ndo, data),
- EXTRACT_U_1(mask), EXTRACT_U_1(mask + 1),
- EXTRACT_U_1(mask + 2), EXTRACT_U_1(mask + 3));
+ GET_IPADDR_STRING(data),
+ GET_U_1(mask), GET_U_1(mask + 1),
+ GET_U_1(mask + 2),
+ GET_U_1(mask + 3));
}
len = 0;
break;
if (len < 16)
ND_PRINT(" len=%u [bad: < 16]", len);
else
- ND_PRINT(" len=%u %s", len, ip6addr_string(ndo, data));
+ ND_PRINT(" len=%u %s", len, GET_IP6ADDR_STRING(data));
len = 0;
break;
case IPSECDOI_ID_IPV6_ADDR_SUBNET:
mask = (const u_char *)(data + sizeof(nd_ipv6));
/*XXX*/
ND_PRINT(" len=%u %s/0x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x", len,
- ip6addr_string(ndo, data),
- EXTRACT_U_1(mask), EXTRACT_U_1(mask + 1), EXTRACT_U_1(mask + 2), EXTRACT_U_1(mask + 3),
- EXTRACT_U_1(mask + 4), EXTRACT_U_1(mask + 5), EXTRACT_U_1(mask + 6), EXTRACT_U_1(mask + 7),
- EXTRACT_U_1(mask + 8), EXTRACT_U_1(mask + 9), EXTRACT_U_1(mask + 10), EXTRACT_U_1(mask + 11),
- EXTRACT_U_1(mask + 12), EXTRACT_U_1(mask + 13), EXTRACT_U_1(mask + 14), EXTRACT_U_1(mask + 15));
+ GET_IP6ADDR_STRING(data),
+ GET_U_1(mask), GET_U_1(mask + 1),
+ GET_U_1(mask + 2),
+ GET_U_1(mask + 3),
+ GET_U_1(mask + 4),
+ GET_U_1(mask + 5),
+ GET_U_1(mask + 6),
+ GET_U_1(mask + 7),
+ GET_U_1(mask + 8),
+ GET_U_1(mask + 9),
+ GET_U_1(mask + 10),
+ GET_U_1(mask + 11),
+ GET_U_1(mask + 12),
+ GET_U_1(mask + 13),
+ GET_U_1(mask + 14),
+ GET_U_1(mask + 15));
}
len = 0;
break;
ND_PRINT(" len=%u [bad: < 8]", len);
else {
ND_PRINT(" len=%u %s-%s", len,
- ipaddr_string(ndo, data),
- ipaddr_string(ndo, data + sizeof(nd_ipv4)));
+ GET_IPADDR_STRING(data),
+ GET_IPADDR_STRING(data + sizeof(nd_ipv4)));
}
len = 0;
break;
ND_PRINT(" len=%u [bad: < 32]", len);
else {
ND_PRINT(" len=%u %s-%s", len,
- ip6addr_string(ndo, data),
- ip6addr_string(ndo, data + sizeof(nd_ipv6)));
+ GET_IP6ADDR_STRING(data),
+ GET_IP6ADDR_STRING(data + sizeof(nd_ipv6)));
}
len = 0;
break;
* Our caller has ensured that the length is >= 4.
*/
ND_PRINT(" len=%u", item_len - 4);
- ND_PRINT(" type=%s", STR_OR_ID(EXTRACT_U_1(p->encode), certstr));
+ ND_PRINT(" type=%s", STR_OR_ID(GET_U_1(p->encode), certstr));
if (2 < ndo->ndo_vflag && 4 < item_len) {
/* Print the entire payload in hex */
ND_PRINT(" ");
* Our caller has ensured that the length is >= 4.
*/
ND_PRINT(" len=%u", item_len - 4);
- ND_PRINT(" type=%s", STR_OR_ID(EXTRACT_U_1(p->encode), certstr));
+ ND_PRINT(" type=%s", STR_OR_ID(GET_U_1(p->encode), certstr));
if (2 < ndo->ndo_vflag && 4 < item_len) {
/* Print the entire payload in hex */
ND_PRINT(" ");
p = (const struct ikev1_pl_n *)ext;
ND_TCHECK_SIZE(p);
- doi = EXTRACT_BE_U_4(p->doi);
- proto = EXTRACT_U_1(p->prot_id);
+ doi = GET_BE_U_4(p->doi);
+ proto = GET_U_1(p->prot_id);
if (doi != 1) {
ND_PRINT(" doi=%u", doi);
ND_PRINT(" proto=%u", proto);
- type = EXTRACT_BE_U_2(p->type);
+ type = GET_BE_U_2(p->type);
if (type < 8192)
ND_PRINT(" type=%s", NOTIFY_ERROR_STR(type));
else if (type < 16384)
ND_PRINT(" type=%s", NOTIFY_STATUS_STR(type));
else
ND_PRINT(" type=%s", numstr(type));
- spi_size = EXTRACT_U_1(p->spi_size);
+ spi_size = GET_U_1(p->spi_size);
if (spi_size) {
ND_PRINT(" spi=");
if (!rawprint(ndo, (const uint8_t *)(p + 1), spi_size))
ND_PRINT(" doi=ipsec");
ND_PRINT(" proto=%s", PROTOIDSTR(proto));
- type = EXTRACT_BE_U_2(p->type);
+ type = GET_BE_U_2(p->type);
if (type < 8192)
ND_PRINT(" type=%s", NOTIFY_ERROR_STR(type));
else if (type < 16384)
ND_PRINT(" type=%s", IPSEC_NOTIFY_STATUS_STR(type));
else
ND_PRINT(" type=%s", numstr(type));
- spi_size = EXTRACT_U_1(p->spi_size);
+ spi_size = GET_U_1(p->spi_size);
if (spi_size) {
ND_PRINT(" spi=");
if (!rawprint(ndo, (const uint8_t *)(p + 1), spi_size))
case IPSECDOI_NTYPE_REPLAY_STATUS:
ND_PRINT(" status=(");
ND_PRINT("replay detection %sabled",
- EXTRACT_BE_U_4(cp) ? "en" : "dis");
+ GET_BE_U_4(cp) ? "en" : "dis");
ND_PRINT(")");
break;
default:
p = (const struct ikev1_pl_d *)ext;
ND_TCHECK_SIZE(p);
- doi = EXTRACT_BE_U_4(p->doi);
- proto = EXTRACT_U_1(p->prot_id);
+ doi = GET_BE_U_4(p->doi);
+ proto = GET_U_1(p->prot_id);
if (doi != 1) {
ND_PRINT(" doi=%u", doi);
ND_PRINT(" proto=%u", proto);
ND_PRINT(" doi=ipsec");
ND_PRINT(" proto=%s", PROTOIDSTR(proto));
}
- spi_size = EXTRACT_U_1(p->spi_size);
+ spi_size = GET_U_1(p->spi_size);
ND_PRINT(" spilen=%u", spi_size);
- num_spi = EXTRACT_BE_U_2(p->num_spi);
+ num_spi = GET_BE_U_2(p->num_spi);
ND_PRINT(" nspi=%u", num_spi);
ND_PRINT(" spi=");
q = (const uint8_t *)(p + 1);
const struct isakmp_gen *p = (const struct isakmp_gen *)ext;
ND_TCHECK_SIZE(ext);
- ikev2_pay_print(ndo, NPSTR(tpay), EXTRACT_U_1(p->critical));
+ ikev2_pay_print(ndo, NPSTR(tpay), GET_U_1(p->critical));
/*
* Our caller has ensured that the length is >= 4.
p = (const struct ikev2_t *)ext;
ND_TCHECK_SIZE(p);
- ikev2_pay_print(ndo, NPSTR(ISAKMP_NPTYPE_T), EXTRACT_U_1(p->h.critical));
+ ikev2_pay_print(ndo, NPSTR(ISAKMP_NPTYPE_T), GET_U_1(p->h.critical));
- t_id = EXTRACT_BE_U_2(p->t_id);
+ t_id = GET_BE_U_2(p->t_id);
map = NULL;
nmap = 0;
- t_type = EXTRACT_U_1(p->t_type);
+ t_type = GET_U_1(p->t_type);
switch (t_type) {
case IV2_T_ENCR:
idstr = STR_OR_ID(t_id, esp_p_map);
p = (const struct ikev2_p *)ext;
ND_TCHECK_SIZE(p);
- ikev2_pay_print(ndo, NPSTR(ISAKMP_NPTYPE_P), EXTRACT_U_1(p->h.critical));
+ ikev2_pay_print(ndo, NPSTR(ISAKMP_NPTYPE_P), GET_U_1(p->h.critical));
/*
* ikev2_sa_print() guarantees that this is >= 4.
*/
prop_length = oprop_length - 4;
ND_PRINT(" #%u protoid=%s transform=%u len=%u",
- EXTRACT_U_1(p->p_no), PROTOIDSTR(EXTRACT_U_1(p->prot_id)),
- EXTRACT_U_1(p->num_t), oprop_length);
+ GET_U_1(p->p_no), PROTOIDSTR(GET_U_1(p->prot_id)),
+ GET_U_1(p->num_t), oprop_length);
cp = (const u_char *)(p + 1);
- spi_size = EXTRACT_U_1(p->spi_size);
+ spi_size = GET_U_1(p->spi_size);
if (spi_size) {
if (prop_length < spi_size)
goto toolong;
* Print the transforms.
*/
tcount = 0;
- for (np = ISAKMP_NPTYPE_T; np != 0; np = EXTRACT_U_1(ext->np)) {
+ for (np = ISAKMP_NPTYPE_T; np != 0; np = GET_U_1(ext->np)) {
tcount++;
ext = (const struct isakmp_gen *)cp;
if (prop_length < sizeof(*ext))
* or truncated, otherwise we could loop forever processing
* zero-length items or otherwise misdissect the packet.
*/
- item_len = EXTRACT_BE_U_2(ext->len);
+ item_len = GET_BE_U_2(ext->len);
if (item_len <= 4)
goto trunc;
u_int item_len;
ND_TCHECK_SIZE(ext1);
- ikev2_pay_print(ndo, "sa", EXTRACT_U_1(ext1->critical));
+ ikev2_pay_print(ndo, "sa", GET_U_1(ext1->critical));
/*
* ikev2_sub0_print() guarantees that this is >= 4.
*/
- osa_length= EXTRACT_BE_U_2(ext1->len);
+ osa_length= GET_BE_U_2(ext1->len);
sa_length = osa_length - 4;
ND_PRINT(" len=%u", sa_length);
*/
cp = (const u_char *)(ext1 + 1);
pcount = 0;
- for (np = ISAKMP_NPTYPE_P; np != 0; np = EXTRACT_U_1(ext->np)) {
+ for (np = ISAKMP_NPTYPE_P; np != 0; np = GET_U_1(ext->np)) {
pcount++;
ext = (const struct isakmp_gen *)cp;
if (sa_length < sizeof(*ext))
* or truncated, otherwise we could loop forever processing
* zero-length items or otherwise misdissect the packet.
*/
- item_len = EXTRACT_BE_U_2(ext->len);
+ item_len = GET_BE_U_2(ext->len);
if (item_len <= 4)
goto trunc;
k = (const struct ikev2_ke *)ext;
ND_TCHECK_SIZE(k);
- ikev2_pay_print(ndo, NPSTR(tpay), EXTRACT_U_1(k->h.critical));
+ ikev2_pay_print(ndo, NPSTR(tpay), GET_U_1(k->h.critical));
if (item_len < 8) {
ND_PRINT(" len=%u < 8", item_len);
return (const u_char *)ext + item_len;
}
ND_PRINT(" len=%u group=%s", item_len - 8,
- STR_OR_ID(EXTRACT_BE_U_2(k->ke_group), dh_p_map));
+ STR_OR_ID(GET_BE_U_2(k->ke_group), dh_p_map));
if (2 < ndo->ndo_vflag && 8 < item_len) {
ND_PRINT(" ");
idp = (const struct ikev2_id *)ext;
ND_TCHECK_SIZE(idp);
- ikev2_pay_print(ndo, NPSTR(tpay), EXTRACT_U_1(idp->h.critical));
+ ikev2_pay_print(ndo, NPSTR(tpay), GET_U_1(idp->h.critical));
/*
* Our caller has ensured that the length is >= 4.
dumphex = 0;
typedata = (const unsigned char *)(ext)+sizeof(struct ikev2_id);
- switch(EXTRACT_U_1(idp->type)) {
+ switch(GET_U_1(idp->type)) {
case ID_IPV4_ADDR:
ND_PRINT(" ipv4:");
dumphex=1;
if(dumpascii) {
ND_TCHECK_LEN(typedata, idtype_len);
for(i=0; i<idtype_len; i++) {
- if(ND_ISPRINT(EXTRACT_U_1(typedata + i))) {
- ND_PRINT("%c", EXTRACT_U_1(typedata + i));
+ if(ND_ASCII_ISPRINT(GET_U_1(typedata + i))) {
+ ND_PRINT("%c", GET_U_1(typedata + i));
} else {
ND_PRINT(".");
}
ND_TCHECK_LEN(ext, sizeof(struct ikev2_auth));
p = (const struct ikev2_auth *)ext;
- ikev2_pay_print(ndo, NPSTR(tpay), EXTRACT_U_1(p->h.critical));
+ ikev2_pay_print(ndo, NPSTR(tpay), GET_U_1(p->h.critical));
/*
* Our caller has ensured that the length is >= 4.
*/
ND_PRINT(" len=%u method=%s", item_len-4,
- STR_OR_ID(EXTRACT_U_1(p->auth_method), v2_auth));
+ STR_OR_ID(GET_U_1(p->auth_method), v2_auth));
if (item_len > 4) {
if (ndo->ndo_vflag > 1) {
ND_PRINT(" authdata=(");
uint32_t proto _U_, int depth _U_)
{
ND_TCHECK_SIZE(ext);
- ikev2_pay_print(ndo, "nonce", EXTRACT_U_1(ext->critical));
+ ikev2_pay_print(ndo, "nonce", GET_U_1(ext->critical));
/*
* Our caller has ensured that the length is >= 4.
p = (const struct ikev2_n *)ext;
ND_TCHECK_SIZE(p);
- ikev2_pay_print(ndo, NPSTR(ISAKMP_NPTYPE_N), EXTRACT_U_1(p->h.critical));
+ ikev2_pay_print(ndo, NPSTR(ISAKMP_NPTYPE_N), GET_U_1(p->h.critical));
showspi = 1;
showsomedata=0;
notify_name=NULL;
- ND_PRINT(" prot_id=%s", PROTOIDSTR(EXTRACT_U_1(p->prot_id)));
+ ND_PRINT(" prot_id=%s", PROTOIDSTR(GET_U_1(p->prot_id)));
- type = EXTRACT_BE_U_2(p->type);
+ type = GET_BE_U_2(p->type);
/* notify space is annoying sparse */
switch(type) {
}
- spi_size = EXTRACT_U_1(p->spi_size);
+ spi_size = GET_U_1(p->spi_size);
if (showspi && spi_size) {
ND_PRINT(" spi=");
if (!rawprint(ndo, (const uint8_t *)(p + 1), spi_size))
u_int i, len;
ND_TCHECK_SIZE(ext);
- ikev2_pay_print(ndo, NPSTR(tpay), EXTRACT_U_1(ext->critical));
+ ikev2_pay_print(ndo, NPSTR(tpay), GET_U_1(ext->critical));
/*
* Our caller has ensured that the length is >= 4.
len = item_len - 4;
ND_TCHECK_LEN(vid, len);
for(i=0; i<len; i++) {
- if(ND_ISPRINT(EXTRACT_U_1(vid + i)))
- ND_PRINT("%c", EXTRACT_U_1(vid + i));
+ if(ND_ASCII_ISPRINT(GET_U_1(vid + i)))
+ ND_PRINT("%c", GET_U_1(vid + i));
else ND_PRINT(".");
}
if (2 < ndo->ndo_vflag && 4 < len) {
#endif
ND_TCHECK_SIZE(ext);
- ikev2_pay_print(ndo, NPSTR(tpay), EXTRACT_U_1(ext->critical));
+ ikev2_pay_print(ndo, NPSTR(tpay), GET_U_1(ext->critical));
dlen = item_len-4;
ND_TCHECK_LEN(dat, dlen);
#ifdef HAVE_LIBCRYPTO
- np = EXTRACT_U_1(ext->np);
+ np = GET_U_1(ext->np);
- /* try to decypt it! */
- if(esp_print_decrypt_buffer_by_ikev2(ndo,
- EXTRACT_U_1(base->flags) & ISAKMP_FLAG_I,
+ /* try to decrypt it! */
+ if(esp_decrypt_buffer_by_ikev2_print(ndo,
+ GET_U_1(base->flags) & ISAKMP_FLAG_I,
base->i_ck, base->r_ck,
dat, dat+dlen)) {
/* got it decrypted, print stuff inside. */
ikev2_sub_print(ndo, base, np, ext,
ndo->ndo_snapend, phase, doi, proto, depth+1);
+
+ /*
+ * esp_decrypt_buffer_by_ikev2_print pushed information
+ * on the buffer stack; we're done with the buffer, so
+ * pop it (which frees the buffer)
+ */
+ nd_pop_packet_info(ndo);
}
#endif
* or truncated, otherwise we could loop forever processing
* zero-length items or otherwise misdissect the packet.
*/
- item_len = EXTRACT_BE_U_2(ext->len);
+ item_len = GET_BE_U_2(ext->len);
if (item_len <= 4)
return NULL;
return cp;
trunc:
- ND_PRINT(" [|isakmp]");
+ nd_print_trunc(ndo);
return NULL;
}
while (np) {
ND_TCHECK_SIZE(ext);
- item_len = EXTRACT_BE_U_2(ext->len);
+ item_len = GET_BE_U_2(ext->len);
ND_TCHECK_LEN(ext, item_len);
depth++;
return NULL;
}
- np = EXTRACT_U_1(ext->np);
+ np = GET_U_1(ext->np);
ext = (const struct isakmp_gen *)cp;
}
return cp;
numstr(u_int x)
{
static char buf[20];
- nd_snprintf(buf, sizeof(buf), "#%u", x);
+ snprintf(buf, sizeof(buf), "#%u", x);
return buf;
}
p = (const struct isakmp *)bp;
ep = ndo->ndo_snapend;
- phase = (EXTRACT_BE_U_4(base->msgid) == 0) ? 1 : 2;
+ phase = (GET_BE_U_4(base->msgid) == 0) ? 1 : 2;
if (phase == 1)
ND_PRINT(" phase %u", phase);
else
/* the first packet */
ND_PRINT(" I");
if (bp2)
- cookie_record(&base->i_ck, bp2);
+ cookie_record(ndo, &base->i_ck, bp2);
} else
ND_PRINT(" ?");
} else {
- if (bp2 && cookie_isinitiator(i, bp2))
+ if (bp2 && cookie_isinitiator(ndo, i, bp2))
ND_PRINT(" I");
- else if (bp2 && cookie_isresponder(i, bp2))
+ else if (bp2 && cookie_isresponder(ndo, i, bp2))
ND_PRINT(" R");
else
ND_PRINT(" ?");
}
- ND_PRINT(" %s", ETYPESTR(EXTRACT_U_1(base->etype)));
- flags = EXTRACT_U_1(base->flags);
+ ND_PRINT(" %s", ETYPESTR(GET_U_1(base->etype)));
+ flags = GET_U_1(base->flags);
if (flags) {
ND_PRINT("[%s%s]", flags & ISAKMP_FLAG_E ? "E" : "",
flags & ISAKMP_FLAG_C ? "C" : "");
ND_PRINT(":");
- np = EXTRACT_U_1(base->np);
+ np = GET_U_1(base->np);
/* regardless of phase... */
if (flags & ISAKMP_FLAG_E) {
done:
if (ndo->ndo_vflag) {
- if (EXTRACT_BE_U_4(base->len) != length) {
+ if (GET_BE_U_4(base->len) != length) {
ND_PRINT(" (len mismatch: isakmp %u/ip %u)",
- EXTRACT_BE_U_4(base->len), length);
+ GET_BE_U_4(base->len), length);
}
}
}
* or truncated, otherwise we could loop forever processing
* zero-length items or otherwise misdissect the packet.
*/
- item_len = EXTRACT_BE_U_2(ext->len);
+ item_len = GET_BE_U_2(ext->len);
if (item_len <= 4)
return NULL;
return cp;
trunc:
- ND_PRINT(" [|isakmp]");
+ nd_print_trunc(ndo);
return NULL;
}
while (np) {
ND_TCHECK_SIZE(ext);
- ND_TCHECK_LEN(ext, EXTRACT_BE_U_2(ext->len));
+ ND_TCHECK_LEN(ext, GET_BE_U_2(ext->len));
depth++;
ND_PRINT("\n");
return NULL;
}
- np = EXTRACT_U_1(ext->np);
+ np = GET_U_1(ext->np);
ext = (const struct isakmp_gen *)cp;
}
return cp;
p = (const struct isakmp *)bp;
ep = ndo->ndo_snapend;
- phase = (EXTRACT_BE_U_4(base->msgid) == 0) ? 1 : 2;
+ phase = (GET_BE_U_4(base->msgid) == 0) ? 1 : 2;
if (phase == 1)
ND_PRINT(" parent_sa");
else
ND_PRINT(" child_sa ");
- ND_PRINT(" %s", ETYPESTR(EXTRACT_U_1(base->etype)));
- flags = EXTRACT_U_1(base->flags);
+ ND_PRINT(" %s", ETYPESTR(GET_U_1(base->etype)));
+ flags = GET_U_1(base->flags);
if (flags) {
ND_PRINT("[%s%s%s]",
flags & ISAKMP_FLAG_I ? "I" : "",
ND_PRINT(":");
- np = EXTRACT_U_1(base->np);
+ np = GET_U_1(base->np);
/* regardless of phase... */
if (flags & ISAKMP_FLAG_E) {
done:
if (ndo->ndo_vflag) {
- if (EXTRACT_BE_U_4(base->len) != length) {
+ if (GET_BE_U_4(base->len) != length) {
ND_PRINT(" (len mismatch: isakmp %u/ip %u)",
- EXTRACT_BE_U_4(base->len), length);
+ GET_BE_U_4(base->len), length);
}
}
}
/* initialize SAs */
if (ndo->ndo_sa_list_head == NULL) {
if (ndo->ndo_espsecret)
- esp_print_decodesecret(ndo);
+ esp_decodesecret_print(ndo);
}
#endif
ep = ndo->ndo_snapend;
if ((const struct isakmp *)ep < p + 1) {
- ND_PRINT("[|isakmp]");
+ nd_print_trunc(ndo);
return;
}
ND_PRINT("isakmp");
- major = (EXTRACT_U_1(p->vers) & ISAKMP_VERS_MAJOR)
+ major = (GET_U_1(p->vers) & ISAKMP_VERS_MAJOR)
>> ISAKMP_VERS_MAJOR_SHIFT;
- minor = (EXTRACT_U_1(p->vers) & ISAKMP_VERS_MINOR)
+ minor = (GET_U_1(p->vers) & ISAKMP_VERS_MINOR)
>> ISAKMP_VERS_MINOR_SHIFT;
if (ndo->ndo_vflag) {
void
isakmp_rfc3948_print(netdissect_options *ndo,
const u_char *bp, u_int length,
- const u_char *bp2)
+ const u_char *bp2, int ver, int fragmented, u_int ttl_hl)
{
ndo->ndo_protocol = "isakmp_rfc3948";
- ND_TCHECK_1(bp);
- if(length == 1 && EXTRACT_U_1(bp)==0xff) {
+ if(length == 1 && GET_U_1(bp)==0xff) {
ND_PRINT("isakmp-nat-keep-alive");
return;
}
if(length < 4) {
goto trunc;
}
- ND_TCHECK_1(bp + 3);
/*
* see if this is an IKE packet
*/
- if (EXTRACT_U_1(bp) == 0 && EXTRACT_U_1(bp + 1) == 0 &&
- EXTRACT_U_1(bp + 2) == 0 && EXTRACT_U_1(bp + 3) == 0) {
+ if (GET_BE_U_4(bp) == 0) {
ND_PRINT("NONESP-encap: ");
isakmp_print(ndo, bp+4, length-4, bp2);
return;
/* must be an ESP packet */
{
- u_int nh, enh, padlen;
- int advance;
-
ND_PRINT("UDP-encap: ");
- advance = esp_print(ndo, bp, length, bp2, &enh, &padlen);
- if(advance <= 0)
- return;
-
- bp += advance;
- length -= advance + padlen;
- nh = enh & 0xff;
+ esp_print(ndo, bp, length, bp2, ver, fragmented, ttl_hl);
- ip_inner_print(ndo, bp, length, nh, bp2);
+ /*
+ * Either this has decrypted the payload and
+ * printed it, in which case there's nothing more
+ * to do, or it hasn't, in which case there's
+ * nothing more to do.
+ */
return;
}
trunc:
- ND_PRINT("[|isakmp]");
- return;
+ nd_print_trunc(ndo);
}
-
-/*
- * Local Variables:
- * c-style: whitesmith
- * c-basic-offset: 8
- * End:
- */
projects / tcpdump / blobdiff