aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexis La Goutte <alexis.lagoutte@gmail.com>2016-07-03 09:47:22 +0000
committerAlexis La Goutte <alexis.lagoutte@gmail.com>2016-07-03 09:48:30 +0000
commit0bc3d758fe44e8c0afc13d7f2f48ae1fd5989140 (patch)
tree608c9a10558b4cf87aae0d4f5e09441d85f265f0
parent783bb5b0c4a3419f446ad313e8d1553c5c69b3fa (diff)
Revert "Support for NSH with VXLAN-GPE encapsulation"
This reverts commit 76a8bca9bc87823e9182fa6ebb35f0b93bcc451b. Change-Id: I85b9778329373872e4f9fd1b90280dfef5e33a06 Reviewed-on: https://code.wireshark.org/review/16255 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
-rw-r--r--epan/dissectors/packet-nsh.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/epan/dissectors/packet-nsh.c b/epan/dissectors/packet-nsh.c
index 49415bb343..23642cb813 100644
--- a/epan/dissectors/packet-nsh.c
+++ b/epan/dissectors/packet-nsh.c
@@ -3,8 +3,6 @@
*Author: Chidambaram Arunachalam <carunach@cisco.com>
*Copyright 2016, ciscoSystems Inc.
*
- *(c) Copyright 2016, Sumit Kumar Jha <sjha3@ncsu.edu>
- * Support for VXLAN GPE encapsulation
*
*Wireshark - Network traffic analyzer
*By Gerald Combs <gerald@wireshark.org>
@@ -34,7 +32,6 @@
#include <epan/ipproto.h>
#include <epan/decode_as.h>
-#define VXLAN_NSH 4
#define MD_TYPE_1 1
#define MD_TYPE_2 2
@@ -363,7 +360,6 @@ proto_reg_handoff_nsh(void)
nsh_handle = create_dissector_handle(dissect_nsh, proto_nsh);
dissector_add_uint("gre.proto", ETHERTYPE_NSH, nsh_handle);
- dissector_add_uint("vxlan.next_proto", VXLAN_NSH, nsh_handle);
dissector_ip = find_dissector_add_dependency("ip", proto_nsh);
dissector_ipv6 = find_dissector_add_dependency("ipv6", proto_nsh);