diff options
author | fenner <fenner@FreeBSD.org> | 2001-07-23 23:15:13 +0000 |
---|---|---|
committer | fenner <fenner@FreeBSD.org> | 2001-07-23 23:15:13 +0000 |
commit | 656ab0c2a8c6557aac660b514e53fdac9e683db9 (patch) | |
tree | f0e506e623d2f415240e815093060f33bf5a4508 /contrib/tcpdump | |
parent | d8ce2cea7a1e7b711df367afcda9eb0faad565e7 (diff) | |
parent | f815ae37f4671c581fdc1c6f99a8490a6dfbb4f6 (diff) | |
download | FreeBSD-src-656ab0c2a8c6557aac660b514e53fdac9e683db9.zip FreeBSD-src-656ab0c2a8c6557aac660b514e53fdac9e683db9.tar.gz |
This commit was generated by cvs2svn to compensate for changes in r80231,
which included commits to RCS files with non-trunk default branches.
Diffstat (limited to 'contrib/tcpdump')
-rw-r--r-- | contrib/tcpdump/CREDITS | 1 | ||||
-rw-r--r-- | contrib/tcpdump/README | 8 | ||||
-rw-r--r-- | contrib/tcpdump/VERSION | 2 | ||||
-rw-r--r-- | contrib/tcpdump/print-rx.c | 28 | ||||
-rw-r--r-- | contrib/tcpdump/print-smb.c | 2 |
5 files changed, 25 insertions, 16 deletions
diff --git a/contrib/tcpdump/CREDITS b/contrib/tcpdump/CREDITS index 3538157..e53d689 100644 --- a/contrib/tcpdump/CREDITS +++ b/contrib/tcpdump/CREDITS @@ -26,6 +26,7 @@ Additional people who have contributed patches: JINMEI Tatuya <jinmei@kame.net> Jefferson Ogata <jogata@nodc.noaa.gov> Jeffrey Hutzelman <jhutz@cmu.edu> + Jim Hutchins <jim@ca.sandia.gov> Juergen Schoenwaelder <schoenw@ibr.cs.tu-bs.de> Ken Hornstein <kenh@cmf.nrl.navy.mil> Kevin Steves <stevesk@sweden.hp.com> diff --git a/contrib/tcpdump/README b/contrib/tcpdump/README index 03fe3cf..6d52e1f 100644 --- a/contrib/tcpdump/README +++ b/contrib/tcpdump/README @@ -1,6 +1,6 @@ -@(#) $Header: /tcpdump/master/tcpdump/README,v 1.58 2000/12/08 06:59:11 mcr Exp $ (LBL) +@(#) $Header: /tcpdump/master/tcpdump/README,v 1.58.2.1 2001/04/11 05:27:42 guy Exp $ (LBL) -TCPDUMP 3.6 +TCPDUMP 3.6.2 Now maintained by "The Tcpdump Group" See www.tcpdump.org @@ -11,8 +11,8 @@ Anonymous CVS is available via: (password "anoncvs") cvs -d cvs.tcpdump.org:/tcpdump/master checkout tcpdump -Version 3.6 of TCPDUMP can be retrived with the CVS tag "tcpdump_3_6": - cvs -d cvs.tcpdump.org:/tcpdump/master checkout -r tcpdump_3_6 tcpdump +Version 3.6.2 of TCPDUMP can be retrived with the CVS tag "tcpdump_3_6rel2": + cvs -d cvs.tcpdump.org:/tcpdump/master checkout -r tcpdump_3_6rel2 tcpdump Please send patches against the master copy to patches@tcpdump.org. diff --git a/contrib/tcpdump/VERSION b/contrib/tcpdump/VERSION index d70c8f8..4a788a0 100644 --- a/contrib/tcpdump/VERSION +++ b/contrib/tcpdump/VERSION @@ -1 +1 @@ -3.6 +3.6.3 diff --git a/contrib/tcpdump/print-rx.c b/contrib/tcpdump/print-rx.c index aa36124..af3cf1b 100644 --- a/contrib/tcpdump/print-rx.c +++ b/contrib/tcpdump/print-rx.c @@ -13,7 +13,7 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/print-rx.c,v 1.20 2001/01/10 08:12:01 fenner Exp $"; + "@(#) $Header: /tcpdump/master/tcpdump/print-rx.c,v 1.20.2.1 2001/07/09 01:40:59 fenner Exp $"; #endif #ifdef HAVE_CONFIG_H @@ -635,14 +635,16 @@ rx_cache_find(const struct rx_header *rxh, const struct ip *ip, int sport, printf(" fid %d/%d/%d", (int) n1, (int) n2, (int) n3); \ } -#define STROUT(MAX) { int i; \ +#define STROUT(MAX) { unsigned int i; \ TCHECK2(bp[0], sizeof(int32_t)); \ - i = (int) EXTRACT_32BITS(bp); \ + i = EXTRACT_32BITS(bp); \ + if (i > MAX) \ + goto trunc; \ bp += sizeof(int32_t); \ - TCHECK2(bp[0], i); \ - strncpy(s, (char *) bp, min(MAX, i)); \ - s[i] = '\0'; \ - printf(" \"%s\"", s); \ + printf(" \""); \ + if (fn_printn(bp, i, snapend)) \ + goto trunc; \ + printf("\""); \ bp += ((i + sizeof(int32_t) - 1) / sizeof(int32_t)) * sizeof(int32_t); \ } @@ -727,7 +729,9 @@ rx_cache_find(const struct rx_header *rxh, const struct ip *ip, int sport, bp += sizeof(int32_t); \ } \ s[MAX] = '\0'; \ - printf(" \"%s\"", s); \ + printf(" \""); \ + fn_print(s, NULL); \ + printf("\""); \ } static void @@ -1087,7 +1091,9 @@ acl_print(u_char *s, int maxsize, u_char *end) if (sscanf((char *) s, "%s %d\n%n", user, &acl, &n) != 2) goto finish; s += n; - printf(" +{%s ", user); + printf(" +{"); + fn_print(user, NULL); + printf(" "); ACLOUT(acl); printf("}"); if (s > end) @@ -1098,7 +1104,9 @@ acl_print(u_char *s, int maxsize, u_char *end) if (sscanf((char *) s, "%s %d\n%n", user, &acl, &n) != 2) goto finish; s += n; - printf(" -{%s ", user); + printf(" -{"); + fn_print(user, NULL); + printf(" "); ACLOUT(acl); printf("}"); if (s > end) diff --git a/contrib/tcpdump/print-smb.c b/contrib/tcpdump/print-smb.c index 85783f9..e5a3da5 100644 --- a/contrib/tcpdump/print-smb.c +++ b/contrib/tcpdump/print-smb.c @@ -893,7 +893,7 @@ void nbt_udp137_print(const uchar *data, int length) p += 2; } } else { - print_data(p, min(rdlen, length - ((const uchar *)p - data))); + print_data(p,rdlen); p += rdlen; } } |