diff options
| author | fenner <fenner@FreeBSD.org> | 2003-03-02 08:22:26 +0000 |
|---|---|---|
| committer | fenner <fenner@FreeBSD.org> | 2003-03-02 08:22:26 +0000 |
| commit | 5f76ebca43302f98858e83a6212d9c610e939bad (patch) | |
| tree | c244ceda18deb5fc8e576971e1e83b7b631f5219 /contrib/tcpdump/print-rx.c | |
| parent | 24ede2d805a7ffac09999aafe7d4f285e45a6edd (diff) | |
| download | FreeBSD-src-5f76ebca43302f98858e83a6212d9c610e939bad.zip FreeBSD-src-5f76ebca43302f98858e83a6212d9c610e939bad.tar.gz | |
Import tcpdump 3.7.2 (fudging for multi-DLT support) from
http://www.tcpdump.org/release/tcpdump-3.7.2.tar.gz
Diffstat (limited to 'contrib/tcpdump/print-rx.c')
| -rw-r--r-- | contrib/tcpdump/print-rx.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/contrib/tcpdump/print-rx.c b/contrib/tcpdump/print-rx.c index 530965d..a448804 100644 --- a/contrib/tcpdump/print-rx.c +++ b/contrib/tcpdump/print-rx.c @@ -34,7 +34,7 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/print-rx.c,v 1.27 2001/10/20 07:41:55 itojun Exp $"; + "@(#) $Header: /tcpdump/master/tcpdump/print-rx.c,v 1.27.2.2 2002/07/10 07:17:57 guy Exp $"; #endif #ifdef HAVE_CONFIG_H @@ -44,7 +44,9 @@ static const char rcsid[] = #include <stdio.h> #include <stdlib.h> #include <string.h> +#ifdef TIME_WITH_SYS_TIME #include <time.h> +#endif #include <sys/param.h> #include <sys/time.h> #include <sys/types.h> @@ -755,15 +757,15 @@ rx_cache_find(const struct rx_header *rxh, const struct ip *ip, int sport, * This is the sickest one of all */ -#define VECOUT(MAX) { char *sp; \ - char s[AFSNAMEMAX]; \ +#define VECOUT(MAX) { u_char *sp; \ + u_char s[AFSNAMEMAX]; \ int k; \ if ((MAX) + 1 > sizeof(s)) \ goto trunc; \ TCHECK2(bp[0], (MAX) * sizeof(int32_t)); \ sp = s; \ for (k = 0; k < (MAX); k++) { \ - *sp++ = (char) EXTRACT_32BITS(bp); \ + *sp++ = (u_char) EXTRACT_32BITS(bp); \ bp += sizeof(int32_t); \ } \ s[(MAX)] = '\0'; \ @@ -1128,7 +1130,7 @@ acl_print(u_char *s, int maxsize, u_char *end) goto finish; s += n; printf(" +{"); - fn_print(user, NULL); + fn_print((u_char *)user, NULL); printf(" "); ACLOUT(acl); printf("}"); @@ -1141,7 +1143,7 @@ acl_print(u_char *s, int maxsize, u_char *end) goto finish; s += n; printf(" -{"); - fn_print(user, NULL); + fn_print((u_char *)user, NULL); printf(" "); ACLOUT(acl); printf("}"); |
