diff options
| author | Michael Mann <mmann78@netscape.net> | 2016-07-12 09:09:57 -0400 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-07-12 13:47:41 +0000 |
| commit | 3fe92ffabfa00d981797ef950af6eaa526617b9b (patch) | |
| tree | cab02ccf88456149ec0e2e0d884929c05c1d8eb9 | |
| parent | 25ba3dbc758337e9134f319b5a43aac69210bb94 (diff) | |
Create stub VXLAN (GPE) protocol for Decode As.
Also remove dissector_add_for_decode_as calls as dissector_add_uint
already handles that.
Change-Id: I87202d49765ffb1a2e6c922cb02b692fb16c0693
Reviewed-on: https://code.wireshark.org/review/16388
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
| -rw-r--r-- | epan/dissectors/packet-vxlan.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/epan/dissectors/packet-vxlan.c b/epan/dissectors/packet-vxlan.c index 8983e891a5..7f44a066da 100644 --- a/epan/dissectors/packet-vxlan.c +++ b/epan/dissectors/packet-vxlan.c @@ -42,6 +42,7 @@ void proto_register_vxlan(void); void proto_reg_handoff_vxlan(void); static int proto_vxlan = -1; +static int proto_vxlan_gpe = -1; static int hf_vxlan_flags = -1; static int hf_vxlan_gpe_flags = -1; @@ -307,8 +308,10 @@ proto_register_vxlan(void) }; /* Register the protocol name and description */ - proto_vxlan = proto_register_protocol("Virtual eXtensible Local Area Network", - "VXLAN", "vxlan"); + proto_vxlan = proto_register_protocol("Virtual eXtensible Local Area Network", "VXLAN", "vxlan"); + + /* Protocol registered just for Decode As */ + proto_vxlan_gpe = proto_register_protocol("Virtual eXtensible Local Area Network (GPE)", "VXLAN (GPE)", "vxlan_gpe"); /* Required function calls to register the header fields and subtrees used */ proto_register_field_array(proto_vxlan, hf, array_length(hf)); @@ -339,13 +342,9 @@ proto_reg_handoff_vxlan(void) mpls_handle = find_dissector_add_dependency("mpls", proto_vxlan); vxlan_handle = create_dissector_handle(dissect_vxlan, proto_vxlan); - vxlan_gpe_handle = create_dissector_handle(dissect_vxlan_gpe, proto_vxlan); + vxlan_gpe_handle = create_dissector_handle(dissect_vxlan_gpe, proto_vxlan_gpe); dissector_add_uint("udp.port", UDP_PORT_VXLAN, vxlan_handle); dissector_add_uint("udp.port", UDP_PORT_VXLAN_GPE, vxlan_gpe_handle); - - dissector_add_for_decode_as("udp.port", vxlan_handle); - dissector_add_for_decode_as("udp.port", vxlan_gpe_handle); - } /* |