diff options
| author | morriss <morriss@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-10-22 15:08:32 +0000 |
|---|---|---|
| committer | morriss <morriss@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-10-22 15:08:32 +0000 |
| commit | 3ce45bd5e1361c210e4019a3e6ffb144f1dff9b4 (patch) | |
| tree | 54209603f076cb7b81a356d5dcc4841ac95fdfec /epan/dissectors/packet-prp.c | |
| parent | ca8f77f28fdeb9b1cdf869db837dc5ee57fa3215 (diff) | |
From Tobias Klauservia https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5327 :
The current PRP dissector in packet-prp.c does not correctly identify VLAN
tags. It uses the hard coded value 0x8000 to check the ethertype.
The attached patch (against current SVN trunk) changes this to use the
ETHERTYPE_VLAN define from epan/etypes.h and also fixes two misspellings in the
respective comments.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34622 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-prp.c')
| -rw-r--r-- | epan/dissectors/packet-prp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-prp.c b/epan/dissectors/packet-prp.c index 91e3c02b43..51e2210c7b 100644 --- a/epan/dissectors/packet-prp.c +++ b/epan/dissectors/packet-prp.c @@ -211,11 +211,11 @@ dissect_prp_redundancy_control_trailer(tvbuff_t *tvb, packet_info *pinfo _U_, pr return; } - if(0x8000 == tvb_get_ntohs(tvb, 12)) /* taged frame */ + if(ETHERTYPE_VLAN == tvb_get_ntohs(tvb, 12)) /* tagged frame */ { offset = 18; } - else /* untaged */ + else /* untagged */ { offset = 14; } |