summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoritojun <itojun>2003-10-28 03:16:35 +0000
committeritojun <itojun>2003-10-28 03:16:35 +0000
commite2826164d4518667c80fa14a93390c77af8b8af7 (patch)
treecf07445031348052f93e48215df695dde8fc23cd
parent53b421eb0f3827c6c51f1ad9792020b77e70576d (diff)
downloadtcpdump-e2826164d4518667c80fa14a93390c77af8b8af7.tar.gz
unsigned/signed mixup
-rw-r--r--Makefile-devel-adds8
-rw-r--r--print-esp.c5
-rw-r--r--print-icmp6.c4
-rw-r--r--print-tcp.c4
4 files changed, 11 insertions, 10 deletions
diff --git a/Makefile-devel-adds b/Makefile-devel-adds
index 512a1199..6e761086 100644
--- a/Makefile-devel-adds
+++ b/Makefile-devel-adds
@@ -1,14 +1,14 @@
#
# Auto-regenerate configure script or Makefile when things change.
-# From autoconf.info . Works best with GNU Make.
+# From autoconf-2.13.info . Works best with GNU Make.
#
${srcdir}/configure: configure.in
- cd ${srcdir} && autoconf
+ cd ${srcdir} && autoconf-2.13
-# autoheader might not change config.h.in, so touch a stamp file.
+# autoheader-2.13 might not change config.h.in, so touch a stamp file.
${srcdir}/config.h.in: ${srcdir}/stamp-h.in
${srcdir}/stamp-h.in: configure.in acconfig.h
- cd ${srcdir} && autoheader
+ cd ${srcdir} && autoheader-2.13
echo timestamp > ${srcdir}/stamp-h.in
config.h: stamp-h
diff --git a/print-esp.c b/print-esp.c
index cc9236ae..9dbc0b3f 100644
--- a/print-esp.c
+++ b/print-esp.c
@@ -23,7 +23,7 @@
#ifndef lint
static const char rcsid[] =
- "@(#) $Header: /tcpdump/master/tcpdump/print-esp.c,v 1.43 2003-08-06 04:59:48 guy Exp $ (LBL)";
+ "@(#) $Header: /tcpdump/master/tcpdump/print-esp.c,v 1.44 2003-10-28 03:16:36 itojun Exp $ (LBL)";
#endif
#ifdef HAVE_CONFIG_H
@@ -226,7 +226,8 @@ static void esp_print_decode_onesecret(char *line)
if (decode) {
char *colon, *p;
char espsecret_key[256];
- int len, i;
+ int len;
+ size_t i;
const EVP_CIPHER *evp;
int ivlen = 8;
int authlen = 0;
diff --git a/print-icmp6.c b/print-icmp6.c
index 0a8bdfe5..e252563a 100644
--- a/print-icmp6.c
+++ b/print-icmp6.c
@@ -21,7 +21,7 @@
#ifndef lint
static const char rcsid[] =
- "@(#) $Header: /tcpdump/master/tcpdump/print-icmp6.c,v 1.71 2003-06-07 11:57:53 guy Exp $";
+ "@(#) $Header: /tcpdump/master/tcpdump/print-icmp6.c,v 1.72 2003-10-28 03:16:36 itojun Exp $";
#endif
#ifdef HAVE_CONFIG_H
@@ -104,7 +104,7 @@ print_lladdr(const u_int8_t *p, size_t l)
static int icmp6_cksum(const struct ip6_hdr *ip6, const struct icmp6_hdr *icp,
int len)
{
- int i;
+ size_t i;
register const u_int16_t *sp;
u_int32_t sum;
union {
diff --git a/print-tcp.c b/print-tcp.c
index d42cfe45..2b7c610c 100644
--- a/print-tcp.c
+++ b/print-tcp.c
@@ -21,7 +21,7 @@
#ifndef lint
static const char rcsid[] =
- "@(#) $Header: /tcpdump/master/tcpdump/print-tcp.c,v 1.105 2003-06-07 11:57:54 guy Exp $ (LBL)";
+ "@(#) $Header: /tcpdump/master/tcpdump/print-tcp.c,v 1.106 2003-10-28 03:16:36 itojun Exp $ (LBL)";
#endif
#ifdef HAVE_CONFIG_H
@@ -133,7 +133,7 @@ static int tcp_cksum(register const struct ip *ip,
static int tcp6_cksum(const struct ip6_hdr *ip6, const struct tcphdr *tp,
int len)
{
- int i, tlen;
+ size_t i, tlen;
register const u_int16_t *sp;
u_int32_t sum;
union {