Small fix for dissect_ndr_nt_UNICODE_STRING_str() in packet-dcerpc-nt.c

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

diff --git a/packet-who.c b/packet-who.c
index e21370a5283c1e1cb8fa58f1ee4f7ff36f0b865b..5f926ed7f3a152683c648098d2b84338ab5f3630 100644 (file)
--- a/packet-who.c
+++ b/packet-who.c
@@ -1,13 +1,12 @@
 /* packet-who.c
  * Routines for who protocol (see man rwhod)
- * Gilbert Ramirez <gram@xiexie.org>
+ * Gilbert Ramirez <gram@alumni.rice.edu>
  *
- * $Id: packet-who.c,v 1.13 2001/01/06 06:18:54 guy Exp $
+ * $Id: packet-who.c,v 1.23 2002/01/24 09:20:52 guy Exp $
  *
  * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * By Gerald Combs <gerald@ethereal.com>
  * 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
@@ -35,7 +34,7 @@
 #include <string.h>
 #include <time.h>
 #include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
 
 
 /*
@@ -102,23 +101,19 @@ dissect_who(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        proto_item      *who_ti = NULL;
        gchar           server_name[33];
        double          loadav_5 = 0.0, loadav_10 = 0.0, loadav_15 = 0.0;
-       struct timeval  tv;
-
-       CHECK_DISPLAY_AS_DATA(proto_who, tvb, pinfo, tree);
-
-       pinfo->current_proto = "WHO";
+       nstime_t        ts;
 
        /* Summary information */
-       if (check_col(pinfo->fd, COL_PROTOCOL))
-               col_set_str(pinfo->fd, COL_PROTOCOL, "WHO");
-       if (check_col(pinfo->fd, COL_INFO))
-               col_clear(pinfo->fd, COL_INFO);
+       if (check_col(pinfo->cinfo, COL_PROTOCOL))
+               col_set_str(pinfo->cinfo, COL_PROTOCOL, "WHO");
+       if (check_col(pinfo->cinfo, COL_INFO))
+               col_clear(pinfo->cinfo, COL_INFO);
 
-       tv.tv_usec = 0;
+       ts.nsecs = 0;
 
        if (tree) {
-               who_ti = proto_tree_add_item(tree, proto_who, tvb, offset,
-                   tvb_length(tvb), FALSE);
+               who_ti = proto_tree_add_item(tree, proto_who, tvb, offset, -1,
+                   FALSE);
                who_tree = proto_item_add_subtree(who_ti, ett_who);
        }
 
@@ -134,16 +129,16 @@ dissect_who(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        offset += 2;
 
        if (tree) {
-               tv.tv_sec = tvb_get_ntohl(tvb, offset);
+               ts.secs = tvb_get_ntohl(tvb, offset);
                proto_tree_add_time(who_tree, hf_who_sendtime, tvb, offset, 4,
-                   &tv);
+                   &ts);
        }
        offset += 4;
 
        if (tree) {
-               tv.tv_sec = tvb_get_ntohl(tvb, offset);
+               ts.secs = tvb_get_ntohl(tvb, offset);
                proto_tree_add_time(who_tree, hf_who_recvtime, tvb, offset, 4,
-                   &tv);
+                   &ts);
        }
        offset += 4;
 
@@ -172,14 +167,14 @@ dissect_who(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        offset += 4;
 
        /* Summary information */
-       if (check_col(pinfo->fd, COL_INFO))
-               col_add_fstr(pinfo->fd, COL_INFO, "%s: %.02f %.02f %.02f",
+       if (check_col(pinfo->cinfo, COL_INFO))
+               col_add_fstr(pinfo->cinfo, COL_INFO, "%s: %.02f %.02f %.02f",
                                server_name, loadav_5, loadav_10, loadav_15);
 
        if (tree) {
-               tv.tv_sec = tvb_get_ntohl(tvb, offset);
+               ts.secs = tvb_get_ntohl(tvb, offset);
                proto_tree_add_time(who_tree, hf_who_boottime, tvb, offset, 4,
-                   &tv);
+                   &ts);
                offset += 4;
 
                dissect_whoent(tvb, offset, who_tree);
@@ -199,11 +194,11 @@ dissect_whoent(tvbuff_t *tvb, int offset, proto_tree *tree)
        int             line_offset = offset;
        gchar           out_line[9];    
        gchar           out_name[9];    
-       struct timeval  tv;
+       nstime_t        ts;
        int             whoent_num = 0;
        guint32         idle_secs; /* say that out loud... */
 
-       tv.tv_usec = 0;
+       ts.nsecs = 0;
 
        while (tvb_reported_length_remaining(tvb, line_offset) > 0
            && whoent_num < MAX_NUM_WHOENTS) {
@@ -221,9 +216,9 @@ dissect_whoent(tvbuff_t *tvb, int offset, proto_tree *tree)
                    8, out_name);
                line_offset += 8;
 
-               tv.tv_sec = tvb_get_ntohl(tvb, line_offset);
+               ts.secs = tvb_get_ntohl(tvb, line_offset);
                proto_tree_add_time(whoent_tree, hf_who_timeon, tvb,
-                   line_offset, 4, &tv);
+                   line_offset, 4, &ts);
                line_offset += 4;
 
                idle_secs = tvb_get_ntohl(tvb, line_offset);
@@ -242,59 +237,59 @@ proto_register_who(void)
        static hf_register_info hf[] = {
                { &hf_who_vers,
                { "Version",    "who.vers", FT_UINT8, BASE_DEC, NULL, 0x0,
-                       "" }},
+                       "", HFILL }},
 
                { &hf_who_type,
                { "Type",       "who.type", FT_UINT8, BASE_DEC, NULL, 0x0,
-                       "" }},
+                       "", HFILL }},
 
                { &hf_who_sendtime,
                { "Send Time",  "who.sendtime", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0,
-                       "" }},
+                       "", HFILL }},
 
                { &hf_who_recvtime,
                { "Receive Time", "who.recvtime", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0,
-                       "" }},
+                       "", HFILL }},
 
                { &hf_who_hostname,
                { "Hostname", "who.hostname", FT_STRING, BASE_NONE, NULL, 0x0,
-                       "" }},
+                       "", HFILL }},
 
                { &hf_who_loadav_5,
                { "Load Average Over Past  5 Minutes", "who.loadav_5", FT_DOUBLE, BASE_NONE, NULL, 0x0,
-                       "" }},
+                       "", HFILL }},
 
                { &hf_who_loadav_10,
                { "Load Average Over Past 10 Minutes", "who.loadav_10", FT_DOUBLE, BASE_NONE, NULL, 0x0,
-                       "" }},
+                       "", HFILL }},
 
                { &hf_who_loadav_15,
                { "Load Average Over Past 15 Minutes", "who.loadav_15", FT_DOUBLE, BASE_NONE, NULL, 0x0,
-                       "" }},
+                       "", HFILL }},
 
                { &hf_who_boottime,
                { "Boot Time", "who.boottime", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0,
-                       "" }},
+                       "", HFILL }},
 
                { &hf_who_whoent,
                { "Who utmp Entry", "who.whoent", FT_NONE, BASE_NONE, NULL, 0x0,
-                       "" }},
+                       "", HFILL }},
 
                { &hf_who_tty,
                { "TTY Name", "who.tty", FT_STRING, BASE_NONE, NULL, 0x0,
-                       "" }},
+                       "", HFILL }},
 
                { &hf_who_uid,
                { "User ID", "who.uid", FT_STRING, BASE_NONE, NULL, 0x0,
-                       "" }},
+                       "", HFILL }},
 
                { &hf_who_timeon,
                { "Time On", "who.timeon", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0,
-                       "" }},
+                       "", HFILL }},
 
                { &hf_who_idle,
-               { "Time Idle", "who.idle", FT_UINT32, BASE_NONE, NULL, 0x0,
-                       "" }},
+               { "Time Idle", "who.idle", FT_UINT32, BASE_DEC, NULL, 0x0,
+                       "", HFILL }},
        };
 
        static gint *ett[] = {
@@ -310,5 +305,8 @@ proto_register_who(void)
 void
 proto_reg_handoff_who(void)
 {
-       dissector_add("udp.port", UDP_PORT_WHO, dissect_who);
+       dissector_handle_t who_handle;
+
+       who_handle = create_dissector_handle(dissect_who, proto_who);
+       dissector_add("udp.port", UDP_PORT_WHO, who_handle);
 }