/* packet-ddtp.c
* Routines for DDTP (Dynamic DNS Tools Protocol) packet disassembly
* see http://ddt.sourceforge.net/
- * Olivier Abad <abad@daba.dhis.net>
+ * Olivier Abad <oabad@noos.fr>
*
- * $Id: packet-ddtp.c,v 1.3 2000/05/11 08:15:05 gram Exp $
+ * $Id: packet-ddtp.c,v 1.24 2003/01/19 21:43:18 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
* 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-
-/*#include <string.h>
-#include <ctype.h>
-#include <time.h>*/
-
#include <glib.h>
-#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 int ett_ddtp = -1;
-#define UDP_PORT_DDTP1 58800
-#define UDP_PORT_DDTP2 58801
+#define UDP_PORT_DDTP 1052
+/*
+ * XXX - is 0 an invalid value? If so, should we remove it from this
+ * list, so that putative DDNS packets with a version number of 0 are
+ * rejected?
+ */
static const value_string vals_ddtp_version[] = {
{ DDTP_VERSION_ERROR, "Protocol Error" },
{ DDTP_VERSION_4, "4" },
{ 0, NULL}
};
-static void
-dissect_ddtp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
+static int
+dissect_ddtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
+ proto_tree *ddtp_tree = NULL;
+ proto_item *ti;
+
+ /*
+ * If we don't recognize the version number, don't dissect this.
+ */
+ if (tvb_bytes_exist(tvb, 0, 4)) {
+ if (match_strval(tvb_get_ntohl(tvb, 0), vals_ddtp_version) == NULL)
+ return 0;
+ }
- proto_tree *ddtp_tree;
- proto_item *ti;
-
- if (check_col(fd, COL_PROTOCOL)) {
+ if (check_col(pinfo->cinfo, COL_PROTOCOL)) {
/* Indicate what kind of message this is. */
- col_add_str (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, NullTVB, offset,
- END_OF_FRAME - offset, NULL);
+ ti = proto_tree_add_item(tree, proto_ddtp, tvb, 0, -1, FALSE);
ddtp_tree = proto_item_add_subtree(ti, ett_ddtp);
- if (!BYTES_ARE_IN_FRAME(offset, 4)) {
- proto_tree_add_text(ddtp_tree, NullTVB, offset, END_OF_FRAME-offset, "Frame too short");
- return;
- }
- proto_tree_add_item(ddtp_tree, hf_ddtp_version, NullTVB, offset, 4, pntohl(pd+offset));
- offset += 4;
- if (!BYTES_ARE_IN_FRAME(offset, 4)) {
- proto_tree_add_text(ddtp_tree, NullTVB, offset, END_OF_FRAME-offset, "Frame too short");
- return;
- }
- proto_tree_add_item(ddtp_tree, hf_ddtp_encrypt, NullTVB, offset, 4, pntohl(pd+offset));
- if (!BYTES_ARE_IN_FRAME(offset+4, 4)) {
- proto_tree_add_text(ddtp_tree, NullTVB, offset+4, END_OF_FRAME-offset-4, "Frame too short");
- return;
- }
- proto_tree_add_item(ddtp_tree, hf_ddtp_hostid, NullTVB, offset+4, 4, pntohl(pd+offset+4));
- if (pntohl(pd+offset) == DDTP_ENCRYPT_PLAINTEXT) {
- offset += 8;
- if (!BYTES_ARE_IN_FRAME(offset, 4)) {
- proto_tree_add_text(ddtp_tree, NullTVB, offset, END_OF_FRAME-offset, "Frame too short");
- return;
+ 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 (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->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);
}
- proto_tree_add_item(ddtp_tree, hf_ddtp_msgtype, NullTVB, offset, 4, pntohl(pd+offset));
- switch (pntohl(pd+offset)) {
- case DDTP_MESSAGE_ERROR :
- offset += 4;
- if (check_col(fd, COL_INFO)) col_add_str (fd, COL_INFO, "Message Error");
- break;
- case DDTP_UPDATE_QUERY :
- offset += 4;
- if (check_col(fd, COL_INFO)) col_add_str (fd, COL_INFO, "Update Query");
- if (!BYTES_ARE_IN_FRAME(offset, 4)) {
- proto_tree_add_text(ddtp_tree, NullTVB, offset, END_OF_FRAME-offset, "Frame too short");
- return;
- }
- proto_tree_add_item(ddtp_tree, hf_ddtp_opcode, NullTVB, offset, 4, pntohl(pd+offset));
- offset += 4;
- if (!BYTES_ARE_IN_FRAME(offset, 4)) {
- proto_tree_add_text(ddtp_tree, NullTVB, offset, END_OF_FRAME-offset, "Frame too short");
- return;
- }
- proto_tree_add_item(ddtp_tree, hf_ddtp_ipaddr, NullTVB, offset, 4, pntohl(pd+offset));
- break;
- case DDTP_UPDATE_REPLY :
- offset += 4;
- if (check_col(fd, COL_INFO)) col_add_str (fd, COL_INFO, "Update Reply");
- if (!BYTES_ARE_IN_FRAME(offset, 4)) {
- proto_tree_add_text(ddtp_tree, NullTVB, offset, END_OF_FRAME-offset, "Frame too short");
- return;
- }
- proto_tree_add_item(ddtp_tree, hf_ddtp_status, NullTVB, offset, 4, pntohl(pd+offset));
- break;
- case DDTP_ALIVE_QUERY :
- offset += 4;
- if (check_col(fd, COL_INFO)) col_add_str (fd, COL_INFO, "Alive Query");
- if (!BYTES_ARE_IN_FRAME(offset, 4)) {
- proto_tree_add_text(ddtp_tree, NullTVB, offset, END_OF_FRAME-offset, "Frame too short");
- return;
- }
- proto_tree_add_text(ddtp_tree, NullTVB, offset, 4, "Dummy : %u", pntohl(pd+offset));
- break;
- case DDTP_ALIVE_REPLY :
- offset += 4;
- if (check_col(fd, COL_INFO)) col_add_str (fd, COL_INFO, "Alive Reply");
- if (!BYTES_ARE_IN_FRAME(offset, 4)) {
- proto_tree_add_text(ddtp_tree, NullTVB, offset, END_OF_FRAME-offset, "Frame too short");
- return;
- }
- proto_tree_add_text(ddtp_tree, NullTVB, offset, 4, "Dummy : %u", pntohl(pd+offset));
- break;
- default :
- if (check_col(fd, COL_INFO)) col_add_str (fd, COL_INFO, "Unknwon type");
- if (!BYTES_ARE_IN_FRAME(offset, 4)) {
- proto_tree_add_text(ddtp_tree, NullTVB, offset, END_OF_FRAME-offset, "Frame too short");
- return;
- }
- proto_tree_add_text(ddtp_tree, NullTVB, offset, 4, "Unknown type : %u", pntohl(pd+offset));
+ 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->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->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->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");
+ }
+ return tvb_length(tvb);
}
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_DDTP1, dissect_ddtp);
- dissector_add("udp.port", UDP_PORT_DDTP2, dissect_ddtp);
+ dissector_handle_t ddtp_handle;
+
+ ddtp_handle = new_create_dissector_handle(dissect_ddtp, proto_ddtp);
+ dissector_add("udp.port", UDP_PORT_DDTP, ddtp_handle);
}
git.samba.org / obnox / wireshark / wip.git / blobdiff