diff options
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | docbook/release-notes.asciidoc | 1 | ||||
| -rw-r--r-- | epan/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | epan/dissectors/Makefile.common | 1 | ||||
| -rwxr-xr-x | epan/dissectors/packet-finger.c | 223 |
5 files changed, 228 insertions, 2 deletions
@@ -61,8 +61,8 @@ What's New New Protocol Support 802.1AE Secure tag, ASTERIX, ATN, BT 3DS, CARP, Cisco MetaData, ELF - file format, EXPORTED PDU, HTTP2, IDRP, ILP, Kafka, MBIM, MiNT, MP4 / - ISOBMFF file format, NXP PN532 HCI, OpenFlow, Picture Transfer Protocol + file format, EXPORTED PDU, FINGER, HTTP2, IDRP, ILP, Kafka, MBIM, MiNT, + MP4/ISOBMFF file format, NXP PN532 HCI, OpenFlow, Picture Transfer Protocol Over IP, QUIC (Quick UDP Internet Connections), SEL RTAC (Real Time Automation Controller) EIA-232 Serial-Line Dissection, Sippy RTPproxy, STANAG 4607, STANAG 5066 SIS, Tinkerforge, UDT, URL Encoded Form Data, diff --git a/docbook/release-notes.asciidoc b/docbook/release-notes.asciidoc index e709decfb1..b9b6304fcd 100644 --- a/docbook/release-notes.asciidoc +++ b/docbook/release-notes.asciidoc @@ -76,6 +76,7 @@ CARP Cisco MetaData ELF file format EXPORTED PDU +FINGER HTTP2 IDRP ILP diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt index 111d7b6e74..b9451d6142 100644 --- a/epan/CMakeLists.txt +++ b/epan/CMakeLists.txt @@ -642,6 +642,7 @@ set(DISSECTOR_SRC dissectors/packet-fddi.c dissectors/packet-fefd.c dissectors/packet-ff.c + dissectors/packet-finger.c dissectors/packet-fip.c dissectors/packet-fix.c dissectors/packet-flexnet.c diff --git a/epan/dissectors/Makefile.common b/epan/dissectors/Makefile.common index 22f21e405a..e7a81811ac 100644 --- a/epan/dissectors/Makefile.common +++ b/epan/dissectors/Makefile.common @@ -564,6 +564,7 @@ DISSECTOR_SRC = \ packet-fddi.c \ packet-fefd.c \ packet-ff.c \ + packet-finger.c \ packet-fip.c \ packet-fix.c \ packet-flexnet.c \ diff --git a/epan/dissectors/packet-finger.c b/epan/dissectors/packet-finger.c new file mode 100755 index 0000000000..464862b7f3 --- /dev/null +++ b/epan/dissectors/packet-finger.c @@ -0,0 +1,223 @@ +/* packet-finger.c + * Routines for basic finger dissection (see http://tools.ietf.org/html/rfc742) + * Copyright 2013, Christopher Maynard <Christopher.Maynard@gtech.com> + * + * $Id$ + * + * Wireshark - Network traffic analyzer + * By Gerald Combs <gerald@wireshark.org> + * Copyright 1998 Gerald Combs + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include "config.h" +#include <glib.h> +#include <epan/packet.h> +#include <epan/conversation.h> +#include <epan/wmem/wmem.h> +#include <epan/expert.h> + +#define FINGER_PORT 79 /* This is the registered IANA port */ + +void proto_reg_handoff_finger(void); + +static int proto_finger = -1; +static int hf_finger_query = -1; +static int hf_finger_response = -1; +static int hf_finger_response_in = -1; +static int hf_finger_response_to = -1; +static int hf_finger_response_time = -1; + +static expert_field ei_finger_nocrlf = EI_INIT; + +static gint ett_finger = -1; + +typedef struct _finger_transaction_t { + guint32 req_frame; + guint32 rep_frame; + nstime_t req_time; +} finger_transaction_t; + +static int +dissect_finger(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, + void *data _U_) +{ + proto_item *ti, *expert_ti; + proto_tree *finger_tree; + conversation_t *conversation; + finger_transaction_t *finger_trans; + gboolean is_query; + guint len; + + col_set_str(pinfo->cinfo, COL_PROTOCOL, "FINGER"); + + if (pinfo->destport == FINGER_PORT) { + is_query = TRUE; + col_set_str(pinfo->cinfo, COL_INFO, "Query"); + } else { + is_query = FALSE; + col_set_str(pinfo->cinfo, COL_INFO, "Response"); + } + + conversation = find_or_create_conversation(pinfo); + finger_trans = (finger_transaction_t *)conversation_get_proto_data(conversation, proto_finger); + if (finger_trans == NULL) { + finger_trans = wmem_new0(wmem_file_scope(), finger_transaction_t); + conversation_add_proto_data(conversation, proto_finger, finger_trans); + } + + len = tvb_length(tvb); + if (!PINFO_FD_VISITED(pinfo)) { + if (pinfo->can_desegment) { + if (is_query) { + if ((len < 2) || (tvb_memeql(tvb, len - 2, "\r\n", 2))) { + pinfo->desegment_len = DESEGMENT_ONE_MORE_SEGMENT; + pinfo->desegment_offset = 0; + return (0); + } else { + finger_trans->req_frame = pinfo->fd->num; + finger_trans->req_time = pinfo->fd->abs_ts; + } + } else { + pinfo->desegment_len = DESEGMENT_UNTIL_FIN; + pinfo->desegment_offset = 0; + return (0); + } + } + } else if (is_query && (finger_trans->req_frame == 0)) { + finger_trans->req_frame = pinfo->fd->num; + finger_trans->req_time = pinfo->fd->abs_ts; + } + + if (!is_query && (finger_trans->rep_frame == 0)) { + /* By comparing finger_trans->rep_frame to 0, if reassembly is turned + * on, finger_trans->rep_frame will be assigned to the reassembled frame + * number, and if reassembly is turned off, finger_trans->rep_frame will + * be assigned to the first frame number of the response. This seems + * to match other protocols' behavior. The alternative is: + * if (pinfo->fd->num > finger_trans->rep_frame) + * which will give us the same frame number either way. + */ + finger_trans->rep_frame = pinfo->fd->num; + } + + ti = proto_tree_add_protocol_format(tree, proto_finger, tvb, 0, -1, + "FINGER: %s", is_query ? "Query" : "Response"); + finger_tree = proto_item_add_subtree(ti, ett_finger); + + if (is_query) { + expert_ti = proto_tree_add_item(finger_tree, hf_finger_query, tvb, 0, -1, ENC_NA); + if ((len < 2) || (tvb_memeql(tvb, len - 2, "\r\n", 2))) { + /* + * From RFC742, Send a single "command line", ending with <CRLF>. + */ + expert_add_info(pinfo, expert_ti, &ei_finger_nocrlf); + } + if (tree && finger_trans->rep_frame) { + ti = proto_tree_add_uint(finger_tree, hf_finger_response_in, + tvb, 0, 0, finger_trans->rep_frame); + PROTO_ITEM_SET_GENERATED(ti); + } + } else if (tree && finger_trans->rep_frame) { + proto_tree_add_item(finger_tree, hf_finger_response, tvb, 0, -1, ENC_NA); + if (finger_trans->req_frame) { + nstime_t ns; + + ti = proto_tree_add_uint(finger_tree, hf_finger_response_to, + tvb, 0, 0, finger_trans->req_frame); + PROTO_ITEM_SET_GENERATED(ti); + + if (pinfo->fd->num == finger_trans->rep_frame) { + nstime_delta(&ns, &pinfo->fd->abs_ts, &finger_trans->req_time); + ti = proto_tree_add_time(finger_tree, hf_finger_response_time, tvb, 0, 0, &ns); + PROTO_ITEM_SET_GENERATED(ti); + } + } + } + + return (len); +} + +void +proto_register_finger(void) +{ + expert_module_t *expert_finger; + + static hf_register_info hf[] = { + { &hf_finger_query, + { "Query", "finger.query", FT_STRING, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + { &hf_finger_response, + { "Response", "finger.response", FT_STRING, BASE_NONE, NULL, 0x0, + NULL, HFILL } + }, + { &hf_finger_response_in, + { "Response In", "finger.response_in", FT_FRAMENUM, BASE_NONE, NULL, + 0x0, "The response to this FINGER query is in this frame", + HFILL } + }, + { &hf_finger_response_to, + { "Request In", "finger.response_to", FT_FRAMENUM, BASE_NONE, NULL, + 0x0, "This is a response to the FINGER query in this frame", + HFILL } + }, + { &hf_finger_response_time, + { "Response Time", "finger.response_time", FT_RELATIVE_TIME, + BASE_NONE, NULL, 0x0, + "The time between the Query and the Response", HFILL } + } + }; + + static gint *ett[] = { + &ett_finger + }; + + static ei_register_info ei[] = { + { &ei_finger_nocrlf, + { "finger.nocrlf", PI_MALFORMED, PI_WARN, "Missing <CR><LF>", EXPFILL} + } + }; + + proto_finger = proto_register_protocol("finger", "FINGER", "finger"); + proto_register_field_array(proto_finger, hf, array_length(hf)); + proto_register_subtree_array(ett, array_length(ett)); + expert_finger = expert_register_protocol(proto_finger); + expert_register_field_array(expert_finger, ei, array_length(ei)); +} + +void +proto_reg_handoff_finger(void) +{ + static dissector_handle_t finger_handle; + + finger_handle = new_create_dissector_handle(dissect_finger, proto_finger); + dissector_add_uint("tcp.port", FINGER_PORT, finger_handle); +} + +/* + * Editor modelines - http://www.wireshark.org/tools/modelines.html + * + * Local variables: + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + * + * vi: set shiftwidth=4 tabstop=4 expandtab: + * :indentSize=4:tabSize=4:noTabs=true: + */ + |