From owner-freebsd-current@FreeBSD.ORG  Thu Jul 15 13:31:50 2004
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Delivered-To: freebsd-current@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id DCCD916A4CE; Thu, 15 Jul 2004 13:31:50 +0000 (GMT)
Received: from cell.sick.ru (cell.sick.ru [217.72.144.68])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id DB37543D39; Thu, 15 Jul 2004 13:31:49 +0000 (GMT)
	(envelope-from glebius@freebsd.org)
Received: from cell.sick.ru (glebius@localhost [127.0.0.1])
	by cell.sick.ru (8.12.11/8.12.8) with ESMTP id i6FDVl5D019686
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);
	Thu, 15 Jul 2004 17:31:48 +0400 (MSD)
	(envelope-from glebius@freebsd.org)
Received: (from glebius@localhost)
	by cell.sick.ru (8.12.11/8.12.11/Submit) id i6FDVlWs019685;
	Thu, 15 Jul 2004 17:31:47 +0400 (MSD)
	(envelope-from glebius@freebsd.org)
X-Authentication-Warning: cell.sick.ru: glebius set sender to
	glebius@freebsd.org using -f
Date: Thu, 15 Jul 2004 17:31:47 +0400
From: Gleb Smirnoff <glebius@freebsd.org>
To: fenner@freebsd.org
Message-ID: <20040715133147.GA19644@cell.sick.ru>
Mime-Version: 1.0
Content-Type: text/plain; charset=koi8-r
Content-Disposition: inline
User-Agent: Mutt/1.5.6i
cc: current@freebsd.org
Subject: tcpdump: PPPoE or 3Com PPPoE
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 15 Jul 2004 13:31:51 -0000

  Bill,

  you are our tcpdump maintainer, aren't you?

  Working with ng_pppoe support for two PPPoE modes I have encountered
a problem, that new version of tcpdump always prints "PPPoE" no matter what
kind of PPPoE it is. This lead me to a confusion and I've spent half an hour
looking for a clue (the older version of tcpdump printed 3Com PPPoE as hex 
values).

 Please take a look at this hack and commit it if possible, or fix it
in other way. Thanks in advance.

diff -u -r1.14 print-ether.c
--- print-ether.c       31 Mar 2004 14:57:24 -0000      1.14
+++ print-ether.c       15 Jul 2004 13:20:44 -0000
@@ -250,10 +250,11 @@
 
                return (1);
 
-       case ETHERTYPE_PPPOED:
-       case ETHERTYPE_PPPOES:
        case ETHERTYPE_PPPOED2:
        case ETHERTYPE_PPPOES2:
+               printf("3Com ");        /* pass through */
+       case ETHERTYPE_PPPOED:
+       case ETHERTYPE_PPPOES:
                pppoe_print(p, length);
                return (1);
 
-- 
Totus tuus, Glebius.
GLEBIUS-RIPN GLEB-RIPE