/* packet-time.c
- * Routines for time packet dissection
+ * Routines for Time Protocol (RFC 868) packet dissection
*
* Richard Sharpe <rsharpe@ns.aus.com>
- * Craig Newell <CraigN@cheque.uq.edu.au>
- * RFC2347 TIME Option Extension
*
- * $Id: packet-time.c,v 1.10 2001/01/03 06:55:34 guy Exp $
+ * $Id$
*
* Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * By Gerald Combs <gerald@ethereal.com>
* Copyright 1998 Gerald Combs
*
* Copied from packet-tftp.c
- *
+ *
* 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.
# include "config.h"
#endif
-#include "packet.h"
+#include <epan/packet.h>
static int proto_time = -1;
static int hf_time_time = -1;
#define UDP_PORT_TIME 37
static void
-dissect_time(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
+dissect_time(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
proto_tree *time_tree;
proto_item *ti;
- OLD_CHECK_DISPLAY_AS_DATA(proto_time, pd, offset, fd, tree);
-
- if (check_col(fd, COL_PROTOCOL))
- col_set_str(fd, COL_PROTOCOL, "TIME");
-
- if (check_col(fd, COL_INFO)) {
- col_add_fstr(fd, COL_INFO, "TIME %s", pi.srcport == UDP_PORT_TIME? "Response":"Request");
+ if (check_col(pinfo->cinfo, COL_PROTOCOL))
+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "TIME");
+
+ if (check_col(pinfo->cinfo, COL_INFO)) {
+ col_add_fstr(pinfo->cinfo, COL_INFO, "TIME %s",
+ pinfo->srcport == pinfo->match_port ? "Response":"Request");
}
-
+
if (tree) {
-
- ti = proto_tree_add_item(tree, proto_time, NullTVB, offset, END_OF_FRAME, FALSE);
+
+ ti = proto_tree_add_item(tree, proto_time, tvb, 0, -1, FALSE);
time_tree = proto_item_add_subtree(ti, ett_time);
-
- proto_tree_add_text(time_tree, NullTVB, offset, 0,
- pi.srcport==37? "Type: Response":"Type: Request");
- if (pi.srcport == 37) {
- guint32 delta_seconds = pntohl(pd+offset);
- proto_tree_add_text(time_tree, NullTVB, offset, 4,
- " %u seconds since midnight 1 January 1900 GMT",
- delta_seconds);
+
+ proto_tree_add_text(time_tree, tvb, 0, 0,
+ pinfo->srcport==UDP_PORT_TIME? "Type: Response":"Type: Request");
+ if (pinfo->srcport == UDP_PORT_TIME) {
+ /* seconds since 1900-01-01 00:00:00 GMT, *not* 1970 */
+ guint32 delta_seconds = tvb_get_ntohl(tvb, 0);
+ proto_tree_add_uint_format(time_tree, hf_time_time, tvb, 0, 4,
+ delta_seconds, "%s",
+ abs_time_secs_to_str(delta_seconds-(guint32)(70*365+18)*24*3600));
}
}
}
{ &hf_time_time,
{ "Time", "time.time",
FT_UINT32, BASE_DEC, NULL, 0x0,
- "Seconds since 00:00 (midnight) 1 January 1900 GMT" }}
+ "Seconds since 00:00 (midnight) 1 January 1900 GMT", HFILL }}
};
static gint *ett[] = {
&ett_time,
void
proto_reg_handoff_time(void)
{
- old_dissector_add("udp.port", UDP_PORT_TIME, dissect_time);
+ dissector_handle_t time_handle;
+
+ time_handle = create_dissector_handle(dissect_time, proto_time);
+ dissector_add("udp.port", UDP_PORT_TIME, time_handle);
}