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

MS NLB: fix msnlb.reserved' exists multiple times with NOT compatible types: FT_NONE and FT_BYTES 

Change-Id: Iff719dce3340c11b7fb874f323eedc0401096262
Reviewed-on: https://code.wireshark.org/review/13682
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Alexis La Goutte 2016-02-03 07:41:08 +01:00 committed by Anders Broman
parent a57c3bcc87
commit e9fc9c4506
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-msnlb.c
View File

@ -533,13 +533,13 @@ proto_register_msnlb(void)
NULL, HFILL }
},
{ &hf_msnlb_reserved2,
{ "Reserved", "msnlb.reserved",
{ "Reserved", "msnlb.reserved2",
FT_NONE, BASE_NONE,
NULL, 0,
NULL, HFILL }
},
{ &hf_msnlb_reserved2_data,
{ "Reserved Data", "msnlb.reserved.data",
{ "Reserved Data", "msnlb.reserved2.data",
FT_UINT32, BASE_DEC_HEX,
NULL, 0,
NULL, HFILL }