diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2016-07-19 09:41:33 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2016-07-19 11:46:59 +0000 |
| commit | d75de9f7559f1e0417c06a5b09d0fa3cf775d92c (patch) | |
| tree | 0b4f6b6fbae4a68d93a703c7f1d34f380cbeb41e /epan/dissectors/packet-mpls.c | |
| parent | 0da99953581b3c044e9dcf080b0374ace691189b (diff) | |
| download | wireshark-d75de9f7559f1e0417c06a5b09d0fa3cf775d92c.tar.gz | |
VXLAN: use the newly created vxlan.next_proto dissector table everywhere
Change-Id: Ib6f44e0f1d3d8c76d2b6e6c778af8c243af4389c
Reviewed-on: https://code.wireshark.org/review/16543
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-mpls.c')
| -rw-r--r-- | epan/dissectors/packet-mpls.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/epan/dissectors/packet-mpls.c b/epan/dissectors/packet-mpls.c index d5f9895c98..8ae02e25e9 100644 --- a/epan/dissectors/packet-mpls.c +++ b/epan/dissectors/packet-mpls.c @@ -67,6 +67,7 @@ #include "packet-juniper.h" #include "packet-sflow.h" #include "packet-l2tp.h" +#include "packet-vxlan.h" void proto_register_mpls(void); void proto_reg_handoff_mpls(void); @@ -645,6 +646,7 @@ proto_reg_handoff_mpls(void) dissector_add_uint("sflow_245.header_protocol", SFLOW_245_HEADER_MPLS, mpls_handle); dissector_add_uint("l2tp.pw_type", L2TPv3_PROTOCOL_MPLS, mpls_handle); dissector_add_uint("udp.port", UDP_PORT_MPLS_OVER_UDP, mpls_handle); + dissector_add_uint("vxlan.next_proto", VXLAN_MPLS, mpls_handle); mpls_pwcw_handle = create_dissector_handle( dissect_pw_mcw, proto_pw_mcw ); dissector_add_uint( "mpls.label", MPLS_LABEL_INVALID, mpls_pwcw_handle ); |