Add program_name field in the netdissect_options structure

[tcpdump] / print-isakmp.c

diff --git a/print-isakmp.c b/print-isakmp.c
index a688c0d9cd8e0c3b3ca296a06a3cc668305f7c73..158b25843479f3bff2377db9a9b97f892c109da7 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


@@ -44,21 +43,15 @@
 
 #include <string.h>
 
 
 #include <string.h>
 

-#include <stdio.h>
-
-#include "interface.h"
+#include "netdissect.h"

 #include "addrtoname.h"
 #include "addrtoname.h"

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

 
 #include "ip.h"
 #ifdef INET6
 #include "ip6.h"
 #endif
 
 
 #include "ip.h"
 #ifdef INET6
 #include "ip6.h"
 #endif
 

-#ifndef HAVE_SOCKADDR_STORAGE
-#define sockaddr_storage sockaddr
-#endif
-

 /* refer to RFC 2408 */
 
 typedef u_char cookie_t[8];
 /* refer to RFC 2408 */
 
 typedef u_char cookie_t[8];


@@ -85,16 +78,16 @@ typedef u_char msgid_t[4];
 struct isakmp {
        cookie_t i_ck;          /* Initiator Cookie */
        cookie_t r_ck;          /* Responder Cookie */
 struct isakmp {
        cookie_t i_ck;          /* Initiator Cookie */
        cookie_t r_ck;          /* Responder Cookie */

-       u_int8_t np;            /* Next Payload Type */
-       u_int8_t vers;
+       uint8_t np;             /* Next Payload Type */
+       uint8_t vers;

 #define ISAKMP_VERS_MAJOR      0xf0
 #define ISAKMP_VERS_MAJOR_SHIFT        4
 #define ISAKMP_VERS_MINOR      0x0f
 #define ISAKMP_VERS_MINOR_SHIFT        0
 #define ISAKMP_VERS_MAJOR      0xf0
 #define ISAKMP_VERS_MAJOR_SHIFT        4
 #define ISAKMP_VERS_MINOR      0x0f
 #define ISAKMP_VERS_MINOR_SHIFT        0

-       u_int8_t etype;         /* Exchange Type */
-       u_int8_t flags;         /* Flags */
+       uint8_t etype;          /* Exchange Type */
+       uint8_t flags;          /* Flags */

        msgid_t msgid;
        msgid_t msgid;

-       u_int32_t len;          /* Length */
+       uint32_t len;           /* Length */

 };
 
 /* Next Payload Type */
 };
 
 /* Next Payload Type */


@@ -138,9 +131,9 @@ struct isakmp {
         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 */
 struct isakmp_gen {
         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 */
 struct isakmp_gen {

-       u_int8_t  np;       /* Next Payload */
-       u_int8_t  critical; /* bit 7 - critical, rest is RESERVED */
-       u_int16_t len;      /* Payload Length */
+       uint8_t  np;       /* Next Payload */
+       uint8_t  critical; /* bit 7 - critical, rest is RESERVED */
+       uint16_t len;      /* Payload Length */

 };
 
 /* 3.3 Data Attributes
 };
 
 /* 3.3 Data Attributes


@@ -154,8 +147,8 @@ struct isakmp_gen {
         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 */
 struct isakmp_data {
         +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 */
 struct isakmp_data {

-       u_int16_t type;     /* defined by DOI-spec, and Attribute Format */
-       u_int16_t lorv;     /* if f equal 1, Attribute Length */
+       uint16_t type;     /* defined by DOI-spec, and Attribute Format */
+       uint16_t lorv;     /* if f equal 1, Attribute Length */

                          /* if f equal 0, Attribute Value */
        /* if f equal 1, Attribute Value */
 };
                          /* if f equal 0, Attribute Value */
        /* if f equal 1, Attribute Value */
 };


@@ -174,8 +167,8 @@ struct isakmp_data {
        */
 struct ikev1_pl_sa {
        struct isakmp_gen h;
        */
 struct ikev1_pl_sa {
        struct isakmp_gen h;

-       u_int32_t doi; /* Domain of Interpretation */
-       u_int32_t sit; /* Situation */
+       uint32_t doi; /* Domain of Interpretation */
+       uint32_t sit; /* Situation */

 };
 
 /* 3.5 Proposal Payload */
 };
 
 /* 3.5 Proposal Payload */


@@ -188,10 +181,10 @@ struct ikev1_pl_sa {
        */
 struct ikev1_pl_p {
        struct isakmp_gen h;
        */
 struct ikev1_pl_p {
        struct isakmp_gen h;

-       u_int8_t p_no;      /* Proposal # */
-       u_int8_t prot_id;   /* Protocol */
-       u_int8_t spi_size;  /* SPI Size */
-       u_int8_t num_t;     /* Number of Transforms */
+       uint8_t p_no;      /* Proposal # */
+       uint8_t prot_id;   /* Protocol */
+       uint8_t spi_size;  /* SPI Size */
+       uint8_t num_t;     /* Number of Transforms */

        /* SPI */
 };
 
        /* SPI */
 };
 


@@ -204,9 +197,9 @@ struct ikev1_pl_p {
        */
 struct ikev1_pl_t {
        struct isakmp_gen h;
        */
 struct ikev1_pl_t {
        struct isakmp_gen h;

-       u_int8_t  t_no;     /* Transform # */
-       u_int8_t  t_id;     /* Transform-Id */
-       u_int16_t reserved; /* RESERVED2 */
+       uint8_t  t_no;     /* Transform # */
+       uint8_t  t_id;     /* Transform-Id */
+       uint16_t reserved; /* RESERVED2 */

        /* SA Attributes */
 };
 
        /* SA Attributes */
 };
 


@@ -221,8 +214,8 @@ struct ikev1_pl_ke {
 struct ikev1_pl_id {
        struct isakmp_gen h;
        union {
 struct ikev1_pl_id {
        struct isakmp_gen h;
        union {

-               u_int8_t  id_type;   /* ID Type */
-               u_int32_t doi_data;  /* DOI Specific ID Data */
+               uint8_t  id_type;   /* ID Type */
+               uint32_t doi_data;  /* DOI Specific ID Data */

        } d;
        /* Identification Data */
 };
        } d;
        /* Identification Data */
 };


@@ -230,7 +223,7 @@ struct ikev1_pl_id {
 /* 3.9 Certificate Payload */
 struct ikev1_pl_cert {
        struct isakmp_gen h;
 /* 3.9 Certificate Payload */
 struct ikev1_pl_cert {
        struct isakmp_gen h;

-       u_int8_t encode; /* Cert Encoding */
+       uint8_t encode; /* Cert Encoding */

        char   cert;   /* Certificate Data */
                /*
                This field indicates the type of
        char   cert;   /* Certificate Data */
                /*
                This field indicates the type of


@@ -242,7 +235,7 @@ struct ikev1_pl_cert {
 /* 3.10 Certificate Request Payload */
 struct ikev1_pl_cr {
        struct isakmp_gen h;
 /* 3.10 Certificate Request Payload */
 struct ikev1_pl_cr {
        struct isakmp_gen h;

-       u_int8_t num_cert; /* # Cert. Types */
+       uint8_t num_cert; /* # Cert. Types */

        /*
        Certificate Types (variable length)
          -- Contains a list of the types of certificates requested,
        /*
        Certificate Types (variable length)
          -- Contains a list of the types of certificates requested,


@@ -277,10 +270,10 @@ struct ikev1_pl_nonce {
 /* 3.14 Notification Payload */
 struct ikev1_pl_n {
        struct isakmp_gen h;
 /* 3.14 Notification Payload */
 struct ikev1_pl_n {
        struct isakmp_gen h;

-       u_int32_t doi;      /* Domain of Interpretation */
-       u_int8_t  prot_id;  /* Protocol-ID */
-       u_int8_t  spi_size; /* SPI Size */
-       u_int16_t type;     /* Notify Message Type */
+       uint32_t doi;      /* Domain of Interpretation */
+       uint8_t  prot_id;  /* Protocol-ID */
+       uint8_t  spi_size; /* SPI Size */
+       uint16_t type;     /* Notify Message Type */

        /* SPI */
        /* Notification Data */
 };
        /* SPI */
        /* Notification Data */
 };


@@ -317,10 +310,10 @@ struct ikev1_pl_n {
 /* 3.15 Delete Payload */
 struct ikev1_pl_d {
        struct isakmp_gen h;
 /* 3.15 Delete Payload */
 struct ikev1_pl_d {
        struct isakmp_gen h;

-       u_int32_t doi;      /* Domain of Interpretation */
-       u_int8_t  prot_id;  /* Protocol-Id */
-       u_int8_t  spi_size; /* SPI Size */
-       u_int16_t num_spi;  /* # of SPIs */
+       uint32_t doi;      /* Domain of Interpretation */
+       uint8_t  prot_id;  /* Protocol-Id */
+       uint8_t  spi_size; /* SPI Size */
+       uint16_t num_spi;  /* # of SPIs */

        /* SPI(es) */
 };
 
        /* SPI(es) */
 };
 


@@ -342,18 +335,18 @@ struct isakmp_ph2tab {
 /* 3.3.1.  Proposal Substructure */
 struct ikev2_p {
        struct isakmp_gen h;
 /* 3.3.1.  Proposal Substructure */
 struct ikev2_p {
        struct isakmp_gen h;

-       u_int8_t p_no;      /* Proposal # */
-       u_int8_t prot_id;   /* Protocol */
-       u_int8_t spi_size;  /* SPI Size */
-       u_int8_t num_t;     /* Number of Transforms */
+       uint8_t p_no;      /* Proposal # */
+       uint8_t prot_id;   /* Protocol */
+       uint8_t spi_size;  /* SPI Size */
+       uint8_t num_t;     /* Number of Transforms */

 };
 
 /* 3.3.2.  Transform Substructure */
 struct ikev2_t {
        struct isakmp_gen h;
 };
 
 /* 3.3.2.  Transform Substructure */
 struct ikev2_t {
        struct isakmp_gen h;

-       u_int8_t t_type;    /* Transform Type (ENCR,PRF,INTEG,etc.*/
-       u_int8_t res2;      /* reserved byte */
-       u_int16_t t_id;     /* Transform ID */
+       uint8_t t_type;    /* Transform Type (ENCR,PRF,INTEG,etc.*/
+       uint8_t res2;      /* reserved byte */
+       uint16_t t_id;     /* Transform ID */

 };
 
 enum ikev2_t_type {
 };
 
 enum ikev2_t_type {


@@ -361,14 +354,14 @@ 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 */
 struct ikev2_ke {
        struct isakmp_gen h;
 };
 
 /* 3.4.  Key Exchange Payload */
 struct ikev2_ke {
        struct isakmp_gen h;

-       u_int16_t  ke_group;
-       u_int16_t  ke_res1;
+       uint16_t  ke_group;
+       uint16_t  ke_res1;

        /* KE data */
 };
 
        /* KE data */
 };
 


@@ -381,13 +374,13 @@ 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;

-       u_int8_t  type;        /* ID type */
-       u_int8_t  res1;
-       u_int16_t res2;
+       uint8_t  type;        /* ID type */
+       uint8_t  res1;
+       uint16_t res2;

        /* SPI */
        /* Notification Data */
 };
        /* SPI */
        /* Notification Data */
 };


@@ -395,9 +388,9 @@ struct ikev2_id {
 /* 3.10 Notification Payload */
 struct ikev2_n {
        struct isakmp_gen h;
 /* 3.10 Notification Payload */
 struct ikev2_n {
        struct isakmp_gen h;

-       u_int8_t  prot_id;  /* Protocol-ID */
-       u_int8_t  spi_size; /* SPI Size */
-       u_int16_t type;     /* Notify Message Type */
+       uint8_t  prot_id;  /* Protocol-ID */
+       uint8_t  spi_size; /* SPI Size */
+       uint16_t type;     /* Notify Message Type */

 };
 
 enum ikev2_n_type {
 };
 
 enum ikev2_n_type {


@@ -430,22 +423,22 @@ enum ikev2_n_type {
 };
 
 struct notify_messages {
 };
 
 struct notify_messages {

-       u_int16_t type;
+       uint16_t type;

        char     *msg;
 };
 
 /* 3.8 Notification Payload */
 struct ikev2_auth {
        struct isakmp_gen h;
        char     *msg;
 };
 
 /* 3.8 Notification Payload */
 struct ikev2_auth {
        struct isakmp_gen h;

-       u_int8_t  auth_method;  /* Protocol-ID */
-       u_int8_t  reserved[3];
+       uint8_t  auth_method;  /* Protocol-ID */
+       uint8_t  reserved[3];

        /* authentication data */
 };
 
 enum ikev2_auth_type {
        IV2_RSA_SIG = 1,
        IV2_SHARED  = 2,
        /* authentication data */
 };
 
 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 */


@@ -453,15 +446,15 @@ enum ikev2_auth_type {
 #if 0
 /* isakmp sa structure */
 struct oakley_sa {
 #if 0
 /* isakmp sa structure */
 struct oakley_sa {

-       u_int8_t  proto_id;            /* OAKLEY */
+       uint8_t  proto_id;            /* OAKLEY */

        vchar_t   *spi;                /* spi */
        vchar_t   *spi;                /* spi */

-       u_int8_t  dhgrp;               /* DH; group */
-       u_int8_t  auth_t;              /* method of authentication */
-       u_int8_t  prf_t;               /* type of prf */
-       u_int8_t  hash_t;              /* type of hash */
-       u_int8_t  enc_t;               /* type of cipher */
-       u_int8_t  life_t;              /* type of duration of lifetime */
-       u_int32_t ldur;                /* life duration */
+       uint8_t  dhgrp;               /* DH; group */
+       uint8_t  auth_t;              /* method of authentication */
+       uint8_t  prf_t;               /* type of prf */
+       uint8_t  hash_t;              /* type of hash */
+       uint8_t  enc_t;               /* type of cipher */
+       uint8_t  life_t;              /* type of duration of lifetime */
+       uint32_t ldur;                /* life duration */

 };
 #endif
 
 };
 #endif
 


@@ -546,21 +539,21 @@ struct oakley_sa {
 /* 4.6.1 Security Association Payload */
 struct ipsecdoi_sa {
        struct isakmp_gen h;
 /* 4.6.1 Security Association Payload */
 struct ipsecdoi_sa {
        struct isakmp_gen h;

-       u_int32_t doi; /* Domain of Interpretation */
-       u_int32_t sit; /* Situation */
+       uint32_t doi; /* Domain of Interpretation */
+       uint32_t sit; /* Situation */

 };
 
 struct ipsecdoi_secrecy_h {
 };
 
 struct ipsecdoi_secrecy_h {

-       u_int16_t len;
-       u_int16_t reserved;
+       uint16_t len;
+       uint16_t reserved;

 };
 
 /* 4.6.2.1 Identification Type Values */
 struct ipsecdoi_id {
        struct isakmp_gen h;
 };
 
 /* 4.6.2.1 Identification Type Values */
 struct ipsecdoi_id {
        struct isakmp_gen h;

-       u_int8_t  type;         /* ID Type */
-       u_int8_t  proto_id;     /* Protocol ID */
-       u_int16_t port;         /* Port */
+       uint8_t  type;          /* ID Type */
+       uint8_t  proto_id;      /* Protocol ID */
+       uint16_t port;          /* Port */

        /* Identification Data */
 };
 
        /* Identification Data */
 };
 


@@ -587,9 +580,9 @@ struct ipsecdoi_id {
                const struct isakmp_gen *ext,                         \
                u_int item_len, \
                const u_char *end_pointer, \
                const struct isakmp_gen *ext,                         \
                u_int item_len, \
                const u_char *end_pointer, \

-               u_int32_t phase,\
-               u_int32_t doi0, \
-               u_int32_t proto0, int depth)
+               uint32_t phase,\
+               uint32_t doi0, \
+               uint32_t proto0, int depth)

 
 DECLARE_PRINTER(v1_sa);
 DECLARE_PRINTER(v1_p);
 
 DECLARE_PRINTER(v1_sa);
 DECLARE_PRINTER(v1_p);


@@ -625,21 +618,21 @@ static const u_char *ikev2_e_print(netdissect_options *ndo,
                                   const struct isakmp_gen *ext,
                                   u_int item_len,
                                   const u_char *end_pointer,
                                   const struct isakmp_gen *ext,
                                   u_int item_len,
                                   const u_char *end_pointer,

-                                  u_int32_t phase,
-                                  u_int32_t doi0,
-                                  u_int32_t proto0, int depth);
+                                  uint32_t phase,
+                                  uint32_t doi0,
+                                  uint32_t proto0, int depth);

 
 
 static const u_char *ike_sub0_print(netdissect_options *ndo,u_char, const struct isakmp_gen *,
 
 
 static const u_char *ike_sub0_print(netdissect_options *ndo,u_char, const struct isakmp_gen *,

-       const u_char *, u_int32_t, u_int32_t, u_int32_t, int);
+       const u_char *, uint32_t, uint32_t, uint32_t, int);

 static const u_char *ikev1_sub_print(netdissect_options *ndo,u_char, const struct isakmp_gen *,
 static const u_char *ikev1_sub_print(netdissect_options *ndo,u_char, const struct isakmp_gen *,

-       const u_char *, u_int32_t, u_int32_t, u_int32_t, int);
+       const u_char *, uint32_t, uint32_t, uint32_t, int);

 
 static const u_char *ikev2_sub_print(netdissect_options *ndo,
                                     struct isakmp *base,
                                     u_char np, const struct isakmp_gen *ext,
 
 static const u_char *ikev2_sub_print(netdissect_options *ndo,
                                     struct isakmp *base,
                                     u_char np, const struct isakmp_gen *ext,

-                                    const u_char *ep, u_int32_t phase,
-                                    u_int32_t doi, u_int32_t proto,
+                                    const u_char *ep, uint32_t phase,
+                                    uint32_t doi, uint32_t proto,

                                     int depth);
 
 
                                     int depth);
 
 


@@ -690,9 +683,9 @@ static const u_char *(*npfunc[])(netdissect_options *ndo, u_char tpay,
                                 const struct isakmp_gen *ext,
                                 u_int item_len,
                                 const u_char *end_pointer,
                                 const struct isakmp_gen *ext,
                                 u_int item_len,
                                 const u_char *end_pointer,

-                                u_int32_t phase,
-                                u_int32_t doi0,
-                                u_int32_t proto0, int depth) = {
+                                uint32_t phase,
+                                uint32_t doi0,
+                                uint32_t proto0, int depth) = {

        NULL,
        ikev1_sa_print,
        ikev1_p_print,
        NULL,
        ikev1_sa_print,
        ikev1_p_print,


@@ -748,7 +741,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;                                      \
                }


@@ -759,7 +752,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++)


@@ -787,9 +780,9 @@ 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;
+       const struct ip *ip;

 #ifdef INET6
 #ifdef INET6

-       struct ip6_hdr *ip6;
+       const struct ip6_hdr *ip6;

 #endif
 
        i = cookie_find(in);
 #endif
 
        i = cookie_find(in);


@@ -798,25 +791,25 @@ 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;
        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));
+               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:
                break;
 #ifdef INET6
        case 6:

-               ip6 = (struct ip6_hdr *)bp2;
+               ip6 = (const struct ip6_hdr *)bp2;

                cookiecache[ninitiator].version = 6;
                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));
+               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;
        }
                break;
 #endif
        default:
                return;
        }

-       unaligned_memcpy(&cookiecache[ninitiator].initiator, in, sizeof(*in));
+       UNALIGNED_MEMCPY(&cookiecache[ninitiator].initiator, in, sizeof(*in));

        ninitiator = (ninitiator + 1) % MAXINITIATORS;
 }
 
        ninitiator = (ninitiator + 1) % MAXINITIATORS;
 }
 


@@ -825,21 +818,21 @@ 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;
+       const struct ip *ip;

 #ifdef INET6
 #ifdef INET6

-       struct ip6_hdr *ip6;
+       const struct ip6_hdr *ip6;

 #endif
 
 #endif
 

-       ip = (struct ip *)bp2;
+       ip = (const struct ip *)bp2;

        switch (IP_V(ip)) {
        case 4:
                if (cookiecache[i].version != 4)
                        return 0;
                if (initiator) {
        switch (IP_V(ip)) {
        case 4:
                if (cookiecache[i].version != 4)
                        return 0;
                if (initiator) {

-                       if (unaligned_memcmp(&ip->ip_src, &cookiecache[i].iaddr.in4, sizeof(struct in_addr)) == 0)
+                       if (UNALIGNED_MEMCMP(&ip->ip_src, &cookiecache[i].iaddr.in4, sizeof(struct in_addr)) == 0)

                                return 1;
                } else {
                                return 1;
                } else {

-                       if (unaligned_memcmp(&ip->ip_src, &cookiecache[i].raddr.in4, sizeof(struct in_addr)) == 0)
+                       if (UNALIGNED_MEMCMP(&ip->ip_src, &cookiecache[i].raddr.in4, sizeof(struct in_addr)) == 0)

                                return 1;
                }
                break;
                                return 1;
                }
                break;


@@ -847,12 +840,12 @@ cookie_sidecheck(int i, const u_char *bp2, int initiator)
        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 (initiator) {

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

                                return 1;
                } else {
                                return 1;
                } else {

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

                                return 1;
                }
                break;
                                return 1;
                }
                break;


@@ -865,18 +858,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;
 
        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);
 


@@ -890,7 +883,7 @@ trunc:
 /*
  * returns false if we run out of data buffer
  */
 /*
  * returns false if we run out of data buffer
  */

-static int ike_show_somedata(struct netdissect_options *ndo,
+static int ike_show_somedata(netdissect_options *ndo,

                             const u_char *cp, const u_char *ep)
 {
        /* there is too much data, just show some of it */
                             const u_char *cp, const u_char *ep)
 {
        /* there is too much data, just show some of it */


@@ -908,10 +901,10 @@ static int ike_show_somedata(struct 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;


@@ -932,7 +925,7 @@ ikev1_attrmap_print(netdissect_options *ndo,
                    const struct attrmap *map, size_t nmap)
 {
        int totlen;
                    const struct attrmap *map, size_t nmap)
 {
        int totlen;

-       u_int32_t t, v;
+       uint32_t t, v;

 
        if (p[0] & 0x80)
                totlen = 4;
 
        if (p[0] & 0x80)
                totlen = 4;


@@ -955,10 +948,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;


@@ -968,7 +961,7 @@ static const u_char *
 ikev1_attr_print(netdissect_options *ndo, const u_char *p, const u_char *ep)
 {
        int totlen;
 ikev1_attr_print(netdissect_options *ndo, const u_char *p, const u_char *ep)
 {
        int totlen;

-       u_int32_t t;
+       uint32_t t;

 
        if (p[0] & 0x80)
                totlen = 4;
 
        if (p[0] & 0x80)
                totlen = 4;


@@ -985,10 +978,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;


@@ -998,26 +991,26 @@ static const u_char *
 ikev1_sa_print(netdissect_options *ndo, u_char tpay _U_,
               const struct isakmp_gen *ext,
                u_int item_len _U_,
 ikev1_sa_print(netdissect_options *ndo, u_char tpay _U_,
               const struct isakmp_gen *ext,
                u_int item_len _U_,

-               const u_char *ep, u_int32_t phase, u_int32_t doi0 _U_,
-               u_int32_t proto0, int depth)
+               const u_char *ep, uint32_t phase, uint32_t doi0 _U_,
+               uint32_t proto0, int depth)

 {
        const struct ikev1_pl_sa *p;
        struct ikev1_pl_sa sa;
 {
        const struct ikev1_pl_sa *p;
        struct ikev1_pl_sa sa;

-       u_int32_t doi, sit, ident;
+       uint32_t doi, sit, ident;

        const u_char *cp, *np;
        int t;
 
        ND_PRINT((ndo,"%s:", NPSTR(ISAKMP_NPTYPE_SA)));
 
        const u_char *cp, *np;
        int t;
 
        ND_PRINT((ndo,"%s:", NPSTR(ISAKMP_NPTYPE_SA)));
 

-       p = (struct ikev1_pl_sa *)ext;
+       p = (const struct ikev1_pl_sa *)ext;

        ND_TCHECK(*p);
        ND_TCHECK(*p);

-       unaligned_memcpy(&sa, ext, sizeof(sa));
+       UNALIGNED_MEMCPY(&sa, ext, sizeof(sa));

        doi = ntohl(sa.doi);
        sit = ntohl(sa.sit);
        if (doi != 1) {
                ND_PRINT((ndo," doi=%d", doi));
        doi = ntohl(sa.doi);
        sit = ntohl(sa.sit);
        if (doi != 1) {
                ND_PRINT((ndo," doi=%d", doi));

-               ND_PRINT((ndo," situation=%u", (u_int32_t)ntohl(sa.sit)));
-               return (u_char *)(p + 1);
+               ND_PRINT((ndo," situation=%u", (uint32_t)ntohl(sa.sit)));
+               return (const u_char *)(p + 1);

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


@@ -1034,15 +1027,15 @@ 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));
        if (sit != 0x01) {
                ND_TCHECK2(*(ext + 1), sizeof(ident));

-               unaligned_memcpy(&ident, ext + 1, sizeof(ident));
-               ND_PRINT((ndo," ident=%u", (u_int32_t)ntohl(ident)));
+               UNALIGNED_MEMCPY(&ident, ext + 1, sizeof(ident));
+               ND_PRINT((ndo," ident=%u", (uint32_t)ntohl(ident)));

                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,


@@ -1057,8 +1050,8 @@ trunc:
 static const u_char *
 ikev1_p_print(netdissect_options *ndo, u_char tpay _U_,
              const struct isakmp_gen *ext, u_int item_len _U_,
 static const u_char *
 ikev1_p_print(netdissect_options *ndo, u_char tpay _U_,
              const struct isakmp_gen *ext, u_int item_len _U_,

-              const u_char *ep, u_int32_t phase, u_int32_t doi0,
-              u_int32_t proto0 _U_, int depth)
+              const u_char *ep, uint32_t phase, uint32_t doi0,
+              uint32_t proto0 _U_, int depth)

 {
        const struct ikev1_pl_p *p;
        struct ikev1_pl_p prop;
 {
        const struct ikev1_pl_p *p;
        struct ikev1_pl_p prop;


@@ -1066,18 +1059,18 @@ ikev1_p_print(netdissect_options *ndo, u_char tpay _U_,
 
        ND_PRINT((ndo,"%s:", NPSTR(ISAKMP_NPTYPE_P)));
 
 
        ND_PRINT((ndo,"%s:", NPSTR(ISAKMP_NPTYPE_P)));
 

-       p = (struct ikev1_pl_p *)ext;
+       p = (const struct ikev1_pl_p *)ext;

        ND_TCHECK(*p);
        ND_TCHECK(*p);

-       unaligned_memcpy(&prop, ext, sizeof(prop));
+       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_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,


@@ -1220,8 +1213,8 @@ static const struct attrmap oakley_t_map[] = {
 static const u_char *
 ikev1_t_print(netdissect_options *ndo, u_char tpay _U_,
              const struct isakmp_gen *ext, u_int item_len,
 static const u_char *
 ikev1_t_print(netdissect_options *ndo, u_char tpay _U_,
              const struct isakmp_gen *ext, u_int item_len,

-             const u_char *ep, u_int32_t phase _U_, u_int32_t doi _U_,
-             u_int32_t proto, int depth _U_)
+             const u_char *ep, uint32_t phase _U_, uint32_t doi _U_,
+             uint32_t proto, int depth _U_)

 {
        const struct ikev1_pl_t *p;
        struct ikev1_pl_t t;
 {
        const struct ikev1_pl_t *p;
        struct ikev1_pl_t t;


@@ -1233,9 +1226,9 @@ ikev1_t_print(netdissect_options *ndo, u_char tpay _U_,
 
        ND_PRINT((ndo,"%s:", NPSTR(ISAKMP_NPTYPE_T)));
 
 
        ND_PRINT((ndo,"%s:", NPSTR(ISAKMP_NPTYPE_T)));
 

-       p = (struct ikev1_pl_t *)ext;
+       p = (const struct ikev1_pl_t *)ext;

        ND_TCHECK(*p);
        ND_TCHECK(*p);

-       unaligned_memcpy(&t, ext, sizeof(t));
+       UNALIGNED_MEMCPY(&t, ext, sizeof(t));

 
        switch (proto) {
        case 1:
 
        switch (proto) {
        case 1:


@@ -1269,8 +1262,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,


@@ -1289,22 +1282,22 @@ trunc:
 static const u_char *
 ikev1_ke_print(netdissect_options *ndo, u_char tpay _U_,
               const struct isakmp_gen *ext, u_int item_len _U_,
 static const u_char *
 ikev1_ke_print(netdissect_options *ndo, u_char tpay _U_,
               const struct isakmp_gen *ext, u_int item_len _U_,

-              const u_char *ep _U_, u_int32_t phase _U_, u_int32_t doi _U_,
-              u_int32_t proto _U_, int depth _U_)
+              const u_char *ep _U_, uint32_t phase _U_, uint32_t doi _U_,
+              uint32_t proto _U_, int depth _U_)

 {
        struct isakmp_gen e;
 
        ND_PRINT((ndo,"%s:", NPSTR(ISAKMP_NPTYPE_KE)));
 
        ND_TCHECK(*ext);
 {
        struct isakmp_gen e;
 
        ND_PRINT((ndo,"%s:", NPSTR(ISAKMP_NPTYPE_KE)));
 
        ND_TCHECK(*ext);

-       unaligned_memcpy(&e, ext, sizeof(e));
+       UNALIGNED_MEMCPY(&e, ext, sizeof(e));

        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;


@@ -1312,9 +1305,9 @@ trunc:
 
 static const u_char *
 ikev1_id_print(netdissect_options *ndo, u_char tpay _U_,
 
 static const u_char *
 ikev1_id_print(netdissect_options *ndo, u_char tpay _U_,

-              const struct isakmp_gen *ext, u_int item_len _U_,
-              const u_char *ep _U_, u_int32_t phase, u_int32_t doi _U_,
-              u_int32_t proto _U_, int depth _U_)
+              const struct isakmp_gen *ext, u_int item_len,
+              const u_char *ep _U_, uint32_t phase, uint32_t doi _U_,
+              uint32_t proto _U_, int depth _U_)

 {
 #define USE_IPSECDOI_IN_PHASE1 1
        const struct ikev1_pl_id *p;
 {
 #define USE_IPSECDOI_IN_PHASE1 1
        const struct ikev1_pl_id *p;


@@ -1332,11 +1325,11 @@ ikev1_id_print(netdissect_options *ndo, u_char tpay _U_,
 
        ND_PRINT((ndo,"%s:", NPSTR(ISAKMP_NPTYPE_ID)));
 
 
        ND_PRINT((ndo,"%s:", NPSTR(ISAKMP_NPTYPE_ID)));
 

-       p = (struct ikev1_pl_id *)ext;
+       p = (const struct ikev1_pl_id *)ext;

        ND_TCHECK(*p);
        ND_TCHECK(*p);

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

        if (sizeof(*p) < item_len) {
        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;


@@ -1353,7 +1346,7 @@ ikev1_id_print(netdissect_options *ndo, u_char tpay _U_,
        default:
                ND_PRINT((ndo," idtype=%s", STR_OR_ID(id.d.id_type, idtypestr)));
                ND_PRINT((ndo," doi_data=%u",
        default:
                ND_PRINT((ndo," idtype=%s", STR_OR_ID(id.d.id_type, idtypestr)));
                ND_PRINT((ndo," doi_data=%u",

-                         (u_int32_t)(ntohl(id.d.doi_data) & 0xffffff)));
+                         (uint32_t)(ntohl(id.d.doi_data) & 0xffffff)));

                break;
 
 #ifdef USE_IPSECDOI_IN_PHASE1
                break;
 
 #ifdef USE_IPSECDOI_IN_PHASE1


@@ -1361,40 +1354,32 @@ 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;
 
                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)));
-               if (id.proto_id) {
-#ifndef WIN32
-                       setprotoent(1);
-#endif /* WIN32 */
-                       pe = getprotobynumber(id.proto_id);
-                       if (pe)
-                               ND_PRINT((ndo," protoid=%s", pe->p_name));
-#ifndef WIN32
-                       endprotoent();
-#endif /* WIN32 */
-               } else {
-                       /* it DOES NOT mean IPPROTO_IP! */
-                       ND_PRINT((ndo," protoid=%s", "0"));
-               }
-               ND_PRINT((ndo," port=%d", ntohs(id.port)));
+               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 = doi_id.proto_id ? getprotobynumber(doi_id.proto_id) : NULL;
+               if (pe)
+                       ND_PRINT((ndo," protoid=%s", pe->p_name));
+               else
+                       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));
                        else
                case IPSECDOI_ID_IPV4_ADDR:
                        if (len < 4)
                                ND_PRINT((ndo," len=%d [bad: < 4]", len));
                        else

-                               ND_PRINT((ndo," len=%d %s", len, ipaddr_string(data)));
+                               ND_PRINT((ndo," len=%d %s", len, ipaddr_string(ndo, data)));

                        len = 0;
                        break;
                case IPSECDOI_ID_FQDN:
                        len = 0;
                        break;
                case IPSECDOI_ID_FQDN:


@@ -1403,7 +1388,7 @@ ikev1_id_print(netdissect_options *ndo, u_char tpay _U_,
                        int i;
                        ND_PRINT((ndo," len=%d ", len));
                        for (i = 0; i < len; i++)
                        int i;
                        ND_PRINT((ndo," len=%d ", len));
                        for (i = 0; i < len; i++)

-                               safeputchar(data[i]);
+                               safeputchar(ndo, data[i]);

                        len = 0;
                        break;
                    }
                        len = 0;
                        break;
                    }


@@ -1415,7 +1400,7 @@ ikev1_id_print(netdissect_options *ndo, u_char tpay _U_,
                        else {
                                mask = data + sizeof(struct in_addr);
                                ND_PRINT((ndo," len=%d %s/%u.%u.%u.%u", len,
                        else {
                                mask = data + sizeof(struct in_addr);
                                ND_PRINT((ndo," len=%d %s/%u.%u.%u.%u", len,

-                                         ipaddr_string(data),
+                                         ipaddr_string(ndo, data),

                                          mask[0], mask[1], mask[2], mask[3]));
                        }
                        len = 0;
                                          mask[0], mask[1], mask[2], mask[3]));
                        }
                        len = 0;


@@ -1426,20 +1411,23 @@ ikev1_id_print(netdissect_options *ndo, u_char tpay _U_,
                        if (len < 16)
                                ND_PRINT((ndo," len=%d [bad: < 16]", len));
                        else
                        if (len < 16)
                                ND_PRINT((ndo," len=%d [bad: < 16]", len));
                        else

-                               ND_PRINT((ndo," len=%d %s", len, ip6addr_string(data)));
+                               ND_PRINT((ndo," len=%d %s", len, ip6addr_string(ndo, data)));

                        len = 0;
                        break;
                case IPSECDOI_ID_IPV6_ADDR_SUBNET:
                    {
                        len = 0;
                        break;
                case IPSECDOI_ID_IPV6_ADDR_SUBNET:
                    {

-                       const u_int32_t *mask;
+                       const u_char *mask;

                        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_int32_t *)(data + sizeof(struct in6_addr));
+                               mask = (const u_char *)(data + sizeof(struct in6_addr));

                                /*XXX*/
                                /*XXX*/

-                               ND_PRINT((ndo," len=%d %s/0x%08x%08x%08x%08x", len,
-                                         ip6addr_string(data),
-                                         mask[0], mask[1], mask[2], mask[3]));
+                               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),
+                                         mask[0], mask[1], mask[2], mask[3],
+                                         mask[4], mask[5], mask[6], mask[7],
+                                         mask[8], mask[9], mask[10], mask[11],
+                                         mask[12], mask[13], mask[14], mask[15]));

                        }
                        len = 0;
                        break;
                        }
                        len = 0;
                        break;


@@ -1450,8 +1438,8 @@ ikev1_id_print(netdissect_options *ndo, u_char tpay _U_,
                                ND_PRINT((ndo," len=%d [bad: < 8]", len));
                        else {
                                ND_PRINT((ndo," len=%d %s-%s", len,
                                ND_PRINT((ndo," len=%d [bad: < 8]", len));
                        else {
                                ND_PRINT((ndo," len=%d %s-%s", len,

-                                         ipaddr_string(data),
-                                         ipaddr_string(data + sizeof(struct in_addr))));
+                                         ipaddr_string(ndo, data),
+                                         ipaddr_string(ndo, data + sizeof(struct in_addr))));

                        }
                        len = 0;
                        break;
                        }
                        len = 0;
                        break;


@@ -1461,8 +1449,8 @@ ikev1_id_print(netdissect_options *ndo, u_char tpay _U_,
                                ND_PRINT((ndo," len=%d [bad: < 32]", len));
                        else {
                                ND_PRINT((ndo," len=%d %s-%s", len,
                                ND_PRINT((ndo," len=%d [bad: < 32]", len));
                        else {
                                ND_PRINT((ndo," len=%d %s-%s", len,

-                                         ip6addr_string(data),
-                                         ip6addr_string(data + sizeof(struct in6_addr))));
+                                         ip6addr_string(ndo, data),
+                                         ip6addr_string(ndo, data + sizeof(struct in6_addr))));

                        }
                        len = 0;
                        break;
                        }
                        len = 0;
                        break;


@@ -1479,11 +1467,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;


@@ -1492,9 +1480,9 @@ trunc:
 static const u_char *
 ikev1_cert_print(netdissect_options *ndo, u_char tpay _U_,
                 const struct isakmp_gen *ext, u_int item_len _U_,
 static const u_char *
 ikev1_cert_print(netdissect_options *ndo, u_char tpay _U_,
                 const struct isakmp_gen *ext, u_int item_len _U_,

-                const u_char *ep _U_, u_int32_t phase _U_,
-                u_int32_t doi0 _U_,
-                u_int32_t proto0 _U_, int depth _U_)
+                const u_char *ep _U_, uint32_t phase _U_,
+                uint32_t doi0 _U_,
+                uint32_t proto0 _U_, int depth _U_)

 {
        const struct ikev1_pl_cert *p;
        struct ikev1_pl_cert cert;
 {
        const struct ikev1_pl_cert *p;
        struct ikev1_pl_cert cert;


@@ -1506,17 +1494,17 @@ ikev1_cert_print(netdissect_options *ndo, u_char tpay _U_,
 
        ND_PRINT((ndo,"%s:", NPSTR(ISAKMP_NPTYPE_CERT)));
 
 
        ND_PRINT((ndo,"%s:", NPSTR(ISAKMP_NPTYPE_CERT)));
 

-       p = (struct ikev1_pl_cert *)ext;
+       p = (const struct ikev1_pl_cert *)ext;

        ND_TCHECK(*p);
        ND_TCHECK(*p);

-       unaligned_memcpy(&cert, ext, sizeof(cert));
+       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_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;


@@ -1525,8 +1513,8 @@ trunc:
 static const u_char *
 ikev1_cr_print(netdissect_options *ndo, u_char tpay _U_,
               const struct isakmp_gen *ext, u_int item_len _U_,
 static const u_char *
 ikev1_cr_print(netdissect_options *ndo, u_char tpay _U_,
               const struct isakmp_gen *ext, u_int item_len _U_,

-              const u_char *ep _U_, u_int32_t phase _U_, u_int32_t doi0 _U_,
-              u_int32_t proto0 _U_, int depth _U_)
+              const u_char *ep _U_, uint32_t phase _U_, uint32_t doi0 _U_,
+              uint32_t proto0 _U_, int depth _U_)

 {
        const struct ikev1_pl_cert *p;
        struct ikev1_pl_cert cert;
 {
        const struct ikev1_pl_cert *p;
        struct ikev1_pl_cert cert;


@@ -1538,17 +1526,17 @@ ikev1_cr_print(netdissect_options *ndo, u_char tpay _U_,
 
        ND_PRINT((ndo,"%s:", NPSTR(ISAKMP_NPTYPE_CR)));
 
 
        ND_PRINT((ndo,"%s:", NPSTR(ISAKMP_NPTYPE_CR)));
 

-       p = (struct ikev1_pl_cert *)ext;
+       p = (const struct ikev1_pl_cert *)ext;

        ND_TCHECK(*p);
        ND_TCHECK(*p);

-       unaligned_memcpy(&cert, ext, sizeof(cert));
+       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_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;


@@ -1557,22 +1545,22 @@ trunc:
 static const u_char *
 ikev1_hash_print(netdissect_options *ndo, u_char tpay _U_,
                 const struct isakmp_gen *ext, u_int item_len _U_,
 static const u_char *
 ikev1_hash_print(netdissect_options *ndo, u_char tpay _U_,
                 const struct isakmp_gen *ext, u_int item_len _U_,

-                const u_char *ep _U_, u_int32_t phase _U_, u_int32_t doi _U_,
-                u_int32_t proto _U_, int depth _U_)
+                const u_char *ep _U_, uint32_t phase _U_, uint32_t doi _U_,
+                uint32_t proto _U_, int depth _U_)

 {
        struct isakmp_gen e;
 
        ND_PRINT((ndo,"%s:", NPSTR(ISAKMP_NPTYPE_HASH)));
 
        ND_TCHECK(*ext);
 {
        struct isakmp_gen e;
 
        ND_PRINT((ndo,"%s:", NPSTR(ISAKMP_NPTYPE_HASH)));
 
        ND_TCHECK(*ext);

-       unaligned_memcpy(&e, ext, sizeof(e));
+       UNALIGNED_MEMCPY(&e, ext, sizeof(e));

        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;


@@ -1581,22 +1569,22 @@ trunc:
 static const u_char *
 ikev1_sig_print(netdissect_options *ndo, u_char tpay _U_,
                const struct isakmp_gen *ext, u_int item_len _U_,
 static const u_char *
 ikev1_sig_print(netdissect_options *ndo, u_char tpay _U_,
                const struct isakmp_gen *ext, u_int item_len _U_,

-               const u_char *ep _U_, u_int32_t phase _U_, u_int32_t doi _U_,
-               u_int32_t proto _U_, int depth _U_)
+               const u_char *ep _U_, uint32_t phase _U_, uint32_t doi _U_,
+               uint32_t proto _U_, int depth _U_)

 {
        struct isakmp_gen e;
 
        ND_PRINT((ndo,"%s:", NPSTR(ISAKMP_NPTYPE_SIG)));
 
        ND_TCHECK(*ext);
 {
        struct isakmp_gen e;
 
        ND_PRINT((ndo,"%s:", NPSTR(ISAKMP_NPTYPE_SIG)));
 
        ND_TCHECK(*ext);

-       unaligned_memcpy(&e, ext, sizeof(e));
+       UNALIGNED_MEMCPY(&e, ext, sizeof(e));

        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;


@@ -1607,26 +1595,26 @@ ikev1_nonce_print(netdissect_options *ndo, u_char tpay _U_,
                  const struct isakmp_gen *ext,
                  u_int item_len _U_,
                  const u_char *ep _U_,
                  const struct isakmp_gen *ext,
                  u_int item_len _U_,
                  const u_char *ep _U_,

-                 u_int32_t phase _U_, u_int32_t doi _U_,
-                 u_int32_t proto _U_, int depth _U_)
+                 uint32_t phase _U_, uint32_t doi _U_,
+                 uint32_t proto _U_, int depth _U_)

 {
        struct isakmp_gen e;
 
        ND_PRINT((ndo,"%s:", NPSTR(ISAKMP_NPTYPE_NONCE)));
 
        ND_TCHECK(*ext);
 {
        struct isakmp_gen e;
 
        ND_PRINT((ndo,"%s:", NPSTR(ISAKMP_NPTYPE_NONCE)));
 
        ND_TCHECK(*ext);

-       unaligned_memcpy(&e, ext, sizeof(e));
+       UNALIGNED_MEMCPY(&e, ext, sizeof(e));

        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;


@@ -1635,14 +1623,15 @@ trunc:
 static const u_char *
 ikev1_n_print(netdissect_options *ndo, u_char tpay _U_,
              const struct isakmp_gen *ext, u_int item_len,
 static const u_char *
 ikev1_n_print(netdissect_options *ndo, u_char tpay _U_,
              const struct isakmp_gen *ext, u_int item_len,

-             const u_char *ep, u_int32_t phase, u_int32_t doi0 _U_,
-             u_int32_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;
        const u_char *cp;

-       u_char *ep2;
-       u_int32_t doi;
-       u_int32_t proto;
+       const u_char *ep2;
+       uint32_t doi;
+       uint32_t proto;

        static const char *notify_error_str[] = {
                NULL,                           "INVALID-PAYLOAD-TYPE",
                "DOI-NOT-SUPPORTED",            "SITUATION-NOT-SUPPORTED",
        static const char *notify_error_str[] = {
                NULL,                           "INVALID-PAYLOAD-TYPE",
                "DOI-NOT-SUPPORTED",            "SITUATION-NOT-SUPPORTED",


@@ -1691,9 +1680,9 @@ ikev1_n_print(netdissect_options *ndo, u_char tpay _U_,
 
        ND_PRINT((ndo,"%s:", NPSTR(ISAKMP_NPTYPE_N)));
 
 
        ND_PRINT((ndo,"%s:", NPSTR(ISAKMP_NPTYPE_N)));
 

-       p = (struct ikev1_pl_n *)ext;
+       p = (const struct ikev1_pl_n *)ext;

        ND_TCHECK(*p);
        ND_TCHECK(*p);

-       unaligned_memcpy(&n, ext, sizeof(n));
+       UNALIGNED_MEMCPY(&n, ext, sizeof(n));

        doi = ntohl(n.doi);
        proto = n.prot_id;
        if (doi != 1) {
        doi = ntohl(n.doi);
        proto = n.prot_id;
        if (doi != 1) {


@@ -1709,10 +1698,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"));


@@ -1729,12 +1718,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=("));


@@ -1751,11 +1740,11 @@ ikev1_n_print(netdissect_options *ndo, u_char tpay _U_,
                    }
                case IPSECDOI_NTYPE_REPLAY_STATUS:
                        ND_PRINT((ndo,"replay detection %sabled",
                    }
                case IPSECDOI_NTYPE_REPLAY_STATUS:
                        ND_PRINT((ndo,"replay detection %sabled",

-                                 (*(u_int32_t *)cp) ? "en" : "dis"));
+                                 EXTRACT_32BITS(cp) ? "en" : "dis"));

                        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;


@@ -1767,7 +1756,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;


@@ -1776,21 +1765,21 @@ trunc:
 static const u_char *
 ikev1_d_print(netdissect_options *ndo, u_char tpay _U_,
              const struct isakmp_gen *ext, u_int item_len _U_,
 static const u_char *
 ikev1_d_print(netdissect_options *ndo, u_char tpay _U_,
              const struct isakmp_gen *ext, u_int item_len _U_,

-             const u_char *ep _U_, u_int32_t phase _U_, u_int32_t doi0 _U_,
-             u_int32_t proto0 _U_, int depth _U_)
+             const u_char *ep _U_, uint32_t phase _U_, uint32_t doi0 _U_,
+             uint32_t proto0 _U_, int depth _U_)

 {
        const struct ikev1_pl_d *p;
        struct ikev1_pl_d d;
 {
        const struct ikev1_pl_d *p;
        struct ikev1_pl_d d;

-       const u_int8_t *q;
-       u_int32_t doi;
-       u_int32_t proto;
+       const uint8_t *q;
+       uint32_t doi;
+       uint32_t proto;

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

-       p = (struct ikev1_pl_d *)ext;
+       p = (const struct ikev1_pl_d *)ext;

        ND_TCHECK(*p);
        ND_TCHECK(*p);

-       unaligned_memcpy(&d, ext, sizeof(d));
+       UNALIGNED_MEMCPY(&d, ext, sizeof(d));

        doi = ntohl(d.doi);
        proto = d.prot_id;
        if (doi != 1) {
        doi = ntohl(d.doi);
        proto = d.prot_id;
        if (doi != 1) {


@@ -1803,11 +1792,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 = (u_int8_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;
        }


@@ -1821,22 +1810,22 @@ static const u_char *
 ikev1_vid_print(netdissect_options *ndo, u_char tpay _U_,
                const struct isakmp_gen *ext,
                u_int item_len _U_, const u_char *ep _U_,
 ikev1_vid_print(netdissect_options *ndo, u_char tpay _U_,
                const struct isakmp_gen *ext,
                u_int item_len _U_, const u_char *ep _U_,

-               u_int32_t phase _U_, u_int32_t doi _U_,
-               u_int32_t proto _U_, int depth _U_)
+               uint32_t phase _U_, uint32_t doi _U_,
+               uint32_t proto _U_, int depth _U_)

 {
        struct isakmp_gen e;
 
        ND_PRINT((ndo,"%s:", NPSTR(ISAKMP_NPTYPE_VID)));
 
        ND_TCHECK(*ext);
 {
        struct isakmp_gen e;
 
        ND_PRINT((ndo,"%s:", NPSTR(ISAKMP_NPTYPE_VID)));
 
        ND_TCHECK(*ext);

-       unaligned_memcpy(&e, ext, sizeof(e));
+       UNALIGNED_MEMCPY(&e, ext, sizeof(e));

        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;


@@ -1861,16 +1850,16 @@ ikev2_gen_print(netdissect_options *ndo, u_char tpay,
        struct isakmp_gen e;
 
        ND_TCHECK(*ext);
        struct isakmp_gen e;
 
        ND_TCHECK(*ext);

-       unaligned_memcpy(&e, ext, sizeof(e));
+       UNALIGNED_MEMCPY(&e, ext, sizeof(e));

        ikev2_pay_print(ndo, NPSTR(tpay), e.critical);
 
        ND_PRINT((ndo," len=%d", ntohs(e.len) - 4));
        if (2 < ndo->ndo_vflag && 4 < ntohs(e.len)) {
                ND_PRINT((ndo," "));
        ikev2_pay_print(ndo, NPSTR(tpay), e.critical);
 
        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;


@@ -1879,21 +1868,21 @@ trunc:
 static const u_char *
 ikev2_t_print(netdissect_options *ndo, u_char tpay _U_, int pcount,
              const struct isakmp_gen *ext, u_int item_len,
 static const u_char *
 ikev2_t_print(netdissect_options *ndo, u_char tpay _U_, int pcount,
              const struct isakmp_gen *ext, u_int item_len,

-             const u_char *ep, u_int32_t phase _U_, u_int32_t doi _U_,
-             u_int32_t proto _U_, int depth _U_)
+             const u_char *ep, uint32_t phase _U_, uint32_t doi _U_,
+             uint32_t proto _U_, int depth _U_)

 {
        const struct ikev2_t *p;
        struct ikev2_t t;
 {
        const struct ikev2_t *p;
        struct ikev2_t t;

-       u_int16_t  t_id;
+       uint16_t  t_id;

        const u_char *cp;
        const char *idstr;
        const struct attrmap *map;
        size_t nmap;
        const u_char *ep2;
 
        const u_char *cp;
        const char *idstr;
        const struct attrmap *map;
        size_t nmap;
        const u_char *ep2;
 

-       p = (struct ikev2_t *)ext;
+       p = (const struct ikev2_t *)ext;

        ND_TCHECK(*p);
        ND_TCHECK(*p);

-       unaligned_memcpy(&t, ext, sizeof(t));
+       UNALIGNED_MEMCPY(&t, ext, sizeof(t));

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


@@ -1937,8 +1926,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,


@@ -1957,16 +1946,16 @@ trunc:
 static const u_char *
 ikev2_p_print(netdissect_options *ndo, u_char tpay _U_, int pcount _U_,
              const struct isakmp_gen *ext, u_int item_len _U_,
 static const u_char *
 ikev2_p_print(netdissect_options *ndo, u_char tpay _U_, int pcount _U_,
              const struct isakmp_gen *ext, u_int item_len _U_,

-              const u_char *ep, u_int32_t phase, u_int32_t doi0,
-              u_int32_t proto0 _U_, int depth)
+              const u_char *ep, uint32_t phase, uint32_t doi0,
+              uint32_t proto0 _U_, int depth)

 {
        const struct ikev2_p *p;
        struct ikev2_p prop;
        const u_char *cp;
 
 {
        const struct ikev2_p *p;
        struct ikev2_p prop;
        const u_char *cp;
 

-       p = (struct ikev2_p *)ext;
+       p = (const struct ikev2_p *)ext;

        ND_TCHECK(*p);
        ND_TCHECK(*p);

-       unaligned_memcpy(&prop, ext, sizeof(prop));
+       UNALIGNED_MEMCPY(&prop, ext, sizeof(prop));

        ikev2_pay_print(ndo, NPSTR(ISAKMP_NPTYPE_P), prop.h.critical);
 
        ND_PRINT((ndo," #%u protoid=%s transform=%d len=%u",
        ikev2_pay_print(ndo, NPSTR(ISAKMP_NPTYPE_P), prop.h.critical);
 
        ND_PRINT((ndo," #%u protoid=%s transform=%d len=%u",


@@ -1974,11 +1963,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,


@@ -1994,14 +1983,14 @@ static const u_char *
 ikev2_sa_print(netdissect_options *ndo, u_char tpay,
                const struct isakmp_gen *ext1,
                u_int item_len _U_, const u_char *ep _U_,
 ikev2_sa_print(netdissect_options *ndo, u_char tpay,
                const struct isakmp_gen *ext1,
                u_int item_len _U_, const u_char *ep _U_,

-               u_int32_t phase _U_, u_int32_t doi _U_,
-               u_int32_t proto _U_, int depth _U_)
+               uint32_t phase _U_, uint32_t doi _U_,
+               uint32_t proto _U_, int depth _U_)

 {
        struct isakmp_gen e;
        int    osa_length, sa_length;
 
        ND_TCHECK(*ext1);
 {
        struct isakmp_gen e;
        int    osa_length, sa_length;
 
        ND_TCHECK(*ext1);

-       unaligned_memcpy(&e, ext1, sizeof(e));
+       UNALIGNED_MEMCPY(&e, ext1, sizeof(e));

        ikev2_pay_print(ndo, "sa", e.critical);
 
        osa_length= ntohs(e.len);
        ikev2_pay_print(ndo, "sa", e.critical);
 
        osa_length= ntohs(e.len);


@@ -2012,7 +2001,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;


@@ -2022,15 +2011,15 @@ static const u_char *
 ikev2_ke_print(netdissect_options *ndo, u_char tpay,
                const struct isakmp_gen *ext,
                u_int item_len _U_, const u_char *ep _U_,
 ikev2_ke_print(netdissect_options *ndo, u_char tpay,
                const struct isakmp_gen *ext,
                u_int item_len _U_, const u_char *ep _U_,

-               u_int32_t phase _U_, u_int32_t doi _U_,
-               u_int32_t proto _U_, int depth _U_)
+               uint32_t phase _U_, uint32_t doi _U_,
+               uint32_t proto _U_, int depth _U_)

 {
        struct ikev2_ke ke;
 {
        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);
        ND_TCHECK(*ext);

-       unaligned_memcpy(&ke, ext, sizeof(ke));
+       UNALIGNED_MEMCPY(&ke, ext, sizeof(ke));

        ikev2_pay_print(ndo, NPSTR(tpay), ke.h.critical);
 
        ND_PRINT((ndo," len=%u group=%s", ntohs(ke.h.len) - 8,
        ikev2_pay_print(ndo, NPSTR(tpay), ke.h.critical);
 
        ND_PRINT((ndo," len=%u group=%s", ntohs(ke.h.len) - 8,


@@ -2038,10 +2027,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;


@@ -2051,16 +2040,16 @@ static const u_char *
 ikev2_ID_print(netdissect_options *ndo, u_char tpay,
                const struct isakmp_gen *ext,
                u_int item_len _U_, const u_char *ep _U_,
 ikev2_ID_print(netdissect_options *ndo, u_char tpay,
                const struct isakmp_gen *ext,
                u_int item_len _U_, const u_char *ep _U_,

-               u_int32_t phase _U_, u_int32_t doi _U_,
-               u_int32_t proto _U_, int depth _U_)
+               uint32_t phase _U_, uint32_t doi _U_,
+               uint32_t proto _U_, int depth _U_)

 {
        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);
 
        ND_TCHECK(*ext);

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

        ikev2_pay_print(ndo, NPSTR(tpay), id.h.critical);
 
        id_len = ntohs(id.h.len);
        ikev2_pay_print(ndo, NPSTR(tpay), id.h.critical);
 
        id_len = ntohs(id.h.len);


@@ -2068,14 +2057,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:


@@ -2111,7 +2100,7 @@ ikev2_ID_print(netdissect_options *ndo, u_char tpay,
        if(dumpascii) {
                ND_TCHECK2(*typedata, idtype_len);
                for(i=0; i<idtype_len; i++) {
        if(dumpascii) {
                ND_TCHECK2(*typedata, idtype_len);
                for(i=0; i<idtype_len; i++) {

-                       if(isprint(typedata[i])) {
+                       if(ND_ISPRINT(typedata[i])) {

                                ND_PRINT((ndo, "%c", typedata[i]));
                        } else {
                                ND_PRINT((ndo, "."));
                                ND_PRINT((ndo, "%c", typedata[i]));
                        } else {
                                ND_PRINT((ndo, "."));


@@ -2119,11 +2108,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;


@@ -2133,8 +2122,8 @@ static const u_char *
 ikev2_cert_print(netdissect_options *ndo, u_char tpay,
                const struct isakmp_gen *ext,
                u_int item_len _U_, const u_char *ep _U_,
 ikev2_cert_print(netdissect_options *ndo, u_char tpay,
                const struct isakmp_gen *ext,
                u_int item_len _U_, const u_char *ep _U_,

-               u_int32_t phase _U_, u_int32_t doi _U_,
-               u_int32_t proto _U_, int depth _U_)
+               uint32_t phase _U_, uint32_t doi _U_,
+               uint32_t proto _U_, int depth _U_)

 {
        return ikev2_gen_print(ndo, tpay, ext);
 }
 {
        return ikev2_gen_print(ndo, tpay, ext);
 }


@@ -2143,8 +2132,8 @@ static const u_char *
 ikev2_cr_print(netdissect_options *ndo, u_char tpay,
                const struct isakmp_gen *ext,
                u_int item_len _U_, const u_char *ep _U_,
 ikev2_cr_print(netdissect_options *ndo, u_char tpay,
                const struct isakmp_gen *ext,
                u_int item_len _U_, const u_char *ep _U_,

-               u_int32_t phase _U_, u_int32_t doi _U_,
-               u_int32_t proto _U_, int depth _U_)
+               uint32_t phase _U_, uint32_t doi _U_,
+               uint32_t proto _U_, int depth _U_)

 {
        return ikev2_gen_print(ndo, tpay, ext);
 }
 {
        return ikev2_gen_print(ndo, tpay, ext);
 }


@@ -2153,17 +2142,17 @@ static const u_char *
 ikev2_auth_print(netdissect_options *ndo, u_char tpay,
                const struct isakmp_gen *ext,
                u_int item_len _U_, const u_char *ep _U_,
 ikev2_auth_print(netdissect_options *ndo, u_char tpay,
                const struct isakmp_gen *ext,
                u_int item_len _U_, const u_char *ep _U_,

-               u_int32_t phase _U_, u_int32_t doi _U_,
-               u_int32_t proto _U_, int depth _U_)
+               uint32_t phase _U_, uint32_t doi _U_,
+               uint32_t proto _U_, int depth _U_)

 {
        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);

-       unaligned_memcpy(&a, ext, sizeof(a));
+       UNALIGNED_MEMCPY(&a, ext, sizeof(a));

        ikev2_pay_print(ndo, NPSTR(tpay), a.h.critical);
        len = ntohs(a.h.len);
 
        ikev2_pay_print(ndo, NPSTR(tpay), a.h.critical);
        len = ntohs(a.h.len);
 


@@ -2172,14 +2161,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;


@@ -2189,26 +2178,26 @@ static const u_char *
 ikev2_nonce_print(netdissect_options *ndo, u_char tpay,
                const struct isakmp_gen *ext,
                u_int item_len _U_, const u_char *ep _U_,
 ikev2_nonce_print(netdissect_options *ndo, u_char tpay,
                const struct isakmp_gen *ext,
                u_int item_len _U_, const u_char *ep _U_,

-               u_int32_t phase _U_, u_int32_t doi _U_,
-               u_int32_t proto _U_, int depth _U_)
+               uint32_t phase _U_, uint32_t doi _U_,
+               uint32_t proto _U_, int depth _U_)

 {
        struct isakmp_gen e;
 
        ND_TCHECK(*ext);
 {
        struct isakmp_gen e;
 
        ND_TCHECK(*ext);

-       unaligned_memcpy(&e, ext, sizeof(e));
+       UNALIGNED_MEMCPY(&e, ext, sizeof(e));

        ikev2_pay_print(ndo, "nonce", e.critical);
 
        ND_PRINT((ndo," len=%d", ntohs(e.len) - 4));
        if (1 < ndo->ndo_vflag && 4 < ntohs(e.len)) {
                ND_PRINT((ndo," nonce=("));
        ikev2_pay_print(ndo, "nonce", e.critical);
 
        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;


@@ -2219,18 +2208,19 @@ static const u_char *
 ikev2_n_print(netdissect_options *ndo, u_char tpay _U_,
                const struct isakmp_gen *ext,
                u_int item_len _U_, const u_char *ep _U_,
 ikev2_n_print(netdissect_options *ndo, u_char tpay _U_,
                const struct isakmp_gen *ext,
                u_int item_len _U_, const u_char *ep _U_,

-               u_int32_t phase _U_, u_int32_t doi _U_,
-               u_int32_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;
        const u_char *cp;
        u_char showspi, showdata, showsomedata;
        const char *notify_name;

-       u_int32_t type;
+       uint32_t type;

 
 

-       p = (struct ikev2_n *)ext;
+       p = (const struct ikev2_n *)ext;

        ND_TCHECK(*p);
        ND_TCHECK(*p);

-       unaligned_memcpy(&n, ext, sizeof(n));
+       UNALIGNED_MEMCPY(&n, ext, sizeof(n));

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


@@ -2395,11 +2385,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;


@@ -2407,7 +2397,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,")"));


@@ -2416,7 +2406,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;


@@ -2426,8 +2416,8 @@ static const u_char *
 ikev2_d_print(netdissect_options *ndo, u_char tpay,
                const struct isakmp_gen *ext,
                u_int item_len _U_, const u_char *ep _U_,
 ikev2_d_print(netdissect_options *ndo, u_char tpay,
                const struct isakmp_gen *ext,
                u_int item_len _U_, const u_char *ep _U_,

-               u_int32_t phase _U_, u_int32_t doi _U_,
-               u_int32_t proto _U_, int depth _U_)
+               uint32_t phase _U_, uint32_t doi _U_,
+               uint32_t proto _U_, int depth _U_)

 {
        return ikev2_gen_print(ndo, tpay, ext);
 }
 {
        return ikev2_gen_print(ndo, tpay, ext);
 }


@@ -2436,15 +2426,15 @@ static const u_char *
 ikev2_vid_print(netdissect_options *ndo, u_char tpay,
                const struct isakmp_gen *ext,
                u_int item_len _U_, const u_char *ep _U_,
 ikev2_vid_print(netdissect_options *ndo, u_char tpay,
                const struct isakmp_gen *ext,
                u_int item_len _U_, const u_char *ep _U_,

-               u_int32_t phase _U_, u_int32_t doi _U_,
-               u_int32_t proto _U_, int depth _U_)
+               uint32_t phase _U_, uint32_t doi _U_,
+               uint32_t proto _U_, int depth _U_)

 {
        struct isakmp_gen e;
        const u_char *vid;
        int i, len;
 
        ND_TCHECK(*ext);
 {
        struct isakmp_gen e;
        const u_char *vid;
        int i, len;
 
        ND_TCHECK(*ext);

-       unaligned_memcpy(&e, ext, sizeof(e));
+       UNALIGNED_MEMCPY(&e, ext, sizeof(e));

        ikev2_pay_print(ndo, NPSTR(tpay), e.critical);
        ND_PRINT((ndo," len=%d vid=", ntohs(e.len) - 4));
 
        ikev2_pay_print(ndo, NPSTR(tpay), e.critical);
        ND_PRINT((ndo," len=%d vid=", ntohs(e.len) - 4));
 


@@ -2452,15 +2442,15 @@ ikev2_vid_print(netdissect_options *ndo, u_char tpay,
        len = ntohs(e.len) - 4;
        ND_TCHECK2(*vid, len);
        for(i=0; i<len; i++) {
        len = ntohs(e.len) - 4;
        ND_TCHECK2(*vid, len);
        for(i=0; i<len; i++) {

-               if(isprint(vid[i])) ND_PRINT((ndo, "%c", vid[i]));
+               if(ND_ISPRINT(vid[i])) ND_PRINT((ndo, "%c", vid[i]));

                else ND_PRINT((ndo, "."));
        }
        if (2 < ndo->ndo_vflag && 4 < len) {
                ND_PRINT((ndo," "));
                else 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;


@@ -2470,8 +2460,8 @@ static const u_char *
 ikev2_TS_print(netdissect_options *ndo, u_char tpay,
                const struct isakmp_gen *ext,
                u_int item_len _U_, const u_char *ep _U_,
 ikev2_TS_print(netdissect_options *ndo, u_char tpay,
                const struct isakmp_gen *ext,
                u_int item_len _U_, const u_char *ep _U_,

-               u_int32_t phase _U_, u_int32_t doi _U_,
-               u_int32_t proto _U_, int depth _U_)
+               uint32_t phase _U_, uint32_t doi _U_,
+               uint32_t proto _U_, int depth _U_)

 {
        return ikev2_gen_print(ndo, tpay, ext);
 }
 {
        return ikev2_gen_print(ndo, tpay, ext);
 }


@@ -2488,26 +2478,26 @@ ikev2_e_print(netdissect_options *ndo,
 #ifndef HAVE_LIBCRYPTO
              _U_
 #endif
 #ifndef HAVE_LIBCRYPTO
              _U_
 #endif

-             u_int32_t phase,
+             uint32_t phase,

 #ifndef HAVE_LIBCRYPTO
              _U_
 #endif
 #ifndef HAVE_LIBCRYPTO
              _U_
 #endif

-             u_int32_t doi,
+             uint32_t doi,

 #ifndef HAVE_LIBCRYPTO
              _U_
 #endif
 #ifndef HAVE_LIBCRYPTO
              _U_
 #endif

-             u_int32_t proto,
+             uint32_t proto,

 #ifndef HAVE_LIBCRYPTO
              _U_
 #endif
              int depth)
 {
        struct isakmp_gen e;
 #ifndef HAVE_LIBCRYPTO
              _U_
 #endif
              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);

-       unaligned_memcpy(&e, ext, sizeof(e));
+       UNALIGNED_MEMCPY(&e, ext, sizeof(e));

        ikev2_pay_print(ndo, NPSTR(tpay), e.critical);
 
        dlen = ntohs(e.len)-4;
        ikev2_pay_print(ndo, NPSTR(tpay), e.critical);
 
        dlen = ntohs(e.len)-4;


@@ -2515,11 +2505,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


@@ -2551,8 +2541,8 @@ static const u_char *
 ikev2_cp_print(netdissect_options *ndo, u_char tpay,
                const struct isakmp_gen *ext,
                u_int item_len _U_, const u_char *ep _U_,
 ikev2_cp_print(netdissect_options *ndo, u_char tpay,
                const struct isakmp_gen *ext,
                u_int item_len _U_, const u_char *ep _U_,

-               u_int32_t phase _U_, u_int32_t doi _U_,
-               u_int32_t proto _U_, int depth _U_)
+               uint32_t phase _U_, uint32_t doi _U_,
+               uint32_t proto _U_, int depth _U_)

 {
        return ikev2_gen_print(ndo, tpay, ext);
 }
 {
        return ikev2_gen_print(ndo, tpay, ext);
 }


@@ -2561,8 +2551,8 @@ static const u_char *
 ikev2_eap_print(netdissect_options *ndo, u_char tpay,
                const struct isakmp_gen *ext,
                u_int item_len _U_, const u_char *ep _U_,
 ikev2_eap_print(netdissect_options *ndo, u_char tpay,
                const struct isakmp_gen *ext,
                u_int item_len _U_, const u_char *ep _U_,

-               u_int32_t phase _U_, u_int32_t doi _U_,
-               u_int32_t proto _U_, int depth _U_)
+               uint32_t phase _U_, uint32_t doi _U_,
+               uint32_t proto _U_, int depth _U_)

 {
        return ikev2_gen_print(ndo, tpay, ext);
 }
 {
        return ikev2_gen_print(ndo, tpay, ext);
 }


@@ -2571,15 +2561,15 @@ static const u_char *
 ike_sub0_print(netdissect_options *ndo,
                 u_char np, const struct isakmp_gen *ext, const u_char *ep,
 
 ike_sub0_print(netdissect_options *ndo,
                 u_char np, const struct isakmp_gen *ext, const u_char *ep,
 

-              u_int32_t phase, u_int32_t doi, u_int32_t proto, int depth)
+              uint32_t phase, uint32_t doi, uint32_t proto, int depth)

 {
        const u_char *cp;
        struct isakmp_gen e;
        u_int item_len;
 
 {
        const u_char *cp;
        struct isakmp_gen e;
        u_int item_len;
 

-       cp = (u_char *)ext;
+       cp = (const u_char *)ext;

        ND_TCHECK(*ext);
        ND_TCHECK(*ext);

-       unaligned_memcpy(&e, ext, sizeof(e));
+       UNALIGNED_MEMCPY(&e, ext, sizeof(e));

 
        /*
         * Since we can't have a payload length of less than 4 bytes,
 
        /*
         * Since we can't have a payload length of less than 4 bytes,


@@ -2611,7 +2601,7 @@ trunc:
 static const u_char *
 ikev1_sub_print(netdissect_options *ndo,
                u_char np, const struct isakmp_gen *ext, const u_char *ep,
 static const u_char *
 ikev1_sub_print(netdissect_options *ndo,
                u_char np, const struct isakmp_gen *ext, const u_char *ep,

-               u_int32_t phase, u_int32_t doi, u_int32_t proto, int depth)
+               uint32_t phase, uint32_t doi, uint32_t proto, int depth)

 {
        const u_char *cp;
        int i;
 {
        const u_char *cp;
        int i;


@@ -2622,7 +2612,7 @@ ikev1_sub_print(netdissect_options *ndo,
        while (np) {
                ND_TCHECK(*ext);
 
        while (np) {
                ND_TCHECK(*ext);
 

-               unaligned_memcpy(&e, ext, sizeof(e));
+               UNALIGNED_MEMCPY(&e, ext, sizeof(e));

 
                ND_TCHECK2(*ext, ntohs(e.len));
 
 
                ND_TCHECK2(*ext, ntohs(e.len));
 


@@ -2641,7 +2631,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:


@@ -2679,7 +2669,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)


@@ -2718,7 +2708,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);
        }
 


@@ -2726,7 +2716,7 @@ done:
        if (ndo->ndo_vflag) {
                if (ntohl(base->len) != length) {
                        ND_PRINT((ndo," (len mismatch: isakmp %u/ip %u)",
        if (ndo->ndo_vflag) {
                if (ntohl(base->len) != length) {
                        ND_PRINT((ndo," (len mismatch: isakmp %u/ip %u)",

-                                 (u_int32_t)ntohl(base->len), length));
+                                 (uint32_t)ntohl(base->len), length));

                }
        }
 }
                }
        }
 }


@@ -2735,15 +2725,15 @@ static const u_char *
 ikev2_sub0_print(netdissect_options *ndo, struct isakmp *base,
                 u_char np, int pcount,
                 const struct isakmp_gen *ext, const u_char *ep,
 ikev2_sub0_print(netdissect_options *ndo, struct isakmp *base,
                 u_char np, int pcount,
                 const struct isakmp_gen *ext, const u_char *ep,

-                u_int32_t phase, u_int32_t doi, u_int32_t proto, int depth)
+                uint32_t phase, uint32_t doi, uint32_t proto, int depth)

 {
        const u_char *cp;
        struct isakmp_gen e;
        u_int item_len;
 
 {
        const u_char *cp;
        struct isakmp_gen e;
        u_int item_len;
 

-       cp = (u_char *)ext;
+       cp = (const u_char *)ext;

        ND_TCHECK(*ext);
        ND_TCHECK(*ext);

-       unaligned_memcpy(&e, ext, sizeof(e));
+       UNALIGNED_MEMCPY(&e, ext, sizeof(e));

 
        /*
         * Since we can't have a payload length of less than 4 bytes,
 
        /*
         * Since we can't have a payload length of less than 4 bytes,


@@ -2786,7 +2776,7 @@ static const u_char *
 ikev2_sub_print(netdissect_options *ndo,
                struct isakmp *base,
                u_char np, const struct isakmp_gen *ext, const u_char *ep,
 ikev2_sub_print(netdissect_options *ndo,
                struct isakmp *base,
                u_char np, const struct isakmp_gen *ext, const u_char *ep,

-               u_int32_t phase, u_int32_t doi, u_int32_t proto, int depth)
+               uint32_t phase, uint32_t doi, uint32_t proto, int depth)

 {
        const u_char *cp;
        int i;
 {
        const u_char *cp;
        int i;


@@ -2799,7 +2789,7 @@ ikev2_sub_print(netdissect_options *ndo,
                pcount++;
                ND_TCHECK(*ext);
 
                pcount++;
                ND_TCHECK(*ext);
 

-               unaligned_memcpy(&e, ext, sizeof(e));
+               UNALIGNED_MEMCPY(&e, ext, sizeof(e));

 
                ND_TCHECK2(*ext, ntohs(e.len));
 
 
                ND_TCHECK2(*ext, ntohs(e.len));
 


@@ -2819,7 +2809,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:


@@ -2872,7 +2862,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);
        }
 


@@ -2880,7 +2870,7 @@ done:
        if (ndo->ndo_vflag) {
                if (ntohl(base->len) != length) {
                        ND_PRINT((ndo, " (len mismatch: isakmp %u/ip %u)",
        if (ndo->ndo_vflag) {
                if (ntohl(base->len) != length) {
                        ND_PRINT((ndo, " (len mismatch: isakmp %u/ip %u)",

-                                 (u_int32_t)ntohl(base->len), length));
+                                 (uint32_t)ntohl(base->len), length));

                }
        }
 }
                }
        }
 }


@@ -2906,12 +2896,12 @@ 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;
        }
 

-       unaligned_memcpy(&base, p, sizeof(base));
+       UNALIGNED_MEMCPY(&base, p, sizeof(base));

 
        ND_PRINT((ndo,"isakmp"));
        major = (base.vers & ISAKMP_VERS_MAJOR)
 
        ND_PRINT((ndo,"isakmp"));
        major = (base.vers & ISAKMP_VERS_MAJOR)


@@ -2925,14 +2915,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,"->"));
                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,":"));