The Tcpdump Group git mirrors - tcpdump/blobdiff

index bef0b45ef7f955543a0cf32dbe62973b1c823787..dcf2ea44705dbaae99df0703cb7694c6a97dc2a8 100644 (file)

--- a/print-isakmp.c

+++ b/print-isakmp.c

@@ -28,7 +28,6 @@

-#define NETDISSECT_REWORKED

#ifdef HAVE_CONFIG_H

#include "config.h"

#endif

#ifdef HAVE_CONFIG_H

#include "config.h"

#endif

@@ -40,18 +39,16 @@

#undef HAVE_LIBCRYPTO

#endif

#undef HAVE_LIBCRYPTO

#endif

-#include <tcpdump-stdinc.h>

+#include <netdissect-stdinc.h>

#include <string.h>

-#include "interface.h"

+#include "netdissect.h"

#include "addrtoname.h"

-#include "extract.h" /* must come after interface.h */

+#include "extract.h"

#include "ip.h"

-#ifdef INET6

#include "ip6.h"

-#endif

/* refer to RFC 2408 */

@@ -355,7 +352,7 @@ enum ikev2_t_type {

IV2_T_PRF = 2,

IV2_T_INTEG= 3,

IV2_T_DH = 4,

IV2_T_PRF = 2,

IV2_T_INTEG= 3,

IV2_T_DH = 4,

- IV2_T_ESN = 5,

+ IV2_T_ESN = 5

};

/* 3.4. Key Exchange Payload */

};

/* 3.4. Key Exchange Payload */

@@ -375,7 +372,7 @@ enum ikev2_id_type {

ID_IPV6_ADDR=5,

ID_DER_ASN1_DN=9,

ID_DER_ASN1_GN=10,

ID_IPV6_ADDR=5,

ID_DER_ASN1_DN=9,

ID_DER_ASN1_GN=10,

- ID_KEY_ID=11,

+ ID_KEY_ID=11

};

struct ikev2_id {

struct isakmp_gen h;

};

struct ikev2_id {

struct isakmp_gen h;

@@ -439,7 +436,7 @@ struct ikev2_auth {

enum ikev2_auth_type {

IV2_RSA_SIG = 1,

IV2_SHARED = 2,

enum ikev2_auth_type {

IV2_RSA_SIG = 1,

IV2_SHARED = 2,

- IV2_DSS_SIG = 3,

+ IV2_DSS_SIG = 3

};

/* refer to RFC 2409 */

};

/* refer to RFC 2409 */

@@ -648,9 +645,7 @@ ikev1_print(netdissect_options *ndo,

int ninitiator = 0;

union inaddr_u {

struct in_addr in4;

int ninitiator = 0;

union inaddr_u {

struct in_addr in4;

-#ifdef INET6

struct in6_addr in6;

-#endif

};

struct {

cookie_t initiator;

};

struct {

cookie_t initiator;

@@ -742,7 +737,7 @@ static const char *etypestr[] = {

#define ETYPESTR(x) STR_OR_ID(x, etypestr)

#define CHECKLEN(p, np) \

#define ETYPESTR(x) STR_OR_ID(x, etypestr)

#define CHECKLEN(p, np) \

- if (ep < (u_char *)(p)) { \

+ if (ep < (const u_char *)(p)) { \

ND_PRINT((ndo," [|%s]", NPSTR(np))); \

goto done; \

}

ND_PRINT((ndo," [|%s]", NPSTR(np))); \

goto done; \

}

@@ -753,7 +748,7 @@ static const char *etypestr[] = {

? npfunc[(x)] : NULL)

static int

? npfunc[(x)] : NULL)

static int

-iszero(u_char *p, size_t l)

+iszero(const u_char *p, size_t l)

{

while (l--) {

if (*p++)

{

while (l--) {

if (*p++)

@@ -781,10 +776,8 @@ static void

cookie_record(cookie_t *in, const u_char *bp2)

{

int i;

cookie_record(cookie_t *in, const u_char *bp2)

{

int i;

- struct ip *ip;

-#ifdef INET6

- struct ip6_hdr *ip6;

-#endif

+ const struct ip *ip;

+ const struct ip6_hdr *ip6;

i = cookie_find(in);

if (0 <= i) {

i = cookie_find(in);

if (0 <= i) {

@@ -792,21 +785,19 @@ cookie_record(cookie_t *in, const u_char *bp2)

return;

}

return;

}

- ip = (struct ip *)bp2;

+ ip = (const struct ip *)bp2;

switch (IP_V(ip)) {

case 4:

cookiecache[ninitiator].version = 4;

UNALIGNED_MEMCPY(&cookiecache[ninitiator].iaddr.in4, &ip->ip_src, sizeof(struct in_addr));

UNALIGNED_MEMCPY(&cookiecache[ninitiator].raddr.in4, &ip->ip_dst, sizeof(struct in_addr));

break;

switch (IP_V(ip)) {

case 4:

cookiecache[ninitiator].version = 4;

UNALIGNED_MEMCPY(&cookiecache[ninitiator].iaddr.in4, &ip->ip_src, sizeof(struct in_addr));

UNALIGNED_MEMCPY(&cookiecache[ninitiator].raddr.in4, &ip->ip_dst, sizeof(struct in_addr));

break;

-#ifdef INET6

case 6:

- ip6 = (struct ip6_hdr *)bp2;

+ ip6 = (const struct ip6_hdr *)bp2;

cookiecache[ninitiator].version = 6;

UNALIGNED_MEMCPY(&cookiecache[ninitiator].iaddr.in6, &ip6->ip6_src, sizeof(struct in6_addr));

UNALIGNED_MEMCPY(&cookiecache[ninitiator].raddr.in6, &ip6->ip6_dst, sizeof(struct in6_addr));

break;

cookiecache[ninitiator].version = 6;

UNALIGNED_MEMCPY(&cookiecache[ninitiator].iaddr.in6, &ip6->ip6_src, sizeof(struct in6_addr));

UNALIGNED_MEMCPY(&cookiecache[ninitiator].raddr.in6, &ip6->ip6_dst, sizeof(struct in6_addr));

break;

-#endif

default:

return;

}

default:

return;

}

@@ -819,12 +810,10 @@ cookie_record(cookie_t *in, const u_char *bp2)

static int

cookie_sidecheck(int i, const u_char *bp2, int initiator)

{

static int

cookie_sidecheck(int i, const u_char *bp2, int initiator)

{

- struct ip *ip;

-#ifdef INET6

- struct ip6_hdr *ip6;

-#endif

+ const struct ip *ip;

+ const struct ip6_hdr *ip6;

- ip = (struct ip *)bp2;

+ ip = (const struct ip *)bp2;

switch (IP_V(ip)) {

case 4:

if (cookiecache[i].version != 4)

switch (IP_V(ip)) {

case 4:

if (cookiecache[i].version != 4)

@@ -837,11 +826,10 @@ cookie_sidecheck(int i, const u_char *bp2, int initiator)

return 1;

}

break;

return 1;

}

break;

-#ifdef INET6

case 6:

if (cookiecache[i].version != 6)

return 0;

case 6:

if (cookiecache[i].version != 6)

return 0;

- ip6 = (struct ip6_hdr *)bp2;

+ ip6 = (const struct ip6_hdr *)bp2;

if (initiator) {

if (UNALIGNED_MEMCMP(&ip6->ip6_src, &cookiecache[i].iaddr.in6, sizeof(struct in6_addr)) == 0)

return 1;

if (initiator) {

if (UNALIGNED_MEMCMP(&ip6->ip6_src, &cookiecache[i].iaddr.in6, sizeof(struct in6_addr)) == 0)

return 1;

@@ -850,7 +838,6 @@ cookie_sidecheck(int i, const u_char *bp2, int initiator)

return 1;

}

break;

return 1;

}

break;

-#endif /* INET6 */

default:

break;

}

default:

break;

}

@@ -859,18 +846,18 @@ cookie_sidecheck(int i, const u_char *bp2, int initiator)

}

static void

}

static void

-hexprint(netdissect_options *ndo, caddr_t loc, size_t len)

+hexprint(netdissect_options *ndo, const uint8_t *loc, size_t len)

{

- u_char *p;

+ const uint8_t *p;

size_t i;

- p = (u_char *)loc;

+ p = loc;

for (i = 0; i < len; i++)

ND_PRINT((ndo,"%02x", p[i] & 0xff));

}

static int

for (i = 0; i < len; i++)

ND_PRINT((ndo,"%02x", p[i] & 0xff));

}

static int

-rawprint(netdissect_options *ndo, caddr_t loc, size_t len)

+rawprint(netdissect_options *ndo, const uint8_t *loc, size_t len)

{

ND_TCHECK2(*loc, len);

{

ND_TCHECK2(*loc, len);

@@ -902,10 +889,10 @@ static int ike_show_somedata(netdissect_options *ndo,

}

ND_PRINT((ndo," data=("));

}

ND_PRINT((ndo," data=("));

- if(!rawprint(ndo, (caddr_t)(cp), len)) goto trunc;

+ if(!rawprint(ndo, (const uint8_t *)(cp), len)) goto trunc;

ND_PRINT((ndo, "..."));

if(elen) {

ND_PRINT((ndo, "..."));

if(elen) {

- if(!rawprint(ndo, (caddr_t)(end), elen)) goto trunc;

+ if(!rawprint(ndo, (const uint8_t *)(end), elen)) goto trunc;

}

ND_PRINT((ndo,")"));

return 1;

}

ND_PRINT((ndo,")"));

return 1;

@@ -949,10 +936,10 @@ ikev1_attrmap_print(netdissect_options *ndo,

if (map && t < nmap && v < map[t].nvalue && map[t].value[v])

ND_PRINT((ndo,"%s", map[t].value[v]));

else

if (map && t < nmap && v < map[t].nvalue && map[t].value[v])

ND_PRINT((ndo,"%s", map[t].value[v]));

else

- rawprint(ndo, (caddr_t)&p[2], 2);

+ rawprint(ndo, (const uint8_t *)&p[2], 2);

} else {

ND_PRINT((ndo,"len=%d value=", EXTRACT_16BITS(&p[2])));

} else {

ND_PRINT((ndo,"len=%d value=", EXTRACT_16BITS(&p[2])));

- rawprint(ndo, (caddr_t)&p[4], EXTRACT_16BITS(&p[2]));

+ rawprint(ndo, (const uint8_t *)&p[4], EXTRACT_16BITS(&p[2]));

}

ND_PRINT((ndo,")"));

return p + totlen;

}

ND_PRINT((ndo,")"));

return p + totlen;

@@ -979,10 +966,10 @@ ikev1_attr_print(netdissect_options *ndo, const u_char *p, const u_char *ep)

if (p[0] & 0x80) {

ND_PRINT((ndo,"value="));

t = p[2];

if (p[0] & 0x80) {

ND_PRINT((ndo,"value="));

t = p[2];

- rawprint(ndo, (caddr_t)&p[2], 2);

+ rawprint(ndo, (const uint8_t *)&p[2], 2);

} else {

ND_PRINT((ndo,"len=%d value=", EXTRACT_16BITS(&p[2])));

} else {

ND_PRINT((ndo,"len=%d value=", EXTRACT_16BITS(&p[2])));

- rawprint(ndo, (caddr_t)&p[4], EXTRACT_16BITS(&p[2]));

+ rawprint(ndo, (const uint8_t *)&p[4], EXTRACT_16BITS(&p[2]));

}

ND_PRINT((ndo,")"));

return p + totlen;

}

ND_PRINT((ndo,")"));

return p + totlen;

@@ -1003,7 +990,7 @@ ikev1_sa_print(netdissect_options *ndo, u_char tpay _U_,

ND_PRINT((ndo,"%s:", NPSTR(ISAKMP_NPTYPE_SA)));

- p = (struct ikev1_pl_sa *)ext;

+ p = (const struct ikev1_pl_sa *)ext;

ND_TCHECK(*p);

UNALIGNED_MEMCPY(&sa, ext, sizeof(sa));

doi = ntohl(sa.doi);

ND_TCHECK(*p);

UNALIGNED_MEMCPY(&sa, ext, sizeof(sa));

doi = ntohl(sa.doi);

@@ -1011,7 +998,7 @@ ikev1_sa_print(netdissect_options *ndo, u_char tpay _U_,

if (doi != 1) {

ND_PRINT((ndo," doi=%d", doi));

ND_PRINT((ndo," situation=%u", (uint32_t)ntohl(sa.sit)));

if (doi != 1) {

ND_PRINT((ndo," doi=%d", doi));

ND_PRINT((ndo," situation=%u", (uint32_t)ntohl(sa.sit)));

- return (u_char *)(p + 1);

+ return (const u_char *)(p + 1);

}

ND_PRINT((ndo," doi=ipsec"));

}

ND_PRINT((ndo," doi=ipsec"));

@@ -1028,7 +1015,7 @@ ikev1_sa_print(netdissect_options *ndo, u_char tpay _U_,

if (sit & 0x04)

ND_PRINT((ndo,"%sintegrity", t ? "+" : ""));

if (sit & 0x04)

ND_PRINT((ndo,"%sintegrity", t ? "+" : ""));

- np = (u_char *)ext + sizeof(sa);

+ np = (const u_char *)ext + sizeof(sa);

if (sit != 0x01) {

ND_TCHECK2(*(ext + 1), sizeof(ident));

UNALIGNED_MEMCPY(&ident, ext + 1, sizeof(ident));

if (sit != 0x01) {

ND_TCHECK2(*(ext + 1), sizeof(ident));

UNALIGNED_MEMCPY(&ident, ext + 1, sizeof(ident));

@@ -1036,7 +1023,7 @@ ikev1_sa_print(netdissect_options *ndo, u_char tpay _U_,

np += sizeof(ident);

}

np += sizeof(ident);

}

- ext = (struct isakmp_gen *)np;

+ ext = (const struct isakmp_gen *)np;

ND_TCHECK(*ext);

cp = ikev1_sub_print(ndo, ISAKMP_NPTYPE_P, ext, ep, phase, doi, proto0,

ND_TCHECK(*ext);

cp = ikev1_sub_print(ndo, ISAKMP_NPTYPE_P, ext, ep, phase, doi, proto0,

@@ -1060,18 +1047,18 @@ ikev1_p_print(netdissect_options *ndo, u_char tpay _U_,

ND_PRINT((ndo,"%s:", NPSTR(ISAKMP_NPTYPE_P)));

- p = (struct ikev1_pl_p *)ext;

+ p = (const struct ikev1_pl_p *)ext;

ND_TCHECK(*p);

UNALIGNED_MEMCPY(&prop, ext, sizeof(prop));

ND_PRINT((ndo," #%d protoid=%s transform=%d",

prop.p_no, PROTOIDSTR(prop.prot_id), prop.num_t));

if (prop.spi_size) {

ND_PRINT((ndo," spi="));

ND_TCHECK(*p);

UNALIGNED_MEMCPY(&prop, ext, sizeof(prop));

ND_PRINT((ndo," #%d protoid=%s transform=%d",

prop.p_no, PROTOIDSTR(prop.prot_id), prop.num_t));

if (prop.spi_size) {

ND_PRINT((ndo," spi="));

- if (!rawprint(ndo, (caddr_t)(p + 1), prop.spi_size))

+ if (!rawprint(ndo, (const uint8_t *)(p + 1), prop.spi_size))

goto trunc;

}

goto trunc;

}

- ext = (struct isakmp_gen *)((u_char *)(p + 1) + prop.spi_size);

+ ext = (const struct isakmp_gen *)((const u_char *)(p + 1) + prop.spi_size);

ND_TCHECK(*ext);

cp = ikev1_sub_print(ndo, ISAKMP_NPTYPE_T, ext, ep, phase, doi0,

ND_TCHECK(*ext);

cp = ikev1_sub_print(ndo, ISAKMP_NPTYPE_T, ext, ep, phase, doi0,

@@ -1227,7 +1214,7 @@ ikev1_t_print(netdissect_options *ndo, u_char tpay _U_,

ND_PRINT((ndo,"%s:", NPSTR(ISAKMP_NPTYPE_T)));

- p = (struct ikev1_pl_t *)ext;

+ p = (const struct ikev1_pl_t *)ext;

ND_TCHECK(*p);

UNALIGNED_MEMCPY(&t, ext, sizeof(t));

ND_TCHECK(*p);

UNALIGNED_MEMCPY(&t, ext, sizeof(t));

@@ -1263,8 +1250,8 @@ ikev1_t_print(netdissect_options *ndo, u_char tpay _U_,

ND_PRINT((ndo," #%d id=%s ", t.t_no, idstr));

else

ND_PRINT((ndo," #%d id=%d ", t.t_no, t.t_id));

ND_PRINT((ndo," #%d id=%s ", t.t_no, idstr));

else

ND_PRINT((ndo," #%d id=%d ", t.t_no, t.t_id));

- cp = (u_char *)(p + 1);

- ep2 = (u_char *)p + item_len;

+ cp = (const u_char *)(p + 1);

+ ep2 = (const u_char *)p + item_len;

while (cp < ep && cp < ep2) {

if (map && nmap) {

cp = ikev1_attrmap_print(ndo, cp, (ep < ep2) ? ep : ep2,

while (cp < ep && cp < ep2) {

if (map && nmap) {

cp = ikev1_attrmap_print(ndo, cp, (ep < ep2) ? ep : ep2,

@@ -1295,10 +1282,10 @@ ikev1_ke_print(netdissect_options *ndo, u_char tpay _U_,

ND_PRINT((ndo," key len=%d", ntohs(e.len) - 4));

if (2 < ndo->ndo_vflag && 4 < ntohs(e.len)) {

ND_PRINT((ndo," "));

ND_PRINT((ndo," key len=%d", ntohs(e.len) - 4));

if (2 < ndo->ndo_vflag && 4 < ntohs(e.len)) {

ND_PRINT((ndo," "));

- if (!rawprint(ndo, (caddr_t)(ext + 1), ntohs(e.len) - 4))

+ if (!rawprint(ndo, (const uint8_t *)(ext + 1), ntohs(e.len) - 4))

goto trunc;

}

goto trunc;

}

- return (u_char *)ext + ntohs(e.len);

+ return (const u_char *)ext + ntohs(e.len);

trunc:

ND_PRINT((ndo," [|%s]", NPSTR(ISAKMP_NPTYPE_KE)));

return NULL;

trunc:

ND_PRINT((ndo," [|%s]", NPSTR(ISAKMP_NPTYPE_KE)));

return NULL;

@@ -1326,11 +1313,11 @@ ikev1_id_print(netdissect_options *ndo, u_char tpay _U_,

ND_PRINT((ndo,"%s:", NPSTR(ISAKMP_NPTYPE_ID)));

- p = (struct ikev1_pl_id *)ext;

+ p = (const struct ikev1_pl_id *)ext;

ND_TCHECK(*p);

UNALIGNED_MEMCPY(&id, ext, sizeof(id));

if (sizeof(*p) < item_len) {

ND_TCHECK(*p);

UNALIGNED_MEMCPY(&id, ext, sizeof(id));

if (sizeof(*p) < item_len) {

- data = (u_char *)(p + 1);

+ data = (const u_char *)(p + 1);

len = item_len - sizeof(*p);

} else {

data = NULL;

len = item_len - sizeof(*p);

} else {

data = NULL;

@@ -1355,27 +1342,27 @@ ikev1_id_print(netdissect_options *ndo, u_char tpay _U_,

#endif

case 2:

{

#endif

case 2:

{

- const struct ipsecdoi_id *p;

- struct ipsecdoi_id id;

+ const struct ipsecdoi_id *doi_p;

+ struct ipsecdoi_id doi_id;

struct protoent *pe;

- p = (struct ipsecdoi_id *)ext;

- ND_TCHECK(*p);

- UNALIGNED_MEMCPY(&id, ext, sizeof(id));

- ND_PRINT((ndo," idtype=%s", STR_OR_ID(id.type, ipsecidtypestr)));

+ doi_p = (const struct ipsecdoi_id *)ext;

+ ND_TCHECK(*doi_p);

+ UNALIGNED_MEMCPY(&doi_id, ext, sizeof(doi_id));

+ ND_PRINT((ndo," idtype=%s", STR_OR_ID(doi_id.type, ipsecidtypestr)));

/* A protocol ID of 0 DOES NOT mean IPPROTO_IP! */

- pe = id.proto_id ? getprotobynumber(id.proto_id) : NULL;

+ pe = doi_id.proto_id ? getprotobynumber(doi_id.proto_id) : NULL;

if (pe)

ND_PRINT((ndo," protoid=%s", pe->p_name));

else

if (pe)

ND_PRINT((ndo," protoid=%s", pe->p_name));

else

- ND_PRINT((ndo," protoid=%u", id.proto_id));

- ND_PRINT((ndo," port=%d", ntohs(id.port)));

+ ND_PRINT((ndo," protoid=%u", doi_id.proto_id));

+ ND_PRINT((ndo," port=%d", ntohs(doi_id.port)));

if (!len)

break;

if (data == NULL)

goto trunc;

ND_TCHECK2(*data, len);

if (!len)

break;

if (data == NULL)

goto trunc;

ND_TCHECK2(*data, len);

- switch (id.type) {

+ switch (doi_id.type) {

case IPSECDOI_ID_IPV4_ADDR:

if (len < 4)

ND_PRINT((ndo," len=%d [bad: < 4]", len));

case IPSECDOI_ID_IPV4_ADDR:

if (len < 4)

ND_PRINT((ndo," len=%d [bad: < 4]", len));

@@ -1407,7 +1394,6 @@ ikev1_id_print(netdissect_options *ndo, u_char tpay _U_,

len = 0;

break;

}

len = 0;

break;

}

-#ifdef INET6

case IPSECDOI_ID_IPV6_ADDR:

if (len < 16)

ND_PRINT((ndo," len=%d [bad: < 16]", len));

case IPSECDOI_ID_IPV6_ADDR:

if (len < 16)

ND_PRINT((ndo," len=%d [bad: < 16]", len));

@@ -1421,7 +1407,7 @@ ikev1_id_print(netdissect_options *ndo, u_char tpay _U_,

if (len < 20)

ND_PRINT((ndo," len=%d [bad: < 20]", len));

else {

if (len < 20)

ND_PRINT((ndo," len=%d [bad: < 20]", len));

else {

- mask = (u_char *)(data + sizeof(struct in6_addr));

+ mask = (const u_char *)(data + sizeof(struct in6_addr));

/*XXX*/

ND_PRINT((ndo," len=%d %s/0x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x", len,

ip6addr_string(ndo, data),

/*XXX*/

ND_PRINT((ndo," len=%d %s/0x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x", len,

ip6addr_string(ndo, data),

@@ -1433,7 +1419,6 @@ ikev1_id_print(netdissect_options *ndo, u_char tpay _U_,

len = 0;

break;

}

len = 0;

break;

}

-#endif /*INET6*/

case IPSECDOI_ID_IPV4_ADDR_RANGE:

if (len < 8)

ND_PRINT((ndo," len=%d [bad: < 8]", len));

case IPSECDOI_ID_IPV4_ADDR_RANGE:

if (len < 8)

ND_PRINT((ndo," len=%d [bad: < 8]", len));

@@ -1444,7 +1429,6 @@ ikev1_id_print(netdissect_options *ndo, u_char tpay _U_,

}

len = 0;

break;

}

len = 0;

break;

-#ifdef INET6

case IPSECDOI_ID_IPV6_ADDR_RANGE:

if (len < 32)

ND_PRINT((ndo," len=%d [bad: < 32]", len));

case IPSECDOI_ID_IPV6_ADDR_RANGE:

if (len < 32)

ND_PRINT((ndo," len=%d [bad: < 32]", len));

@@ -1455,7 +1439,6 @@ ikev1_id_print(netdissect_options *ndo, u_char tpay _U_,

}

len = 0;

break;

}

len = 0;

break;

-#endif /*INET6*/

case IPSECDOI_ID_DER_ASN1_DN:

case IPSECDOI_ID_DER_ASN1_GN:

case IPSECDOI_ID_KEY_ID:

case IPSECDOI_ID_DER_ASN1_DN:

case IPSECDOI_ID_DER_ASN1_GN:

case IPSECDOI_ID_KEY_ID:

@@ -1468,11 +1451,11 @@ ikev1_id_print(netdissect_options *ndo, u_char tpay _U_,

ND_PRINT((ndo," len=%d", len));

if (2 < ndo->ndo_vflag) {

ND_PRINT((ndo," "));

ND_PRINT((ndo," len=%d", len));

if (2 < ndo->ndo_vflag) {

ND_PRINT((ndo," "));

- if (!rawprint(ndo, (caddr_t)data, len))

+ if (!rawprint(ndo, (const uint8_t *)data, len))

goto trunc;

}

goto trunc;

}

- return (u_char *)ext + item_len;

+ return (const u_char *)ext + item_len;

trunc:

ND_PRINT((ndo," [|%s]", NPSTR(ISAKMP_NPTYPE_ID)));

return NULL;

trunc:

ND_PRINT((ndo," [|%s]", NPSTR(ISAKMP_NPTYPE_ID)));

return NULL;

@@ -1495,17 +1478,17 @@ ikev1_cert_print(netdissect_options *ndo, u_char tpay _U_,

ND_PRINT((ndo,"%s:", NPSTR(ISAKMP_NPTYPE_CERT)));

- p = (struct ikev1_pl_cert *)ext;

+ p = (const struct ikev1_pl_cert *)ext;

ND_TCHECK(*p);

UNALIGNED_MEMCPY(&cert, ext, sizeof(cert));

ND_PRINT((ndo," len=%d", item_len - 4));

ND_PRINT((ndo," type=%s", STR_OR_ID((cert.encode), certstr)));

if (2 < ndo->ndo_vflag && 4 < item_len) {

ND_PRINT((ndo," "));

ND_TCHECK(*p);

UNALIGNED_MEMCPY(&cert, ext, sizeof(cert));

ND_PRINT((ndo," len=%d", item_len - 4));

ND_PRINT((ndo," type=%s", STR_OR_ID((cert.encode), certstr)));

if (2 < ndo->ndo_vflag && 4 < item_len) {

ND_PRINT((ndo," "));

- if (!rawprint(ndo, (caddr_t)(ext + 1), item_len - 4))

+ if (!rawprint(ndo, (const uint8_t *)(ext + 1), item_len - 4))

goto trunc;

}

goto trunc;

}

- return (u_char *)ext + item_len;

+ return (const u_char *)ext + item_len;

trunc:

ND_PRINT((ndo," [|%s]", NPSTR(ISAKMP_NPTYPE_CERT)));

return NULL;

trunc:

ND_PRINT((ndo," [|%s]", NPSTR(ISAKMP_NPTYPE_CERT)));

return NULL;

@@ -1527,17 +1510,17 @@ ikev1_cr_print(netdissect_options *ndo, u_char tpay _U_,

ND_PRINT((ndo,"%s:", NPSTR(ISAKMP_NPTYPE_CR)));

- p = (struct ikev1_pl_cert *)ext;

+ p = (const struct ikev1_pl_cert *)ext;

ND_TCHECK(*p);

UNALIGNED_MEMCPY(&cert, ext, sizeof(cert));

ND_PRINT((ndo," len=%d", item_len - 4));

ND_PRINT((ndo," type=%s", STR_OR_ID((cert.encode), certstr)));

if (2 < ndo->ndo_vflag && 4 < item_len) {

ND_PRINT((ndo," "));

ND_TCHECK(*p);

UNALIGNED_MEMCPY(&cert, ext, sizeof(cert));

ND_PRINT((ndo," len=%d", item_len - 4));

ND_PRINT((ndo," type=%s", STR_OR_ID((cert.encode), certstr)));

if (2 < ndo->ndo_vflag && 4 < item_len) {

ND_PRINT((ndo," "));

- if (!rawprint(ndo, (caddr_t)(ext + 1), item_len - 4))

+ if (!rawprint(ndo, (const uint8_t *)(ext + 1), item_len - 4))

goto trunc;

}

goto trunc;

}

- return (u_char *)ext + item_len;

+ return (const u_char *)ext + item_len;

trunc:

ND_PRINT((ndo," [|%s]", NPSTR(ISAKMP_NPTYPE_CR)));

return NULL;

trunc:

ND_PRINT((ndo," [|%s]", NPSTR(ISAKMP_NPTYPE_CR)));

return NULL;

@@ -1558,10 +1541,10 @@ ikev1_hash_print(netdissect_options *ndo, u_char tpay _U_,

ND_PRINT((ndo," len=%d", ntohs(e.len) - 4));

if (2 < ndo->ndo_vflag && 4 < ntohs(e.len)) {

ND_PRINT((ndo," "));

ND_PRINT((ndo," len=%d", ntohs(e.len) - 4));

if (2 < ndo->ndo_vflag && 4 < ntohs(e.len)) {

ND_PRINT((ndo," "));

- if (!rawprint(ndo, (caddr_t)(ext + 1), ntohs(e.len) - 4))

+ if (!rawprint(ndo, (const uint8_t *)(ext + 1), ntohs(e.len) - 4))

goto trunc;

}

goto trunc;

}

- return (u_char *)ext + ntohs(e.len);

+ return (const u_char *)ext + ntohs(e.len);

trunc:

ND_PRINT((ndo," [|%s]", NPSTR(ISAKMP_NPTYPE_HASH)));

return NULL;

trunc:

ND_PRINT((ndo," [|%s]", NPSTR(ISAKMP_NPTYPE_HASH)));

return NULL;

@@ -1582,10 +1565,10 @@ ikev1_sig_print(netdissect_options *ndo, u_char tpay _U_,

ND_PRINT((ndo," len=%d", ntohs(e.len) - 4));

if (2 < ndo->ndo_vflag && 4 < ntohs(e.len)) {

ND_PRINT((ndo," "));

ND_PRINT((ndo," len=%d", ntohs(e.len) - 4));

if (2 < ndo->ndo_vflag && 4 < ntohs(e.len)) {

ND_PRINT((ndo," "));

- if (!rawprint(ndo, (caddr_t)(ext + 1), ntohs(e.len) - 4))

+ if (!rawprint(ndo, (const uint8_t *)(ext + 1), ntohs(e.len) - 4))

goto trunc;

}

goto trunc;

}

- return (u_char *)ext + ntohs(e.len);

+ return (const u_char *)ext + ntohs(e.len);

trunc:

ND_PRINT((ndo," [|%s]", NPSTR(ISAKMP_NPTYPE_SIG)));

return NULL;

trunc:

ND_PRINT((ndo," [|%s]", NPSTR(ISAKMP_NPTYPE_SIG)));

return NULL;

@@ -1608,14 +1591,14 @@ ikev1_nonce_print(netdissect_options *ndo, u_char tpay _U_,

ND_PRINT((ndo," n len=%d", ntohs(e.len) - 4));

if (2 < ndo->ndo_vflag && 4 < ntohs(e.len)) {

ND_PRINT((ndo," "));

ND_PRINT((ndo," n len=%d", ntohs(e.len) - 4));

if (2 < ndo->ndo_vflag && 4 < ntohs(e.len)) {

ND_PRINT((ndo," "));

- if (!rawprint(ndo, (caddr_t)(ext + 1), ntohs(e.len) - 4))

+ if (!rawprint(ndo, (const uint8_t *)(ext + 1), ntohs(e.len) - 4))

goto trunc;

} else if (1 < ndo->ndo_vflag && 4 < ntohs(e.len)) {

ND_PRINT((ndo," "));

goto trunc;

} else if (1 < ndo->ndo_vflag && 4 < ntohs(e.len)) {

ND_PRINT((ndo," "));

- if (!ike_show_somedata(ndo, (u_char *)(caddr_t)(ext + 1), ep))

+ if (!ike_show_somedata(ndo, (const u_char *)(const uint8_t *)(ext + 1), ep))

goto trunc;

}

goto trunc;

}

- return (u_char *)ext + ntohs(e.len);

+ return (const u_char *)ext + ntohs(e.len);

trunc:

ND_PRINT((ndo," [|%s]", NPSTR(ISAKMP_NPTYPE_NONCE)));

return NULL;

trunc:

ND_PRINT((ndo," [|%s]", NPSTR(ISAKMP_NPTYPE_NONCE)));

return NULL;

@@ -1627,9 +1610,10 @@ ikev1_n_print(netdissect_options *ndo, u_char tpay _U_,

const u_char *ep, uint32_t phase, uint32_t doi0 _U_,

uint32_t proto0 _U_, int depth)

{

const u_char *ep, uint32_t phase, uint32_t doi0 _U_,

uint32_t proto0 _U_, int depth)

{

- struct ikev1_pl_n *p, n;

+ const struct ikev1_pl_n *p;

+ struct ikev1_pl_n n;

const u_char *cp;

- u_char *ep2;

+ const u_char *ep2;

uint32_t doi;

uint32_t proto;

static const char *notify_error_str[] = {

uint32_t doi;

uint32_t proto;

static const char *notify_error_str[] = {

@@ -1680,7 +1664,7 @@ ikev1_n_print(netdissect_options *ndo, u_char tpay _U_,

ND_PRINT((ndo,"%s:", NPSTR(ISAKMP_NPTYPE_N)));

- p = (struct ikev1_pl_n *)ext;

+ p = (const struct ikev1_pl_n *)ext;

ND_TCHECK(*p);

UNALIGNED_MEMCPY(&n, ext, sizeof(n));

doi = ntohl(n.doi);

ND_TCHECK(*p);

UNALIGNED_MEMCPY(&n, ext, sizeof(n));

doi = ntohl(n.doi);

@@ -1698,10 +1682,10 @@ ikev1_n_print(netdissect_options *ndo, u_char tpay _U_,

ND_PRINT((ndo," type=%s", numstr(ntohs(n.type))));

if (n.spi_size) {

ND_PRINT((ndo," spi="));

ND_PRINT((ndo," type=%s", numstr(ntohs(n.type))));

if (n.spi_size) {

ND_PRINT((ndo," spi="));

- if (!rawprint(ndo, (caddr_t)(p + 1), n.spi_size))

+ if (!rawprint(ndo, (const uint8_t *)(p + 1), n.spi_size))

goto trunc;

}

goto trunc;

}

- return (u_char *)(p + 1) + n.spi_size;

+ return (const u_char *)(p + 1) + n.spi_size;

}

ND_PRINT((ndo," doi=ipsec"));

}

ND_PRINT((ndo," doi=ipsec"));

@@ -1718,12 +1702,12 @@ ikev1_n_print(netdissect_options *ndo, u_char tpay _U_,

ND_PRINT((ndo," type=%s", numstr(ntohs(n.type))));

if (n.spi_size) {

ND_PRINT((ndo," spi="));

ND_PRINT((ndo," type=%s", numstr(ntohs(n.type))));

if (n.spi_size) {

ND_PRINT((ndo," spi="));

- if (!rawprint(ndo, (caddr_t)(p + 1), n.spi_size))

+ if (!rawprint(ndo, (const uint8_t *)(p + 1), n.spi_size))

goto trunc;

}

goto trunc;

}

- cp = (u_char *)(p + 1) + n.spi_size;

- ep2 = (u_char *)p + item_len;

+ cp = (const u_char *)(p + 1) + n.spi_size;

+ ep2 = (const u_char *)p + item_len;

if (cp < ep) {

ND_PRINT((ndo," orig=("));

if (cp < ep) {

ND_PRINT((ndo," orig=("));

@@ -1744,7 +1728,7 @@ ikev1_n_print(netdissect_options *ndo, u_char tpay _U_,

break;

case ISAKMP_NTYPE_NO_PROPOSAL_CHOSEN:

if (ikev1_sub_print(ndo, ISAKMP_NPTYPE_SA,

break;

case ISAKMP_NTYPE_NO_PROPOSAL_CHOSEN:

if (ikev1_sub_print(ndo, ISAKMP_NPTYPE_SA,

- (struct isakmp_gen *)cp, ep, phase, doi, proto,

+ (const struct isakmp_gen *)cp, ep, phase, doi, proto,

depth) == NULL)

return NULL;

break;

depth) == NULL)

return NULL;

break;

@@ -1756,7 +1740,7 @@ ikev1_n_print(netdissect_options *ndo, u_char tpay _U_,

}

ND_PRINT((ndo,")"));

}

ND_PRINT((ndo,")"));

}

- return (u_char *)ext + item_len;

+ return (const u_char *)ext + item_len;

trunc:

ND_PRINT((ndo," [|%s]", NPSTR(ISAKMP_NPTYPE_N)));

return NULL;

trunc:

ND_PRINT((ndo," [|%s]", NPSTR(ISAKMP_NPTYPE_N)));

return NULL;

@@ -1777,7 +1761,7 @@ ikev1_d_print(netdissect_options *ndo, u_char tpay _U_,

ND_PRINT((ndo,"%s:", NPSTR(ISAKMP_NPTYPE_D)));

- p = (struct ikev1_pl_d *)ext;

+ p = (const struct ikev1_pl_d *)ext;

ND_TCHECK(*p);

UNALIGNED_MEMCPY(&d, ext, sizeof(d));

doi = ntohl(d.doi);

ND_TCHECK(*p);

UNALIGNED_MEMCPY(&d, ext, sizeof(d));

doi = ntohl(d.doi);

@@ -1792,11 +1776,11 @@ ikev1_d_print(netdissect_options *ndo, u_char tpay _U_,

ND_PRINT((ndo," spilen=%u", d.spi_size));

ND_PRINT((ndo," nspi=%u", ntohs(d.num_spi)));

ND_PRINT((ndo," spi="));

ND_PRINT((ndo," spilen=%u", d.spi_size));

ND_PRINT((ndo," nspi=%u", ntohs(d.num_spi)));

ND_PRINT((ndo," spi="));

- q = (uint8_t *)(p + 1);

+ q = (const uint8_t *)(p + 1);

for (i = 0; i < ntohs(d.num_spi); i++) {

if (i != 0)

ND_PRINT((ndo,","));

for (i = 0; i < ntohs(d.num_spi); i++) {

if (i != 0)

ND_PRINT((ndo,","));

- if (!rawprint(ndo, (caddr_t)q, d.spi_size))

+ if (!rawprint(ndo, (const uint8_t *)q, d.spi_size))

goto trunc;

q += d.spi_size;

}

goto trunc;

q += d.spi_size;

}

@@ -1822,10 +1806,10 @@ ikev1_vid_print(netdissect_options *ndo, u_char tpay _U_,

ND_PRINT((ndo," len=%d", ntohs(e.len) - 4));

if (2 < ndo->ndo_vflag && 4 < ntohs(e.len)) {

ND_PRINT((ndo," "));

ND_PRINT((ndo," len=%d", ntohs(e.len) - 4));

if (2 < ndo->ndo_vflag && 4 < ntohs(e.len)) {

ND_PRINT((ndo," "));

- if (!rawprint(ndo, (caddr_t)(ext + 1), ntohs(e.len) - 4))

+ if (!rawprint(ndo, (const uint8_t *)(ext + 1), ntohs(e.len) - 4))

goto trunc;

}

goto trunc;

}

- return (u_char *)ext + ntohs(e.len);

+ return (const u_char *)ext + ntohs(e.len);

trunc:

ND_PRINT((ndo," [|%s]", NPSTR(ISAKMP_NPTYPE_VID)));

return NULL;

trunc:

ND_PRINT((ndo," [|%s]", NPSTR(ISAKMP_NPTYPE_VID)));

return NULL;

@@ -1856,10 +1840,10 @@ ikev2_gen_print(netdissect_options *ndo, u_char tpay,

ND_PRINT((ndo," len=%d", ntohs(e.len) - 4));

if (2 < ndo->ndo_vflag && 4 < ntohs(e.len)) {

ND_PRINT((ndo," "));

ND_PRINT((ndo," len=%d", ntohs(e.len) - 4));

if (2 < ndo->ndo_vflag && 4 < ntohs(e.len)) {

ND_PRINT((ndo," "));

- if (!rawprint(ndo, (caddr_t)(ext + 1), ntohs(e.len) - 4))

+ if (!rawprint(ndo, (const uint8_t *)(ext + 1), ntohs(e.len) - 4))

goto trunc;

}

goto trunc;

}

- return (u_char *)ext + ntohs(e.len);

+ return (const u_char *)ext + ntohs(e.len);

trunc:

ND_PRINT((ndo," [|%s]", NPSTR(tpay)));

return NULL;

trunc:

ND_PRINT((ndo," [|%s]", NPSTR(tpay)));

return NULL;

@@ -1880,7 +1864,7 @@ ikev2_t_print(netdissect_options *ndo, u_char tpay _U_, int pcount,

size_t nmap;

const u_char *ep2;

size_t nmap;

const u_char *ep2;

- p = (struct ikev2_t *)ext;

+ p = (const struct ikev2_t *)ext;

ND_TCHECK(*p);

UNALIGNED_MEMCPY(&t, ext, sizeof(t));

ikev2_pay_print(ndo, NPSTR(ISAKMP_NPTYPE_T), t.h.critical);

ND_TCHECK(*p);

UNALIGNED_MEMCPY(&t, ext, sizeof(t));

ikev2_pay_print(ndo, NPSTR(ISAKMP_NPTYPE_T), t.h.critical);

@@ -1926,8 +1910,8 @@ ikev2_t_print(netdissect_options *ndo, u_char tpay _U_, int pcount,

ND_PRINT((ndo," #%u type=%s id=%u ", pcount,

STR_OR_ID(t.t_type, ikev2_t_type_map),

t.t_id));

ND_PRINT((ndo," #%u type=%s id=%u ", pcount,

STR_OR_ID(t.t_type, ikev2_t_type_map),

t.t_id));

- cp = (u_char *)(p + 1);

- ep2 = (u_char *)p + item_len;

+ cp = (const u_char *)(p + 1);

+ ep2 = (const u_char *)p + item_len;

while (cp < ep && cp < ep2) {

if (map && nmap) {

cp = ikev1_attrmap_print(ndo, cp, (ep < ep2) ? ep : ep2,

while (cp < ep && cp < ep2) {

if (map && nmap) {

cp = ikev1_attrmap_print(ndo, cp, (ep < ep2) ? ep : ep2,

@@ -1953,7 +1937,7 @@ ikev2_p_print(netdissect_options *ndo, u_char tpay _U_, int pcount _U_,

struct ikev2_p prop;

const u_char *cp;

struct ikev2_p prop;

const u_char *cp;

- p = (struct ikev2_p *)ext;

+ p = (const struct ikev2_p *)ext;

ND_TCHECK(*p);

UNALIGNED_MEMCPY(&prop, ext, sizeof(prop));

ikev2_pay_print(ndo, NPSTR(ISAKMP_NPTYPE_P), prop.h.critical);

ND_TCHECK(*p);

UNALIGNED_MEMCPY(&prop, ext, sizeof(prop));

ikev2_pay_print(ndo, NPSTR(ISAKMP_NPTYPE_P), prop.h.critical);

@@ -1963,11 +1947,11 @@ ikev2_p_print(netdissect_options *ndo, u_char tpay _U_, int pcount _U_,

prop.num_t, ntohs(prop.h.len)));

if (prop.spi_size) {

ND_PRINT((ndo," spi="));

prop.num_t, ntohs(prop.h.len)));

if (prop.spi_size) {

ND_PRINT((ndo," spi="));

- if (!rawprint(ndo, (caddr_t)(p + 1), prop.spi_size))

+ if (!rawprint(ndo, (const uint8_t *)(p + 1), prop.spi_size))

goto trunc;

}

goto trunc;

}

- ext = (struct isakmp_gen *)((u_char *)(p + 1) + prop.spi_size);

+ ext = (const struct isakmp_gen *)((const u_char *)(p + 1) + prop.spi_size);

ND_TCHECK(*ext);

cp = ikev2_sub_print(ndo, NULL, ISAKMP_NPTYPE_T, ext, ep, phase, doi0,

ND_TCHECK(*ext);

cp = ikev2_sub_print(ndo, NULL, ISAKMP_NPTYPE_T, ext, ep, phase, doi0,

@@ -2001,7 +1985,7 @@ ikev2_sa_print(netdissect_options *ndo, u_char tpay,

ext1+1, ep,

0, 0, 0, depth);

ext1+1, ep,

0, 0, 0, depth);

- return (u_char *)ext1 + osa_length;

+ return (const u_char *)ext1 + osa_length;

trunc:

ND_PRINT((ndo," [|%s]", NPSTR(tpay)));

return NULL;

trunc:

ND_PRINT((ndo," [|%s]", NPSTR(tpay)));

return NULL;

@@ -2015,9 +1999,9 @@ ikev2_ke_print(netdissect_options *ndo, u_char tpay,

uint32_t proto _U_, int depth _U_)

{

struct ikev2_ke ke;

uint32_t proto _U_, int depth _U_)

{

struct ikev2_ke ke;

- struct ikev2_ke *k;

+ const struct ikev2_ke *k;

- k = (struct ikev2_ke *)ext;

+ k = (const struct ikev2_ke *)ext;

ND_TCHECK(*ext);

UNALIGNED_MEMCPY(&ke, ext, sizeof(ke));

ikev2_pay_print(ndo, NPSTR(tpay), ke.h.critical);

ND_TCHECK(*ext);

UNALIGNED_MEMCPY(&ke, ext, sizeof(ke));

ikev2_pay_print(ndo, NPSTR(tpay), ke.h.critical);

@@ -2027,10 +2011,10 @@ ikev2_ke_print(netdissect_options *ndo, u_char tpay,

if (2 < ndo->ndo_vflag && 8 < ntohs(ke.h.len)) {

ND_PRINT((ndo," "));

if (2 < ndo->ndo_vflag && 8 < ntohs(ke.h.len)) {

ND_PRINT((ndo," "));

- if (!rawprint(ndo, (caddr_t)(k + 1), ntohs(ke.h.len) - 8))

+ if (!rawprint(ndo, (const uint8_t *)(k + 1), ntohs(ke.h.len) - 8))

goto trunc;

}

goto trunc;

}

- return (u_char *)ext + ntohs(ke.h.len);

+ return (const u_char *)ext + ntohs(ke.h.len);

trunc:

ND_PRINT((ndo," [|%s]", NPSTR(tpay)));

return NULL;

trunc:

ND_PRINT((ndo," [|%s]", NPSTR(tpay)));

return NULL;

@@ -2046,7 +2030,7 @@ ikev2_ID_print(netdissect_options *ndo, u_char tpay,

struct ikev2_id id;

int id_len, idtype_len, i;

unsigned int dumpascii, dumphex;

struct ikev2_id id;

int id_len, idtype_len, i;

unsigned int dumpascii, dumphex;

- unsigned char *typedata;

+ const unsigned char *typedata;

ND_TCHECK(*ext);

UNALIGNED_MEMCPY(&id, ext, sizeof(id));

ND_TCHECK(*ext);

UNALIGNED_MEMCPY(&id, ext, sizeof(id));

@@ -2057,14 +2041,14 @@ ikev2_ID_print(netdissect_options *ndo, u_char tpay,

ND_PRINT((ndo," len=%d", id_len - 4));

if (2 < ndo->ndo_vflag && 4 < id_len) {

ND_PRINT((ndo," "));

ND_PRINT((ndo," len=%d", id_len - 4));

if (2 < ndo->ndo_vflag && 4 < id_len) {

ND_PRINT((ndo," "));

- if (!rawprint(ndo, (caddr_t)(ext + 1), id_len - 4))

+ if (!rawprint(ndo, (const uint8_t *)(ext + 1), id_len - 4))

goto trunc;

}

idtype_len =id_len - sizeof(struct ikev2_id);

dumpascii = 0;

dumphex = 0;

goto trunc;

}

idtype_len =id_len - sizeof(struct ikev2_id);

dumpascii = 0;

dumphex = 0;

- typedata = (unsigned char *)(ext)+sizeof(struct ikev2_id);

+ typedata = (const unsigned char *)(ext)+sizeof(struct ikev2_id);

switch(id.type) {

case ID_IPV4_ADDR:

switch(id.type) {

case ID_IPV4_ADDR:

@@ -2108,11 +2092,11 @@ ikev2_ID_print(netdissect_options *ndo, u_char tpay,

}

if(dumphex) {

}

if(dumphex) {

- if (!rawprint(ndo, (caddr_t)typedata, idtype_len))

+ if (!rawprint(ndo, (const uint8_t *)typedata, idtype_len))

goto trunc;

}

goto trunc;

}

- return (u_char *)ext + id_len;

+ return (const u_char *)ext + id_len;

trunc:

ND_PRINT((ndo," [|%s]", NPSTR(tpay)));

return NULL;

trunc:

ND_PRINT((ndo," [|%s]", NPSTR(tpay)));

return NULL;

@@ -2148,7 +2132,7 @@ ikev2_auth_print(netdissect_options *ndo, u_char tpay,

struct ikev2_auth a;

const char *v2_auth[]={ "invalid", "rsasig",

"shared-secret", "dsssig" };

struct ikev2_auth a;

const char *v2_auth[]={ "invalid", "rsasig",

"shared-secret", "dsssig" };

- u_char *authdata = (u_char*)ext + sizeof(a);

+ const u_char *authdata = (const u_char*)ext + sizeof(a);

unsigned int len;

ND_TCHECK(*ext);

unsigned int len;

ND_TCHECK(*ext);

@@ -2161,14 +2145,14 @@ ikev2_auth_print(netdissect_options *ndo, u_char tpay,

if (1 < ndo->ndo_vflag && 4 < len) {

ND_PRINT((ndo," authdata=("));

if (1 < ndo->ndo_vflag && 4 < len) {

ND_PRINT((ndo," authdata=("));

- if (!rawprint(ndo, (caddr_t)authdata, len - sizeof(a)))

+ if (!rawprint(ndo, (const uint8_t *)authdata, len - sizeof(a)))

goto trunc;

ND_PRINT((ndo,") "));

} else if(ndo->ndo_vflag && 4 < len) {

if(!ike_show_somedata(ndo, authdata, ep)) goto trunc;

}

goto trunc;

ND_PRINT((ndo,") "));

} else if(ndo->ndo_vflag && 4 < len) {

if(!ike_show_somedata(ndo, authdata, ep)) goto trunc;

}

- return (u_char *)ext + len;

+ return (const u_char *)ext + len;

trunc:

ND_PRINT((ndo," [|%s]", NPSTR(tpay)));

return NULL;

trunc:

ND_PRINT((ndo," [|%s]", NPSTR(tpay)));

return NULL;

@@ -2190,14 +2174,14 @@ ikev2_nonce_print(netdissect_options *ndo, u_char tpay,

ND_PRINT((ndo," len=%d", ntohs(e.len) - 4));

if (1 < ndo->ndo_vflag && 4 < ntohs(e.len)) {

ND_PRINT((ndo," nonce=("));

ND_PRINT((ndo," len=%d", ntohs(e.len) - 4));

if (1 < ndo->ndo_vflag && 4 < ntohs(e.len)) {

ND_PRINT((ndo," nonce=("));

- if (!rawprint(ndo, (caddr_t)(ext + 1), ntohs(e.len) - 4))

+ if (!rawprint(ndo, (const uint8_t *)(ext + 1), ntohs(e.len) - 4))

goto trunc;

ND_PRINT((ndo,") "));

} else if(ndo->ndo_vflag && 4 < ntohs(e.len)) {

if(!ike_show_somedata(ndo, (const u_char *)(ext+1), ep)) goto trunc;

}

goto trunc;

ND_PRINT((ndo,") "));

} else if(ndo->ndo_vflag && 4 < ntohs(e.len)) {

if(!ike_show_somedata(ndo, (const u_char *)(ext+1), ep)) goto trunc;

}

- return (u_char *)ext + ntohs(e.len);

+ return (const u_char *)ext + ntohs(e.len);

trunc:

ND_PRINT((ndo," [|%s]", NPSTR(tpay)));

return NULL;

trunc:

ND_PRINT((ndo," [|%s]", NPSTR(tpay)));

return NULL;

@@ -2211,13 +2195,14 @@ ikev2_n_print(netdissect_options *ndo, u_char tpay _U_,

uint32_t phase _U_, uint32_t doi _U_,

uint32_t proto _U_, int depth _U_)

{

uint32_t phase _U_, uint32_t doi _U_,

uint32_t proto _U_, int depth _U_)

{

- struct ikev2_n *p, n;

+ const struct ikev2_n *p;

+ struct ikev2_n n;

const u_char *cp;

u_char showspi, showdata, showsomedata;

const char *notify_name;

uint32_t type;

const u_char *cp;

u_char showspi, showdata, showsomedata;

const char *notify_name;

uint32_t type;

- p = (struct ikev2_n *)ext;

+ p = (const struct ikev2_n *)ext;

ND_TCHECK(*p);

UNALIGNED_MEMCPY(&n, ext, sizeof(n));

ikev2_pay_print(ndo, NPSTR(ISAKMP_NPTYPE_N), n.h.critical);

ND_TCHECK(*p);

UNALIGNED_MEMCPY(&n, ext, sizeof(n));

ikev2_pay_print(ndo, NPSTR(ISAKMP_NPTYPE_N), n.h.critical);

@@ -2384,11 +2369,11 @@ ikev2_n_print(netdissect_options *ndo, u_char tpay _U_,

if (showspi && n.spi_size) {

ND_PRINT((ndo," spi="));

if (showspi && n.spi_size) {

ND_PRINT((ndo," spi="));

- if (!rawprint(ndo, (caddr_t)(p + 1), n.spi_size))

+ if (!rawprint(ndo, (const uint8_t *)(p + 1), n.spi_size))

goto trunc;

}

goto trunc;

}

- cp = (u_char *)(p + 1) + n.spi_size;

+ cp = (const u_char *)(p + 1) + n.spi_size;

if(3 < ndo->ndo_vflag) {

showdata = 1;

if(3 < ndo->ndo_vflag) {

showdata = 1;

@@ -2396,7 +2381,7 @@ ikev2_n_print(netdissect_options *ndo, u_char tpay _U_,

if ((showdata || (showsomedata && ep-cp < 30)) && cp < ep) {

ND_PRINT((ndo," data=("));

if ((showdata || (showsomedata && ep-cp < 30)) && cp < ep) {

ND_PRINT((ndo," data=("));

- if (!rawprint(ndo, (caddr_t)(cp), ep - cp))

+ if (!rawprint(ndo, (const uint8_t *)(cp), ep - cp))

goto trunc;

ND_PRINT((ndo,")"));

goto trunc;

ND_PRINT((ndo,")"));

@@ -2405,7 +2390,7 @@ ikev2_n_print(netdissect_options *ndo, u_char tpay _U_,

if(!ike_show_somedata(ndo, cp, ep)) goto trunc;

}

if(!ike_show_somedata(ndo, cp, ep)) goto trunc;

}

- return (u_char *)ext + item_len;

+ return (const u_char *)ext + item_len;

trunc:

ND_PRINT((ndo," [|%s]", NPSTR(ISAKMP_NPTYPE_N)));

return NULL;

trunc:

ND_PRINT((ndo," [|%s]", NPSTR(ISAKMP_NPTYPE_N)));

return NULL;

@@ -2446,10 +2431,10 @@ ikev2_vid_print(netdissect_options *ndo, u_char tpay,

}

if (2 < ndo->ndo_vflag && 4 < len) {

ND_PRINT((ndo," "));

}

if (2 < ndo->ndo_vflag && 4 < len) {

ND_PRINT((ndo," "));

- if (!rawprint(ndo, (caddr_t)(ext + 1), ntohs(e.len) - 4))

+ if (!rawprint(ndo, (const uint8_t *)(ext + 1), ntohs(e.len) - 4))

goto trunc;

}

goto trunc;

}

- return (u_char *)ext + ntohs(e.len);

+ return (const u_char *)ext + ntohs(e.len);

trunc:

ND_PRINT((ndo," [|%s]", NPSTR(tpay)));

return NULL;

trunc:

ND_PRINT((ndo," [|%s]", NPSTR(tpay)));

return NULL;

@@ -2492,7 +2477,7 @@ ikev2_e_print(netdissect_options *ndo,

int depth)

{

struct isakmp_gen e;

int depth)

{

struct isakmp_gen e;

- u_char *dat;

+ const u_char *dat;

volatile int dlen;

ND_TCHECK(*ext);

volatile int dlen;

ND_TCHECK(*ext);

@@ -2504,11 +2489,11 @@ ikev2_e_print(netdissect_options *ndo,

ND_PRINT((ndo," len=%d", dlen));

if (2 < ndo->ndo_vflag && 4 < dlen) {

ND_PRINT((ndo," "));

ND_PRINT((ndo," len=%d", dlen));

if (2 < ndo->ndo_vflag && 4 < dlen) {

ND_PRINT((ndo," "));

- if (!rawprint(ndo, (caddr_t)(ext + 1), dlen))

+ if (!rawprint(ndo, (const uint8_t *)(ext + 1), dlen))

goto trunc;

}

goto trunc;

}

- dat = (u_char *)(ext+1);

+ dat = (const u_char *)(ext+1);

ND_TCHECK2(*dat, dlen);

#ifdef HAVE_LIBCRYPTO

ND_TCHECK2(*dat, dlen);

#ifdef HAVE_LIBCRYPTO

@@ -2566,7 +2551,7 @@ ike_sub0_print(netdissect_options *ndo,

struct isakmp_gen e;

u_int item_len;

struct isakmp_gen e;

u_int item_len;

- cp = (u_char *)ext;

+ cp = (const u_char *)ext;

ND_TCHECK(*ext);

UNALIGNED_MEMCPY(&e, ext, sizeof(e));

ND_TCHECK(*ext);

UNALIGNED_MEMCPY(&e, ext, sizeof(e));

@@ -2630,7 +2615,7 @@ ikev1_sub_print(netdissect_options *ndo,

}

np = e.np;

}

np = e.np;

- ext = (struct isakmp_gen *)cp;

+ ext = (const struct isakmp_gen *)cp;

}

return cp;

trunc:

}

return cp;

trunc:

@@ -2668,7 +2653,7 @@ ikev1_print(netdissect_options *ndo,

i = cookie_find(&base->i_ck);

if (i < 0) {

i = cookie_find(&base->i_ck);

if (i < 0) {

- if (iszero((u_char *)&base->r_ck, sizeof(base->r_ck))) {

+ if (iszero((const u_char *)&base->r_ck, sizeof(base->r_ck))) {

/* the first packet */

ND_PRINT((ndo," I"));

if (bp2)

/* the first packet */

ND_PRINT((ndo," I"));

if (bp2)

@@ -2707,7 +2692,7 @@ ikev1_print(netdissect_options *ndo,

CHECKLEN(p + 1, base->np);

np = base->np;

CHECKLEN(p + 1, base->np);

np = base->np;

- ext = (struct isakmp_gen *)(p + 1);

+ ext = (const struct isakmp_gen *)(p + 1);

ikev1_sub_print(ndo, np, ext, ep, phase, 0, 0, 0);

}

ikev1_sub_print(ndo, np, ext, ep, phase, 0, 0, 0);

}

@@ -2730,7 +2715,7 @@ ikev2_sub0_print(netdissect_options *ndo, struct isakmp *base,

struct isakmp_gen e;

u_int item_len;

struct isakmp_gen e;

u_int item_len;

- cp = (u_char *)ext;

+ cp = (const u_char *)ext;

ND_TCHECK(*ext);

UNALIGNED_MEMCPY(&e, ext, sizeof(e));

ND_TCHECK(*ext);

UNALIGNED_MEMCPY(&e, ext, sizeof(e));

@@ -2808,7 +2793,7 @@ ikev2_sub_print(netdissect_options *ndo,

}

np = e.np;

}

np = e.np;

- ext = (struct isakmp_gen *)cp;

+ ext = (const struct isakmp_gen *)cp;

}

return cp;

trunc:

}

return cp;

trunc:

@@ -2861,7 +2846,7 @@ ikev2_print(netdissect_options *ndo,

CHECKLEN(p + 1, base->np)

np = base->np;

CHECKLEN(p + 1, base->np)

np = base->np;

- ext = (struct isakmp_gen *)(p + 1);

+ ext = (const struct isakmp_gen *)(p + 1);

ikev2_sub_print(ndo, base, np, ext, ep, phase, 0, 0, 0);

}

ikev2_sub_print(ndo, base, np, ext, ep, phase, 0, 0, 0);

}

@@ -2895,7 +2880,7 @@ isakmp_print(netdissect_options *ndo,

p = (const struct isakmp *)bp;

ep = ndo->ndo_snapend;

p = (const struct isakmp *)bp;

ep = ndo->ndo_snapend;

- if ((struct isakmp *)ep < p + 1) {

+ if ((const struct isakmp *)ep < p + 1) {

ND_PRINT((ndo,"[|isakmp]"));

return;

}

ND_PRINT((ndo,"[|isakmp]"));

return;

}

@@ -2914,14 +2899,14 @@ isakmp_print(netdissect_options *ndo,

if (ndo->ndo_vflag) {

ND_PRINT((ndo," msgid "));

if (ndo->ndo_vflag) {

ND_PRINT((ndo," msgid "));

- hexprint(ndo, (caddr_t)&base.msgid, sizeof(base.msgid));

+ hexprint(ndo, (const uint8_t *)&base.msgid, sizeof(base.msgid));

}

if (1 < ndo->ndo_vflag) {

ND_PRINT((ndo," cookie "));

}

if (1 < ndo->ndo_vflag) {

ND_PRINT((ndo," cookie "));

- hexprint(ndo, (caddr_t)&base.i_ck, sizeof(base.i_ck));

+ hexprint(ndo, (const uint8_t *)&base.i_ck, sizeof(base.i_ck));

ND_PRINT((ndo,"->"));

- hexprint(ndo, (caddr_t)&base.r_ck, sizeof(base.r_ck));

+ hexprint(ndo, (const uint8_t *)&base.r_ck, sizeof(base.r_ck));

}

ND_PRINT((ndo,":"));

}

ND_PRINT((ndo,":"));