* in the STUN2 dissector
* Copyright 2008, 8x8 Inc. <petithug@8x8.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.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*
* Please refer to the following specs for protocol detail:
* - draft-ietf-behave-rfc3489bis-15
* - draft-ietf-behave-nat-behavior-discovery-03
* - draft-ietf-behave-turn-07
* - draft-ietf-behave-turn-ipv6-03
+ *
+ * XXX - these are now:
+ * - RFC 5389
+ * - RFC 5245
+ * - RFC 5780
+ * - RFC 5766
+ * - RFC 6156
+ *
+ * Update as necessary.
*/
#include "config.h"
-#include <glib.h>
-
#include <epan/packet.h>
-#include <packet-tcp.h>
+#include "packet-tcp.h"
+
+void proto_register_turnchannel(void);
+void proto_reg_handoff_turnchannel(void);
/* heuristic subdissectors */
static heur_dissector_list_t heur_subdissector_list;
-/* data dissector handle */
-static dissector_handle_t data_handle;
-
/* Initialize the protocol and registered fields */
static int proto_turnchannel = -1;
/* Initialize the subtree pointers */
static gint ett_turnchannel = -1;
+static dissector_handle_t turnchannel_tcp_handle;
+static dissector_handle_t turnchannel_udp_handle;
+
static int
dissect_turnchannel_message(tvbuff_t *tvb, packet_info *pinfo,
proto_tree *tree, void *data _U_)
{
- guint len;
+ guint len;
guint16 channel_id;
guint16 data_len;
proto_item *ti;
proto_tree *turnchannel_tree;
+ heur_dtbl_entry_t *hdtbl_entry;
- len = tvb_length(tvb);
+ len = tvb_captured_length(tvb);
/* First, make sure we have enough data to do the check. */
if (len < TURNCHANNEL_HDR_LEN) {
return 0;
/* Seems to be a decent TURN channel message */
col_set_str(pinfo->cinfo, COL_PROTOCOL, "TURN CHANNEL");
- if (check_col(pinfo->cinfo, COL_INFO))
- col_add_fstr(pinfo->cinfo, COL_INFO, "Channel Id 0x%x", channel_id);
+ col_add_fstr(pinfo->cinfo, COL_INFO, "Channel Id 0x%x", channel_id);
ti = proto_tree_add_item(tree, proto_turnchannel, tvb, 0, -1, ENC_NA);
tvbuff_t *next_tvb;
guint reported_len, new_len;
- new_len = tvb_length_remaining(tvb, TURNCHANNEL_HDR_LEN);
+ new_len = tvb_captured_length_remaining(tvb, TURNCHANNEL_HDR_LEN);
reported_len = tvb_reported_length_remaining(tvb,
TURNCHANNEL_HDR_LEN);
if (data_len < reported_len) {
reported_len = data_len;
}
- next_tvb = tvb_new_subset(tvb, TURNCHANNEL_HDR_LEN, new_len,
+ next_tvb = tvb_new_subset_length_caplen(tvb, TURNCHANNEL_HDR_LEN, new_len,
reported_len);
if (!dissector_try_heuristic(heur_subdissector_list,
- next_tvb, pinfo, tree, NULL)) {
- call_dissector(data_handle,next_tvb, pinfo, tree);
+ next_tvb, pinfo, tree, &hdtbl_entry, NULL)) {
+ call_data_dissector(next_tvb, pinfo, tree);
}
}
- return tvb_length(tvb);
+ return tvb_captured_length(tvb);
}
-
-static void
-dissect_turnchannel_message_no_return(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
-{
- dissect_turnchannel_message(tvb, pinfo, tree, NULL);
-}
-
-
static guint
-get_turnchannel_message_len(packet_info *pinfo _U_, tvbuff_t *tvb, int offset)
+get_turnchannel_message_len(packet_info *pinfo _U_, tvbuff_t *tvb,
+ int offset, void *data _U_)
{
return (guint)tvb_get_ntohs(tvb, offset+2) + TURNCHANNEL_HDR_LEN;
}
-static void
-dissect_turnchannel_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+static int
+dissect_turnchannel_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
{
tcp_dissect_pdus(tvb, pinfo, tree, TRUE, TURNCHANNEL_HDR_LEN,
- get_turnchannel_message_len, dissect_turnchannel_message_no_return);
+ get_turnchannel_message_len, dissect_turnchannel_message, data);
+ return tvb_captured_length(tvb);
}
static gboolean
dissect_turnchannel_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
{
- guint len;
+ guint len;
guint16 channel_id;
guint16 data_len;
- len = tvb_length(tvb);
+ len = tvb_captured_length(tvb);
/* First, make sure we have enough data to do the check. */
if (len < TURNCHANNEL_HDR_LEN) {
return FALSE;
proto_turnchannel = proto_register_protocol("TURN Channel",
"TURNCHANNEL", "turnchannel");
- new_register_dissector("turnchannel", dissect_turnchannel_message,
- proto_turnchannel);
+ turnchannel_tcp_handle = register_dissector("turnchannel-tcp", dissect_turnchannel_tcp, proto_turnchannel);
+ turnchannel_udp_handle = register_dissector("turnchannel", dissect_turnchannel_message, proto_turnchannel);
/* subdissectors */
- register_heur_dissector_list("turnchannel", &heur_subdissector_list);
+ heur_subdissector_list = register_heur_dissector_list("turnchannel", proto_turnchannel);
/* Required function calls to register the header fields and subtrees used */
proto_register_field_array(proto_turnchannel, hf, array_length(hf));
void
proto_reg_handoff_turnchannel(void)
{
- dissector_handle_t turnchannel_tcp_handle;
- dissector_handle_t turnchannel_udp_handle;
-
- turnchannel_tcp_handle = create_dissector_handle(dissect_turnchannel_tcp, proto_turnchannel);
- turnchannel_udp_handle = find_dissector("turnchannel");
-
- /* Used for "Decode As" in case STUN negotiation isn't captured */
- dissector_add_handle("tcp.port", turnchannel_tcp_handle);
- dissector_add_handle("udp.port", turnchannel_udp_handle);
-
- /* TURN negoiation is handled through STUN2 dissector (packet-stun.c),
+ /* Register for "Decode As" in case STUN negotiation isn't captured */
+ dissector_add_for_decode_as_with_preference("tcp.port", turnchannel_tcp_handle);
+ dissector_add_for_decode_as_with_preference("udp.port", turnchannel_udp_handle);
+
+ /*
+ * SSL/TLS and DTLS Application-Layer Protocol Negotiation (ALPN)
+ * protocol ID.
+ */
+ dissector_add_string("tls.alpn", "stun.turn", turnchannel_tcp_handle);
+ dissector_add_string("dtls.alpn", "stun.turn", turnchannel_udp_handle);
+
+ /* TURN negotiation is handled through STUN2 dissector (packet-stun.c),
so only it should be able to determine if a packet is a TURN packet */
- heur_dissector_add("stun", dissect_turnchannel_heur, proto_turnchannel);
-
- data_handle = find_dissector("data");
+ heur_dissector_add("stun", dissect_turnchannel_heur, "TURN Channel over STUN", "turnchannel_stun", proto_turnchannel, HEURISTIC_ENABLE);
}
+
+/*
+ * Editor modelines - http://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 8
+ * tab-width: 8
+ * indent-tabs-mode: t
+ * End:
+ *
+ * vi: set shiftwidth=8 tabstop=8 noexpandtab:
+ * :indentSize=8:tabSize=8:noTabs=false:
+ */
git.samba.org / metze / wireshark / wip.git / blobdiff