Set the svn:eol-style property on all text files to "native", so that

[obnox/wireshark/wip.git] / packet-time.c

diff --git a/packet-time.c b/packet-time.c
index d5be771020ed94acb60069fa751f8f7e18a353df..73c115d13d7d9089e828f7e99e710b5704668a67 100644 (file)
--- a/packet-time.c
+++ b/packet-time.c
@@ -1,28 +1,26 @@
 /* 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.12 2001/01/09 06:31:44 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.
@@ -32,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include "packet.h"
+#include <epan/packet.h>
 
 static int proto_time = -1;
 static int hf_time_time = -1;
@@ -47,31 +45,27 @@ dissect_time(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   proto_tree   *time_tree;
   proto_item   *ti;
 
-  CHECK_DISPLAY_AS_DATA(proto_time, tvb, pinfo, tree);
-  
-  pinfo->current_proto = "TIME";
+  if (check_col(pinfo->cinfo, COL_PROTOCOL))
+    col_set_str(pinfo->cinfo, COL_PROTOCOL, "TIME");
 
-  if (check_col(pinfo->fd, COL_PROTOCOL))
-    col_set_str(pinfo->fd, COL_PROTOCOL, "TIME");
-  
-  if (check_col(pinfo->fd, COL_INFO)) {
-    col_add_fstr(pinfo->fd, COL_INFO, "TIME %s",
-                pinfo->srcport == UDP_PORT_TIME? "Response":"Request");
+  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, tvb, 0,
-                            tvb_length(tvb), 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, tvb, 0, 0,
                        pinfo->srcport==UDP_PORT_TIME? "Type: Response":"Type: Request");
-    if (pinfo->srcport == UDP_PORT_TIME) { 
+    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_text(time_tree, tvb, 0, 4,
-                         "%u seconds since midnight 1 January 1900 GMT",
-                         delta_seconds);
+      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));
     }
   }
 }
@@ -84,7 +78,7 @@ proto_register_time(void)
     { &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,
@@ -98,5 +92,8 @@ proto_register_time(void)
 void
 proto_reg_handoff_time(void)
 {
-  dissector_add("udp.port", UDP_PORT_TIME, dissect_time, proto_time);
+  dissector_handle_t time_handle;
+
+  time_handle = create_dissector_handle(dissect_time, proto_time);
+  dissector_add("udp.port", UDP_PORT_TIME, time_handle);
 }