![Guy Harris](/assets/img/avatar_default.png)
statements. Move the setting of the Protocol column in various dissectors before anything is fetched from the packet, and also clear the Info column at that point in those and some other dissectors, so that if an exception is thrown, the columns don't reflect the previous protocol. Don't use col_add_fstr(..., "%s", string); Use col_add_str(..., string); as it does the same thing, but doesn't drag all the heavy *printf machinery in. Fix the DDTP dissector to set the Info column regardless of whether we're building a protocol tree or not, and to set it to "Encrypted payload" if the payload is encrypted. Also fix a typo in a field name. Register the FTP data dissector as being associated with the FTP data protocol, not the FTP protocol (the removed "CHECK_DISPLAY_AS_DATA()" call checked "proto_ftp_data", and the removed "pinfo->current_proto =" line set it to "FTP-DATA", so it should be associated with "proto_ftp_data"). Make the H1 dissector check whether the frame has at least 2 bytes in it before checking the first two bytes; heuristic dissectors must not throw exceptions until they've accepted the packet as one of theirs. Use "tvb_format_text()" rather than "tvb_get_ptr()" and "format_text()" in some dissectors where the result of "tvb_get_ptr()" is used only in the "format_text()" call. In the Quake dissector, don't check whether there are at least 4 bytes in the packet - if we return, the packet won't be dissected at all (it's not as if some other dissector will get to handle it), and, if we don't return, we'll throw an exception if there aren't at least 4 bytes in the packet, so the packet will be marked as short or malformed, as appropriate. In the RIPng dissector, associate the table of strings for the command field with the command field, so that the dissector doesn't have to format the string for the protocol tree entry itself, and so that the filter construction dialog box can let you select "Request" or "Response" from a list rather than requiring you to know the values for "Request" and "Response". Make "dissect_rpc()" static, as it's called only through a heuristic dissector list. Use "col_set_str()" to set the COL_PROTOCOL column for RPC protocols; the string used is from a table provided by the dissector, and is a string constant. Don't format the Info column for WSP into a buffer and then format that buffer into the column with "%s" - "col_add_fstr()" can do the formatting for you, without having to allocate your own buffer (or run through the *printf machinery twice). Don't fetch fields from the WTP packet until you're ready to use them, so that you don't throw an exception before you even set the Protocol column or clear the Info column. Use "pinfo->destport", not "pi.destport", in the Zebra dissector when checking whether the packet is a request or reply, and do the check by comparing with "pinfo->match_port" rather than TCP_PORT_ZEBRA (so that if the dissector is ever registered on another port, it still correctly determines whether the packet is a request or reply - the Network Monitor HTTP dissector has port 80 wired into its brain, which is a bit irritating if you're trying to get it to dissect HTTP proxy traffic on port 3128 or proxy administration UI traffic on port 3132). svn path=/trunk/; revision=2931
311 lines
8.2 KiB
C
311 lines
8.2 KiB
C
/* packet-who.c
|
|
* Routines for who protocol (see man rwhod)
|
|
* Gilbert Ramirez <gram@xiexie.org>
|
|
*
|
|
* $Id: packet-who.c,v 1.15 2001/01/22 08:03:46 guy Exp $
|
|
*
|
|
* Ethereal - Network traffic analyzer
|
|
* By Gerald Combs <gerald@zing.org>
|
|
* 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
|
|
* 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 <time.h>
|
|
#include <glib.h>
|
|
#include "packet.h"
|
|
|
|
|
|
/*
|
|
*
|
|
RWHOD(8) UNIX System Manager's Manual RWHOD(8)
|
|
|
|
|
|
The messages sent and received, are of the form:
|
|
|
|
struct outmp {
|
|
0 char out_line[8]; tty name
|
|
8 char out_name[8]; user id
|
|
16 long out_time; time on
|
|
};
|
|
|
|
struct whod {
|
|
0 char wd_vers;
|
|
1 char wd_type;
|
|
2 char wd_fill[2];
|
|
4 int wd_sendtime;
|
|
8 int wd_recvtime;
|
|
12 char wd_hostname[32];
|
|
44 int wd_loadav[3];
|
|
56 int wd_boottime;
|
|
60 struct whoent {
|
|
struct outmp we_utmp;
|
|
(20 each) int we_idle;
|
|
} wd_we[1024 / sizeof (struct whoent)];
|
|
};
|
|
|
|
Linux 2.0 May 13, 1997 2
|
|
|
|
*
|
|
*/
|
|
|
|
static int proto_who = -1;
|
|
static int hf_who_vers = -1;
|
|
static int hf_who_type = -1;
|
|
static int hf_who_sendtime = -1;
|
|
static int hf_who_recvtime = -1;
|
|
static int hf_who_hostname = -1;
|
|
static int hf_who_loadav_5 = -1;
|
|
static int hf_who_loadav_10 = -1;
|
|
static int hf_who_loadav_15 = -1;
|
|
static int hf_who_boottime = -1;
|
|
static int hf_who_whoent = -1;
|
|
static int hf_who_tty = -1;
|
|
static int hf_who_uid = -1;
|
|
static int hf_who_timeon = -1;
|
|
static int hf_who_idle = -1;
|
|
|
|
static gint ett_who = -1;
|
|
static gint ett_whoent = -1;
|
|
|
|
#define UDP_PORT_WHO 513
|
|
|
|
static void dissect_whoent(tvbuff_t *tvb, int offset, proto_tree *tree);
|
|
|
|
static void
|
|
dissect_who(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|
{
|
|
int offset = 0;
|
|
proto_tree *who_tree = NULL;
|
|
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;
|
|
|
|
/* 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);
|
|
|
|
tv.tv_usec = 0;
|
|
|
|
if (tree) {
|
|
who_ti = proto_tree_add_item(tree, proto_who, tvb, offset,
|
|
tvb_length(tvb), FALSE);
|
|
who_tree = proto_item_add_subtree(who_ti, ett_who);
|
|
}
|
|
|
|
if (tree)
|
|
proto_tree_add_item(who_tree, hf_who_vers, tvb, offset, 1, FALSE);
|
|
offset += 1;
|
|
|
|
if (tree)
|
|
proto_tree_add_item(who_tree, hf_who_type, tvb, offset, 1, FALSE);
|
|
offset += 1;
|
|
|
|
/* 2 filler bytes */
|
|
offset += 2;
|
|
|
|
if (tree) {
|
|
tv.tv_sec = tvb_get_ntohl(tvb, offset);
|
|
proto_tree_add_time(who_tree, hf_who_sendtime, tvb, offset, 4,
|
|
&tv);
|
|
}
|
|
offset += 4;
|
|
|
|
if (tree) {
|
|
tv.tv_sec = tvb_get_ntohl(tvb, offset);
|
|
proto_tree_add_time(who_tree, hf_who_recvtime, tvb, offset, 4,
|
|
&tv);
|
|
}
|
|
offset += 4;
|
|
|
|
tvb_get_nstringz0(tvb, offset, 32, server_name);
|
|
if (tree)
|
|
proto_tree_add_string(who_tree, hf_who_hostname, tvb, offset,
|
|
32, server_name);
|
|
offset += 32;
|
|
|
|
loadav_5 = (double) tvb_get_ntohl(tvb, offset) / 100.0;
|
|
if (tree)
|
|
proto_tree_add_double(who_tree, hf_who_loadav_5, tvb, offset,
|
|
4, loadav_5);
|
|
offset += 4;
|
|
|
|
loadav_10 = (double) tvb_get_ntohl(tvb, offset) / 100.0;
|
|
if (tree)
|
|
proto_tree_add_double(who_tree, hf_who_loadav_10, tvb, offset,
|
|
4, loadav_10);
|
|
offset += 4;
|
|
|
|
loadav_15 = (double) tvb_get_ntohl(tvb, offset) / 100.0;
|
|
if (tree)
|
|
proto_tree_add_double(who_tree, hf_who_loadav_15, tvb, offset,
|
|
4, loadav_15);
|
|
offset += 4;
|
|
|
|
/* Summary information */
|
|
if (check_col(pinfo->fd, COL_INFO))
|
|
col_add_fstr(pinfo->fd, COL_INFO, "%s: %.02f %.02f %.02f",
|
|
server_name, loadav_5, loadav_10, loadav_15);
|
|
|
|
if (tree) {
|
|
tv.tv_sec = tvb_get_ntohl(tvb, offset);
|
|
proto_tree_add_time(who_tree, hf_who_boottime, tvb, offset, 4,
|
|
&tv);
|
|
offset += 4;
|
|
|
|
dissect_whoent(tvb, offset, who_tree);
|
|
}
|
|
}
|
|
|
|
/* The man page says that (1024 / sizeof(struct whoent)) is the maximum number
|
|
* of whoent structures in the packet. */
|
|
#define SIZE_OF_WHOENT 24
|
|
#define MAX_NUM_WHOENTS (1024 / SIZE_OF_WHOENT)
|
|
|
|
static void
|
|
dissect_whoent(tvbuff_t *tvb, int offset, proto_tree *tree)
|
|
{
|
|
proto_tree *whoent_tree = NULL;
|
|
proto_item *whoent_ti = NULL;
|
|
int line_offset = offset;
|
|
gchar out_line[9];
|
|
gchar out_name[9];
|
|
struct timeval tv;
|
|
int whoent_num = 0;
|
|
guint32 idle_secs; /* say that out loud... */
|
|
|
|
tv.tv_usec = 0;
|
|
|
|
while (tvb_reported_length_remaining(tvb, line_offset) > 0
|
|
&& whoent_num < MAX_NUM_WHOENTS) {
|
|
whoent_ti = proto_tree_add_item(tree, hf_who_whoent, tvb,
|
|
line_offset, SIZE_OF_WHOENT, FALSE);
|
|
whoent_tree = proto_item_add_subtree(whoent_ti, ett_whoent);
|
|
|
|
tvb_get_nstringz0(tvb, line_offset, 8, out_line);
|
|
proto_tree_add_string(whoent_tree, hf_who_tty, tvb, line_offset,
|
|
8, out_line);
|
|
line_offset += 8;
|
|
|
|
tvb_get_nstringz0(tvb, line_offset, 8, out_name);
|
|
proto_tree_add_string(whoent_tree, hf_who_uid, tvb, line_offset,
|
|
8, out_name);
|
|
line_offset += 8;
|
|
|
|
tv.tv_sec = tvb_get_ntohl(tvb, line_offset);
|
|
proto_tree_add_time(whoent_tree, hf_who_timeon, tvb,
|
|
line_offset, 4, &tv);
|
|
line_offset += 4;
|
|
|
|
idle_secs = tvb_get_ntohl(tvb, line_offset);
|
|
proto_tree_add_uint_format(whoent_tree, hf_who_idle, tvb,
|
|
line_offset, 4, idle_secs, "Idle: %s",
|
|
time_secs_to_str(idle_secs));
|
|
line_offset += 4;
|
|
|
|
whoent_num++;
|
|
}
|
|
}
|
|
|
|
void
|
|
proto_register_who(void)
|
|
{
|
|
static hf_register_info hf[] = {
|
|
{ &hf_who_vers,
|
|
{ "Version", "who.vers", FT_UINT8, BASE_DEC, NULL, 0x0,
|
|
"" }},
|
|
|
|
{ &hf_who_type,
|
|
{ "Type", "who.type", FT_UINT8, BASE_DEC, NULL, 0x0,
|
|
"" }},
|
|
|
|
{ &hf_who_sendtime,
|
|
{ "Send Time", "who.sendtime", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0,
|
|
"" }},
|
|
|
|
{ &hf_who_recvtime,
|
|
{ "Receive Time", "who.recvtime", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0,
|
|
"" }},
|
|
|
|
{ &hf_who_hostname,
|
|
{ "Hostname", "who.hostname", FT_STRING, BASE_NONE, NULL, 0x0,
|
|
"" }},
|
|
|
|
{ &hf_who_loadav_5,
|
|
{ "Load Average Over Past 5 Minutes", "who.loadav_5", FT_DOUBLE, BASE_NONE, NULL, 0x0,
|
|
"" }},
|
|
|
|
{ &hf_who_loadav_10,
|
|
{ "Load Average Over Past 10 Minutes", "who.loadav_10", FT_DOUBLE, BASE_NONE, NULL, 0x0,
|
|
"" }},
|
|
|
|
{ &hf_who_loadav_15,
|
|
{ "Load Average Over Past 15 Minutes", "who.loadav_15", FT_DOUBLE, BASE_NONE, NULL, 0x0,
|
|
"" }},
|
|
|
|
{ &hf_who_boottime,
|
|
{ "Boot Time", "who.boottime", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0,
|
|
"" }},
|
|
|
|
{ &hf_who_whoent,
|
|
{ "Who utmp Entry", "who.whoent", FT_NONE, BASE_NONE, NULL, 0x0,
|
|
"" }},
|
|
|
|
{ &hf_who_tty,
|
|
{ "TTY Name", "who.tty", FT_STRING, BASE_NONE, NULL, 0x0,
|
|
"" }},
|
|
|
|
{ &hf_who_uid,
|
|
{ "User ID", "who.uid", FT_STRING, BASE_NONE, NULL, 0x0,
|
|
"" }},
|
|
|
|
{ &hf_who_timeon,
|
|
{ "Time On", "who.timeon", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0,
|
|
"" }},
|
|
|
|
{ &hf_who_idle,
|
|
{ "Time Idle", "who.idle", FT_UINT32, BASE_NONE, NULL, 0x0,
|
|
"" }},
|
|
};
|
|
|
|
static gint *ett[] = {
|
|
&ett_who,
|
|
&ett_whoent,
|
|
};
|
|
|
|
proto_who = proto_register_protocol("Who", "WHO", "who");
|
|
proto_register_field_array(proto_who, hf, array_length(hf));
|
|
proto_register_subtree_array(ett, array_length(ett));
|
|
}
|
|
|
|
void
|
|
proto_reg_handoff_who(void)
|
|
{
|
|
dissector_add("udp.port", UDP_PORT_WHO, dissect_who, proto_who);
|
|
}
|