diff options
| author | Dario Lombardo <lomato@gmail.com> | 2015-01-21 15:00:56 +0100 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2015-01-21 19:58:13 +0000 |
| commit | e1f4f53b064289f21fbffa77d58790b626449bba (patch) | |
| tree | 03348bac6312ff8ed6c2507c11419e5cf7979e03 /epan/dissectors/packet-hpfeeds.c | |
| parent | fb1e149875065f1adc1c5fb734fd2c886c9f80ad (diff) | |
HPFEEDS: cleanup in the dissector code.
Change-Id: Ia675fb703811c4b6be6a278d9396a917dfcf982d
Reviewed-on: https://code.wireshark.org/review/6715
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-hpfeeds.c')
| -rw-r--r-- | epan/dissectors/packet-hpfeeds.c | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/epan/dissectors/packet-hpfeeds.c b/epan/dissectors/packet-hpfeeds.c index d08fa6eb72..2656aeae9b 100644 --- a/epan/dissectors/packet-hpfeeds.c +++ b/epan/dissectors/packet-hpfeeds.c @@ -64,8 +64,6 @@ static gint ett_hpfeeds = -1; static expert_field ei_hpfeeds_opcode_unknown = EI_INIT; -static dissector_handle_t json_hdl; - /* OPCODE */ #define OP_ERROR 0 /* error message*/ #define OP_INFO 1 /* server name, nonce */ @@ -73,22 +71,6 @@ static dissector_handle_t json_hdl; #define OP_PUBLISH 3 /* client id, channelname, payload */ #define OP_SUBSCRIBE 4 /* client id, channelname*/ - -/* WELL-KNOWN CHANNELS */ -#define CH_EINVAL 0 -/* Dionaea honeypot */ -#define CH_DIONAEA_CAPTURE 1 -#define CH_DIONAEA_DCE 2 -#define CH_DIONAEA_SHELLCODE 3 -#define CH_DIONAEA_UINQUE 4 -#define CH_DIONAEA_CONNECTIONS 5 -/* Kippo honeypot */ -#define CH_KIPPO_SESSIONS 10 -/* Glastopf honeypot */ -#define CH_GLASTOPF_EVENTS 20 -/* Honeymap geoloc channel */ -#define CH_GEOLOC_EVENTS 30 - /* OFFSET FOR HEADER */ #define HPFEEDS_HDR_LEN 5 @@ -166,7 +148,7 @@ dissect_hpfeeds_publish_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree_add_item(tree, hf_hpfeeds_chan_len, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - /* get the channel name as ephemeral string to pass it to the json decoder */ + /* get the channel name as ephemeral string to pass it to the heuristic decoders */ strptr = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, len, ENC_ASCII); proto_tree_add_item(tree, hf_hpfeeds_channel, tvb, offset, len, ENC_ASCII|ENC_NA); offset += len; @@ -429,8 +411,6 @@ proto_reg_handoff_hpfeeds(void) hpfeeds_dissector_port = hpfeeds_port_pref; dissector_add_uint("tcp.port", hpfeeds_dissector_port, hpfeeds_handle); - - json_hdl = find_dissector("json"); } /* |