Wireshark · Wireshark-commits: [Wireshark-commits] rev 31446: /trunk/ /trunk/epan/dissectors/: packet-isl.c /trunk/: manuf wka.tmpl

[sfisher@xxxxxxxxxxxxx]

http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=31446

User: sfisher
Date: 2010/01/05 02:15 AM

Log:
 More updates to the ISL dissector:
 
 1) Rollback r14139 in two parts:
 
     a) Change user priority back to what Cisco's ISL documentation states that
        the values mean instead of the 802.1Q CoS values (see also note below).
     b) Change the destination address back to type FT_ETHER since the
        ISL-Frame values were added to manuf/wka.tmpl in r16741 with a /40
        mask.
 
 2) Add 03-00-0C-00-00/40 to manuf/wka.tmpl for ISL over Token Ring.
 
 3) Move the type and user fields to a tree elow the destination address since
    that is where the values come from. 
 
 NOTE: Regarding change 1a, I noticed in the Wiki's isl-2-dot1q.cap sample
       capture file that bit #2 is being set to 1 when bits 0 and 1 are set to
       1.  When bits 0 and 1 are both set to 0, bit 2 is not set.  I cannot
       find a reference to this bit being used in Cisco's documentation.

Directory: /trunk/epan/dissectors/
  Changes    Path            Action
  +22 -17    packet-isl.c    Modified

Directory: /trunk/
  Changes    Path          Action
  +10 -0     manuf         Modified
  +1 -0      wka.tmpl      Modified