forked from osmocom/wireshark
![Michael Mann](/assets/img/avatar_default.png)
Similar to the "tcp.port" changes in I99604f95d426ad345f4b494598d94178b886eb67, convert dissectors that use "udp.port". More cleanup done on dissectors that use both TCP and UDP dissector tables, so that less preference callbacks exist. Change-Id: If07be9b9e850c244336a7069599cd554ce312dd3 Reviewed-on: https://code.wireshark.org/review/18120 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
261 lines
9.2 KiB
C
261 lines
9.2 KiB
C
/* packet-tivoconnect.c
|
|
* Routines for TiVoConnect Discovery Protocol dissection
|
|
* Copyright 2006, Kees Cook <kees@outflux.net>
|
|
* IANA UDP/TCP port: 2190 (tivoconnect)
|
|
* Protocol Spec: http://tivo.com/developer/i/TiVoConnectDiscovery.pdf
|
|
*
|
|
* IANA's full name is "TiVoConnect Beacon", where as TiVo's own
|
|
* documentation calls this protocol "TiVoConnect Discovery Protocol".
|
|
*
|
|
* 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.
|
|
*/
|
|
|
|
/*
|
|
* TODO
|
|
* - split services into a subtree
|
|
* - split platform into a subtree
|
|
*
|
|
*/
|
|
|
|
#include "config.h"
|
|
|
|
#include <epan/packet.h>
|
|
|
|
void proto_reg_handoff_tivoconnect(void);
|
|
void proto_register_tivoconnect(void);
|
|
|
|
#define TIVOCONNECT_PORT 2190
|
|
|
|
static int proto_tivoconnect = -1;
|
|
static int hf_tivoconnect_flavor = -1;
|
|
static int hf_tivoconnect_method = -1;
|
|
static int hf_tivoconnect_platform = -1;
|
|
static int hf_tivoconnect_machine = -1;
|
|
static int hf_tivoconnect_identity = -1;
|
|
static int hf_tivoconnect_services = -1;
|
|
static int hf_tivoconnect_version = -1;
|
|
|
|
static gint ett_tivoconnect = -1;
|
|
|
|
static int
|
|
dissect_tivoconnect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean is_tcp)
|
|
{
|
|
/* parsing variables */
|
|
gchar * string;
|
|
gint length;
|
|
/* value strings */
|
|
const gchar * proto_name;
|
|
gchar * packet_identity = NULL;
|
|
gchar * packet_machine = NULL;
|
|
|
|
/* validate that we have a tivoconnect packet */
|
|
if ( tvb_strncaseeql(tvb, 0, "tivoconnect", 11) != 0) {
|
|
return 0;
|
|
}
|
|
|
|
length = tvb_captured_length(tvb);
|
|
string = (gchar*)tvb_get_string_enc(wmem_packet_scope(), tvb, 0, length, ENC_ASCII);
|
|
|
|
/* Make entries in Protocol column and Info column on summary display */
|
|
col_set_str(pinfo->cinfo, COL_PROTOCOL, "TiVoConnect");
|
|
|
|
/* make a distinction between UDP and TCP packets */
|
|
proto_name = is_tcp ? "Discovery Connection" : "Discovery Beacon";
|
|
|
|
col_set_str(pinfo->cinfo, COL_INFO, proto_name);
|
|
|
|
/* if (tree) */ {
|
|
/* Set up structures needed to add the protocol subtree and manage it */
|
|
proto_item *ti;
|
|
proto_tree *tivoconnect_tree;
|
|
|
|
/* parsing variables */
|
|
guint offset = 0;
|
|
gchar * field;
|
|
|
|
/* create display subtree for the protocol */
|
|
ti = proto_tree_add_item(tree, proto_tivoconnect, tvb, 0, -1, ENC_NA);
|
|
|
|
tivoconnect_tree = proto_item_add_subtree(ti, ett_tivoconnect);
|
|
|
|
/* process the packet */
|
|
for ( field = strtok(string, "\n");
|
|
field;
|
|
offset += length, field = strtok(NULL, "\n") ) {
|
|
gchar * value;
|
|
gint fieldlen;
|
|
|
|
length = (int)strlen(field) + 1;
|
|
|
|
if ( !(value = strchr(field, '=')) ) {
|
|
/* bad packet: missing the field separator */
|
|
continue;
|
|
}
|
|
*value++ = '\0';
|
|
fieldlen = (int)strlen(field) + 1;
|
|
|
|
if ( g_ascii_strcasecmp(field, "tivoconnect") == 0 ) {
|
|
proto_tree_add_item(tivoconnect_tree,
|
|
hf_tivoconnect_flavor, tvb, offset+fieldlen,
|
|
length-fieldlen-1, ENC_ASCII|ENC_NA);
|
|
}
|
|
else if ( g_ascii_strcasecmp(field, "method") == 0 ) {
|
|
proto_tree_add_item(tivoconnect_tree,
|
|
hf_tivoconnect_method, tvb, offset+fieldlen,
|
|
length-fieldlen-1, ENC_ASCII|ENC_NA);
|
|
}
|
|
else if ( g_ascii_strcasecmp(field, "platform") == 0 ) {
|
|
proto_tree_add_item(tivoconnect_tree,
|
|
hf_tivoconnect_platform, tvb, offset+fieldlen,
|
|
length-fieldlen-1, ENC_ASCII|ENC_NA);
|
|
}
|
|
else if ( g_ascii_strcasecmp(field, "machine") == 0 ) {
|
|
proto_tree_add_item(tivoconnect_tree,
|
|
hf_tivoconnect_machine, tvb, offset+fieldlen,
|
|
length-fieldlen-1, ENC_ASCII|ENC_NA);
|
|
packet_machine = value;
|
|
}
|
|
else if ( g_ascii_strcasecmp(field, "identity") == 0 ) {
|
|
proto_tree_add_item(tivoconnect_tree,
|
|
hf_tivoconnect_identity, tvb, offset+fieldlen,
|
|
length-fieldlen-1, ENC_ASCII|ENC_NA);
|
|
packet_identity = value;
|
|
}
|
|
else if ( g_ascii_strcasecmp(field, "services") == 0 ) {
|
|
proto_tree_add_item(tivoconnect_tree,
|
|
hf_tivoconnect_services, tvb, offset+fieldlen,
|
|
length-fieldlen-1, ENC_ASCII|ENC_NA);
|
|
}
|
|
else if ( g_ascii_strcasecmp(field, "swversion") == 0 ) {
|
|
proto_tree_add_item(tivoconnect_tree,
|
|
hf_tivoconnect_version, tvb, offset+fieldlen,
|
|
length-fieldlen-1, ENC_ASCII|ENC_NA);
|
|
}
|
|
else {
|
|
/* unknown field! */
|
|
}
|
|
}
|
|
|
|
/* Adjust "Info" column and top of tree into more useful info */
|
|
if (packet_machine) {
|
|
proto_item_append_text(ti, ", %s", packet_machine);
|
|
col_add_fstr(pinfo->cinfo, COL_INFO, "%s %s",
|
|
proto_name, packet_machine);
|
|
}
|
|
if (packet_identity) {
|
|
proto_item_append_text(ti,
|
|
packet_machine ? " (%s)" : ", ID:%s",
|
|
packet_identity);
|
|
if (packet_machine) {
|
|
col_add_fstr(pinfo->cinfo, COL_INFO, "%s %s (%s)",
|
|
proto_name, packet_machine, packet_identity);
|
|
}
|
|
else {
|
|
col_add_fstr(pinfo->cinfo, COL_INFO, "%s ID:%s",
|
|
proto_name, packet_identity);
|
|
}
|
|
}
|
|
|
|
}
|
|
|
|
return tvb_reported_length(tvb);
|
|
}
|
|
|
|
static int
|
|
dissect_tivoconnect_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
|
|
{
|
|
return dissect_tivoconnect(tvb, pinfo, tree, TRUE);
|
|
}
|
|
|
|
static int
|
|
dissect_tivoconnect_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
|
|
{
|
|
return dissect_tivoconnect(tvb, pinfo, tree, FALSE);
|
|
}
|
|
|
|
void
|
|
proto_register_tivoconnect(void)
|
|
{
|
|
static hf_register_info hf[] = {
|
|
{ &hf_tivoconnect_flavor,
|
|
{ "Flavor", "tivoconnect.flavor",
|
|
FT_STRINGZ, BASE_NONE, NULL, 0,
|
|
"Protocol Flavor supported by the originator", HFILL }},
|
|
{ &hf_tivoconnect_method,
|
|
{ "Method", "tivoconnect.method",
|
|
FT_STRINGZ, BASE_NONE, NULL, 0,
|
|
"Packet was delivered via UDP(broadcast) or TCP(connected)", HFILL }},
|
|
{ &hf_tivoconnect_platform,
|
|
{ "Platform", "tivoconnect.platform",
|
|
FT_STRINGZ, BASE_NONE, NULL, 0,
|
|
"System platform, either tcd(TiVo) or pc(Computer)", HFILL }},
|
|
{ &hf_tivoconnect_machine,
|
|
{ "Machine", "tivoconnect.machine",
|
|
FT_STRINGZ, BASE_NONE, NULL, 0,
|
|
"Human-readable system name", HFILL }},
|
|
{ &hf_tivoconnect_identity,
|
|
{ "Identity", "tivoconnect.identity",
|
|
FT_STRINGZ, BASE_NONE, NULL, 0,
|
|
"Unique serial number for the system", HFILL }},
|
|
{ &hf_tivoconnect_services,
|
|
{ "Services", "tivoconnect.services",
|
|
FT_STRINGZ, BASE_NONE, NULL, 0,
|
|
"List of available services on the system", HFILL }},
|
|
{ &hf_tivoconnect_version,
|
|
{ "Version", "tivoconnect.version",
|
|
FT_STRINGZ, BASE_NONE, NULL, 0,
|
|
"System software version", HFILL }},
|
|
};
|
|
|
|
static gint *ett[] = {
|
|
&ett_tivoconnect,
|
|
};
|
|
|
|
proto_tivoconnect = proto_register_protocol("TiVoConnect Discovery Protocol",
|
|
"TiVoConnect", "tivoconnect");
|
|
|
|
proto_register_field_array(proto_tivoconnect, hf, array_length(hf));
|
|
proto_register_subtree_array(ett, array_length(ett));
|
|
}
|
|
|
|
|
|
void
|
|
proto_reg_handoff_tivoconnect(void)
|
|
{
|
|
dissector_handle_t tivoconnect_tcp_handle, tivoconnect_udp_handle;
|
|
|
|
tivoconnect_tcp_handle = create_dissector_handle(dissect_tivoconnect_tcp, proto_tivoconnect);
|
|
tivoconnect_udp_handle = create_dissector_handle(dissect_tivoconnect_udp, proto_tivoconnect);
|
|
dissector_add_uint_with_preference("udp.port", TIVOCONNECT_PORT, tivoconnect_udp_handle);
|
|
dissector_add_uint_with_preference("tcp.port", TIVOCONNECT_PORT, tivoconnect_tcp_handle);
|
|
}
|
|
|
|
/*
|
|
* Editor modelines - http://www.wireshark.org/tools/modelines.html
|
|
*
|
|
* Local variables:
|
|
* c-basic-offset: 4
|
|
* tab-width: 8
|
|
* indent-tabs-mode: nil
|
|
* End:
|
|
*
|
|
* vi: set shiftwidth=4 tabstop=8 expandtab:
|
|
* :indentSize=4:tabSize=8:noTabs=true:
|
|
*/
|