]> The Tcpdump Group git mirrors - tcpdump/blobdiff - print-isakmp.c
s/sprintf/snprintf/.
[tcpdump] / print-isakmp.c
index 9a6a0d401a9ede1102175b4856e442d9947b9c87..5f4abc00aa1e5dda5b2c0b4abdccf26cf73de1ec 100644 (file)
-/*     $NetBSD: print-ntp.c,v 1.3 1997/03/15 18:37:55 is Exp $ */
-
 /*
- * Copyright (c) 1990, 1991, 1992, 1993, 1994
- *     The Regents of the University of California.  All rights reserved.
- *
+ * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
+ * All rights reserved.
+ * 
  * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that: (1) source code distributions
- * retain the above copyright notice and this paragraph in its entirety, (2)
- * distributions including binary code include the above copyright notice and
- * this paragraph in its entirety in the documentation or other materials
- * provided with the distribution, and (3) all advertising materials mentioning
- * features or use of this software display the following acknowledgement:
- * ``This product includes software developed by the University of California,
- * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
- * the University nor the names of its contributors may be used to endorse
- * or promote products derived from this software without specific prior
- * written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the project nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
  *
- * Format and print ntp packets.
- *     By Jeffrey Mogul/DECWRL
- *     loosely based on print-bootp.c
  */
 
 #ifndef lint
-static char rcsid[] =
-    "@(#) Header: print-ntp.c,v 1.14 94/06/14 20:18:46 leres Exp (LBL)";
+static const char rcsid[] =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-isakmp.c,v 1.10 2000-01-17 06:24:25 itojun Exp $ (LBL)";
+#endif
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
 #endif
 
+#include <string.h>
+#include <ctype.h>
 #include <sys/param.h>
 #include <sys/time.h>
-#include <sys/types.h>
 #include <sys/socket.h>
 
+#if __STDC__
+struct mbuf;
+struct rtentry;
+#endif
 #include <net/if.h>
 
 #include <netinet/in.h>
-#ifdef __NetBSD__
-#include <net/if_ether.h>
-#else
 #include <netinet/if_ether.h>
+#include <netinet/in_systm.h>
+#include <netinet/ip.h>
+#include <netinet/ip_var.h>
+#include <netinet/udp.h>
+#include <netinet/udp_var.h>
+#include <netinet/tcp.h>
+
+#ifdef INET6
+#include <netinet/ip6.h>
 #endif
 
-#include <ctype.h>
 #include <stdio.h>
-#include <string.h>
+#include <netdb.h>
 
+#include "isakmp.h"
+#include "ipsec_doi.h"
+#include "oakley.h"
 #include "interface.h"
 #include "addrtoname.h"
-#undef MODEMASK                                        /* Solaris sucks */
-#include "ntp.h"
-
-struct isakmp_header {
-  u_char  init_cookie[4];
-  u_char  resp_cookie[4];
-  u_char  nextpayload;
-#if BYTE_ORDER == LITTLE_ENDIAN
-  u_char  mnver:4;
-  u_char  mjver:4;
-#endif
-#if BYTE_ORDER == BIG_ENDIAN
-  u_char  mjver:4;
-  u_char  mnver:4;
-#endif  
-  u_char  exgtype;
-  u_char  flags;
-  u_char  msgid[4];
-  u_int32 length;
+#include "extract.h"                    /* must come after interface.h */
+
+#ifndef HAVE_SOCKADDR_STORAGE
+#define sockaddr_storage sockaddr
+#endif
+
+static u_char *isakmp_sa_print __P((struct isakmp_gen *, u_char *, u_int32_t,
+       u_int32_t, u_int32_t));
+static u_char *isakmp_p_print __P((struct isakmp_gen *, u_char *, u_int32_t,
+       u_int32_t, u_int32_t));
+static u_char *isakmp_t_print __P((struct isakmp_gen *, u_char *, u_int32_t,
+       u_int32_t, u_int32_t));
+static u_char *isakmp_ke_print __P((struct isakmp_gen *, u_char *, u_int32_t,
+       u_int32_t, u_int32_t));
+static u_char *isakmp_id_print __P((struct isakmp_gen *, u_char *, u_int32_t,
+       u_int32_t, u_int32_t));
+static u_char *isakmp_hash_print __P((struct isakmp_gen *, u_char *,
+       u_int32_t, u_int32_t, u_int32_t));
+static u_char *isakmp_nonce_print __P((struct isakmp_gen *, u_char *,
+       u_int32_t, u_int32_t, u_int32_t));
+static u_char *isakmp_n_print __P((struct isakmp_gen *, u_char *, u_int32_t,
+       u_int32_t, u_int32_t));
+static u_char *isakmp_d_print __P((struct isakmp_gen *, u_char *, u_int32_t,
+       u_int32_t, u_int32_t));
+static u_char *isakmp_vid_print __P((struct isakmp_gen *, u_char *, u_int32_t,
+       u_int32_t, u_int32_t));
+static u_char *isakmp_sub0_print __P((u_char, struct isakmp_gen *, u_char *,
+       u_int32_t, u_int32_t, u_int32_t));
+static u_char *isakmp_sub_print __P((u_char, struct isakmp_gen *, u_char *,
+       u_int32_t, u_int32_t, u_int32_t));
+static char *numstr __P((int));
+
+#define MAXINITIATORS  20
+int ninitiator = 0;
+struct {
+       cookie_t initiator;
+       struct sockaddr_storage iaddr;
+       struct sockaddr_storage raddr;
+} cookiecache[MAXINITIATORS];
+
+/* protocol id */
+static char *protoidstr[] = {
+       NULL, "isakmp", "ipsec-ah", "ipsec-esp", "ipcomp",
 };
 
-#define FLAGS_ENCRYPTION 1
-#define FLAGS_COMMIT     2
+/* isakmp->np */
+static char *npstr[] = {
+       "none", "sa", "p", "t", "ke", "id", "cert", "cr", "hash",
+       "sig", "nonce", "n", "d", "vid"
+};
+
+/* isakmp->np */
+static u_char *(*npfunc[]) __P((struct isakmp_gen *, u_char *, u_int32_t,
+               u_int32_t, u_int32_t)) = {
+       NULL,
+       isakmp_sa_print,
+       isakmp_p_print,
+       isakmp_t_print,
+       isakmp_ke_print,
+       isakmp_id_print,
+       NULL,
+       NULL,
+       isakmp_hash_print,
+       NULL,
+       isakmp_nonce_print,
+       isakmp_n_print,
+       isakmp_d_print,
+       isakmp_vid_print,
+};
+
+/* isakmp->etype */
+static char *etypestr[] = {
+       "none", "base", "ident", "auth", "agg", "inf", NULL, NULL,
+       NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+       NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+       NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+       "oakley-quick", "oakley-newgroup",
+};
+
+#define STR_OR_ID(x, tab) \
+       (((x) < sizeof(tab)/sizeof(tab[0]) && tab[(x)]) ? tab[(x)] : numstr(x))
+#define PROTOIDSTR(x)  STR_OR_ID(x, protoidstr)
+#define NPSTR(x)       STR_OR_ID(x, npstr)
+#define ETYPESTR(x)    STR_OR_ID(x, etypestr)
+
+#define NPFUNC(x) \
+       (((x) < sizeof(npfunc)/sizeof(npfunc[0]) && npfunc[(x)]) \
+               ? npfunc[(x)] : NULL)
+
+static int
+iszero(u_char *p, size_t l)
+{
+       while (l--) {
+               if (*p++)
+                       return 0;
+       }
+       return 1;
+}
+
+/* find cookie from initiator cache */
+static int
+cookie_find(cookie_t *in)
+{
+       int i;
+
+       for (i = 0; i < MAXINITIATORS; i++) {
+               if (memcmp(in, &cookiecache[i].initiator, sizeof(*in)) == 0)
+                       return i;
+       }
+
+       return -1;
+}
+
+/* record initiator */
+static void
+cookie_record(cookie_t *in, const u_char *bp2)
+{
+       int i;
+       struct ip *ip;
+       struct sockaddr_in *sin;
+#ifdef INET6
+       struct ip6_hdr *ip6;
+       struct sockaddr_in6 *sin6;
+#endif
+
+       i = cookie_find(in);
+       if (0 <= i) {
+               ninitiator = (i + 1) % MAXINITIATORS;
+               return;
+       }
+
+       ip = (struct ip *)bp2;
+       switch (ip->ip_v) {
+       case 4:
+               memset(&cookiecache[ninitiator].iaddr, 0,
+                       sizeof(cookiecache[ninitiator].iaddr));
+               memset(&cookiecache[ninitiator].raddr, 0,
+                       sizeof(cookiecache[ninitiator].raddr));
+
+               sin = (struct sockaddr_in *)&cookiecache[ninitiator].iaddr;
+#ifdef HAVE_SOCKADDR_SA_LEN
+               sin->sin_len = sizeof(struct sockaddr_in);
+#endif
+               sin->sin_family = AF_INET;
+               memcpy(&sin->sin_addr, &ip->ip_src, sizeof(ip->ip_src));
+               sin = (struct sockaddr_in *)&cookiecache[ninitiator].raddr;
+#ifdef HAVE_SOCKADDR_SA_LEN
+               sin->sin_len = sizeof(struct sockaddr_in);
+#endif
+               sin->sin_family = AF_INET;
+               memcpy(&sin->sin_addr, &ip->ip_dst, sizeof(ip->ip_dst));
+               break;
+#ifdef INET6
+       case 6:
+               memset(&cookiecache[ninitiator].iaddr, 0,
+                       sizeof(cookiecache[ninitiator].iaddr));
+               memset(&cookiecache[ninitiator].raddr, 0,
+                       sizeof(cookiecache[ninitiator].raddr));
+
+               ip6 = (struct ip6_hdr *)bp2;
+               sin6 = (struct sockaddr_in6 *)&cookiecache[ninitiator].iaddr;
+#ifdef HAVE_SOCKADDR_SA_LEN
+               sin6->sin6_len = sizeof(struct sockaddr_in6);
+#endif
+               sin6->sin6_family = AF_INET6;
+               memcpy(&sin6->sin6_addr, &ip6->ip6_src, sizeof(ip6->ip6_src));
+               sin6 = (struct sockaddr_in6 *)&cookiecache[ninitiator].raddr;
+#ifdef HAVE_SOCKADDR_SA_LEN
+               sin6->sin6_len = sizeof(struct sockaddr_in6);
+#endif
+               sin6->sin6_family = AF_INET6;
+               memcpy(&sin6->sin6_addr, &ip6->ip6_dst, sizeof(ip6->ip6_dst));
+               break;
+#endif
+       default:
+               return;
+       }
+       memcpy(&cookiecache[ninitiator].initiator, in, sizeof(*in));
+       ninitiator = (ninitiator + 1) % MAXINITIATORS;
+}
+
+#define cookie_isinitiator(x, y)       cookie_sidecheck((x), (y), 1)
+#define cookie_isresponder(x, y)       cookie_sidecheck((x), (y), 0)
+static int
+cookie_sidecheck(int i, const u_char *bp2, int initiator)
+{
+       struct sockaddr_storage ss;
+       struct sockaddr *sa;
+       struct ip *ip;
+       struct sockaddr_in *sin;
+#ifdef INET6
+       struct ip6_hdr *ip6;
+       struct sockaddr_in6 *sin6;
+#endif
+       int salen;
+
+       memset(&ss, 0, sizeof(ss));
+       ip = (struct ip *)bp2;
+       switch (ip->ip_v) {
+       case 4:
+               sin = (struct sockaddr_in *)&ss;
+#ifdef HAVE_SOCKADDR_SA_LEN
+               sin->sin_len = sizeof(struct sockaddr_in);
+#endif
+               sin->sin_family = AF_INET;
+               memcpy(&sin->sin_addr, &ip->ip_src, sizeof(ip->ip_src));
+               break;
+#ifdef INET6
+       case 6:
+               ip6 = (struct ip6_hdr *)bp2;
+               sin6 = (struct sockaddr_in6 *)&ss;
+#ifdef HAVE_SOCKADDR_SA_LEN
+               sin6->sin6_len = sizeof(struct sockaddr_in6);
+#endif
+               sin6->sin6_family = AF_INET6;
+               memcpy(&sin6->sin6_addr, &ip6->ip6_src, sizeof(ip6->ip6_src));
+               break;
+#endif
+       default:
+               return 0;
+       }
+
+       sa = (struct sockaddr *)&ss;
+       if (initiator) {
+               if (sa->sa_family != ((struct sockaddr *)&cookiecache[i].iaddr)->sa_family)
+                       return 0;
+#ifdef HAVE_SOCKADDR_SA_LEN
+               salen = sa->sa_len;
+#else
+#ifdef INET6
+               if (sa->sa_family == AF_INET6)
+                       salen = sizeof(struct sockaddr_in6);
+               else
+                       salen = sizeof(struct sockaddr);
+#else
+               salen = sizeof(struct sockaddr);
+#endif
+#endif
+               if (memcmp(&ss, &cookiecache[i].iaddr, salen) == 0)
+                       return 1;
+       } else {
+               if (sa->sa_family != ((struct sockaddr *)&cookiecache[i].raddr)->sa_family)
+                       return 0;
+#ifdef HAVE_SOCKADDR_SA_LEN
+               salen = sa->sa_len;
+#else
+#ifdef INET6
+               if (sa->sa_family == AF_INET6)
+                       salen = sizeof(struct sockaddr_in6);
+               else
+                       salen = sizeof(struct sockaddr);
+#else
+               salen = sizeof(struct sockaddr);
+#endif
+#endif
+               if (memcmp(&ss, &cookiecache[i].raddr, salen) == 0)
+                       return 1;
+       }
+       return 0;
+}
+
+static void
+rawprint(caddr_t loc, size_t len)
+{
+       static u_char *p;
+       int i;
+
+       p = (u_char *)loc;
+       for (i = 0; i < len; i++)
+               printf("%02x", p[i] & 0xff);
+}
+
+struct attrmap {
+       char *type;
+       int nvalue;
+       char *value[30];        /*XXX*/
+};
+
+static u_char *
+isakmp_attrmap_print(u_char *p, u_char *ep, struct attrmap *map, size_t nmap)
+{
+       u_short *q;
+       int totlen;
+       u_int32_t t, v;
+
+       q = (u_short *)p;
+       if (p[0] & 0x80)
+               totlen = 4;
+       else
+               totlen = 4 + ntohs(q[1]);
+       if (ep < p + totlen) {
+               printf("[|attr]");
+               return ep + 1;
+       }
+
+       printf("(");
+       t = ntohs(q[0]) & 0x7fff;
+       if (map && t < nmap && map[t].type)
+               printf("type=%s ", map[t].type);
+       else
+               printf("type=#%d ", t);
+       if (p[0] & 0x80) {
+               printf("value=");
+               v = ntohs(q[1]);
+               if (map && t < nmap && v < map[t].nvalue && map[t].value[v])
+                       printf("%s", map[t].value[v]);
+               else
+                       rawprint((caddr_t)&q[1], 2);
+       } else {
+               printf("len=%d value=", ntohs(q[1]));
+               rawprint((caddr_t)&p[4], ntohs(q[1]));
+       }
+       printf(")");
+       return p + totlen;
+}
+
+static u_char *
+isakmp_attr_print(u_char *p, u_char *ep)
+{
+       u_short *q;
+       int totlen;
+       u_int32_t t;
+
+       q = (u_short *)p;
+       if (p[0] & 0x80)
+               totlen = 4;
+       else
+               totlen = 4 + ntohs(q[1]);
+       if (ep < p + totlen) {
+               printf("[|attr]");
+               return ep + 1;
+       }
+
+       printf("(");
+       t = ntohs(q[0]) & 0x7fff;
+       printf("type=#%d ", t);
+       if (p[0] & 0x80) {
+               printf("value=");
+               t = q[1];
+               rawprint((caddr_t)&q[1], 2);
+       } else {
+               printf("len=%d value=", ntohs(q[1]));
+               rawprint((caddr_t)&p[2], ntohs(q[1]));
+       }
+       printf(")");
+       return p + totlen;
+}
+
+static u_char *
+isakmp_sa_print(struct isakmp_gen *ext, u_char *ep, u_int32_t phase,
+       u_int32_t doi0, u_int32_t proto0)
+{
+       struct isakmp_pl_sa *p;
+       u_int32_t *q;
+       u_int32_t doi;
+       u_int32_t sit;
+       u_char *cp;
+       int t;
+
+       printf("%s:", NPSTR(ISAKMP_NPTYPE_SA));
+
+       p = (struct isakmp_pl_sa *)ext;
+       doi = ntohl(p->doi);
+       if (doi != 1) {
+               printf(" doi=%d", doi);
+               printf(" situation=%u", (u_int32_t)ntohl(p->sit));
+               return (u_char *)(p + 1);
+       }
+
+       printf(" doi=ipsec");
+       q = (u_int32_t *)&p->sit;
+       printf(" situation=");
+       t = 0;
+       if (ntohl(*q) & 0x01) {
+               printf("identity");
+               t++;
+       }
+       if (ntohl(*q) & 0x02) {
+               printf("%ssecrecy", t ? "+" : "");
+               t++;
+       }
+       if (ntohl(*q) & 0x04)
+               printf("%sintegrity", t ? "+" : "");
+       sit = htonl(*q++);
+
+       if (sit != 0x01)
+               printf(" ident=%u", (u_int32_t)ntohl(*q++));
+
+       ext = (struct isakmp_gen *)q;
+
+       cp = isakmp_sub_print(ISAKMP_NPTYPE_P, ext, ep, phase, doi, proto0);
+
+       return cp;
+}
+
+static u_char *
+isakmp_p_print(struct isakmp_gen *ext, u_char *ep, u_int32_t phase,
+       u_int32_t doi0, u_int32_t proto0)
+{
+       struct isakmp_pl_p *p;
+       u_char *cp;
+
+       printf("%s:", NPSTR(ISAKMP_NPTYPE_P));
+
+       p = (struct isakmp_pl_p *)ext;
+       printf(" #%d protoid=%s transform=%d",
+               p->p_no, PROTOIDSTR(p->prot_id), p->num_t);
+       if (p->spi_size) {
+               printf(" spi=");
+               rawprint((caddr_t)(p + 1), p->spi_size);
+       }
+
+       ext = (struct isakmp_gen *)((u_char *)(p + 1) + p->spi_size);
+
+       cp = isakmp_sub_print(ISAKMP_NPTYPE_T, ext, ep, phase, doi0,
+               p->prot_id);
+
+       return cp;
+}
+
+static char *isakmp_p_map[] = {
+       NULL, "ike",
+};
+
+static char *ah_p_map[] = {
+       NULL, "md5", "sha", "1des",
+};
+
+static char *esp_p_map[] = {
+       NULL, "1des-iv64", "1des", "3des", "rc5", "idea", "cast",
+       "blowfish", "3idea", "1des-iv32", "rc4", "null"
+};
+
+static char *ipcomp_p_map[] = {
+       NULL, "oui", "deflate", "lzs",
+};
+
+struct attrmap ipsec_t_map[] = {
+       { NULL, 0, },
+       { "lifetype", 3, { NULL, "sec", "kb", }, },
+       { "life", 0, },
+       { "group desc", 5,      { NULL, "modp768", "modp1024", "EC2N 2^155",
+                                 "EC2N 2^185", }, },
+       { "enc mode", 3, { NULL, "tunnel", "transport", }, },
+       { "auth", 5, { NULL, "hmac-md5", "hmac-sha1", "1des-mac", "keyed", }, },
+       { "keylen", 0, },
+       { "rounds", 0, },
+       { "dictsize", 0, },
+       { "privalg", 0, },
+};
+
+struct attrmap oakley_t_map[] = {
+       { NULL, 0 },
+       { "enc", 7,     { NULL, "1des", "idea", "blowfish", "rc5",
+                         "3des", "cast"}, },
+       { "hash", 4,    { NULL, "md5", "sha1", "tiger", }, },
+       { "auth", 6,    { NULL, "preshared", "dss", "rsa sig", "rsa enc",
+                         "rsa enc revised", }, },
+       { "group desc", 5,      { NULL, "modp768", "modp1024", "EC2N 2^155",
+                                 "EC2N 2^185", }, },
+       { "group type", 4,      { NULL, "MODP", "ECP", "EC2N", }, },
+       { "group prime", 0, },
+       { "group gen1", 0, },
+       { "group gen2", 0, },
+       { "group curve A", 0, },
+       { "group curve B", 0, },
+       { "lifetype", 3,        { NULL, "sec", "kb", }, },
+       { "lifeduration", 0, },
+       { "prf", 0, },
+       { "keylen", 0, },
+       { "field", 0, },
+       { "order", 0, },
+};
+
+static u_char *
+isakmp_t_print(struct isakmp_gen *ext, u_char *ep, u_int32_t phase,
+       u_int32_t doi, u_int32_t proto)
+{
+       struct isakmp_pl_t *p;
+       u_char *cp;
+       char *idstr;
+       struct attrmap *map;
+       size_t nmap;
+       u_char *ep2;
+
+       printf("%s:", NPSTR(ISAKMP_NPTYPE_T));
+
+       p = (struct isakmp_pl_t *)ext;
+
+       switch (proto) {
+       case 1:
+               idstr = STR_OR_ID(p->t_id, isakmp_p_map);
+               map = oakley_t_map;
+               nmap = sizeof(oakley_t_map)/sizeof(oakley_t_map[0]);
+               break;
+       case 2:
+               idstr = STR_OR_ID(p->t_id, ah_p_map);
+               map = ipsec_t_map;
+               nmap = sizeof(ipsec_t_map)/sizeof(ipsec_t_map[0]);
+               break;
+       case 3:
+               idstr = STR_OR_ID(p->t_id, esp_p_map);
+               map = ipsec_t_map;
+               nmap = sizeof(ipsec_t_map)/sizeof(ipsec_t_map[0]);
+               break;
+       case 4:
+               idstr = STR_OR_ID(p->t_id, ipcomp_p_map);
+               map = ipsec_t_map;
+               nmap = sizeof(ipsec_t_map)/sizeof(ipsec_t_map[0]);
+               break;
+       default:
+               idstr = NULL;
+               map = NULL;
+               nmap = 0;
+               break;
+       }
+
+       if (idstr)
+               printf(" #%d id=%s ", p->t_no, idstr);
+       else
+               printf(" #%d id=%d ", p->t_no, p->t_id);
+       cp = (u_char *)(p + 1);
+       ep2 = (u_char *)p + ntohs(ext->len);
+       while (cp < ep && cp < ep2) {
+               if (map && nmap) {
+                       cp = isakmp_attrmap_print(cp, (ep < ep2) ? ep : ep2,
+                               map, nmap);
+               } else
+                       cp = isakmp_attr_print(cp, (ep < ep2) ? ep : ep2);
+       }
+       if (ep < ep2)
+               printf("...");
+       return cp;
+}
+
+static u_char *
+isakmp_ke_print(struct isakmp_gen *ext, u_char *ep, u_int32_t phase,
+       u_int32_t doi, u_int32_t proto)
+{
+       printf("%s:", NPSTR(ISAKMP_NPTYPE_KE));
+
+       printf(" key len=%d", ntohs(ext->len) - 4);
+       if (2 < vflag && 4 < ntohs(ext->len)) {
+               printf(" ");
+               rawprint((caddr_t)(ext + 1), ntohs(ext->len) - 4);
+       }
+       return (u_char *)ext + ntohs(ext->len);
+}
+
+static u_char *
+isakmp_id_print(struct isakmp_gen *ext, u_char *ep, u_int32_t phase,
+       u_int32_t doi, u_int32_t proto)
+{
+#define USE_IPSECDOI_IN_PHASE1 1
+       struct isakmp_pl_id *p;
+       static char *idtypestr[] = {
+               "IPv4", "IPv4net", "IPv6", "IPv6net",
+       };
+       static char *ipsecidtypestr[] = {
+               NULL, "IPv4", "FQDN", "user FQDN", "IPv4net", "IPv6",
+               "IPv6net", "IPv4range", "IPv6range", "ASN1 DN", "ASN1 GN",
+               "keyid",
+       };
+       int len;
+       u_char *data;
+
+       printf("%s:", NPSTR(ISAKMP_NPTYPE_ID));
+
+       p = (struct isakmp_pl_id *)ext;
+       if (sizeof(*p) < ext->len)
+               data = (u_char *)(p + 1);
+       else
+               data = NULL;
+       len = ntohs(ext->len) - sizeof(*p);
+
+#if 0 /*debug*/
+       printf(" [phase=%d doi=%d proto=%d]", phase, doi, proto);
+#endif
+       switch (phase) {
+#ifndef USE_IPSECDOI_IN_PHASE1
+       case 1:
+#endif
+       default:
+               printf(" idtype=%s", STR_OR_ID(p->d.id_type, idtypestr));
+               printf(" doi_data=%u",
+                       (u_int32_t)(ntohl(p->d.doi_data) & 0xffffff));
+               break;
+
+#ifdef USE_IPSECDOI_IN_PHASE1
+       case 1:
+#endif
+       case 2:
+           {
+               struct ipsecdoi_id *p;
+               struct protoent *pe;
+
+               p = (struct ipsecdoi_id *)ext;
+               printf(" idtype=%s", STR_OR_ID(p->type, ipsecidtypestr));
+               setprotoent(1);
+               pe = getprotobynumber(p->proto_id);
+               if (pe)
+                       printf(" protoid=%s", pe->p_name);
+               else
+                       printf(" protoid=%s", PROTOIDSTR(p->proto_id));
+               endprotoent();
+               printf(" port=%d", ntohs(p->port));
+               if (!len)
+                       break;
+               switch (p->type) {
+               case IPSECDOI_ID_IPV4_ADDR:
+                       printf(" len=%d %s", len, ipaddr_string(data));
+                       len = 0;
+                       break;
+               case IPSECDOI_ID_FQDN:
+               case IPSECDOI_ID_USER_FQDN:
+                   {
+                       int i;
+                       printf(" len=%d ", len);
+                       for (i = 0; i < len; i++) {
+                               if (isprint(data[i]))
+                                       printf("%c", data[i]);
+                               else
+                                       printf("\\%03o", data[i]);
+                       }
+                       len = 0;
+                       break;
+                   }
+               case IPSECDOI_ID_IPV4_ADDR_SUBNET:
+                   {
+                       u_char *mask;
+                       mask = data + sizeof(struct in_addr);
+                       printf(" len=%d %s/%u.%u.%u.%u", len,
+                               ipaddr_string(data),
+                               mask[0], mask[1], mask[2], mask[3]);
+                       len = 0;
+                       break;
+                   }
+#ifdef INET6
+               case IPSECDOI_ID_IPV6_ADDR:
+                       printf(" len=%d %s", len, ip6addr_string(data));
+                       len = 0;
+                       break;
+               case IPSECDOI_ID_IPV6_ADDR_SUBNET:
+                   {
+                       u_int32_t *mask;
+                       mask = (u_int32_t *)(data + sizeof(struct in6_addr));
+                       /*XXX*/
+                       printf(" len=%d %s/0x%08x%08x%08x%08x", len,
+                               ip6addr_string(data),
+                               mask[0], mask[1], mask[2], mask[3]);
+                       len = 0;
+                       break;
+                   }
+#endif /*INET6*/
+               case IPSECDOI_ID_IPV4_ADDR_RANGE:
+                       printf(" len=%d %s-%s", len, ipaddr_string(data),
+                               ipaddr_string(data + sizeof(struct in_addr)));
+                       len = 0;
+                       break;
+#ifdef INET6
+               case IPSECDOI_ID_IPV6_ADDR_RANGE:
+                       printf(" len=%d %s-%s", len, ip6addr_string(data),
+                               ip6addr_string(data + sizeof(struct in6_addr)));
+                       len = 0;
+                       break;
+#endif /*INET6*/
+               case IPSECDOI_ID_DER_ASN1_DN:
+               case IPSECDOI_ID_DER_ASN1_GN:
+               case IPSECDOI_ID_KEY_ID:
+                       break;
+               }
+               break;
+           }
+       }
+       if (data && len) {
+               len -= sizeof(*p);
+               printf(" len=%d", len);
+               if (2 < vflag) {
+                       printf(" ");
+                       rawprint((caddr_t)data, len);
+               }
+       }
+       return (u_char *)ext + ntohs(ext->len);
+}
+
+static u_char *
+isakmp_hash_print(struct isakmp_gen *ext, u_char *ep, u_int32_t phase,
+       u_int32_t doi, u_int32_t proto)
+{
+       printf("%s:", NPSTR(ISAKMP_NPTYPE_HASH));
+
+       printf(" len=%d", ntohs(ext->len) - 4);
+       if (2 < vflag && 4 < ntohs(ext->len)) {
+               printf(" ");
+               rawprint((caddr_t)(ext + 1), ntohs(ext->len) - 4);
+       }
+       return (u_char *)ext + ntohs(ext->len);
+}
+
+static u_char *
+isakmp_nonce_print(struct isakmp_gen *ext, u_char *ep, u_int32_t phase,
+       u_int32_t doi, u_int32_t proto)
+{
+       printf("%s:", NPSTR(ISAKMP_NPTYPE_NONCE));
+
+       printf(" n len=%d", ntohs(ext->len) - 4);
+       if (2 < vflag && 4 < ntohs(ext->len)) {
+               printf(" ");
+               rawprint((caddr_t)(ext + 1), ntohs(ext->len) - 4);
+       }
+       return (u_char *)ext + ntohs(ext->len);
+}
+
+static u_char *
+isakmp_n_print(struct isakmp_gen *ext, u_char *ep, u_int32_t phase,
+       u_int32_t doi0, u_int32_t proto0)
+{
+       struct isakmp_pl_n *p;
+       u_char *cp;
+       u_char *ep2;
+       u_int32_t doi;
+       u_int32_t proto;
+       static char *notifystr[] = {
+               NULL,                           "INVALID-PAYLOAD-TYPE",
+               "DOI-NOT-SUPPORTED",            "SITUATION-NOT-SUPPORTED",
+               "INVALID-COOKIE",               "INVALID-MAJOR-VERSION",
+               "INVALID-MINOR-VERSION",        "INVALID-EXCHANGE-TYPE",
+               "INVALID-FLAGS",                "INVALID-MESSAGE-ID",
+               "INVALID-PROTOCOL-ID",          "INVALID-SPI",
+               "INVALID-TRANSFORM-ID",         "ATTRIBUTES-NOT-SUPPORTED",
+               "NO-PROPOSAL-CHOSEN",           "BAD-PROPOSAL-SYNTAX",
+               "PAYLOAD-MALFORMED",            "INVALID-KEY-INFORMATION",
+               "INVALID-ID-INFORMATION",       "INVALID-CERT-ENCODING",
+               "INVALID-CERTIFICATE",          "CERT-TYPE-UNSUPPORTED",
+               "INVALID-CERT-AUTHORITY",       "INVALID-HASH-INFORMATION",
+               "AUTHENTICATION-FAILED",        "INVALID-SIGNATURE",
+               "ADDRESS-NOTIFICATION",         "NOTIFY-SA-LIFETIME",
+               "CERTIFICATE-UNAVAILABLE",      "UNSUPPORTED-EXCHANGE-TYPE",
+               "UNEQUAL-PAYLOAD-LENGTHS",
+       };
+       static char *ipsecnotifystr[] = {
+               "RESPONDER-LIFETIME",           "REPLAY-STATUS",
+               "INITIAL-CONTACT",
+       };
+/* NOTE: these macro must be called with x in proper range */
+#define NOTIFYSTR(x) \
+       (((x) == 16384) ? "CONNECTED" : STR_OR_ID((x), notifystr))
+#define IPSECNOTIFYSTR(x) \
+       (((x) == 8192) ? "RESERVED" : STR_OR_ID(((x) - 24576), ipsecnotifystr))
+
+       printf("%s:", NPSTR(ISAKMP_NPTYPE_N));
+
+       p = (struct isakmp_pl_n *)ext;
+       doi = ntohl(p->doi);
+       proto = p->prot_id;
+       if (doi != 1) {
+               printf(" doi=%d", doi);
+               printf(" proto=%d", proto);
+               printf(" type=%s", NOTIFYSTR(ntohs(p->type)));
+               if (p->spi_size) {
+                       printf(" spi=");
+                       rawprint((caddr_t)(p + 1), p->spi_size);
+               }
+               return (u_char *)(p + 1) + p->spi_size;
+       }
+
+       printf(" doi=ipsec");
+       printf(" proto=%s", PROTOIDSTR(proto));
+       if (ntohs(p->type) < 8192)
+               printf(" type=%s", NOTIFYSTR(ntohs(p->type)));
+       else if (ntohs(p->type) < 16384)
+               printf(" type=%s", IPSECNOTIFYSTR(ntohs(p->type)));
+       else if (ntohs(p->type) < 24576)
+               printf(" type=%s", NOTIFYSTR(ntohs(p->type)));
+       else if (ntohs(p->type) < 40960)
+               printf(" type=%s", IPSECNOTIFYSTR(ntohs(p->type)));
+       else
+               printf(" type=%s", NOTIFYSTR(ntohs(p->type)));
+       if (p->spi_size) {
+               printf(" spi=");
+               rawprint((caddr_t)(p + 1), p->spi_size);
+       }
+
+       cp = (u_char *)(p + 1) + p->spi_size;
+       ep2 = (u_char *)p + ntohs(ext->len);
+
+       if (cp < ep) {
+               printf(" orig=(");
+               switch (ntohs(p->type)) {
+               case IPSECDOI_NTYPE_RESPONDER_LIFETIME:
+                   {
+                       struct attrmap *map = oakley_t_map;
+                       size_t nmap = sizeof(oakley_t_map)/sizeof(oakley_t_map[0]);
+                       while (cp < ep && cp < ep2) {
+                               cp = isakmp_attrmap_print(cp,
+                                       (ep < ep2) ? ep : ep2, map, nmap);
+                       }
+                       break;
+                   }
+               case IPSECDOI_NTYPE_REPLAY_STATUS:
+                       printf("replay detection %sabled",
+                               (*(u_int32_t *)cp) ? "en" : "dis");
+                       break;
+               case ISAKMP_NTYPE_NO_PROPOSAL_CHOSEN:
+                       isakmp_sub_print(ISAKMP_NPTYPE_SA,
+                               (struct isakmp_gen *)cp, ep, phase, doi, proto);
+                       break;
+               default:
+                       /* NULL is dummy */
+                       isakmp_print(cp,
+                               ntohs(ext->len) - sizeof(*p) - p->spi_size,
+                               NULL);
+               }
+               printf(")");
+       }
+       return (u_char *)ext + ntohs(ext->len);
+}
+
+static u_char *
+isakmp_d_print(struct isakmp_gen *ext, u_char *ep, u_int32_t phase,
+       u_int32_t doi0, u_int32_t proto0)
+{
+       struct isakmp_pl_d *p;
+       u_int8_t *q;
+       u_int32_t doi;
+       u_int32_t proto;
+       int i;
+
+       printf("%s:", NPSTR(ISAKMP_NPTYPE_D));
+
+       p = (struct isakmp_pl_d *)ext;
+       doi = ntohl(p->doi);
+       proto = p->prot_id;
+       if (doi != 1) {
+               printf(" doi=%u", doi);
+               printf(" proto=%u", proto);
+       } else {
+               printf(" doi=ipsec");
+               printf(" proto=%s", PROTOIDSTR(proto));
+       }
+       printf(" spilen=%u", p->spi_size);
+       printf(" nspi=%u", ntohs(p->num_spi));
+       printf(" spi=");
+       q = (u_int8_t *)(p + 1);
+       for (i = 0; i < ntohs(p->num_spi); i++) {
+               if (i != 0)
+                       printf(",");
+               rawprint((caddr_t)q, p->spi_size);
+               q += p->spi_size;
+       }
+       return q;
+}
+
+static u_char *
+isakmp_vid_print(struct isakmp_gen *ext, u_char *ep, u_int32_t phase,
+       u_int32_t doi, u_int32_t proto)
+{
+       printf("%s:", NPSTR(ISAKMP_NPTYPE_VID));
+
+       printf(" len=%d", ntohs(ext->len) - 4);
+       if (2 < vflag && 4 < ntohs(ext->len)) {
+               printf(" ");
+               rawprint((caddr_t)(ext + 1), ntohs(ext->len) - 4);
+       }
+       return (u_char *)ext + ntohs(ext->len);
+}
+
+static u_char *
+isakmp_sub0_print(u_char np, struct isakmp_gen *ext, u_char *ep,
+       u_int32_t phase, u_int32_t doi, u_int32_t proto)
+{
+       u_char *cp;
+
+       cp = (u_char *)ext;
+
+       if (NPFUNC(np))
+               cp = (*NPFUNC(np))(ext, ep, phase, doi, proto);
+       else {
+               printf("%s", NPSTR(np));
+               cp += ntohs(ext->len);
+       }
+       return cp;
+}
+
+static u_char *
+isakmp_sub_print(u_char np, struct isakmp_gen *ext, u_char *ep,
+       u_int32_t phase, u_int32_t doi, u_int32_t proto)
+{
+       u_char *cp;
+       static int depth = 0;
+       int i;
+
+       cp = (u_char *)ext;
+
+       while (np) {
+               if (ep < (u_char *)ext + ntohs(ext->len)) {
+                       printf(" [|%s]", NPSTR(np));
+                       cp = ep + 1;
+                       break;
+               }
+               depth++;
+               printf("\n");
+               for (i = 0; i < depth; i++)
+                       printf("    ");
+               printf("(");
+               cp = isakmp_sub0_print(np, ext, ep, phase, doi, proto);
+               printf(")");
+               depth--;
+
+               np = ext->np;
+               ext = (struct isakmp_gen *)cp;
+       }
+       return cp;
+}
+
+static char *
+numstr(int x)
+{
+       static char buf[20];
+       snprintf(buf, sizeof(buf), "#%d", x);
+       return buf;
+}
 
-/*
- * Print isakmp requests
- */
 void
-isakmp_print(register const u_char *cp, int length)
-{
-  struct isakmp_header *ih;
-  register const u_char *ep;
-  int mode, version, leapind;
-  
-#define TCHECK(var, l) if ((u_char *)&(var) > ep - l) goto trunc
-  
-  ih = (struct isakmp_header *)cp;
-  /* Note funny sized packets */
-  if (length < 20)
-    {
-      (void)printf(" [len=%d]", length);
-    }
+isakmp_print(const u_char *bp, u_int length, const u_char *bp2)
+{
+       struct isakmp *base;
+       u_char *ep;
+       u_char np;
+       int i;
+       int phase;
+       int major, minor;
 
-  /* 'ep' points to the end of avaible data. */
-  ep = snapend;
+       base = (struct isakmp *)bp;
+       ep = (u_char *)snapend;
 
-  printf(" isakmp");
+       if ((struct isakmp *)ep < base + 1) {
+               printf("[|isakmp]");
+               return;
+       }
 
-  printf(" v%d.%d\n\t", ih->mjver, ih->mnver);
+       printf("isakmp");
+       if (vflag) {
+               major = (base->vers & ISAKMP_VERS_MAJOR)
+                               >> ISAKMP_VERS_MAJOR_SHIFT;
+               minor = (base->vers & ISAKMP_VERS_MINOR)
+                               >> ISAKMP_VERS_MINOR_SHIFT;
+               printf(" %d.%d", major, minor);
+       }
 
-  if(ih->flags & FLAGS_ENCRYPTION)
-    {
-      printf(" encrypted");
-    }
-  
-  if(ih->flags & FLAGS_COMMIT)
-    {
-      printf(" commit");
-    }
+       if (vflag) {
+               printf(" msgid ");
+               rawprint((caddr_t)&base->msgid, sizeof(base->msgid));
+       }
+
+       if (1 < vflag) {
+               printf(" cookie ");
+               rawprint((caddr_t)&base->i_ck, sizeof(base->i_ck));
+               printf("->");
+               rawprint((caddr_t)&base->r_ck, sizeof(base->r_ck));
+       }
+       printf(":");
+
+       phase = (*(u_int32_t *)base->msgid == 0) ? 1 : 2;
+       if (phase == 1)
+               printf(" phase %d", phase);
+       else
+               printf(" phase %d/others", phase);
+
+       i = cookie_find(&base->i_ck);
+       if (i < 0) {
+               if (iszero((u_char *)&base->r_ck, sizeof(base->r_ck))) {
+                       /* the first packet */
+                       printf(" I");
+                       if (bp2)
+                               cookie_record(&base->i_ck, bp2);
+               } else
+                       printf(" ?");
+       } else {
+               if (bp2 && cookie_isinitiator(i, bp2))
+                       printf(" I");
+               else if (bp2 && cookie_isresponder(i, bp2))
+                       printf(" R");
+               else
+                       printf(" ?");
+       }
+
+       printf(" %s", ETYPESTR(base->etype));
+       if (base->flags) {
+               printf("[%s%s]", base->flags & ISAKMP_FLAG_E ? "E" : "",
+                       base->flags & ISAKMP_FLAG_C ? "C" : "");
+       }
+       printf(":");
 
-  printf(" from:%02x%02x%02x%02x to: %02x%02x%02x%02x",
-        ih->init_cookie[0], ih->init_cookie[1],
-        ih->init_cookie[2], ih->init_cookie[3], 
-        ih->resp_cookie[0], ih->resp_cookie[1], 
-        ih->resp_cookie[2], ih->resp_cookie[3]);
-
-  TCHECK(ih->msgid, sizeof(ih->msgid));
-  printf(" msgid:%02x%02x%02x%02x",
-        ih->msgid[0], ih->msgid[1],
-        ih->msgid[2], ih->msgid[3]);
-
-  TCHECK(ih->length, sizeof(ih->length));
-  printf(" length %d", ntohl(ih->length));
-  
-  if(ih->mjver > 1)
     {
-      printf(" new version");
-      return;
+       struct isakmp_gen *ext;
+       int nparen;
+
+#define CHECKLEN(p, np) \
+       if (ep < (u_char *)(p)) {                               \
+               printf(" [|%s]", NPSTR(np));                    \
+               goto done;                                      \
+       }
+
+       /* regardless of phase... */
+       if (base->flags & ISAKMP_FLAG_E) {
+               /*
+                * encrypted, nothing we can do right now.
+                * we hope to decrypt the packet in the future...
+                */
+               printf(" [|%s]", NPSTR(base->np));
+               goto done;
+       }
+
+       nparen = 0;
+       CHECKLEN(base + 1, base->np)
+
+       np = base->np;
+       ext = (struct isakmp_gen *)(base + 1);
+       isakmp_sub_print(np, ext, ep, phase, 0, 0);
     }
 
-trunc:
-       fputs(" [|isakmp]", stdout);
+done:
+       if (vflag) {
+               if (ntohl(base->len) != length) {
+                       printf(" (len mismatch: isakmp %u/ip %d)",
+                               (u_int32_t)ntohl(base->len), length);
+               }
+       }
 }