tcpdump: PPPoE or 3Com PPPoE

  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
_at__at_ -250,10 +250,11 _at__at_
 
                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