Date: Sat, 4 Mar 2006 14:32:26 -0000 From: "Steven Hartland" <killing@multiplay.co.uk> To: "Michael Vince" <mv@roq.com>, <freebsd-stable@freebsd.org> Subject: Re: 6-stable and Tcpdump problems Message-ID: <00cb01c63f98$7872b4c0$b3db87d4@multiplay.co.uk> References: <440997D1.8070002@roq.com>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format.
------=_NextPart_000_00C8_01C63F98.75A75FC0
Content-Type: text/plain; format=flowed; charset="iso-8859-1";
reply-type=response
Content-Transfer-Encoding: 7bit
Looks broken to me. Try the attached patch which should fix it.
Steve
----- Original Message -----
From: "Michael Vince" <mv@roq.com>
> Can any one agree with me there is a bug here? I have the same result on
> multiple machines.
================================================
This e.mail is private and confidential between Multiplay (UK) Ltd. and the person or entity to whom it is addressed. In the event of misdirection, the recipient is prohibited from using, copying, printing or otherwise disseminating it or any information contained in it.
In the event of misdirection, illegible or incomplete transmission please telephone (023) 8024 3137
or return the E.mail to postmaster@multiplay.co.uk.
------=_NextPart_000_00C8_01C63F98.75A75FC0
Content-Type: application/octet-stream;
name="tcpdump.c.patch"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
filename="tcpdump.c.patch"
--- tcpdump.c.orig Sat Mar 4 13:57:32 2006=0A=
+++ tcpdump.c Sat Mar 4 14:26:55 2006=0A=
@@ -1235,5 +1235,12 @@=0A=
* Include the link-layer header.=0A=
*/=0A=
- hex_print("\n\t", sp, h->caplen);=0A=
+ if ( Aflag )=0A=
+ {=0A=
+ ascii_print("\n\t", sp, h->caplen);=0A=
+ }=0A=
+ else=0A=
+ {=0A=
+ hex_print("\n\t", sp, h->caplen);=0A=
+ }=0A=
} else {=0A=
/*=0A=
@@ -1243,8 +1250,18 @@=0A=
*/=0A=
if (h->caplen > hdrlen)=0A=
- hex_print("\n\t", sp + hdrlen,=0A=
- h->caplen - hdrlen);=0A=
+ {=0A=
+ if ( Aflag )=0A=
+ {=0A=
+ ascii_print("\n\t", sp + hdrlen,=0A=
+ h->caplen - hdrlen);=0A=
+ }=0A=
+ else=0A=
+ {=0A=
+ hex_print("\n\t", sp + hdrlen,=0A=
+ h->caplen - hdrlen);=0A=
+ }=0A=
+ }=0A=
}=0A=
- } else if (Xflag) {=0A=
+ } else if (Xflag) {=0A=
/*=0A=
* Print the raw packet data.=0A=
------=_NextPart_000_00C8_01C63F98.75A75FC0--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?00cb01c63f98$7872b4c0$b3db87d4>