Module Name: src
Committed By: christos
Date: Sun Oct 20 02:58:34 UTC 2013
Modified Files:
src/external/bsd/tcpdump/dist: print-esp.c print-icmp6.c print-isakmp.c
print-pgm.c print-pim.c print-sctp.c
Log Message:
remove unused variables
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/tcpdump/dist/print-esp.c \
src/external/bsd/tcpdump/dist/print-pgm.c \
src/external/bsd/tcpdump/dist/print-pim.c \
src/external/bsd/tcpdump/dist/print-sctp.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/tcpdump/dist/print-icmp6.c \
src/external/bsd/tcpdump/dist/print-isakmp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/tcpdump/dist/print-esp.c
diff -u src/external/bsd/tcpdump/dist/print-esp.c:1.3 src/external/bsd/tcpdump/dist/print-esp.c:1.4
--- src/external/bsd/tcpdump/dist/print-esp.c:1.3 Sat Apr 6 15:33:08 2013
+++ src/external/bsd/tcpdump/dist/print-esp.c Sat Oct 19 22:58:34 2013
@@ -27,7 +27,7 @@
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
@@ -221,7 +221,6 @@ 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;
@@ -234,7 +233,6 @@ espprint_decode_encalgo(netdissect_optio
}
*colon = '\0';
- len = colon - decode;
if (strlen(decode) > strlen("-hmac96") &&
!strcmp(decode + strlen(decode) - strlen("-hmac96"),
"-hmac96")) {
@@ -540,7 +538,6 @@ esp_print(netdissect_options *ndo,
#ifdef HAVE_LIBCRYPTO
struct ip *ip;
struct sa_list *sa = NULL;
- int espsecret_keylen;
#ifdef INET6
struct ip6_hdr *ip6 = NULL;
#endif
@@ -551,7 +548,6 @@ esp_print(netdissect_options *ndo,
u_char *ivoff;
u_char *p;
EVP_CIPHER_CTX ctx;
- int blocksz;
#endif
esp = (struct newesp *)bp;
@@ -655,7 +651,6 @@ esp_print(netdissect_options *ndo,
ivoff = (u_char *)(esp + 1) + 0;
ivlen = sa->ivlen;
secret = sa->secret;
- espsecret_keylen = sa->secretlen;
ep = ep - sa->authlen;
if (sa->evp) {
@@ -663,7 +658,7 @@ esp_print(netdissect_options *ndo,
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);
Index: src/external/bsd/tcpdump/dist/print-pgm.c
diff -u src/external/bsd/tcpdump/dist/print-pgm.c:1.3 src/external/bsd/tcpdump/dist/print-pgm.c:1.4
--- src/external/bsd/tcpdump/dist/print-pgm.c:1.3 Sat Apr 6 15:33:08 2013
+++ src/external/bsd/tcpdump/dist/print-pgm.c Sat Oct 19 22:58:34 2013
@@ -19,7 +19,7 @@
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
@@ -176,7 +176,7 @@ pgm_print(register const u_char *bp, reg
#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;
@@ -550,8 +550,7 @@ pgm_print(register const u_char *bp, reg
(void)printf("[Bad OPT_FRAGMENT option, length %u != 16]", opt_len);
return;
}
- flags1 = *bp++;
- flags2 = *bp++;
+ bp += 2; /* skip flags */
seq = EXTRACT_32BITS(bp);
bp += sizeof(u_int32_t);
offset = EXTRACT_32BITS(bp);
@@ -563,8 +562,7 @@ pgm_print(register const u_char *bp, reg
break;
case PGM_OPT_NAK_LIST:
- flags1 = *bp++;
- flags2 = *bp++;
+ bp += 2; /* skip flags */
opt_len -= sizeof(u_int32_t); /* option header */
(void)printf(" NAK LIST");
while (opt_len) {
@@ -585,8 +583,7 @@ pgm_print(register const u_char *bp, reg
(void)printf("[Bad OPT_JOIN option, length %u != 8]", opt_len);
return;
}
- flags1 = *bp++;
- flags2 = *bp++;
+ bp += 2; /* skip flags */
seq = EXTRACT_32BITS(bp);
bp += sizeof(u_int32_t);
(void)printf(" JOIN %u", seq);
@@ -598,8 +595,7 @@ pgm_print(register const u_char *bp, reg
(void)printf("[Bad OPT_NAK_BO_IVL option, length %u != 12]", opt_len);
return;
}
- flags1 = *bp++;
- flags2 = *bp++;
+ bp += 2; /* skip flags */
offset = EXTRACT_32BITS(bp);
bp += sizeof(u_int32_t);
seq = EXTRACT_32BITS(bp);
@@ -613,8 +609,7 @@ pgm_print(register const u_char *bp, reg
(void)printf("[Bad OPT_NAK_BO_RNG option, length %u != 12]", opt_len);
return;
}
- flags1 = *bp++;
- flags2 = *bp++;
+ bp += 2; /* skip flags */
offset = EXTRACT_32BITS(bp);
bp += sizeof(u_int32_t);
seq = EXTRACT_32BITS(bp);
@@ -624,8 +619,7 @@ pgm_print(register const u_char *bp, reg
break;
case PGM_OPT_REDIRECT:
- flags1 = *bp++;
- flags2 = *bp++;
+ bp += 2; /* skip flags */
switch (EXTRACT_16BITS(bp)) {
case AFI_IP:
addr_size = sizeof(struct in_addr);
@@ -660,8 +654,7 @@ pgm_print(register const u_char *bp, reg
(void)printf("[Bad OPT_PARITY_PRM option, length %u != 8]", opt_len);
return;
}
- flags1 = *bp++;
- flags2 = *bp++;
+ bp += 2; /* skip flags */
len = EXTRACT_32BITS(bp);
bp += sizeof(u_int32_t);
(void)printf(" PARITY MAXTGS %u", len);
@@ -673,8 +666,7 @@ pgm_print(register const u_char *bp, reg
(void)printf("[Bad OPT_PARITY_GRP option, length %u != 8]", opt_len);
return;
}
- flags1 = *bp++;
- flags2 = *bp++;
+ bp += 2; /* skip flags */
seq = EXTRACT_32BITS(bp);
bp += sizeof(u_int32_t);
(void)printf(" PARITY GROUP %u", seq);
@@ -686,8 +678,7 @@ pgm_print(register const u_char *bp, reg
(void)printf("[Bad OPT_CURR_TGSIZE option, length %u != 8]", opt_len);
return;
}
- flags1 = *bp++;
- flags2 = *bp++;
+ bp += 2; /* skip flags */
len = EXTRACT_32BITS(bp);
bp += sizeof(u_int32_t);
(void)printf(" PARITY ATGS %u", len);
@@ -699,8 +690,7 @@ pgm_print(register const u_char *bp, reg
(void)printf("[Bad OPT_NBR_UNREACH option, length %u != 4]", opt_len);
return;
}
- flags1 = *bp++;
- flags2 = *bp++;
+ bp += 2; /* skip flags */
(void)printf(" NBR_UNREACH");
opts_len -= 4;
break;
@@ -716,8 +706,7 @@ pgm_print(register const u_char *bp, reg
(void)printf("[Bad OPT_SYN option, length %u != 4]", opt_len);
return;
}
- flags1 = *bp++;
- flags2 = *bp++;
+ bp += 2; /* skip flags */
(void)printf(" SYN");
opts_len -= 4;
break;
@@ -727,8 +716,7 @@ pgm_print(register const u_char *bp, reg
(void)printf("[Bad OPT_FIN option, length %u != 4]", opt_len);
return;
}
- flags1 = *bp++;
- flags2 = *bp++;
+ bp += 2; /* skip flags */
(void)printf(" FIN");
opts_len -= 4;
break;
@@ -738,8 +726,7 @@ pgm_print(register const u_char *bp, reg
(void)printf("[Bad OPT_RST option, length %u != 4]", opt_len);
return;
}
- flags1 = *bp++;
- flags2 = *bp++;
+ bp += 2; /* skip flags */
(void)printf(" RST");
opts_len -= 4;
break;
@@ -755,15 +742,13 @@ pgm_print(register const u_char *bp, reg
(void)printf("[Bad OPT_CRQST option, length %u != 4]", opt_len);
return;
}
- flags1 = *bp++;
- flags2 = *bp++;
+ bp += 2; /* skip flags */
(void)printf(" CRQST");
opts_len -= 4;
break;
case PGM_OPT_PGMCC_DATA:
- flags1 = *bp++;
- flags2 = *bp++;
+ bp += 2; /* skip flags */
offset = EXTRACT_32BITS(bp);
bp += sizeof(u_int32_t);
switch (EXTRACT_16BITS(bp)) {
@@ -796,8 +781,7 @@ pgm_print(register const u_char *bp, reg
break;
case PGM_OPT_PGMCC_FEEDBACK:
- flags1 = *bp++;
- flags2 = *bp++;
+ bp += 2; /* skip flags */
offset = EXTRACT_32BITS(bp);
bp += sizeof(u_int32_t);
switch (EXTRACT_16BITS(bp)) {
Index: src/external/bsd/tcpdump/dist/print-pim.c
diff -u src/external/bsd/tcpdump/dist/print-pim.c:1.3 src/external/bsd/tcpdump/dist/print-pim.c:1.4
--- src/external/bsd/tcpdump/dist/print-pim.c:1.3 Sat Apr 6 15:33:08 2013
+++ src/external/bsd/tcpdump/dist/print-pim.c Sat Oct 19 22:58:34 2013
@@ -25,7 +25,7 @@
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
@@ -126,7 +126,7 @@ static void pimv2_print(register const u
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. */
@@ -177,6 +177,8 @@ pimv1_join_prune_print(register const u_
* 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));
Index: src/external/bsd/tcpdump/dist/print-sctp.c
diff -u src/external/bsd/tcpdump/dist/print-sctp.c:1.3 src/external/bsd/tcpdump/dist/print-sctp.c:1.4
--- src/external/bsd/tcpdump/dist/print-sctp.c:1.3 Sat Apr 6 15:33:08 2013
+++ src/external/bsd/tcpdump/dist/print-sctp.c Sat Oct 19 22:58:34 2013
@@ -39,7 +39,7 @@
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
@@ -349,10 +349,6 @@ void sctp_print(const u_char *bp,
}
case SCTP_HEARTBEAT_REQUEST :
{
- const struct sctpHBsender *hb;
-
- hb=(const struct sctpHBsender*)chunkDescPtr;
-
printf("[HB REQ] ");
break;
Index: src/external/bsd/tcpdump/dist/print-icmp6.c
diff -u src/external/bsd/tcpdump/dist/print-icmp6.c:1.4 src/external/bsd/tcpdump/dist/print-icmp6.c:1.5
--- src/external/bsd/tcpdump/dist/print-icmp6.c:1.4 Sat Apr 6 15:33:08 2013
+++ src/external/bsd/tcpdump/dist/print-icmp6.c Sat Oct 19 22:58:34 2013
@@ -25,7 +25,7 @@
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
@@ -679,9 +679,7 @@ 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;
@@ -717,12 +715,10 @@ icmp6_opt_print(const u_char *bp, int re
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;
@@ -738,7 +734,6 @@ icmp6_opt_print(const u_char *bp, int re
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;
Index: src/external/bsd/tcpdump/dist/print-isakmp.c
diff -u src/external/bsd/tcpdump/dist/print-isakmp.c:1.4 src/external/bsd/tcpdump/dist/print-isakmp.c:1.5
--- src/external/bsd/tcpdump/dist/print-isakmp.c:1.4 Sat Apr 6 15:33:08 2013
+++ src/external/bsd/tcpdump/dist/print-isakmp.c Sat Oct 19 22:58:34 2013
@@ -34,7 +34,7 @@
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
@@ -550,7 +550,6 @@ ikev1_sa_print(netdissect_options *ndo,
{
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;
@@ -569,7 +568,6 @@ ikev1_sa_print(netdissect_options *ndo,
}
ND_PRINT((ndo," doi=ipsec"));
- q = (u_int32_t *)&sa.sit;
ND_PRINT((ndo," situation="));
t = 0;
if (sit & 0x01) {
@@ -1773,7 +1771,6 @@ ikev2_n_print(netdissect_options *ndo, 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;
@@ -1950,7 +1947,6 @@ ikev2_n_print(netdissect_options *ndo, u
}
cp = (u_char *)(p + 1) + n.spi_size;
- ep2 = (u_char *)p + item_len;
if(3 < ndo->ndo_vflag) {
showdata = 1;
@@ -2267,7 +2263,6 @@ ikev1_print(netdissect_options *ndo,
if (ndo->ndo_vflag) {
const struct isakmp_gen *ext;
- int nparen;
ND_PRINT((ndo,":"));
@@ -2281,7 +2276,6 @@ ikev1_print(netdissect_options *ndo,
goto done;
}
- nparen = 0;
CHECKLEN(p + 1, base->np);
np = base->np;
ext = (struct isakmp_gen *)(p + 1);
@@ -2424,7 +2418,6 @@ ikev2_print(netdissect_options *ndo,
if (ndo->ndo_vflag) {
const struct isakmp_gen *ext;
- int nparen;
ND_PRINT((ndo, ":"));
@@ -2438,7 +2431,6 @@ ikev2_print(netdissect_options *ndo,
goto done;
}
- nparen = 0;
CHECKLEN(p + 1, base->np)
np = base->np;
@@ -2522,9 +2514,6 @@ isakmp_rfc3948_print(netdissect_options
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;
