*
* $Id$
*
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
-static int expert_tap = -1;
-
+static int expert_tap = -1;
+static int proto_expert = -1;
+static int highest_severity = 0;
+
+static int ett_expert = -1;
+static int ett_subexpert = -1;
+
+static int hf_expert_msg = -1;
+static int hf_expert_group = -1;
+static int hf_expert_severity = -1;
+
+const value_string expert_group_vals[] = {
+ { PI_CHECKSUM, "Checksum" },
+ { PI_SEQUENCE, "Sequence" },
+ { PI_RESPONSE_CODE, "Response" },
+ { PI_REQUEST_CODE, "Request" },
+ { PI_UNDECODED, "Undecoded" },
+ { PI_REASSEMBLE, "Reassemble" },
+ { PI_MALFORMED, "Malformed" },
+ { PI_DEBUG, "Debug" },
+ { PI_PROTOCOL, "Protocol" },
+/* { PI_SECURITY, "Security" },*/
+ { 0, NULL }
+};
+
+const value_string expert_severity_vals[] = {
+ { PI_ERROR, "Error" },
+ { PI_WARN, "Warn" },
+ { PI_NOTE, "Note" },
+ { PI_CHAT, "Chat" },
+ { 0, "Ok" },
+ { 0, NULL }
+};
void
expert_init(void)
{
+ static hf_register_info hf[] = {
+ { &hf_expert_msg,
+ { "Message", "expert.message", FT_STRING, BASE_NONE, NULL, 0, "Wireshark expert information", HFILL }
+ },
+ { &hf_expert_group,
+ { "Group", "expert.group", FT_UINT32, BASE_NONE, VALS(expert_group_vals), 0, "Wireshark expert group", HFILL }
+ },
+ { &hf_expert_severity,
+ { "Severity level", "expert.severity", FT_UINT32, BASE_NONE, VALS(expert_severity_vals), 0, "Wireshark expert severity level", HFILL }
+ }
+ };
+ static gint *ett[] = {
+ &ett_expert,
+ &ett_subexpert
+ };
+
if(expert_tap == -1) {
expert_tap = register_tap("expert");
}
+
+ if (proto_expert == -1) {
+ proto_expert = proto_register_protocol("Expert Info", "Expert", "expert");
+ proto_register_field_array(proto_expert, hf, array_length(hf));
+ proto_register_subtree_array(ett, array_length(ett));
+ proto_set_cant_toggle(proto_expert);
+ }
+
+ highest_severity = 0;
}
+
void
expert_cleanup(void)
{
}
-/* set's the PI_ flags to a protocol item
- * (and it's parent items till the toplevel) */
+int
+expert_get_highest_severity(void)
+{
+ return highest_severity;
+}
+
+
+/* set's the PI_ flags to a protocol item
+ * (and its parent items till the toplevel) */
static void
expert_set_item_flags(proto_item *pi, int group, int severity)
{
}
}
+static proto_tree*
+expert_create_tree(proto_item *pi, int group, int severity, const char *msg)
+{
+ proto_tree *tree;
+ proto_item *ti;
+
+ tree = proto_item_add_subtree(pi, ett_expert);
+ ti = proto_tree_add_protocol_format(tree, proto_expert, NULL, 0, 0, "Expert Info (%s/%s): %s",
+ val_to_str(severity, expert_severity_vals, "?%u?"),
+ val_to_str(group, expert_group_vals, "?%u?"),
+ msg);
+ PROTO_ITEM_SET_GENERATED(ti);
+
+ return proto_item_add_subtree(ti, ett_subexpert);
+}
static void
expert_set_info_vformat(
packet_info *pinfo, proto_item *pi, int group, int severity, const char *format, va_list ap)
{
- int ret; /*tmp return value */
- char formatted[300];
+ char formatted[300];
+ int tap;
expert_info_t *ei;
+ proto_tree *tree;
+ proto_item *ti;
/* if this packet isn't loaded because of a read filter, don't output anything */
- if(pinfo->fd->num == -1) {
+ if(pinfo == NULL || pinfo->fd->num == 0) {
return;
}
+ if(severity > highest_severity) {
+ highest_severity = severity;
+ }
+
+ if(pi != NULL && pi->finfo != NULL) {
+ expert_set_item_flags(pi, group, severity);
+ }
+
+ if (check_col(pinfo->cinfo, COL_EXPERT))
+ col_add_str(pinfo->cinfo, COL_EXPERT, val_to_str(severity, expert_severity_vals, "?%u?"));
+
+ tap = have_tap_listener(expert_tap);
+
/* XXX - use currently nonexistant se_vsnprintf instead */
- ret = g_vsnprintf(formatted, sizeof(formatted), format, ap);
- if ((ret == -1) || (ret >= sizeof(formatted)))
- formatted[sizeof(formatted) - 1] = '\0';
+ g_vsnprintf(formatted, sizeof(formatted), format, ap);
+
+ tree = expert_create_tree(pi, group, severity, formatted);
+ ti = proto_tree_add_string(tree, hf_expert_msg, NULL, 0, 0, formatted);
+ PROTO_ITEM_SET_GENERATED(ti);
+ ti = proto_tree_add_uint(tree, hf_expert_severity, NULL, 0, 0, severity);
+ PROTO_ITEM_SET_GENERATED(ti);
+ ti = proto_tree_add_uint(tree, hf_expert_group, NULL, 0, 0, group);
+ PROTO_ITEM_SET_GENERATED(ti);
+
+ if (!tap)
+ return;
- ei = se_alloc(sizeof(expert_info_t));
- ei->packet_num = pinfo ? pinfo->fd->num : -1;
- ei->group = group;
+ ei = ep_alloc(sizeof(expert_info_t));
+
+ ei->packet_num = pinfo->fd->num;
+ ei->group = group;
ei->severity = severity;
- ei->protocol = se_strdup(pinfo->current_proto);
- ei->summary = se_strdup(formatted);
+ ei->protocol = pinfo->current_proto; /* ep_strdup(pinfo->current_proto); it's a const */
+ ei->summary = ep_strdup(formatted);
+ ei->pitem = NULL;
/* if we have a proto_item (not a faked item), set expert attributes to it */
- if(pi != NULL && pi->finfo != NULL) {
- expert_set_item_flags(pi, group, severity);
+ if(pi != NULL && PITEM_FINFO(pi) != NULL) {
+ ei->pitem = pi;
}
tap_queue_packet(expert_tap, pinfo, ei);
git.samba.org / obnox / wireshark / wip.git / blobdiff