* see http://ddt.sourceforge.net/
* Olivier Abad <oabad@cybercable.fr>
*
- * $Id: packet-ddtp.c,v 1.11 2000/11/19 08:53:56 guy Exp $
+ * $Id: packet-ddtp.c,v 1.20 2002/01/24 09:20:47 guy Exp $
*
* Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * By Gerald Combs <gerald@ethereal.com>
* Copyright 2000
- *
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
#ifdef HAVE_NETINET_IN_H
# include <netinet/in.h>
#endif
-#include "packet.h"
-#include "dfilter.h"
+#include <epan/packet.h>
#include "packet-ddtp.h"
static int proto_ddtp = -1;
static void
dissect_ddtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
- proto_tree *ddtp_tree;
+ proto_tree *ddtp_tree = NULL;
proto_item *ti;
- CHECK_DISPLAY_AS_DATA(proto_ddtp, tvb, pinfo, tree);
-
- pinfo->current_proto = "DDTP";
- if (check_col(pinfo->fd, COL_PROTOCOL)) {
+ if (check_col(pinfo->cinfo, COL_PROTOCOL)) {
/* Indicate what kind of message this is. */
- col_set_str (pinfo->fd, COL_PROTOCOL, "DDTP");
+ col_set_str (pinfo->cinfo, COL_PROTOCOL, "DDTP");
+ }
+ if (check_col(pinfo->cinfo, COL_INFO)) {
+ /* In case we throw an exception below. */
+ col_clear (pinfo->cinfo, COL_INFO);
}
if (tree) {
- ti = proto_tree_add_item(tree, proto_ddtp, tvb, 0,
- tvb_length(tvb), FALSE);
+ ti = proto_tree_add_item(tree, proto_ddtp, tvb, 0, -1, FALSE);
ddtp_tree = proto_item_add_subtree(ti, ett_ddtp);
proto_tree_add_item(ddtp_tree, hf_ddtp_version, tvb, 0, 4, FALSE);
proto_tree_add_item(ddtp_tree, hf_ddtp_encrypt, tvb, 4, 4, FALSE);
proto_tree_add_item(ddtp_tree, hf_ddtp_hostid, tvb, 8, 4, FALSE);
- if (tvb_get_ntohl(tvb, 4) == DDTP_ENCRYPT_PLAINTEXT) {
+ }
+ if (tvb_get_ntohl(tvb, 4) == DDTP_ENCRYPT_PLAINTEXT) {
+ if (tree)
proto_tree_add_item(ddtp_tree, hf_ddtp_msgtype, tvb, 12, 4, FALSE);
- switch (tvb_get_ntohl(tvb, 12)) {
- case DDTP_MESSAGE_ERROR :
- if (check_col(pinfo->fd, COL_INFO))
- col_set_str (pinfo->fd, COL_INFO, "Message Error");
- break;
- case DDTP_UPDATE_QUERY :
- if (check_col(pinfo->fd, COL_INFO))
- col_set_str (pinfo->fd, COL_INFO, "Update Query");
+ switch (tvb_get_ntohl(tvb, 12)) {
+ case DDTP_MESSAGE_ERROR :
+ if (check_col(pinfo->cinfo, COL_INFO))
+ col_set_str (pinfo->cinfo, COL_INFO, "Message Error");
+ break;
+ case DDTP_UPDATE_QUERY :
+ if (check_col(pinfo->cinfo, COL_INFO))
+ col_set_str (pinfo->cinfo, COL_INFO, "Update Query");
+ if (tree) {
proto_tree_add_item(ddtp_tree, hf_ddtp_opcode, tvb, 16, 4,
FALSE);
proto_tree_add_item(ddtp_tree, hf_ddtp_ipaddr, tvb, 20, 4,
FALSE);
- break;
- case DDTP_UPDATE_REPLY :
- if (check_col(pinfo->fd, COL_INFO))
- col_set_str (pinfo->fd, COL_INFO, "Update Reply");
+ }
+ break;
+ case DDTP_UPDATE_REPLY :
+ if (check_col(pinfo->cinfo, COL_INFO))
+ col_set_str (pinfo->cinfo, COL_INFO, "Update Reply");
+ if (tree) {
proto_tree_add_item(ddtp_tree, hf_ddtp_status, tvb, 16, 4,
FALSE);
- break;
- case DDTP_ALIVE_QUERY :
- if (check_col(pinfo->fd, COL_INFO))
- col_set_str (pinfo->fd, COL_INFO, "Alive Query");
+ }
+ break;
+ case DDTP_ALIVE_QUERY :
+ if (check_col(pinfo->cinfo, COL_INFO))
+ col_set_str (pinfo->cinfo, COL_INFO, "Alive Query");
+ if (tree) {
proto_tree_add_text(ddtp_tree, tvb, 16, 4, "Dummy : %u",
tvb_get_ntohl(tvb, 16));
- break;
- case DDTP_ALIVE_REPLY :
- if (check_col(pinfo->fd, COL_INFO))
- col_set_str (pinfo->fd, COL_INFO, "Alive Reply");
+ }
+ break;
+ case DDTP_ALIVE_REPLY :
+ if (check_col(pinfo->cinfo, COL_INFO))
+ col_set_str (pinfo->cinfo, COL_INFO, "Alive Reply");
+ if (tree) {
proto_tree_add_text(ddtp_tree, tvb, 16, 4, "Dummy : %u",
tvb_get_ntohl(tvb, 16));
- break;
- default :
- if (check_col(pinfo->fd, COL_INFO))
- col_set_str (pinfo->fd, COL_INFO, "Unknwon type");
+ }
+ break;
+ default :
+ if (check_col(pinfo->cinfo, COL_INFO))
+ col_set_str (pinfo->cinfo, COL_INFO, "Unknown type");
+ if (tree) {
proto_tree_add_text(ddtp_tree, tvb, 12, 4, "Unknown type : %u",
tvb_get_ntohl(tvb, 12));
}
}
- }
+ } else {
+ if (check_col(pinfo->cinfo, COL_INFO))
+ col_set_str (pinfo->cinfo, COL_INFO, "Encrypted payload");
+ }
}
void
static hf_register_info hf_ddtp[] = {
{ &hf_ddtp_version,
{ "Version", "ddtp.version", FT_UINT32, BASE_DEC, VALS(vals_ddtp_version), 0x0,
- "Version" } },
+ "Version", HFILL }},
{ &hf_ddtp_encrypt,
{ "Encryption", "ddtp.encrypt", FT_UINT32, BASE_DEC, VALS(vals_ddtp_encrypt), 0x0,
- "Encryption type" } },
+ "Encryption type", HFILL }},
{ &hf_ddtp_hostid,
{ "Hostid", "ddtp.hostid", FT_UINT32, BASE_DEC, NULL, 0x0,
- "Host ID" } },
+ "Host ID", HFILL }},
{ &hf_ddtp_msgtype,
{ "Message type", "ddtp.msgtype", FT_UINT32, BASE_DEC, VALS(vals_ddtp_msgtype), 0x0,
- "Message Type" } },
+ "Message Type", HFILL }},
{ &hf_ddtp_opcode,
{ "Opcode", "ddtp.opcode", FT_UINT32, BASE_DEC, VALS(vals_ddtp_opcode), 0x0,
- "Update query opcode" } },
+ "Update query opcode", HFILL }},
{ &hf_ddtp_ipaddr,
- { "IP addres", "ddtp.ipaddr", FT_IPv4, BASE_NONE, NULL, 0x0,
- "IP address" } },
+ { "IP address", "ddtp.ipaddr", FT_IPv4, BASE_NONE, NULL, 0x0,
+ "IP address", HFILL }},
{ &hf_ddtp_status,
{ "Status", "ddtp.status", FT_UINT32, BASE_DEC, VALS(vals_ddtp_status), 0x0,
- "Update reply status" } }
+ "Update reply status", HFILL }}
};
static gint *ett[] = { &ett_ddtp };
- proto_ddtp = proto_register_protocol("Dynamic DNS Tools Protocol", "ddtp");
+ proto_ddtp = proto_register_protocol("Dynamic DNS Tools Protocol",
+ "DDTP", "ddtp");
proto_register_field_array(proto_ddtp, hf_ddtp, array_length(hf_ddtp));
proto_register_subtree_array(ett, array_length(ett));
}
void
proto_reg_handoff_ddtp(void)
{
- dissector_add("udp.port", UDP_PORT_DDTP, dissect_ddtp);
+ dissector_handle_t ddtp_handle;
+
+ ddtp_handle = create_dissector_handle(dissect_ddtp, proto_ddtp);
+ dissector_add("udp.port", UDP_PORT_DDTP, ddtp_handle);
}
git.samba.org / obnox / wireshark / wip.git / blobdiff