From owner-freebsd-stable@FreeBSD.ORG Sat Mar 4 14:32:52 2006 Return-Path: X-Original-To: freebsd-stable@freebsd.org Delivered-To: freebsd-stable@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1ED6716A420 for ; Sat, 4 Mar 2006 14:32:52 +0000 (GMT) (envelope-from killing@multiplay.co.uk) Received: from multiplay.co.uk (core6.multiplay.co.uk [85.236.96.23]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7702A43D46 for ; Sat, 4 Mar 2006 14:32:51 +0000 (GMT) (envelope-from killing@multiplay.co.uk) Received: from vader ([212.135.219.179]) by multiplay.co.uk (multiplay.co.uk [85.236.96.23]) (MDaemon.PRO.v8.1.3.R) with ESMTP id md50002348023.msg for ; Sat, 04 Mar 2006 14:32:37 +0000 Message-ID: <00cb01c63f98$7872b4c0$b3db87d4@multiplay.co.uk> From: "Steven Hartland" To: "Michael Vince" , References: <440997D1.8070002@roq.com> Date: Sat, 4 Mar 2006 14:32:26 -0000 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_NextPart_000_00C8_01C63F98.75A75FC0" X-Priority: 3 X-MSMail-Priority: Normal X-Mailer: Microsoft Outlook Express 6.00.2900.2670 X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2900.2670 X-Spam-Processed: multiplay.co.uk, Sat, 04 Mar 2006 14:32:38 +0000 (not processed: message from valid local sender) X-MDRemoteIP: 212.135.219.179 X-Return-Path: killing@multiplay.co.uk X-MDaemon-Deliver-To: freebsd-stable@freebsd.org X-MDAV-Processed: multiplay.co.uk, Sat, 04 Mar 2006 14:32:38 +0000 Cc: Subject: Re: 6-stable and Tcpdump problems X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2006 14:32:52 -0000 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" > 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--