 @@ -17,27 +17,27 @@
  * 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.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static const char rcsid[] _U_ =
     "@(#) Header: /tcpdump/master/tcpdump/print-esp.c,v 1.58 2007-12-07 00:03:07 mcr Exp  (LBL)";
 #else
-__RCSID("$NetBSD: print-esp.c,v 1.3 2013/04/06 19:33:08 christos Exp $");
+__RCSID("$NetBSD: print-esp.c,v 1.4 2013/10/20 02:58:34 christos Exp $");
 #endif
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #include <string.h>
 #include <tcpdump-stdinc.h>
 #include <stdlib.h>
 @@ -211,40 +211,38 @@ int espprint_decode_hex(netdissect_optio
+	}
 	return i;
+}
 /*
  * decode the form:    SPINUM@IP <tab> ALGONAME:0xsecret
  */
 static int
 espprint_decode_encalgo(netdissect_options *ndo,
 			char *decode, struct sa_list *sa)
+{
 	int len;
 	size_t i;
 	const EVP_CIPHER *evp;
 	int authlen = 0;
 	char *colon, *p;
 	colon = strchr(decode, ':');
 	if (colon == NULL) {
 		(*ndo->ndo_warning)(ndo, "failed to decode espsecret: %s\n", decode);
 		return 0;
+	}
 	*colon = '\0';
 	len = colon - decode;
 	if (strlen(decode) > strlen("-hmac96") &&
 	    !strcmp(decode + strlen(decode) - strlen("-hmac96"),
 		    "-hmac96")) {
 		p = strstr(decode, "-hmac96");
 		*p = '\0';
 		authlen = 12;
+	}
 	if (strlen(decode) > strlen("-cbc") &&
 	    !strcmp(decode + strlen(decode) - strlen("-cbc"), "-cbc")) {
 		p = strstr(decode, "-cbc");
 		*p = '\0';
+	}
 	evp = EVP_get_cipherbyname(decode);
 @@ -530,38 +528,36 @@ esp_print(netdissect_options *ndo,
 #endif
+	,
 	int *padlen
 #ifndef HAVE_LIBCRYPTO
 	_U_
 #endif
+	)
+{
 	register const struct newesp *esp;
 	register const u_char *ep;
 #ifdef HAVE_LIBCRYPTO
 	struct ip *ip;
 	struct sa_list *sa = NULL;
 	int espsecret_keylen;
 #ifdef INET6
 	struct ip6_hdr *ip6 = NULL;
 #endif
 	int advance;
 	int len;
 	u_char *secret;
 	int ivlen = 0;
 	u_char *ivoff;
 	u_char *p;
 	EVP_CIPHER_CTX ctx;
 	int blocksz;
 #endif
 	esp = (struct newesp *)bp;
 #ifdef HAVE_LIBCRYPTO
 	secret = NULL;
 	advance = 0;
 #endif
 #if 0
 	/* keep secret out of a register */
 	p = (u_char *)&secret;
 #endif
 @@ -645,35 +641,34 @@ esp_print(netdissect_options *ndo,
 		goto fail;
 	/* if we can't get nexthdr, we do not need to decrypt it */
 	if (ep - bp2 < len)
 		goto fail;
 	if (ep - bp2 > len) {
 		/* FCS included at end of frame (NetBSD 1.6 or later) */
 		ep = bp2 + len;
+	}
 	ivoff = (u_char *)(esp + 1) + 0;
 	ivlen = sa->ivlen;
 	secret = sa->secret;
 	espsecret_keylen = sa->secretlen;
 	ep = ep - sa->authlen;
 	if (sa->evp) {
 		memset(&ctx, 0, sizeof(ctx));
 		if (EVP_CipherInit(&ctx, sa->evp, secret, NULL, 0) < 0)
 			(*ndo->ndo_warning)(ndo, "espkey init failed");
-		blocksz = EVP_CIPHER_CTX_block_size(&ctx);
+		(void)EVP_CIPHER_CTX_block_size(&ctx);
 		p = ivoff;
 		EVP_CipherInit(&ctx, NULL, NULL, p, 0);
 		EVP_Cipher(&ctx, p + ivlen, p + ivlen, ep - (p + ivlen));
 		EVP_CIPHER_CTX_cleanup(&ctx);
 		advance = ivoff - (u_char *)esp + ivlen;
 	} else
 		advance = sizeof(struct newesp);
 	/* sanity check for pad length */
 	if (ep - bp < *(ep - 2))
 		goto fail;

 @@ -9,27 +9,27 @@
  * WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT
  * LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
  * FOR A PARTICULAR PURPOSE.
+ *
  * Original code by Andy Heffernan (ahh@juniper.net)
  */
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static const char rcsid[] _U_ =
     "@(#) Header: /tcpdump/master/tcpdump/print-pgm.c,v 1.5 2005-06-07 22:05:58 guy Exp ";
 #else
-__RCSID("$NetBSD: print-pgm.c,v 1.3 2013/04/06 19:33:08 christos Exp $");
+__RCSID("$NetBSD: print-pgm.c,v 1.4 2013/10/20 02:58:34 christos Exp $");
 #endif
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #include <tcpdump-stdinc.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 @@ -166,27 +166,27 @@ pgm_print(register const u_char *bp, reg
 	register const struct pgm_header *pgm;
 	register const struct ip *ip;
 	register char ch;
 	u_int16_t sport, dport;
 	int addr_size;
 	const void *nla;
 	int nla_af;
 #ifdef INET6
 	char nla_buf[INET6_ADDRSTRLEN];
 	register const struct ip6_hdr *ip6;
 #else
 	char nla_buf[INET_ADDRSTRLEN];
 #endif
-	u_int8_t opt_type, opt_len, flags1, flags2;
+	u_int8_t opt_type, opt_len;
 	u_int32_t seq, opts_len, len, offset;
 	pgm = (struct pgm_header *)bp;
 	ip = (struct ip *)bp2;
 #ifdef INET6
 	if (IP_V(ip) == 6)
 		ip6 = (struct ip6_hdr *)bp2;
 	else
 		ip6 = NULL;
 #else /* INET6 */
 	if (IP_V(ip) == 6) {
 		(void)printf("Can't handle IPv6");
 		return;
 @@ -540,102 +540,96 @@ pgm_print(register const u_char *bp, reg
 			(void)printf("[Bad OPT_LENGTH option, length %u != 4]", opt_len);
 			return;
+		    }
 		    (void)printf(" OPTS LEN (extra?) %d", EXTRACT_16BITS(bp));
 		    bp += sizeof(u_int16_t);
 		    opts_len -= 4;
 		    break;
 		case PGM_OPT_FRAGMENT:
 		    if (opt_len != 16) {
 			(void)printf("[Bad OPT_FRAGMENT option, length %u != 16]", opt_len);
 			return;
+		    }
-		    flags1 = *bp++;
+		    bp += 2;	/* skip flags */
 		    flags2 = *bp++;
 		    seq = EXTRACT_32BITS(bp);
 		    bp += sizeof(u_int32_t);
 		    offset = EXTRACT_32BITS(bp);
 		    bp += sizeof(u_int32_t);
 		    len = EXTRACT_32BITS(bp);
 		    bp += sizeof(u_int32_t);
 		    (void)printf(" FRAG seq %u off %u len %u", seq, offset, len);
 		    opts_len -= 16;
 		    break;
 		case PGM_OPT_NAK_LIST:
-		    flags1 = *bp++;
+		    bp += 2;	/* skip flags */
 		    flags2 = *bp++;
 		    opt_len -= sizeof(u_int32_t);	/* option header */
 		    (void)printf(" NAK LIST");
 		    while (opt_len) {
 			if (opt_len < sizeof(u_int32_t)) {
 			    (void)printf("[Option length not a multiple of 4]");
 			    return;
+			}
 			TCHECK2(*bp, sizeof(u_int32_t));
 			(void)printf(" %u", EXTRACT_32BITS(bp));
 			bp += sizeof(u_int32_t);
 			opt_len -= sizeof(u_int32_t);
 			opts_len -= sizeof(u_int32_t);
+		    }
 		    break;
 		case PGM_OPT_JOIN:
 		    if (opt_len != 8) {
 			(void)printf("[Bad OPT_JOIN option, length %u != 8]", opt_len);
 			return;
+		    }
-		    flags1 = *bp++;
+		    bp += 2;	/* skip flags */
 		    flags2 = *bp++;
 		    seq = EXTRACT_32BITS(bp);
 		    bp += sizeof(u_int32_t);
 		    (void)printf(" JOIN %u", seq);
 		    opts_len -= 8;
 		    break;
 		case PGM_OPT_NAK_BO_IVL:
 		    if (opt_len != 12) {
 			(void)printf("[Bad OPT_NAK_BO_IVL option, length %u != 12]", opt_len);
 			return;
+		    }
-		    flags1 = *bp++;
+		    bp += 2;	/* skip flags */
 		    flags2 = *bp++;
 		    offset = EXTRACT_32BITS(bp);
 		    bp += sizeof(u_int32_t);
 		    seq = EXTRACT_32BITS(bp);
 		    bp += sizeof(u_int32_t);
 		    (void)printf(" BACKOFF ivl %u ivlseq %u", offset, seq);
 		    opts_len -= 12;
 		    break;
 		case PGM_OPT_NAK_BO_RNG:
 		    if (opt_len != 12) {
 			(void)printf("[Bad OPT_NAK_BO_RNG option, length %u != 12]", opt_len);
 			return;
+		    }
-		    flags1 = *bp++;
+		    bp += 2;	/* skip flags */
 		    flags2 = *bp++;
 		    offset = EXTRACT_32BITS(bp);
 		    bp += sizeof(u_int32_t);
 		    seq = EXTRACT_32BITS(bp);
 		    bp += sizeof(u_int32_t);
 		    (void)printf(" BACKOFF max %u min %u", offset, seq);
 		    opts_len -= 12;
 		    break;
 		case PGM_OPT_REDIRECT:
-		    flags1 = *bp++;
+		    bp += 2;	/* skip flags */
 		    flags2 = *bp++;
 		    switch (EXTRACT_16BITS(bp)) {
 		    case AFI_IP:
 			addr_size = sizeof(struct in_addr);
 			nla_af = AF_INET;
 			break;
 #ifdef INET6
 		    case AFI_IP6:
 			addr_size = sizeof(struct in6_addr);
 			nla_af = AF_INET6;
 			break;
 #endif
 		    default:
 			goto trunc;
 @@ -650,130 +644,121 @@ pgm_print(register const u_char *bp, reg
 		    nla = bp;
 		    bp += addr_size;
 		    inet_ntop(nla_af, nla, nla_buf, sizeof(nla_buf));
 		    (void)printf(" REDIRECT %s",  (char *)nla);
 		    opts_len -= 4 + addr_size;
 		    break;
 		case PGM_OPT_PARITY_PRM:
 		    if (opt_len != 8) {
 			(void)printf("[Bad OPT_PARITY_PRM option, length %u != 8]", opt_len);
 			return;
+		    }
-		    flags1 = *bp++;
+		    bp += 2;	/* skip flags */
 		    flags2 = *bp++;
 		    len = EXTRACT_32BITS(bp);
 		    bp += sizeof(u_int32_t);
 		    (void)printf(" PARITY MAXTGS %u", len);
 		    opts_len -= 8;
 		    break;
 		case PGM_OPT_PARITY_GRP:
 		    if (opt_len != 8) {
 			(void)printf("[Bad OPT_PARITY_GRP option, length %u != 8]", opt_len);
 			return;
+		    }
-		    flags1 = *bp++;
+		    bp += 2;	/* skip flags */
 		    flags2 = *bp++;
 		    seq = EXTRACT_32BITS(bp);
 		    bp += sizeof(u_int32_t);
 		    (void)printf(" PARITY GROUP %u", seq);
 		    opts_len -= 8;
 		    break;
 		case PGM_OPT_CURR_TGSIZE:
 		    if (opt_len != 8) {
 			(void)printf("[Bad OPT_CURR_TGSIZE option, length %u != 8]", opt_len);
 			return;
+		    }
-		    flags1 = *bp++;
+		    bp += 2;	/* skip flags */
 		    flags2 = *bp++;
 		    len = EXTRACT_32BITS(bp);
 		    bp += sizeof(u_int32_t);
 		    (void)printf(" PARITY ATGS %u", len);
 		    opts_len -= 8;
 		    break;
 		case PGM_OPT_NBR_UNREACH:
 		    if (opt_len != 4) {
 			(void)printf("[Bad OPT_NBR_UNREACH option, length %u != 4]", opt_len);
 			return;
+		    }
-		    flags1 = *bp++;
+		    bp += 2;	/* skip flags */
 		    flags2 = *bp++;
 		    (void)printf(" NBR_UNREACH");
 		    opts_len -= 4;
 		    break;
 		case PGM_OPT_PATH_NLA:
 		    (void)printf(" PATH_NLA [%d]", opt_len);
 		    bp += opt_len;
 		    opts_len -= opt_len;
 		    break;
 		case PGM_OPT_SYN:
 		    if (opt_len != 4) {
 			(void)printf("[Bad OPT_SYN option, length %u != 4]", opt_len);
 			return;
+		    }
-		    flags1 = *bp++;
+		    bp += 2;	/* skip flags */
 		    flags2 = *bp++;
 		    (void)printf(" SYN");
 		    opts_len -= 4;
 		    break;
 		case PGM_OPT_FIN:
 		    if (opt_len != 4) {
 			(void)printf("[Bad OPT_FIN option, length %u != 4]", opt_len);
 			return;
+		    }
-		    flags1 = *bp++;
+		    bp += 2;	/* skip flags */
 		    flags2 = *bp++;
 		    (void)printf(" FIN");
 		    opts_len -= 4;
 		    break;
 		case PGM_OPT_RST:
 		    if (opt_len != 4) {
 			(void)printf("[Bad OPT_RST option, length %u != 4]", opt_len);
 			return;
+		    }
-		    flags1 = *bp++;
+		    bp += 2;	/* skip flags */
 		    flags2 = *bp++;
 		    (void)printf(" RST");
 		    opts_len -= 4;
 		    break;
 		case PGM_OPT_CR:
 		    (void)printf(" CR");
 		    bp += opt_len;
 		    opts_len -= opt_len;
 		    break;
 		case PGM_OPT_CRQST:
 		    if (opt_len != 4) {
 			(void)printf("[Bad OPT_CRQST option, length %u != 4]", opt_len);
 			return;
+		    }
-		    flags1 = *bp++;
+		    bp += 2;	/* skip flags */
 		    flags2 = *bp++;
 		    (void)printf(" CRQST");
 		    opts_len -= 4;
 		    break;
 		case PGM_OPT_PGMCC_DATA:
-		    flags1 = *bp++;
+		    bp += 2;	/* skip flags */
 		    flags2 = *bp++;
 		    offset = EXTRACT_32BITS(bp);
 		    bp += sizeof(u_int32_t);
 		    switch (EXTRACT_16BITS(bp)) {
 		    case AFI_IP:
 			addr_size = sizeof(struct in_addr);
 			nla_af = AF_INET;
 			break;
 #ifdef INET6
 		    case AFI_IP6:
 			addr_size = sizeof(struct in6_addr);
 			nla_af = AF_INET6;
 			break;
 #endif
 @@ -786,28 +771,27 @@ pgm_print(register const u_char *bp, reg
 			(void)printf("[Bad OPT_PGMCC_DATA option, length %u != 12 + address size]", opt_len);
 			return;
+		    }
 		    TCHECK2(*bp, addr_size);
 		    nla = bp;
 		    bp += addr_size;
 		    inet_ntop(nla_af, nla, nla_buf, sizeof(nla_buf));
 		    (void)printf(" PGMCC DATA %u %s", offset, (char*)nla);
 		    opts_len -= 16;
 		    break;
 		case PGM_OPT_PGMCC_FEEDBACK:
-		    flags1 = *bp++;
+		    bp += 2;	/* skip flags */
 		    flags2 = *bp++;
 		    offset = EXTRACT_32BITS(bp);
 		    bp += sizeof(u_int32_t);
 		    switch (EXTRACT_16BITS(bp)) {
 		    case AFI_IP:
 			addr_size = sizeof(struct in_addr);
 			nla_af = AF_INET;
 			break;
 #ifdef INET6
 		    case AFI_IP6:
 			addr_size = sizeof(struct in6_addr);
 			nla_af = AF_INET6;
 			break;
 #endif

 @@ -15,27 +15,27 @@
  * 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.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static const char rcsid[] _U_ =
     "@(#) Header: /tcpdump/master/tcpdump/print-pim.c,v 1.49 2006-02-13 01:31:35 hannes Exp  (LBL)";
 #else
-__RCSID("$NetBSD: print-pim.c,v 1.3 2013/04/06 19:33:08 christos Exp $");
+__RCSID("$NetBSD: print-pim.c,v 1.4 2013/10/20 02:58:34 christos Exp $");
 #endif
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #include <tcpdump-stdinc.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include "interface.h"
 @@ -116,27 +116,27 @@ struct pim {
 			 * Graft-Ack (PIM-DM only), C-RP-Adv
 			 */
 #define PIM_VER(x)	(((x) & 0xf0) >> 4)
 #define PIM_TYPE(x)	((x) & 0x0f)
 	u_char  pim_rsv;	/* Reserved */
 	u_short	pim_cksum;	/* IP style check sum */
 };
 static void pimv2_print(register const u_char *bp, register u_int len, u_int cksum);
 static void
 pimv1_join_prune_print(register const u_char *bp, register u_int len)
+{
-	int maddrlen, addrlen, ngroups, njoin, nprune;
+	int addrlen, maddrlen, ngroups, njoin, nprune;
 	int njp;
 	/* If it's a single group and a single source, use 1-line output. */
 	if (TTEST2(bp[0], 30) && bp[11] == 1 &&
 	    ((njoin = EXTRACT_16BITS(&bp[20])) + EXTRACT_16BITS(&bp[22])) == 1) {
 		int hold;
 		(void)printf(" RPF %s ", ipaddr_string(bp));
 		hold = EXTRACT_16BITS(&bp[6]);
 		if (hold != 180) {
 			(void)printf("Hold ");
 			relts_print(hold);
+		}
 @@ -167,26 +167,28 @@ pimv1_join_prune_print(register const u_
 	len -= 8;
 	TCHECK2(bp[0], 4);
 	maddrlen = bp[1];
 	addrlen = bp[2];
 	ngroups = bp[3];
 	bp += 4;
 	len -= 4;
 	while (ngroups--) {
 		/*
 		 * XXX - does the address have length "addrlen" and the
 		 * mask length "maddrlen"?
 		 */
 		__USE(addrlen);
 		__USE(maddrlen);
 		TCHECK2(bp[0], sizeof(struct in_addr));
 		(void)printf("\n\tGroup: %s", ipaddr_string(bp));
 		TCHECK2(bp[4], sizeof(struct in_addr));
 		if (EXTRACT_32BITS(&bp[4]) != 0xffffffff)
 			(void)printf("/%s", ipaddr_string(&bp[4]));
 		TCHECK2(bp[8], 4);
 		njoin = EXTRACT_16BITS(&bp[8]);
 		nprune = EXTRACT_16BITS(&bp[10]);
 		(void)printf(" joined: %d pruned: %d", njoin, nprune);
 		bp += 12;
 		len -= 12;
 		for (njp = 0; njp < (njoin + nprune); njp++) {
 			const char *type;

 @@ -15,27 +15,27 @@
  * 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.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static const char rcsid[] _U_ =
     "@(#) Header: /tcpdump/master/tcpdump/print-icmp6.c,v 1.86 2008-02-05 19:36:13 guy Exp ";
 #else
-__RCSID("$NetBSD: print-icmp6.c,v 1.4 2013/04/06 19:33:08 christos Exp $");
+__RCSID("$NetBSD: print-icmp6.c,v 1.5 2013/10/20 02:58:34 christos Exp $");
 #endif
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #ifdef INET6
 #include <tcpdump-stdinc.h>
 #include <stdio.h>
 #include <string.h>
 @@ -669,29 +669,27 @@ get_upperlayer(u_char *bp, u_int *prot)
 		default:	/* unknown or undecodable header */
 			*prot = nh; /* meaningless, but set here anyway */
 			return(NULL);
+		}
+	}
 	return(NULL);		/* should be notreached, though */
+}
 static void
 icmp6_opt_print(const u_char *bp, int resid)
+{
 	const struct nd_opt_hdr *op;
 	const struct nd_opt_hdr *opl;	/* why there's no struct? */
 	const struct nd_opt_prefix_info *opp;
 	const struct icmp6_opts_redirect *opr;
 	const struct nd_opt_mtu *opm;
 	const struct nd_opt_rdnss *oprd;
 	const struct nd_opt_advinterval *opa;
 	const struct nd_opt_homeagent_info *oph;
 	const struct nd_opt_route_info *opri;
 	const u_char *cp, *ep;
 	struct in6_addr in6, *in6p;
 	size_t l;
 	u_int i;
 #define ECHECK(var) if ((u_char *)&(var) > ep - sizeof(var)) return
 	cp = bp;
 @@ -707,48 +705,45 @@ icmp6_opt_print(const u_char *bp, int re
 		if (op->nd_opt_len == 0)
 			goto trunc;
 		if (cp + (op->nd_opt_len << 3) > ep)
 			goto trunc;
                 printf("\n\t  %s option (%u), length %u (%u): ",
                        tok2str(icmp6_opt_values, "unknown", op->nd_opt_type),
                        op->nd_opt_type,
                        op->nd_opt_len << 3,
                        op->nd_opt_len);
 		switch (op->nd_opt_type) {
 		case ND_OPT_SOURCE_LINKADDR:
 			opl = (struct nd_opt_hdr *)op;
 			l = (op->nd_opt_len << 3) - 2;
 			print_lladdr(cp + 2, l);
 			break;
 		case ND_OPT_TARGET_LINKADDR:
 			opl = (struct nd_opt_hdr *)op;
 			l = (op->nd_opt_len << 3) - 2;
 			print_lladdr(cp + 2, l);
 			break;
 		case ND_OPT_PREFIX_INFORMATION:
 			opp = (struct nd_opt_prefix_info *)op;
 			TCHECK(opp->nd_opt_pi_prefix);
                         printf("%s/%u%s, Flags [%s], valid time %ss",
                                ip6addr_string(&opp->nd_opt_pi_prefix),
                                opp->nd_opt_pi_prefix_len,
                                (op->nd_opt_len != 4) ? "badlen" : "",
                                bittok2str(icmp6_opt_pi_flag_values, "none", opp->nd_opt_pi_flags_reserved),
                                get_lifetime(EXTRACT_32BITS(&opp->nd_opt_pi_valid_time)));
                         printf(", pref. time %ss", get_lifetime(EXTRACT_32BITS(&opp->nd_opt_pi_preferred_time)));
 			break;
 		case ND_OPT_REDIRECTED_HEADER:
 			opr = (struct icmp6_opts_redirect *)op;
                         print_unknown_data(bp,"\n\t    ",op->nd_opt_len<<3);
 			/* xxx */
 			break;
 		case ND_OPT_MTU:
 			opm = (struct nd_opt_mtu *)op;
 			TCHECK(opm->nd_opt_mtu_mtu);
 			printf(" %u%s",
                                EXTRACT_32BITS(&opm->nd_opt_mtu_mtu),
                                (op->nd_opt_len != 1) ? "bad option length" : "" );
                         break;
 		case ND_OPT_RDNSS:
 			oprd = (struct nd_opt_rdnss *)op;
 			l = (op->nd_opt_len - 1) / 2;

 @@ -24,27 +24,27 @@
  * 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.
+ *
  */
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static const char rcsid[] _U_ =
     "@(#) Header: /tcpdump/master/tcpdump/print-isakmp.c,v 1.61 2008-02-05 19:34:25 guy Exp  (LBL)";
 #else
-__RCSID("$NetBSD: print-isakmp.c,v 1.4 2013/04/06 19:33:08 christos Exp $");
+__RCSID("$NetBSD: print-isakmp.c,v 1.5 2013/10/20 02:58:34 christos Exp $");
 #endif
 #endif
 #define NETDISSECT_REWORKED
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #include <tcpdump-stdinc.h>
 #include <string.h>
 #include <stdio.h>
 @@ -540,46 +540,44 @@ ikev1_attr_print(netdissect_options *ndo
 	ND_PRINT((ndo,")"));
 	return p + totlen;
+}
 static const u_char *
 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 struct ikev1_pl_sa *p;
 	struct ikev1_pl_sa sa;
 	const u_int32_t *q;
 	u_int32_t doi, sit, ident;
 	const u_char *cp, *np;
 	int t;
 	ND_PRINT((ndo,"%s:", NPSTR(ISAKMP_NPTYPE_SA)));
 	p = (struct ikev1_pl_sa *)ext;
 	ND_TCHECK(*p);
 	safememcpy(&sa, ext, sizeof(sa));
 	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," doi=ipsec"));
 	q = (u_int32_t *)&sa.sit;
 	ND_PRINT((ndo," situation="));
 	t = 0;
 	if (sit & 0x01) {
 		ND_PRINT((ndo,"identity"));
 		t++;
+	}
 	if (sit & 0x02) {
 		ND_PRINT((ndo,"%ssecrecy", t ? "+" : ""));
 		t++;
+	}
 	if (sit & 0x04)
 		ND_PRINT((ndo,"%sintegrity", t ? "+" : ""));
 @@ -1763,27 +1761,26 @@ trunc:
 	return NULL;
+}
 /* notify payloads */
 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_,
 		u_int32_t phase _U_, u_int32_t doi _U_,
 		u_int32_t proto _U_, int depth _U_)
+{
 	struct ikev2_n *p, n;
 	const u_char *cp;
 	u_char *ep2;
 	u_char showspi, showdata, showsomedata;
 	const char *notify_name;
 	u_int32_t type;
 	p = (struct ikev2_n *)ext;
 	ND_TCHECK(*p);
 	safememcpy(&n, ext, sizeof(n));
 	ikev2_pay_print(ndo, NPSTR(ISAKMP_NPTYPE_N), n.h.critical);
 	showspi = 1;
 	showdata = 0;
 	showsomedata=0;
 	notify_name=NULL;
 @@ -1940,27 +1937,26 @@ ikev2_n_print(netdissect_options *ndo, u
 	if(notify_name) {
 		ND_PRINT((ndo," type=%u(%s)", type, notify_name));
+	}
 	if (showspi && n.spi_size) {
 		ND_PRINT((ndo," spi="));
 		if (!rawprint(ndo, (caddr_t)(p + 1), n.spi_size))
 			goto trunc;
+	}
 	cp = (u_char *)(p + 1) + n.spi_size;
 	ep2 = (u_char *)p + item_len;
 	if(3 < ndo->ndo_vflag) {
 		showdata = 1;
+	}
 	if ((showdata || (showsomedata && ep-cp < 30)) && cp < ep) {
 		ND_PRINT((ndo," data=("));
 		if (!rawprint(ndo, (caddr_t)(cp), ep - cp))
 			goto trunc;
 		ND_PRINT((ndo,")"));
 	} else if(showsomedata && cp < ep) {
 @@ -2257,41 +2253,39 @@ ikev1_print(netdissect_options *ndo,
 			ND_PRINT((ndo," R"));
 		else
 			ND_PRINT((ndo," ?"));
+	}
 	ND_PRINT((ndo," %s", ETYPESTR(base->etype)));
 	if (base->flags) {
 		ND_PRINT((ndo,"[%s%s]", base->flags & ISAKMP_FLAG_E ? "E" : "",
 			  base->flags & ISAKMP_FLAG_C ? "C" : ""));
+	}
 	if (ndo->ndo_vflag) {
 		const struct isakmp_gen *ext;
 		int nparen;
 		ND_PRINT((ndo,":"));
 		/* 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...
 			 */
 			ND_PRINT((ndo," [encrypted %s]", NPSTR(base->np)));
 			goto done;
+		}
 		nparen = 0;
 		CHECKLEN(p + 1, base->np);
 		np = base->np;
 		ext = (struct isakmp_gen *)(p + 1);
 		ikev1_sub_print(ndo, np, ext, ep, phase, 0, 0, 0);
+	}
 done:
 	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));
+		}
+	}
 @@ -2414,41 +2408,39 @@ ikev2_print(netdissect_options *ndo,
 	else
 		ND_PRINT((ndo, " child_sa "));
 	ND_PRINT((ndo, " %s", ETYPESTR(base->etype)));
 	if (base->flags) {
 		ND_PRINT((ndo, "[%s%s%s]",
 			  base->flags & ISAKMP_FLAG_I ? "I" : "",
 			  base->flags & ISAKMP_FLAG_V ? "V" : "",
 			  base->flags & ISAKMP_FLAG_R ? "R" : ""));
+	}
 	if (ndo->ndo_vflag) {
 		const struct isakmp_gen *ext;
 		int nparen;
 		ND_PRINT((ndo, ":"));
 		/* 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...
 			 */
 			ND_PRINT((ndo, " [encrypted %s]", NPSTR(base->np)));
 			goto done;
+		}
 		nparen = 0;
 		CHECKLEN(p + 1, base->np)
 		np = base->np;
 		ext = (struct isakmp_gen *)(p + 1);
 		ikev2_sub_print(ndo, base, np, ext, ep, phase, 0, 0, 0);
+	}
 done:
 	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));
+		}
 @@ -2512,29 +2504,26 @@ isakmp_print(netdissect_options *ndo,
 		break;
 	case IKEv2_MAJOR_VERSION:
 		ikev2_print(ndo, bp, length, bp2, &base);
 		break;
+	}
+}
 void
 isakmp_rfc3948_print(netdissect_options *ndo,
 		     const u_char *bp, u_int length,
 		     const u_char *bp2)
+{
 	const u_char *ep;
 	ep = ndo->ndo_snapend;
 	if(length == 1 && bp[0]==0xff) {
 		ND_PRINT((ndo, "isakmp-nat-keep-alive"));
 		return;
+	}
 	if(length < 4) {
 		goto trunc;
+	}
 	/*
 	 * see if this is an IKE packet
 	 */
 	if(bp[0]==0 && bp[1]==0 && bp[2]==0 && bp[3]==0) {

 @@ -29,27 +29,27 @@
  * 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.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static const char rcsid[] _U_ =
 "@(#) Header: /tcpdump/master/tcpdump/print-sctp.c,v 1.21 2007-09-13 18:03:49 guy Exp  (NETLAB/PEL)";
 #else
-__RCSID("$NetBSD: print-sctp.c,v 1.3 2013/04/06 19:33:08 christos Exp $");
+__RCSID("$NetBSD: print-sctp.c,v 1.4 2013/10/20 02:58:34 christos Exp $");
 #endif
 #endif
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 #include <tcpdump-stdinc.h>
 #include "sctpHeader.h"
 #include "sctpConstants.h"
 #include <assert.h>
 @@ -339,30 +339,26 @@ void sctp_print(const u_char *bp,
 	    /* print duplicate TSNs */
 	    for (dupTSN = (const u_char *)frag, tsnNo=0;
 		 (const void *) dupTSN < nextChunk && tsnNo<EXTRACT_16BITS(&sack->numDupTsns);
 		 dupTSN += 4, tsnNo++)
 	      printf("\n\t\t[dup TSN #%u: %u] ", tsnNo+1,
 	          EXTRACT_32BITS(dupTSN));
 	    break;
+	  }
 	case SCTP_HEARTBEAT_REQUEST :
+	  {
 	    const struct sctpHBsender *hb;
 	    hb=(const struct sctpHBsender*)chunkDescPtr;
 	    printf("[HB REQ] ");
 	    break;
+	  }
 	case SCTP_HEARTBEAT_ACK :
 	  printf("[HB ACK] ");
 	  break;
 	case SCTP_ABORT_ASSOCIATION :
 	  printf("[ABORT] ");
 	  break;
 	case SCTP_SHUTDOWN :
 	  printf("[SHUTDOWN] ");
 	  break;