aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
authorJoão Valverde <joao.valverde@tecnico.ulisboa.pt>2015-08-21 03:54:36 +0100
committerHadriel Kaplan <hadrielk@yahoo.com>2015-08-21 03:08:23 +0000
commitd9395b7e3417b14524e724062a9291b508691b6a (patch)
treec421d24b48db9ca242ac929d3ebd4558ff7318c0 /epan
parent56d131c4d17cf8bf3b1b888708585774be48ea53 (diff)
Rename 'ip_next_header_dissector_table' to 'ipv6_next_header_dissector_table' in IPv6 dissector
Provides better readability, the dissector table is only used for IPv6 extension headers. Change-Id: I87d877a89c6465d4475f2f0a40636ccd1b6cdd92 Reviewed-on: https://code.wireshark.org/review/10174 Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
Diffstat (limited to 'epan')
-rw-r--r--epan/dissectors/packet-ipv6.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-ipv6.c b/epan/dissectors/packet-ipv6.c
index 22ff9ca52c..f10b3bd63d 100644
--- a/epan/dissectors/packet-ipv6.c
+++ b/epan/dissectors/packet-ipv6.c
@@ -480,7 +480,7 @@ static const fragment_items ipv6_frag_items = {
static dissector_handle_t data_handle;
static dissector_table_t ip_dissector_table;
-static dissector_table_t ip_next_header_dissector_table;
+static dissector_table_t ipv6_next_header_dissector_table;
/* Reassemble fragmented datagrams */
static gboolean ipv6_reassemble = TRUE;
@@ -2271,7 +2271,7 @@ again:
/* Get a tvbuff for the options. */
options_tvb = tvb_new_subset_remaining(tvb, offset);
- nxt_handle = dissector_get_uint_handle( ip_next_header_dissector_table, nxt);
+ nxt_handle = dissector_get_uint_handle(ipv6_next_header_dissector_table, nxt);
if ((nxt_handle) &&
((advance = call_dissector_with_data(nxt_handle, options_tvb, pinfo, ipv6_tree, &iph)) > 0)) {
@@ -3187,7 +3187,7 @@ proto_register_ipv6(void)
proto_ipv6_routing = proto_register_protocol("IPv6 Routing", "Routing", "ipv6.routing_hdr");
proto_ipv6_shim6 = proto_register_protocol("IPv6 SHIM6", "SHIM6", "ipv6.shim6");
proto_ipv6_dstopts = proto_register_protocol("IPv6 DST OPT", "DST OPT", "ipv6.dst_opt");
- ip_next_header_dissector_table = register_dissector_table("ipv6.nxt",
+ ipv6_next_header_dissector_table = register_dissector_table("ipv6.nxt",
"IPv6 Next Header", FT_UINT32, BASE_DEC);
/* Register configuration options */