osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

packet-hislip.c: Remove duplicate entries from vendorID. 

This does occasionally happen to enumerated vendor ID values for protocols
(company/product line buyouts/acquisitions, etc).
Use "first value" as the vendor ID of choice.

Change-Id: I9a277bf07276809e0684bd3a9f121d4a656d87f6
Reviewed-on: https://code.wireshark.org/review/21137
Reviewed-by: Michael Mann <mmann78@netscape.net>
This commit is contained in:
Michael Mann 2017-04-16 10:22:33 -04:00
parent 1ebdf3d7f0
commit f5f5e8c6a7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
epan/dissectors/packet-hislip.c
View File

@ -296,7 +296,7 @@ static const value_string vendorID[] =
{ 0x4153, "ASCOR Incorporated" },
{ 0x4154, "Thurlby Thandar Instruments Limited" },
{ 0x4155, "Anritsu Company" },
{ 0x4155, "Serendipity Systems, Inc." },
/* { 0x4155, "Serendipity Systems, Inc." }, XXX - duplicate of "Anritsu Company" */
{ 0x4156, "Advantest Corporation" },
{ 0x4241, "BAE Systems" },
{ 0x4242, "B&B Technologies" },
@ -346,7 +346,7 @@ static const value_string vendorID[] =
{ 0x5343, "Scicom" },
{ 0x534C, "Schlumberger Technologies" },
{ 0x5352, "Scientific Research Corporation" },
{ 0x5352, "Sony/Tektronix Corporation" },
/* { 0x5352, "Sony/Tektronix Corporation" }, XXX - duplicate of "Scientific Research Corporation" */
{ 0x5353, "Spectrum Signal Processing, Inc." },
{ 0x5441, "Talon Instruments" },
{ 0x5445, "Teradyne" },