aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Dreibholz <dreibh@simula.no>2021-05-21 11:58:38 +0200
committerWireshark GitLab Utility <gerald+gitlab-utility@wireshark.org>2021-05-21 13:09:21 +0000
commitcc8dd9b5090f9a7acb7972d6493d4d29b09adfb4 (patch)
tree961ca51abb8c782ad34a7bdad7a32c7469ec7f3c
parent9f895960c19cfb1fb99781346b46e923bc7a8234 (diff)
Added statistics for CalcAppProtocol.
-rw-r--r--epan/dissectors/packet-calcappprotocol.c271
1 files changed, 265 insertions, 6 deletions
diff --git a/epan/dissectors/packet-calcappprotocol.c b/epan/dissectors/packet-calcappprotocol.c
index 9151850987..d3a0dd815f 100644
--- a/epan/dissectors/packet-calcappprotocol.c
+++ b/epan/dissectors/packet-calcappprotocol.c
@@ -18,15 +18,17 @@
#include <epan/packet.h>
#include <epan/sctpppids.h>
+#include <epan/stat_tap_ui.h>
+void proto_register_calcappprotocol(void);
+void proto_reg_handoff_calcappprotocol(void);
#define CALCAPPPROTOCOL_PAYLOAD_PROTOCOL_ID_LEGACY 0x29097603
-void proto_register_calcappprotocol(void);
-void proto_reg_handoff_calcappprotocol(void);
/* Initialize the protocol and registered fields */
static int proto_calcappprotocol = -1;
+static int tap_calcappprotocol = -1;
static int hf_message_type = -1;
static int hf_message_flags = -1;
static int hf_message_length = -1;
@@ -34,6 +36,9 @@ static int hf_message_jobid = -1;
static int hf_message_jobsize = -1;
static int hf_message_completed = -1;
+static guint64 calcappprotocol_total_msgs = 0;
+static guint64 calcappprotocol_total_bytes = 0;
+
/* Initialize the subtree pointers */
static gint ett_calcappprotocol = -1;
@@ -74,13 +79,21 @@ static const value_string message_type_values[] = {
};
+typedef struct _tap_calcappprotocol_rec_t {
+ guint8 type;
+ guint16 size;
+ const char* type_string;
+} tap_calcappprotocol_rec_t;
+
+
static void
dissect_calcappprotocol_message(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *calcappprotocol_tree)
{
- guint8 type;
-
- type = tvb_get_guint8(message_tvb, MESSAGE_TYPE_OFFSET);
- col_add_fstr(pinfo->cinfo, COL_INFO, "%s ", val_to_str_const(type, message_type_values, "Unknown CalcAppProtocol type"));
+ tap_calcappprotocol_rec_t* tap_rec = wmem_new0(wmem_packet_scope(), tap_calcappprotocol_rec_t);
+ tap_rec->type = tvb_get_guint8(message_tvb, MESSAGE_TYPE_OFFSET);
+ tap_rec->size = tvb_get_ntohs(message_tvb, MESSAGE_LENGTH_OFFSET);
+ tap_rec->type_string = val_to_str_const(tap_rec->type, message_type_values, "Unknown CalcAppProtocol message type");
+ tap_queue_packet(tap_calcappprotocol, pinfo, tap_rec);
proto_tree_add_item(calcappprotocol_tree, hf_message_type, message_tvb, MESSAGE_TYPE_OFFSET, MESSAGE_TYPE_LENGTH, ENC_BIG_ENDIAN);
proto_tree_add_item(calcappprotocol_tree, hf_message_flags, message_tvb, MESSAGE_FLAGS_OFFSET, MESSAGE_FLAGS_LENGTH, ENC_BIG_ENDIAN);
@@ -114,6 +127,229 @@ dissect_calcappprotocol(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *t
}
+/* TAP STAT INFO */
+typedef enum
+{
+ MESSAGE_TYPE_COLUMN = 0,
+ MESSAGES_COLUMN,
+ MESSAGES_SHARE_COLUMN,
+ BYTES_COLUMN,
+ BYTES_SHARE_COLUMN,
+ FIRST_SEEN_COLUMN,
+ LAST_SEEN_COLUMN,
+ INTERVAL_COLUMN,
+ MESSAGE_RATE_COLUMN,
+ BYTE_RATE_COLUMN
+} calcappprotocol_stat_columns;
+
+static stat_tap_table_item calcappprotocol_stat_fields[] = {
+ { TABLE_ITEM_STRING, TAP_ALIGN_LEFT, "CalcAppProtocol Message Type", "%-25s" },
+ { TABLE_ITEM_UINT, TAP_ALIGN_RIGHT, "Messages ", "%u" },
+ { TABLE_ITEM_UINT, TAP_ALIGN_RIGHT, "Messages Share (%)" , "%1.3f %%" },
+ { TABLE_ITEM_UINT, TAP_ALIGN_RIGHT, "Bytes (B)", "%u" },
+ { TABLE_ITEM_UINT, TAP_ALIGN_RIGHT, "Bytes Share (%) ", "%1.3f %%" },
+ { TABLE_ITEM_FLOAT, TAP_ALIGN_LEFT, "First Seen (s)", "%1.6f" },
+ { TABLE_ITEM_FLOAT, TAP_ALIGN_LEFT, "Last Seen (s)", "%1.6f" },
+ { TABLE_ITEM_FLOAT, TAP_ALIGN_LEFT, "Interval (s)", "%1.6f" },
+ { TABLE_ITEM_FLOAT, TAP_ALIGN_LEFT, "Message Rate (Msg/s)", "%1.2f" },
+ { TABLE_ITEM_FLOAT, TAP_ALIGN_LEFT, "Byte Rate (B/s)", "%1.2f" }
+};
+
+static void calcappprotocol_stat_init(stat_tap_table_ui* new_stat)
+{
+ const char *table_name = "CalcAppProtocol Statistics";
+ int num_fields = sizeof(calcappprotocol_stat_fields)/sizeof(stat_tap_table_item);
+ stat_tap_table *table;
+ int i = 0;
+ stat_tap_table_item_type items[sizeof(calcappprotocol_stat_fields)/sizeof(stat_tap_table_item)];
+
+ table = stat_tap_find_table(new_stat, table_name);
+ if (table) {
+ if (new_stat->stat_tap_reset_table_cb) {
+ new_stat->stat_tap_reset_table_cb(table);
+ }
+ return;
+ }
+
+ table = stat_tap_init_table(table_name, num_fields, 0, NULL);
+ stat_tap_add_table(new_stat, table);
+
+ /* Add a row for each value type */
+ while (message_type_values[i].strptr) {
+ items[MESSAGE_TYPE_COLUMN].type = TABLE_ITEM_STRING;
+ items[MESSAGE_TYPE_COLUMN].value.string_value = message_type_values[i].strptr;
+ items[MESSAGES_COLUMN].type = TABLE_ITEM_UINT;
+ items[MESSAGES_COLUMN].value.uint_value = 0;
+ items[MESSAGES_SHARE_COLUMN].type = TABLE_ITEM_NONE;
+ items[MESSAGES_SHARE_COLUMN].value.float_value = -1.0;
+ items[BYTES_COLUMN].type = TABLE_ITEM_UINT;
+ items[BYTES_COLUMN].value.uint_value = 0;
+ items[BYTES_SHARE_COLUMN].type = TABLE_ITEM_NONE;
+ items[BYTES_SHARE_COLUMN].value.float_value = -1.0;
+ items[FIRST_SEEN_COLUMN].type = TABLE_ITEM_NONE;
+ items[FIRST_SEEN_COLUMN].value.float_value = DBL_MAX;
+ items[LAST_SEEN_COLUMN].type = TABLE_ITEM_NONE;
+ items[LAST_SEEN_COLUMN].value.float_value = DBL_MIN;
+ items[INTERVAL_COLUMN].type = TABLE_ITEM_NONE;
+ items[INTERVAL_COLUMN].value.float_value = -1.0;
+ items[MESSAGE_RATE_COLUMN].type = TABLE_ITEM_NONE;
+ items[MESSAGE_RATE_COLUMN].value.float_value = -1.0;
+ items[BYTE_RATE_COLUMN].type = TABLE_ITEM_NONE;
+ items[BYTE_RATE_COLUMN].value.float_value = -1.0;
+ stat_tap_init_table_row(table, i, num_fields, items);
+ i++;
+ }
+}
+
+static tap_packet_status
+calcappprotocol_stat_packet(void* tapdata, packet_info* pinfo _U_, epan_dissect_t* edt _U_, const void* data)
+{
+ stat_data_t* stat_data = (stat_data_t*)tapdata;
+ const tap_calcappprotocol_rec_t* tap_rec = (const tap_calcappprotocol_rec_t*)data;
+ stat_tap_table* table;
+ stat_tap_table_item_type* msg_data;
+ gint idx;
+ guint64 messages;
+ guint64 bytes;
+ int i = 0;
+ double firstSeen = -1.0;
+ double lastSeen = -1.0;
+
+ idx = str_to_val_idx(tap_rec->type_string, message_type_values);
+ if (idx < 0)
+ return TAP_PACKET_DONT_REDRAW;
+
+ table = g_array_index(stat_data->stat_tap_data->tables, stat_tap_table*, 0);
+
+ /* Update packets counter */
+ calcappprotocol_total_msgs++;
+ msg_data = stat_tap_get_field_data(table, idx, MESSAGES_COLUMN);
+ msg_data->value.uint_value++;
+ messages = msg_data->value.uint_value;
+ stat_tap_set_field_data(table, idx, MESSAGES_COLUMN, msg_data);
+
+ /* Update bytes counter */
+ calcappprotocol_total_bytes += tap_rec->size;
+ msg_data = stat_tap_get_field_data(table, idx, BYTES_COLUMN);
+ msg_data->value.uint_value += tap_rec->size;
+ bytes = msg_data->value.uint_value;
+ stat_tap_set_field_data(table, idx, BYTES_COLUMN, msg_data);
+
+ /* Update messages and bytes share */
+ while (message_type_values[i].strptr) {
+ msg_data = stat_tap_get_field_data(table, i, MESSAGES_COLUMN);
+ const guint m = msg_data->value.uint_value;
+ msg_data = stat_tap_get_field_data(table, i, BYTES_COLUMN);
+ const guint b = msg_data->value.uint_value;
+
+ msg_data = stat_tap_get_field_data(table, i, MESSAGES_SHARE_COLUMN);
+ msg_data->type = TABLE_ITEM_FLOAT;
+ msg_data->value.float_value = 100.0 * m / (double)calcappprotocol_total_msgs;
+ stat_tap_set_field_data(table, i, MESSAGES_SHARE_COLUMN, msg_data);
+
+ msg_data = stat_tap_get_field_data(table, i, BYTES_SHARE_COLUMN);
+ msg_data->type = TABLE_ITEM_FLOAT;
+ msg_data->value.float_value = 100.0 * b / (double)calcappprotocol_total_bytes;
+ stat_tap_set_field_data(table, i, BYTES_SHARE_COLUMN, msg_data);
+ i++;
+ }
+
+ /* Update first seen time */
+ if (pinfo->presence_flags & PINFO_HAS_TS) {
+ msg_data = stat_tap_get_field_data(table, idx, FIRST_SEEN_COLUMN);
+ msg_data->type = TABLE_ITEM_FLOAT;
+ msg_data->value.float_value = MIN(msg_data->value.float_value, nstime_to_sec(&pinfo->rel_ts));
+ firstSeen = msg_data->value.float_value;
+ stat_tap_set_field_data(table, idx, FIRST_SEEN_COLUMN, msg_data);
+ }
+
+ /* Update last seen time */
+ if (pinfo->presence_flags & PINFO_HAS_TS) {
+ msg_data = stat_tap_get_field_data(table, idx, LAST_SEEN_COLUMN);
+ msg_data->type = TABLE_ITEM_FLOAT;
+ msg_data->value.float_value = MAX(msg_data->value.float_value, nstime_to_sec(&pinfo->rel_ts));
+ lastSeen = msg_data->value.float_value;
+ stat_tap_set_field_data(table, idx, LAST_SEEN_COLUMN, msg_data);
+ }
+
+ if ((lastSeen - firstSeen) > 0.0) {
+ /* Update interval */
+ msg_data = stat_tap_get_field_data(table, idx, INTERVAL_COLUMN);
+ msg_data->type = TABLE_ITEM_FLOAT;
+ msg_data->value.float_value = lastSeen - firstSeen;
+ stat_tap_set_field_data(table, idx, INTERVAL_COLUMN, msg_data);
+
+ /* Update message rate */
+ msg_data = stat_tap_get_field_data(table, idx, MESSAGE_RATE_COLUMN);
+ msg_data->type = TABLE_ITEM_FLOAT;
+ msg_data->value.float_value = messages / (lastSeen - firstSeen);
+ stat_tap_set_field_data(table, idx, MESSAGE_RATE_COLUMN, msg_data);
+
+ /* Update byte rate */
+ msg_data = stat_tap_get_field_data(table, idx, BYTE_RATE_COLUMN);
+ msg_data->type = TABLE_ITEM_FLOAT;
+ msg_data->value.float_value = bytes / (lastSeen - firstSeen);
+ stat_tap_set_field_data(table, idx, BYTE_RATE_COLUMN, msg_data);
+ }
+
+ return TAP_PACKET_REDRAW;
+}
+
+static void
+calcappprotocol_stat_reset(stat_tap_table* table)
+{
+ guint element;
+ stat_tap_table_item_type* item_data;
+
+ for (element = 0; element < table->num_elements; element++) {
+ item_data = stat_tap_get_field_data(table, element, MESSAGES_COLUMN);
+ item_data->value.uint_value = 0;
+ stat_tap_set_field_data(table, element, MESSAGES_COLUMN, item_data);
+
+ item_data = stat_tap_get_field_data(table, element, MESSAGES_SHARE_COLUMN);
+ item_data->type = TABLE_ITEM_NONE;
+ item_data->value.float_value = -1.0;
+ stat_tap_set_field_data(table, element, MESSAGES_SHARE_COLUMN, item_data);
+
+ item_data = stat_tap_get_field_data(table, element, BYTES_COLUMN);
+ item_data->value.uint_value = 0;
+ stat_tap_set_field_data(table, element, BYTES_COLUMN, item_data);
+
+ item_data = stat_tap_get_field_data(table, element, BYTES_SHARE_COLUMN);
+ item_data->type = TABLE_ITEM_NONE;
+ item_data->value.float_value = -1.0;
+ stat_tap_set_field_data(table, element, BYTES_SHARE_COLUMN, item_data);
+
+ item_data = stat_tap_get_field_data(table, element, FIRST_SEEN_COLUMN);
+ item_data->type = TABLE_ITEM_NONE;
+ item_data->value.float_value = DBL_MAX;
+ stat_tap_set_field_data(table, element, FIRST_SEEN_COLUMN, item_data);
+
+ item_data = stat_tap_get_field_data(table, element, LAST_SEEN_COLUMN);
+ item_data->type = TABLE_ITEM_NONE;
+ item_data->value.float_value = DBL_MIN;
+ stat_tap_set_field_data(table, element, LAST_SEEN_COLUMN, item_data);
+
+ item_data = stat_tap_get_field_data(table, element, INTERVAL_COLUMN);
+ item_data->type = TABLE_ITEM_NONE;
+ item_data->value.float_value = -1.0;
+ stat_tap_set_field_data(table, element, INTERVAL_COLUMN, item_data);
+
+ item_data = stat_tap_get_field_data(table, element, MESSAGE_RATE_COLUMN);
+ item_data->type = TABLE_ITEM_NONE;
+ item_data->value.float_value = -1.0;
+ stat_tap_set_field_data(table, element, MESSAGE_RATE_COLUMN, item_data);
+
+ item_data = stat_tap_get_field_data(table, element, BYTE_RATE_COLUMN);
+ item_data->type = TABLE_ITEM_NONE;
+ item_data->value.float_value = -1.0;
+ stat_tap_set_field_data(table, element, BYTE_RATE_COLUMN, item_data);
+ }
+ calcappprotocol_total_msgs = 0;
+ calcappprotocol_total_bytes = 0;
+}
+
+
/* Register the protocol with Wireshark */
void
proto_register_calcappprotocol(void)
@@ -134,12 +370,35 @@ proto_register_calcappprotocol(void)
&ett_calcappprotocol
};
+ static tap_param calcappprotocol_stat_params[] = {
+ { PARAM_FILTER, "filter", "Filter", NULL, TRUE }
+ };
+
+ static stat_tap_table_ui calcappprotocol_stat_table = {
+ REGISTER_STAT_GROUP_RSERPOOL,
+ "CalcAppProtocol Statistics",
+ "calcappprotocol",
+ "calcappprotocol,stat",
+ calcappprotocol_stat_init,
+ calcappprotocol_stat_packet,
+ calcappprotocol_stat_reset,
+ NULL,
+ NULL,
+ sizeof(calcappprotocol_stat_fields)/sizeof(stat_tap_table_item), calcappprotocol_stat_fields,
+ sizeof(calcappprotocol_stat_params)/sizeof(tap_param), calcappprotocol_stat_params,
+ NULL,
+ 0
+ };
+
/* Register the protocol name and description */
proto_calcappprotocol = proto_register_protocol("Calculation Application Protocol", "CalcAppProtocol", "calcappprotocol");
/* Required function calls to register the header fields and subtrees used */
proto_register_field_array(proto_calcappprotocol, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
+ tap_calcappprotocol = register_tap("calcappprotocol");
+
+ register_stat_tap_table_ui(&calcappprotocol_stat_table);
}
void