diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2009-06-02 15:22:33 +0000 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2009-06-02 15:22:33 +0000 |
| commit | a48abd8b334e322c14bf663e5bd602f3e9a681c7 (patch) | |
| tree | de788f4383d59cc619992b1bc796906ffb352006 /epan/dissectors/packet-hip.c | |
| parent | 9cbe53f92b2593bc545aad762f4d49ff788ea38d (diff) | |
| download | wireshark-a48abd8b334e322c14bf663e5bd602f3e9a681c7.tar.gz | |
Removed a unused preference setting, some unused includes and
some unused code.
svn path=/trunk/; revision=28598
Diffstat (limited to 'epan/dissectors/packet-hip.c')
| -rw-r--r-- | epan/dissectors/packet-hip.c | 28 |
1 files changed, 1 insertions, 27 deletions
diff --git a/epan/dissectors/packet-hip.c b/epan/dissectors/packet-hip.c index 2107673dd4..c2d8e8d7c4 100644 --- a/epan/dissectors/packet-hip.c +++ b/epan/dissectors/packet-hip.c @@ -42,20 +42,11 @@ #include <stdlib.h> #include <string.h> -#include <glib.h> #include <epan/packet.h> #include <epan/addr_resolv.h> -#include <epan/conversation.h> #include "ipproto.h" #include "in_cksum.h" -#include "prefs.h" - -#include "packet-ip.h" - -/* 128-bit Host Identity Tag */ -#define HIT_BITSIZE 128 -typedef unsigned char hip_hit [HIT_BITSIZE/8]; #define HI_ALG_DSA 3 #define HI_ALG_RSA 5 @@ -390,9 +381,6 @@ static gint ett_hip_tlv = -1; static gint ett_hip_tlv_data = -1; static gint ett_hip_tlv_host_id_hdr = -1; -/* Place HIP summary in protocol tree */ -static gboolean hip_summary_in_tree = TRUE; - /* Dissect the HIP packet */ static void dissect_hip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) @@ -448,12 +436,7 @@ dissect_hip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* populate a tree in the second pane with the status of the link layer (i.e. none) */ if(tree) { - if (hip_summary_in_tree) { - ti = proto_tree_add_protocol_format(tree, proto_hip, tvb, 0, -1, - "Host Identity Protocol"); - } else { - ti = proto_tree_add_item(tree, proto_hip, tvb, 0, -1, FALSE); - } + ti = proto_tree_add_item(tree, proto_hip, tvb, 0, -1, FALSE); hip_tree = proto_item_add_subtree(ti, ett_hip); proto_tree_add_item(hip_tree, hf_hip_proto, tvb, offset, 1, FALSE); @@ -575,7 +558,6 @@ dissect_hip_in_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) void proto_register_hip(void) { - module_t *hip_module; static hf_register_info hf[] = { { &hf_hip_proto, { "Payload Protocol", "hip.proto", @@ -946,14 +928,6 @@ proto_register_hip(void) proto_register_field_array(proto_hip, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); - - /* Register configuration preferences */ - hip_module = prefs_register_protocol(proto_hip, NULL); - prefs_register_bool_preference(hip_module, "summary_in_tree", - "Show HIP summary in protocol tree", - "Whether the HIP summary line should be " - "shown in the protocol tree", - &hip_summary_in_tree); } static int |