* By Gerald Combs <gerald@wireshark.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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * SPDX-License-Identifier: GPL-2.0-or-later
*/
#include <config.h>
#include <stdio.h>
#include <stdlib.h>
+#include <stdarg.h>
#include <string.h>
#include <errno.h>
#include <glib.h>
-#include <wsutil/wsjsmn.h>
+#include <wsutil/wsjson.h>
#include <wsutil/ws_printf.h>
+#include <wsutil/json_dumper.h>
#include <file.h>
+#include <epan/epan_dissect.h>
#include <epan/exceptions.h>
#include <epan/color_filters.h>
#include <epan/prefs.h>
#include <epan/column.h>
+#include <ui/ssl_key_export.h>
+
+#include <ui/io_graph_item.h>
#include <epan/stats_tree_priv.h>
#include <epan/stat_tap_ui.h>
#include <epan/conversation_table.h>
+#include <epan/sequence_analysis.h>
+#include <epan/expert.h>
+#include <epan/export_object.h>
+#include <epan/follow.h>
+#include <epan/rtd_table.h>
+#include <epan/srt_table.h>
#include <epan/dissectors/packet-h225.h>
#include <epan/rtp_pt.h>
#include <ui/voip_calls.h>
#include <ui/rtp_stream.h>
#include <ui/tap-rtp-common.h>
+#include <ui/tap-rtp-analysis.h>
#include <epan/to_str.h>
-#ifdef HAVE_GEOIP
-# include <GeoIP.h>
-# include <epan/geoip_db.h>
-# include <wsutil/pint.h>
-#endif
-
-#include <wsutil/strtoi.h>
-
-#include "sharkd.h"
+#include <epan/addr_resolv.h>
+#include <epan/dissectors/packet-rtp.h>
+#include <ui/rtp_media.h>
+#ifdef HAVE_SPEEXDSP
+# include <speex/speex_resampler.h>
+#else
+# include <codecs/speex/speex_resampler.h>
+#endif /* HAVE_SPEEXDSP */
-static struct register_ct *
-_get_conversation_table_by_name(const char *name)
-{
- guint count = conversation_table_get_num();
- guint i;
+#include <epan/maxmind_db.h>
- /* XXX, wow O(n^2), move to libwireshark */
- for (i = 0; i < count; i++)
- {
- struct register_ct *table = get_conversation_table_by_num(i);
- const char *label = proto_get_protocol_short_name(find_protocol_by_id(get_conversation_proto_id(table)));
+#include <wsutil/pint.h>
+#include <wsutil/strtoi.h>
- if (!strcmp(label, name))
- return table;
- }
+#include "globals.h"
- return NULL;
-}
+#include "sharkd.h"
-static void
-json_unescape_str(char *input)
+struct sharkd_filter_item
{
- char *output = input;
-
- while (*input)
- {
- char ch = *input++;
-
- if (ch == '\\')
- {
- /* TODO, add more escaping rules */
- ch = *input++;
- }
+ guint8 *filtered; /* can be NULL if all frames are matching for given filter. */
+};
- *output = ch;
- output++;
- }
+static GHashTable *filter_table = NULL;
- *output = '\0';
-}
+static json_dumper dumper = {0};
static const char *
json_find_attr(const char *buf, const jsmntok_t *tokens, int count, const char *attr)
}
static void
-json_puts_string(const char *str)
+json_print_base64(const guint8 *data, size_t len)
{
- int i;
-
- if (str == NULL)
- str = "";
-
- putchar('"');
- for (i = 0; str[i]; i++)
- {
- switch (str[i])
- {
- case '\\':
- case '"':
- putchar('\\');
- putchar(str[i]);
- break;
-
- case '\n':
- putchar('\\');
- putchar('n');
- break;
+ json_dumper_begin_base64(&dumper);
+ json_dumper_write_base64(&dumper, data, len);
+ json_dumper_end_base64(&dumper);
+}
- default:
- putchar(str[i]);
- break;
- }
+static void G_GNUC_PRINTF(2, 3)
+sharkd_json_value_anyf(const char *key, const char *format, ...)
+{
+ if (key)
+ json_dumper_set_member_name(&dumper, key);
+
+ if (format) {
+ va_list ap;
+ va_start(ap, format);
+ json_dumper_value_va_list(&dumper, format, ap);
+ va_end(ap);
}
-
- putchar('"');
}
static void
-json_print_base64(const guint8 *data, int len)
+sharkd_json_value_string(const char *key, const char *str)
{
- int i;
- int base64_state1 = 0;
- int base64_state2 = 0;
- gsize wrote;
- gchar buf[(1 / 3 + 1) * 4 + 4 + 1];
+ if (key)
+ json_dumper_set_member_name(&dumper, key);
+ if (str)
+ json_dumper_value_string(&dumper, str);
+}
- putchar('"');
+static void
+sharkd_json_value_base64(const char *key, const guint8 *data, size_t len)
+{
+ if (key)
+ json_dumper_set_member_name(&dumper, key);
+ json_print_base64(data, len);
+}
- for (i = 0; i < len; i++)
- {
- wrote = g_base64_encode_step(&data[i], 1, FALSE, buf, &base64_state1, &base64_state2);
- if (wrote > 0)
- {
- buf[wrote] = '\0';
- printf("%s", buf);
- }
+static void G_GNUC_PRINTF(2, 3)
+sharkd_json_value_stringf(const char *key, const char *format, ...)
+{
+ if (key)
+ json_dumper_set_member_name(&dumper, key);
+
+ if (format) {
+ va_list ap;
+ va_start(ap, format);
+ char* sformat = g_strdup_printf("\"%s\"", format);
+ json_dumper_value_va_list(&dumper, sformat, ap);
+ g_free(sformat);
+ va_end(ap);
}
+}
- wrote = g_base64_encode_close(FALSE, buf, &base64_state1, &base64_state2);
- if (wrote > 0)
- {
- buf[wrote] = '\0';
- printf("%s", buf);
- }
+static void
+sharkd_json_array_open(const char *key)
+{
+ if (key)
+ json_dumper_set_member_name(&dumper, key);
+ json_dumper_begin_array(&dumper);
+}
- putchar('"');
+static void
+sharkd_json_array_close(void)
+{
+ json_dumper_end_array(&dumper);
}
-struct filter_item
+static void
+sharkd_json_simple_reply(int err, const char *errmsg)
{
- struct filter_item *next;
+ json_dumper_begin_object(&dumper);
+ sharkd_json_value_anyf("err", "%d", err);
+ if (errmsg)
+ sharkd_json_value_string("errmsg", errmsg);
- char *filter;
- guint8 *filtered;
-};
+ json_dumper_end_object(&dumper);
+ json_dumper_finish(&dumper);
+}
-static struct filter_item *filter_list = NULL;
+static void
+sharkd_session_filter_free(gpointer data)
+{
+ struct sharkd_filter_item *l = (struct sharkd_filter_item *) data;
+
+ g_free(l->filtered);
+ g_free(l);
+}
-static const guint8 *
+static const struct sharkd_filter_item *
sharkd_session_filter_data(const char *filter)
{
- struct filter_item *l;
-
- for (l = filter_list; l; l = l->next)
- {
- if (!strcmp(l->filter, filter))
- return l->filtered;
- }
+ struct sharkd_filter_item *l;
+ l = (struct sharkd_filter_item *) g_hash_table_lookup(filter_table, filter);
+ if (!l)
{
guint8 *filtered = NULL;
if (ret == -1)
return NULL;
- l = (struct filter_item *) g_malloc(sizeof(struct filter_item));
- l->filter = g_strdup(filter);
+ l = (struct sharkd_filter_item *) g_malloc(sizeof(struct sharkd_filter_item));
l->filtered = filtered;
- l->next = filter_list;
- filter_list = l;
-
- return filtered;
+ g_hash_table_insert(filter_table, g_strdup(filter), l);
}
+
+ return l;
}
-static void
-sharkd_session_process_info_conv_cb(gpointer data, gpointer user_data)
+static gboolean
+sharkd_rtp_match_init(rtpstream_id_t *id, const char *init_str)
+{
+ gboolean ret = FALSE;
+ char **arr;
+ guint32 tmp_addr_src, tmp_addr_dst;
+ address tmp_src_addr, tmp_dst_addr;
+
+ memset(id, 0, sizeof(*id));
+
+ arr = g_strsplit(init_str, "_", 7); /* pass larger value, so we'll catch incorrect input :) */
+ if (g_strv_length(arr) != 5)
+ goto fail;
+
+ /* TODO, for now only IPv4 */
+ if (!get_host_ipaddr(arr[0], &tmp_addr_src))
+ goto fail;
+
+ if (!ws_strtou16(arr[1], NULL, &id->src_port))
+ goto fail;
+
+ if (!get_host_ipaddr(arr[2], &tmp_addr_dst))
+ goto fail;
+
+ if (!ws_strtou16(arr[3], NULL, &id->dst_port))
+ goto fail;
+
+ if (!ws_hexstrtou32(arr[4], NULL, &id->ssrc))
+ goto fail;
+
+ set_address(&tmp_src_addr, AT_IPv4, 4, &tmp_addr_src);
+ copy_address(&id->src_addr, &tmp_src_addr);
+ set_address(&tmp_dst_addr, AT_IPv4, 4, &tmp_addr_dst);
+ copy_address(&id->dst_addr, &tmp_dst_addr);
+
+ ret = TRUE;
+
+fail:
+ g_strfreev(arr);
+ return ret;
+}
+
+static gboolean
+sharkd_session_process_info_nstat_cb(const void *key, void *value, void *userdata _U_)
+{
+ stat_tap_table_ui *stat_tap = (stat_tap_table_ui *) value;
+
+ json_dumper_begin_object(&dumper);
+ sharkd_json_value_string("name", stat_tap->title);
+ sharkd_json_value_stringf("tap", "nstat:%s", (const char *) key);
+ json_dumper_end_object(&dumper);
+
+ return FALSE;
+}
+
+static gboolean
+sharkd_session_process_info_conv_cb(const void* key, void* value, void* userdata _U_)
{
- struct register_ct *table = (struct register_ct *) data;
- int *pi = (int *) user_data;
+ struct register_ct *table = (struct register_ct *) value;
- const char *label = proto_get_protocol_short_name(find_protocol_by_id(get_conversation_proto_id(table)));
+ const char *label = (const char *) key;
if (get_conversation_packet_func(table))
{
- printf("%s{", (*pi) ? "," : "");
- printf("\"name\":\"Conversation List/%s\"", label);
- printf(",\"tap\":\"conv:%s\"", label);
- printf("}");
-
- *pi = *pi + 1;
+ json_dumper_begin_object(&dumper);
+ sharkd_json_value_stringf("name", "Conversation List/%s", label);
+ sharkd_json_value_stringf("tap", "conv:%s", label);
+ json_dumper_end_object(&dumper);
}
if (get_hostlist_packet_func(table))
{
- printf("%s{", (*pi) ? "," : "");
- printf("\"name\":\"Endpoint/%s\"", label);
- printf(",\"tap\":\"endpt:%s\"", label);
- printf("}");
-
- *pi = *pi + 1;
+ json_dumper_begin_object(&dumper);
+ sharkd_json_value_stringf("name", "Endpoint/%s", label);
+ sharkd_json_value_stringf("tap", "endpt:%s", label);
+ json_dumper_end_object(&dumper);
}
+ return FALSE;
+}
+
+static gboolean
+sharkd_session_seq_analysis_cb(const void *key, void *value, void *userdata _U_)
+{
+ register_analysis_t *analysis = (register_analysis_t *) value;
+
+ json_dumper_begin_object(&dumper);
+ sharkd_json_value_string("name", sequence_analysis_get_ui_name(analysis));
+ sharkd_json_value_stringf("tap", "seqa:%s", (const char *) key);
+ json_dumper_end_object(&dumper);
+
+ return FALSE;
+}
+
+static gboolean
+sharkd_export_object_visit_cb(const void *key _U_, void *value, void *user_data _U_)
+{
+ register_eo_t *eo = (register_eo_t *) value;
+
+ const int proto_id = get_eo_proto_id(eo);
+ const char *filter = proto_get_protocol_filter_name(proto_id);
+ const char *label = proto_get_protocol_short_name(find_protocol_by_id(proto_id));
+
+ json_dumper_begin_object(&dumper);
+ sharkd_json_value_stringf("name", "Export Object/%s", label);
+ sharkd_json_value_stringf("tap", "eo:%s", filter);
+ json_dumper_end_object(&dumper);
+
+ return FALSE;
+}
+
+static gboolean
+sharkd_srt_visit_cb(const void *key _U_, void *value, void *user_data _U_)
+{
+ register_srt_t *srt = (register_srt_t *) value;
+
+ const int proto_id = get_srt_proto_id(srt);
+ const char *filter = proto_get_protocol_filter_name(proto_id);
+ const char *label = proto_get_protocol_short_name(find_protocol_by_id(proto_id));
+
+ json_dumper_begin_object(&dumper);
+ sharkd_json_value_stringf("name", "Service Response Time/%s", label);
+ sharkd_json_value_stringf("tap", "srt:%s", filter);
+ json_dumper_end_object(&dumper);
+
+ return FALSE;
+}
+
+static gboolean
+sharkd_rtd_visit_cb(const void *key _U_, void *value, void *user_data _U_)
+{
+ register_rtd_t *rtd = (register_rtd_t *) value;
+
+ const int proto_id = get_rtd_proto_id(rtd);
+ const char *filter = proto_get_protocol_filter_name(proto_id);
+ const char *label = proto_get_protocol_short_name(find_protocol_by_id(proto_id));
+
+ json_dumper_begin_object(&dumper);
+ sharkd_json_value_stringf("name", "Response Time Delay/%s", label);
+ sharkd_json_value_stringf("tap", "rtd:%s", filter);
+ json_dumper_end_object(&dumper);
+
+ return FALSE;
+}
+
+static gboolean
+sharkd_follower_visit_cb(const void *key _U_, void *value, void *user_data _U_)
+{
+ register_follow_t *follower = (register_follow_t *) value;
+
+ const int proto_id = get_follow_proto_id(follower);
+ const char *label = proto_get_protocol_short_name(find_protocol_by_id(proto_id));
+ const char *filter = label; /* correct: get_follow_by_name() is registered by short name */
+
+ json_dumper_begin_object(&dumper);
+ sharkd_json_value_stringf("name", "Follow/%s", label);
+ sharkd_json_value_stringf("tap", "follow:%s", filter);
+ json_dumper_end_object(&dumper);
+
+ return FALSE;
}
/**
* Process info request
*
* Output object with attributes:
+ * (m) version - version number
+ *
* (m) columns - available column formats, array of object with attributes:
* 'name' - column name
* 'format' - column format-name
* 'name' - conversation name
* 'tap' - sharkd tap-name for conversation
*
- * (m) taps - available taps, array of object with attributes:
+ * (m) eo - available export object list, array of object with attributes:
+ * 'name' - export object name
+ * 'tap' - sharkd tap-name for eo
+ *
+ * (m) srt - available service response time list, array of object with attributes:
+ * 'name' - service response time name
+ * 'tap' - sharkd tap-name for srt
+ *
+ * (m) rtd - available response time delay list, array of object with attributes:
+ * 'name' - response time delay name
+ * 'tap' - sharkd tap-name for rtd
+ *
+ * (m) seqa - available sequence analysis (flow) list, array of object with attributes:
+ * 'name' - sequence analysis name
+ * 'tap' - sharkd tap-name
+ *
+ * (m) taps - available taps, array of object with attributes:
+ * 'name' - tap name
+ * 'tap' - sharkd tap-name
+ *
+ * (m) follow - available followers, array of object with attributes:
+ * 'name' - tap name
+ * 'tap' - sharkd tap-name
+ *
+ * (m) ftypes - conversation table for FT_ number to string, array of FT_xxx strings.
+ *
+ * (m) nstat - available table-based taps, array of object with attributes:
* 'name' - tap name
* 'tap' - sharkd tap-name
*
- * (m) ftypes - conversation table for FT_ number to string
*/
static void
sharkd_session_process_info(void)
{
int i;
- printf("{\"columns\":[");
+ json_dumper_begin_object(&dumper);
+
+ sharkd_json_array_open("columns");
for (i = 0; i < NUM_COL_FMTS; i++)
{
const char *col_format = col_format_to_string(i);
const char *col_descr = col_format_desc(i);
- printf("%s{", (i) ? "," : "");
- printf("\"name\":\"%s\"", col_descr);
- printf(",\"format\":\"%s\"", col_format);
- printf("}");
+ json_dumper_begin_object(&dumper);
+ sharkd_json_value_string("name", col_descr);
+ sharkd_json_value_string("format", col_format);
+ json_dumper_end_object(&dumper);
}
- printf("]");
+ sharkd_json_array_close();
- printf(",\"stats\":[");
+ sharkd_json_array_open("stats");
{
GList *cfg_list = stats_tree_get_cfg_list();
GList *l;
- const char *sepa = "";
for (l = cfg_list; l; l = l->next)
{
stats_tree_cfg *cfg = (stats_tree_cfg *) l->data;
- printf("%s{", sepa);
- printf("\"name\":\"%s\"", cfg->name);
- printf(",\"tap\":\"stat:%s\"", cfg->abbr);
- printf("}");
- sepa = ",";
+ json_dumper_begin_object(&dumper);
+ sharkd_json_value_string("name", cfg->name);
+ sharkd_json_value_stringf("tap", "stat:%s", cfg->abbr);
+ json_dumper_end_object(&dumper);
}
g_list_free(cfg_list);
}
- printf("]");
+ sharkd_json_array_close();
- printf(",\"ftypes\":[");
+ sharkd_json_array_open("ftypes");
for (i = 0; i < FT_NUM_TYPES; i++)
+ sharkd_json_value_string(NULL, ftype_name((ftenum_t) i));
+ sharkd_json_array_close();
+
+ sharkd_json_value_string("version", sharkd_version());
+
+ sharkd_json_array_open("nstat");
+ i = 0;
+ stat_tap_iterate_tables(sharkd_session_process_info_nstat_cb, &i);
+ sharkd_json_array_close();
+
+ sharkd_json_array_open("convs");
+ i = 0;
+ conversation_table_iterate_tables(sharkd_session_process_info_conv_cb, &i);
+ sharkd_json_array_close();
+
+ sharkd_json_array_open("seqa");
+ i = 0;
+ sequence_analysis_table_iterate_tables(sharkd_session_seq_analysis_cb, &i);
+ sharkd_json_array_close();
+
+ sharkd_json_array_open("taps");
{
- if (i)
- printf(",");
- json_puts_string(ftype_name((ftenum_t) i));
+ json_dumper_begin_object(&dumper);
+ sharkd_json_value_string("name", "RTP streams");
+ sharkd_json_value_string("tap", "rtp-streams");
+ json_dumper_end_object(&dumper);
+
+ json_dumper_begin_object(&dumper);
+ sharkd_json_value_string("name", "Expert Information");
+ sharkd_json_value_string("tap", "expert");
+ json_dumper_end_object(&dumper);
}
- printf("]");
+ sharkd_json_array_close();
- printf(",\"version\":");
- json_puts_string(sharkd_version());
+ sharkd_json_array_open("eo");
+ i = 0;
+ eo_iterate_tables(sharkd_export_object_visit_cb, &i);
+ sharkd_json_array_close();
- printf(",\"convs\":[");
+ sharkd_json_array_open("srt");
i = 0;
- conversation_table_iterate_tables(sharkd_session_process_info_conv_cb, &i);
- printf("]");
+ srt_table_iterate_tables(sharkd_srt_visit_cb, &i);
+ sharkd_json_array_close();
- printf(",\"taps\":[");
- printf("]");
+ sharkd_json_array_open("rtd");
+ i = 0;
+ rtd_table_iterate_tables(sharkd_rtd_visit_cb, &i);
+ sharkd_json_array_close();
+
+ sharkd_json_array_open("follow");
+ i = 0;
+ follow_iterate_followers(sharkd_follower_visit_cb, &i);
+ sharkd_json_array_close();
- printf("}\n");
+ json_dumper_end_object(&dumper);
+ json_dumper_finish(&dumper);
}
/**
if (sharkd_cf_open(tok_file, WTAP_TYPE_AUTO, FALSE, &err) != CF_OK)
{
- printf("{\"err\":%d}\n", err);
+ sharkd_json_simple_reply(err, NULL);
return;
}
}
ENDTRY;
- printf("{\"err\":%d}\n", err);
+ sharkd_json_simple_reply(err, NULL);
}
/**
* Process status request
*
* Output object with attributes:
- * (m) frames - count of currently loaded frames
+ * (m) frames - count of currently loaded frames
+ * (m) duration - time difference between time of first frame, and last loaded frame
+ * (o) filename - capture filename
+ * (o) filesize - capture filesize
*/
static void
sharkd_session_process_status(void)
{
- printf("{\"frames\":%d", cfile.count);
+ json_dumper_begin_object(&dumper);
- printf("}\n");
+ sharkd_json_value_anyf("frames", "%u", cfile.count);
+ sharkd_json_value_anyf("duration", "%.9f", nstime_to_sec(&cfile.elapsed_time));
+
+ if (cfile.filename)
+ {
+ char *name = g_path_get_basename(cfile.filename);
+
+ sharkd_json_value_string("filename", name);
+ g_free(name);
+ }
+
+ if (cfile.provider.wth)
+ {
+ gint64 file_size = wtap_file_size(cfile.provider.wth, NULL);
+
+ if (file_size > 0)
+ sharkd_json_value_anyf("filesize", "%" G_GINT64_FORMAT, file_size);
+ }
+
+ json_dumper_end_object(&dumper);
+ json_dumper_finish(&dumper);
}
struct sharkd_analyse_data
};
static void
-sharkd_session_process_analyse_cb(packet_info *pi, proto_tree *tree, struct epan_column_info *cinfo, const GSList *data_src, void *data)
+sharkd_session_process_analyse_cb(epan_dissect_t *edt, proto_tree *tree, struct epan_column_info *cinfo, const GSList *data_src, void *data)
{
struct sharkd_analyse_data *analyser = (struct sharkd_analyse_data *) data;
+ packet_info *pi = &edt->pi;
frame_data *fdata = pi->fd;
(void) tree;
if (!g_hash_table_lookup_extended(analyser->protocols_set, GUINT_TO_POINTER(proto_id), NULL, NULL))
{
g_hash_table_insert(analyser->protocols_set, GUINT_TO_POINTER(proto_id), GUINT_TO_POINTER(proto_id));
-
- if (g_hash_table_size(analyser->protocols_set) != 1)
- printf(",");
- json_puts_string(proto_get_protocol_filter_name(proto_id));
+ sharkd_json_value_string(NULL, proto_get_protocol_filter_name(proto_id));
}
}
}
analyser.last_time = NULL;
analyser.protocols_set = g_hash_table_new(NULL /* g_direct_hash() */, NULL /* g_direct_equal */);
- printf("{\"frames\":%d", cfile.count);
+ json_dumper_begin_object(&dumper);
- printf(",\"protocols\":[");
+ sharkd_json_value_anyf("frames", "%u", cfile.count);
+
+ sharkd_json_array_open("protocols");
for (framenum = 1; framenum <= cfile.count; framenum++)
- sharkd_dissect_request(framenum, &sharkd_session_process_analyse_cb, 0, 0, 0, &analyser);
- printf("]");
+ sharkd_dissect_request(framenum, (framenum != 1) ? 1 : 0, framenum - 1, &sharkd_session_process_analyse_cb, SHARKD_DISSECT_FLAG_NULL, &analyser);
+ sharkd_json_array_close();
if (analyser.first_time)
- printf(",\"first\":%.9f", nstime_to_sec(analyser.first_time));
+ sharkd_json_value_anyf("first", "%.9f", nstime_to_sec(analyser.first_time));
if (analyser.last_time)
- printf(",\"last\":%.9f", nstime_to_sec(analyser.last_time));
+ sharkd_json_value_anyf("last", "%.9f", nstime_to_sec(analyser.last_time));
- printf("}\n");
+ json_dumper_end_object(&dumper);
+ json_dumper_finish(&dumper);
g_hash_table_destroy(analyser.protocols_set);
}
+static column_info *
+sharkd_session_create_columns(column_info *cinfo, const char *buf, const jsmntok_t *tokens, int count)
+{
+ const char *columns_custom[32];
+ guint16 columns_fmt[32];
+ gint16 columns_occur[32];
+
+ int i, cols;
+
+ for (i = 0; i < 32; i++)
+ {
+ const char *tok_column;
+ char tok_column_name[64];
+ char *custom_sepa;
+
+ ws_snprintf(tok_column_name, sizeof(tok_column_name), "column%d", i);
+ tok_column = json_find_attr(buf, tokens, count, tok_column_name);
+ if (tok_column == NULL)
+ break;
+
+ columns_custom[i] = NULL;
+ columns_occur[i] = 0;
+
+ if ((custom_sepa = strchr(tok_column, ':')))
+ {
+ *custom_sepa = '\0'; /* XXX, C abuse: discarding-const */
+
+ columns_fmt[i] = COL_CUSTOM;
+ columns_custom[i] = tok_column;
+
+ if (!ws_strtoi16(custom_sepa + 1, NULL, &columns_occur[i]))
+ return NULL;
+ }
+ else
+ {
+ if (!ws_strtou16(tok_column, NULL, &columns_fmt[i]))
+ return NULL;
+
+ if (columns_fmt[i] >= NUM_COL_FMTS)
+ return NULL;
+
+ /* if custom, that it shouldn't be just custom number -> error */
+ if (columns_fmt[i] == COL_CUSTOM)
+ return NULL;
+ }
+ }
+
+ cols = i;
+
+ col_setup(cinfo, cols);
+
+ for (i = 0; i < cols; i++)
+ {
+ col_item_t *col_item = &cinfo->columns[i];
+
+ col_item->col_fmt = columns_fmt[i];
+ col_item->col_title = NULL; /* no need for title */
+
+ if (col_item->col_fmt == COL_CUSTOM)
+ {
+ col_item->col_custom_fields = g_strdup(columns_custom[i]);
+ col_item->col_custom_occurrence = columns_occur[i];
+ }
+
+ col_item->col_fence = 0;
+ }
+
+ col_finalize(cinfo);
+
+ return cinfo;
+}
+
/**
* sharkd_session_process_frames()
*
* Process frames request
*
* Input:
+ * (o) column0...columnXX - requested columns either number in range [0..NUM_COL_FMTS), or custom (syntax <dfilter>:<occurence>).
+ * If column0 is not specified default column set will be used.
* (o) filter - filter to be used
- * (o) range - packet range to be used [TODO]
+ * (o) skip=N - skip N frames
+ * (o) limit=N - show only N frames
+ * (o) refs - list (comma separated) with sorted time reference frame numbers.
*
* Output array of frames with attributes:
* (m) c - array of column data
* (m) num - frame number
- * (m) i - if frame is ignored
- * (m) m - if frame is marked
- * (m) bg - color filter - background color in hex
- * (m) fg - color filter - foreground color in hex
+ * (o) i - if frame is ignored
+ * (o) m - if frame is marked
+ * (o) ct - if frame is commented
+ * (o) bg - color filter - background color in hex
+ * (o) fg - color filter - foreground color in hex
*/
static void
sharkd_session_process_frames(const char *buf, const jsmntok_t *tokens, int count)
{
const char *tok_filter = json_find_attr(buf, tokens, count, "filter");
+ const char *tok_column = json_find_attr(buf, tokens, count, "column0");
+ const char *tok_skip = json_find_attr(buf, tokens, count, "skip");
+ const char *tok_limit = json_find_attr(buf, tokens, count, "limit");
+ const char *tok_refs = json_find_attr(buf, tokens, count, "refs");
const guint8 *filter_data = NULL;
- const char *frame_sepa = "";
- unsigned int framenum;
int col;
+ guint32 framenum, prev_dis_num = 0;
+ guint32 current_ref_frame = 0, next_ref_frame = G_MAXUINT32;
+ guint32 skip;
+ guint32 limit;
+
column_info *cinfo = &cfile.cinfo;
+ column_info user_cinfo;
+
+ if (tok_column)
+ {
+ memset(&user_cinfo, 0, sizeof(user_cinfo));
+ cinfo = sharkd_session_create_columns(&user_cinfo, buf, tokens, count);
+ if (!cinfo)
+ return;
+ }
if (tok_filter)
{
- filter_data = sharkd_session_filter_data(tok_filter);
- if (!filter_data)
+ const struct sharkd_filter_item *filter_item;
+
+ filter_item = sharkd_session_filter_data(tok_filter);
+ if (!filter_item)
+ return;
+ filter_data = filter_item->filtered;
+ }
+
+ skip = 0;
+ if (tok_skip)
+ {
+ if (!ws_strtou32(tok_skip, NULL, &skip))
+ return;
+ }
+
+ limit = 0;
+ if (tok_limit)
+ {
+ if (!ws_strtou32(tok_limit, NULL, &limit))
+ return;
+ }
+
+ if (tok_refs)
+ {
+ if (!ws_strtou32(tok_refs, &tok_refs, &next_ref_frame))
return;
}
- printf("[");
+ sharkd_json_array_open(NULL);
for (framenum = 1; framenum <= cfile.count; framenum++)
{
- frame_data *fdata = frame_data_sequence_find(cfile.frames, framenum);
+ frame_data *fdata;
+ guint32 ref_frame = (framenum != 1) ? 1 : 0;
if (filter_data && !(filter_data[framenum / 8] & (1 << (framenum % 8))))
continue;
- sharkd_dissect_columns(framenum, cinfo, (fdata->color_filter == NULL));
+ if (skip)
+ {
+ skip--;
+ prev_dis_num = framenum;
+ continue;
+ }
+
+ if (tok_refs)
+ {
+ if (framenum >= next_ref_frame)
+ {
+ current_ref_frame = next_ref_frame;
+
+ if (*tok_refs != ',')
+ next_ref_frame = G_MAXUINT32;
+
+ while (*tok_refs == ',' && framenum >= next_ref_frame)
+ {
+ current_ref_frame = next_ref_frame;
+
+ if (!ws_strtou32(tok_refs + 1, &tok_refs, &next_ref_frame))
+ {
+ fprintf(stderr, "sharkd_session_process_frames() wrong format for refs: %s\n", tok_refs);
+ break;
+ }
+ }
+
+ if (*tok_refs == '\0' && framenum >= next_ref_frame)
+ {
+ current_ref_frame = next_ref_frame;
+ next_ref_frame = G_MAXUINT32;
+ }
+ }
+
+ if (current_ref_frame)
+ ref_frame = current_ref_frame;
+ }
+
+ fdata = sharkd_get_frame(framenum);
+ sharkd_dissect_columns(fdata, ref_frame, prev_dis_num, cinfo, (fdata->color_filter == NULL));
- printf("%s{\"c\":[", frame_sepa);
+ json_dumper_begin_object(&dumper);
+
+ sharkd_json_array_open("c");
for (col = 0; col < cinfo->num_cols; ++col)
{
const col_item_t *col_item = &cinfo->columns[col];
- if (col)
- printf(",");
+ sharkd_json_value_string(NULL, col_item->col_data);
+ }
+ sharkd_json_array_close();
+
+ sharkd_json_value_anyf("num", "%u", framenum);
- json_puts_string(col_item->col_data);
+ if (fdata->has_user_comment || fdata->has_phdr_comment)
+ {
+ if (!fdata->has_user_comment || sharkd_get_user_comment(fdata) != NULL)
+ sharkd_json_value_anyf("ct", "true");
}
- printf("],\"num\":%u", framenum);
- if (fdata->flags.ignored)
- printf(",\"i\":true");
+ if (fdata->ignored)
+ sharkd_json_value_anyf("i", "true");
- if (fdata->flags.marked)
- printf(",\"m\":true");
+ if (fdata->marked)
+ sharkd_json_value_anyf("m", "true");
if (fdata->color_filter)
{
- printf(",\"bg\":\"%x\"", color_t_to_rgb(&fdata->color_filter->bg_color));
- printf(",\"fg\":\"%x\"", color_t_to_rgb(&fdata->color_filter->fg_color));
+ sharkd_json_value_stringf("bg", "%x", color_t_to_rgb(&fdata->color_filter->bg_color));
+ sharkd_json_value_stringf("fg", "%x", color_t_to_rgb(&fdata->color_filter->fg_color));
}
- printf("}");
- frame_sepa = ",";
+ json_dumper_end_object(&dumper);
+ prev_dis_num = framenum;
+
+ if (limit && --limit == 0)
+ break;
}
- printf("]\n");
+ sharkd_json_array_close();
+ json_dumper_finish(&dumper);
if (cinfo != &cfile.cinfo)
col_cleanup(cinfo);
sharkd_session_process_tap_stats_node_cb(const stat_node *n)
{
stat_node *node;
- const char *sepa = "";
- printf("[");
+ sharkd_json_array_open(NULL);
for (node = n->children; node; node = node->next)
{
+ json_dumper_begin_object(&dumper);
+
/* code based on stats_tree_get_values_from_node() */
- printf("%s{\"name\":\"%s\"", sepa, node->name);
- printf(",\"count\":%u", node->counter);
+ sharkd_json_value_string("name", node->name);
+ sharkd_json_value_anyf("count", "%d", node->counter);
if (node->counter && ((node->st_flags & ST_FLG_AVERAGE) || node->rng))
{
- printf(",\"avg\":%.2f", ((float)node->total) / node->counter);
- printf(",\"min\":%u", node->minvalue);
- printf(",\"max\":%u", node->maxvalue);
+ switch(node->datatype)
+ {
+ case STAT_DT_INT:
+ sharkd_json_value_anyf("avg", "%.2f", ((float)node->total.int_total) / node->counter);
+ sharkd_json_value_anyf("min", "%d", node->minvalue.int_min);
+ sharkd_json_value_anyf("max", "%d", node->maxvalue.int_max);
+ break;
+ case STAT_DT_FLOAT:
+ sharkd_json_value_anyf("avg", "%.2f", node->total.float_total / node->counter);
+ sharkd_json_value_anyf("min", "%f", node->minvalue.float_min);
+ sharkd_json_value_anyf("max", "%f", node->maxvalue.float_max);
+ break;
+ }
}
if (node->st->elapsed)
- printf(",\"rate\":%.4f",((float)node->counter) / node->st->elapsed);
+ sharkd_json_value_anyf("rate", "%.4f", ((float)node->counter) / node->st->elapsed);
if (node->parent && node->parent->counter)
- printf(",\"perc\":%.2f", (node->counter * 100.0) / node->parent->counter);
+ sharkd_json_value_anyf("perc", "%.2f", (node->counter * 100.0) / node->parent->counter);
else if (node->parent == &(node->st->root))
- printf(",\"perc\":100");
+ sharkd_json_value_anyf("perc", "100");
if (prefs.st_enable_burstinfo && node->max_burst)
{
if (prefs.st_burst_showcount)
- printf(",\"burstcount\":%d", node->max_burst);
+ sharkd_json_value_anyf("burstcount", "%d", node->max_burst);
else
- printf(",\"burstrate\":%.4f", ((double)node->max_burst) / prefs.st_burst_windowlen);
+ sharkd_json_value_anyf("burstrate", "%.4f", ((double)node->max_burst) / prefs.st_burst_windowlen);
- printf(",\"bursttime\":%.3f", ((double)node->burst_time / 1000.0));
+ sharkd_json_value_anyf("bursttime", "%.3f", (node->burst_time / 1000.0));
}
if (node->children)
{
- printf(",\"sub\":");
+ sharkd_json_value_anyf("sub", NULL);
sharkd_session_process_tap_stats_node_cb(node);
}
- printf("}");
- sepa = ",";
+ json_dumper_end_object(&dumper);
}
- printf("]");
+ sharkd_json_array_close();
}
/**
static void
sharkd_session_process_tap_stats_cb(void *psp)
{
- stats_tree *st = (stats_tree *)psp;
+ stats_tree *st = (stats_tree *) psp;
+
+ json_dumper_begin_object(&dumper);
- printf("{\"tap\":\"stats:%s\",\"type\":\"stats\"", st->cfg->abbr);
+ sharkd_json_value_stringf("tap", "stats:%s", st->cfg->abbr);
+ sharkd_json_value_string("type", "stats");
+ sharkd_json_value_string("name", st->cfg->name);
- printf(",\"name\":\"%s\",\"stats\":", st->cfg->name);
+ sharkd_json_value_anyf("stats", NULL);
sharkd_session_process_tap_stats_node_cb(&st->root);
- printf("},");
-}
-struct sharkd_conv_tap_data
-{
- const char *type;
- conv_hash_t hash;
- gboolean resolve_name;
- gboolean resolve_port;
-};
+ json_dumper_end_object(&dumper);
+}
-static int
-sharkd_session_geoip_addr(address *addr, const char *suffix)
+static void
+sharkd_session_free_tap_stats_cb(void *psp)
{
- int with_geoip = 0;
+ stats_tree *st = (stats_tree *) psp;
- (void) addr;
- (void) suffix;
+ stats_tree_free(st);
+}
-#ifdef HAVE_GEOIP
- if (addr->type == AT_IPv4)
- {
- guint32 ip = pntoh32(addr->data);
+struct sharkd_expert_tap
+{
+ GSList *details;
+ GStringChunk *text;
+};
- guint num_dbs = geoip_db_num_dbs();
- guint dbnum;
+/**
+ * sharkd_session_process_tap_expert_cb()
+ *
+ * Output expert tap:
+ *
+ * (m) tap - tap name
+ * (m) type:expert - tap output type
+ * (m) details - array of object with attributes:
+ * (m) f - frame number, which generated expert information
+ * (o) s - severity
+ * (o) g - group
+ * (m) m - expert message
+ * (o) p - protocol
+ */
+static void
+sharkd_session_process_tap_expert_cb(void *tapdata)
+{
+ struct sharkd_expert_tap *etd = (struct sharkd_expert_tap *) tapdata;
+ GSList *list;
- for (dbnum = 0; dbnum < num_dbs; dbnum++)
- {
- const char *geoip_key = NULL;
- char *geoip_val;
+ json_dumper_begin_object(&dumper);
- int db_type = geoip_db_type(dbnum);
+ sharkd_json_value_string("tap", "expert");
+ sharkd_json_value_string("type", "expert");
- switch (db_type)
- {
- case GEOIP_COUNTRY_EDITION:
- geoip_key = "geoip_country";
- break;
+ sharkd_json_array_open("details");
+ for (list = etd->details; list; list = list->next)
+ {
+ expert_info_t *ei = (expert_info_t *) list->data;
+ const char *tmp;
- case GEOIP_CITY_EDITION_REV0:
- case GEOIP_CITY_EDITION_REV1:
- geoip_key = "geoip_city";
- break;
+ json_dumper_begin_object(&dumper);
- case GEOIP_ORG_EDITION:
- geoip_key = "geoip_org";
- break;
+ sharkd_json_value_anyf("f", "%u", ei->packet_num);
- case GEOIP_ISP_EDITION:
- geoip_key = "geoip_isp";
- break;
+ tmp = try_val_to_str(ei->severity, expert_severity_vals);
+ if (tmp)
+ sharkd_json_value_string("s", tmp);
- case GEOIP_ASNUM_EDITION:
- geoip_key = "geoip_as";
- break;
+ tmp = try_val_to_str(ei->group, expert_group_vals);
+ if (tmp)
+ sharkd_json_value_string("g", tmp);
- case WS_LAT_FAKE_EDITION:
- geoip_key = "geoip_lat";
- break;
+ sharkd_json_value_string("m", ei->summary);
- case WS_LON_FAKE_EDITION:
- geoip_key = "geoip_lon";
- break;
- }
+ if (ei->protocol)
+ sharkd_json_value_string("p", ei->protocol);
- if (geoip_key && (geoip_val = geoip_db_lookup_ipv4(dbnum, ip, NULL)))
- {
- printf(",\"%s%s\":", geoip_key, suffix);
- json_puts_string(geoip_val);
- with_geoip = 1;
- }
- }
+ json_dumper_end_object(&dumper);
}
-#ifdef HAVE_GEOIP_V6
- if (addr->type == AT_IPv6)
+ sharkd_json_array_close();
+
+ json_dumper_end_object(&dumper);
+}
+
+static tap_packet_status
+sharkd_session_packet_tap_expert_cb(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *pointer)
+{
+ struct sharkd_expert_tap *etd = (struct sharkd_expert_tap *) tapdata;
+ const expert_info_t *ei = (const expert_info_t *) pointer;
+ expert_info_t *ei_copy;
+
+ if (ei == NULL)
+ return TAP_PACKET_DONT_REDRAW;
+
+ ei_copy = g_new(expert_info_t, 1);
+ /* Note: this is a shallow copy */
+ *ei_copy = *ei;
+
+ /* ei->protocol, ei->summary might be allocated in packet scope, make a copy. */
+ ei_copy->protocol = g_string_chunk_insert_const(etd->text, ei_copy->protocol);
+ ei_copy->summary = g_string_chunk_insert_const(etd->text, ei_copy->summary);
+
+ etd->details = g_slist_prepend(etd->details, ei_copy);
+
+ return TAP_PACKET_REDRAW;
+}
+
+static void
+sharkd_session_free_tap_expert_cb(void *tapdata)
+{
+ struct sharkd_expert_tap *etd = (struct sharkd_expert_tap *) tapdata;
+
+ g_slist_free_full(etd->details, g_free);
+ g_string_chunk_free(etd->text);
+ g_free(etd);
+}
+
+/**
+ * sharkd_session_process_tap_flow_cb()
+ *
+ * Output flow tap:
+ * (m) tap - tap name
+ * (m) type:flow - tap output type
+ * (m) nodes - array of strings with node address
+ * (m) flows - array of object with attributes:
+ * (m) t - frame time string
+ * (m) n - array of two numbers with source node index and destination node index
+ * (m) pn - array of two numbers with source and destination port
+ * (o) c - comment
+ */
+static void
+sharkd_session_process_tap_flow_cb(void *tapdata)
+{
+ seq_analysis_info_t *graph_analysis = (seq_analysis_info_t *) tapdata;
+ GList *flow_list;
+ guint i;
+
+ sequence_analysis_get_nodes(graph_analysis);
+
+ json_dumper_begin_object(&dumper);
+ sharkd_json_value_stringf("tap", "seqa:%s", graph_analysis->name);
+ sharkd_json_value_string("type", "flow");
+
+ sharkd_json_array_open("nodes");
+ for (i = 0; i < graph_analysis->num_nodes; i++)
{
- const struct e_in6_addr *ip6 = (const struct e_in6_addr *) addr->data;
+ char *addr_str;
- guint num_dbs = geoip_db_num_dbs();
- guint dbnum;
+ addr_str = address_to_display(NULL, &(graph_analysis->nodes[i]));
+ sharkd_json_value_string(NULL, addr_str);
+ wmem_free(NULL, addr_str);
+ }
+ sharkd_json_array_close();
- for (dbnum = 0; dbnum < num_dbs; dbnum++)
- {
- const char *geoip_key = NULL;
- char *geoip_val;
+ sharkd_json_array_open("flows");
+ flow_list = g_queue_peek_nth_link(graph_analysis->items, 0);
+ while (flow_list)
+ {
+ seq_analysis_item_t *sai = (seq_analysis_item_t *) flow_list->data;
- int db_type = geoip_db_type(dbnum);
+ flow_list = g_list_next(flow_list);
- switch (db_type)
- {
- case GEOIP_COUNTRY_EDITION_V6:
- geoip_key = "geoip_country";
- break;
-#if NUM_DB_TYPES > 31
- case GEOIP_CITY_EDITION_REV0_V6:
- case GEOIP_CITY_EDITION_REV1_V6:
- geoip_key = "geoip_city";
- break;
+ if (!sai->display)
+ continue;
- case GEOIP_ORG_EDITION_V6:
- geoip_key = "geoip_org";
- break;
+ json_dumper_begin_object(&dumper);
- case GEOIP_ISP_EDITION_V6:
- geoip_key = "geoip_isp";
- break;
+ sharkd_json_value_string("t", sai->time_str);
+ sharkd_json_value_anyf("n", "[%u,%u]", sai->src_node, sai->dst_node);
+ sharkd_json_value_anyf("pn", "[%u,%u]", sai->port_src, sai->port_dst);
- case GEOIP_ASNUM_EDITION_V6:
- geoip_key = "geoip_as";
- break;
-#endif /* DB_NUM_TYPES */
- case WS_LAT_FAKE_EDITION:
- geoip_key = "geoip_lat";
- break;
+ if (sai->comment)
+ sharkd_json_value_string("c", sai->comment);
- case WS_LON_FAKE_EDITION:
- geoip_key = "geoip_lon";
- break;
- }
+ json_dumper_end_object(&dumper);
+ }
+ sharkd_json_array_close();
- if (geoip_key && (geoip_val = geoip_db_lookup_ipv6(dbnum, *ip6, NULL)))
- {
- printf(",\"%s%s\":", geoip_key, suffix);
- json_puts_string(geoip_val);
- with_geoip = 1;
- }
- }
+ json_dumper_end_object(&dumper);
+}
+
+static void
+sharkd_session_free_tap_flow_cb(void *tapdata)
+{
+ seq_analysis_info_t *graph_analysis = (seq_analysis_info_t *) tapdata;
+
+ sequence_analysis_info_free(graph_analysis);
+}
+
+struct sharkd_conv_tap_data
+{
+ const char *type;
+ conv_hash_t hash;
+ gboolean resolve_name;
+ gboolean resolve_port;
+};
+
+static gboolean
+sharkd_session_geoip_addr(address *addr, const char *suffix)
+{
+ const mmdb_lookup_t *lookup = NULL;
+ gboolean with_geoip = FALSE;
+ char json_key[64];
+
+ if (addr->type == AT_IPv4)
+ {
+ guint32 ip;
+
+ memcpy(&ip, addr->data, 4);
+ lookup = maxmind_db_lookup_ipv4(ip);
}
-#endif
-#endif
+ else if (addr->type == AT_IPv6)
+ {
+ const ws_in6_addr *ip6 = (const ws_in6_addr *) addr->data;
+
+ lookup = maxmind_db_lookup_ipv6(ip6);
+ }
+
+ if (!lookup || !lookup->found)
+ return FALSE;
+
+ if (lookup->country)
+ {
+ snprintf(json_key, sizeof(json_key), "geoip_country%s", suffix);
+ sharkd_json_value_string(json_key, lookup->country);
+ with_geoip = TRUE;
+ }
+
+ if (lookup->country_iso)
+ {
+ snprintf(json_key, sizeof(json_key), "geoip_country_iso%s", suffix);
+ sharkd_json_value_string(json_key, lookup->country_iso);
+ with_geoip = TRUE;
+ }
+
+ if (lookup->city)
+ {
+ snprintf(json_key, sizeof(json_key), "geoip_city%s", suffix);
+ sharkd_json_value_string(json_key, lookup->city);
+ with_geoip = TRUE;
+ }
+
+ if (lookup->as_org)
+ {
+ snprintf(json_key, sizeof(json_key), "geoip_as_org%s", suffix);
+ sharkd_json_value_string(json_key, lookup->as_org);
+ with_geoip = TRUE;
+ }
+
+ if (lookup->as_number > 0)
+ {
+ snprintf(json_key, sizeof(json_key), "geoip_as%s", suffix);
+ sharkd_json_value_anyf(json_key, "%u", lookup->as_number);
+ with_geoip = TRUE;
+ }
+
+ if (lookup->latitude >= -90.0 && lookup->latitude <= 90.0)
+ {
+ snprintf(json_key, sizeof(json_key), "geoip_lat%s", suffix);
+ sharkd_json_value_anyf(json_key, "%f", lookup->latitude);
+ with_geoip = TRUE;
+ }
+
+ if (lookup->longitude >= -180.0 && lookup->longitude <= 180.0)
+ {
+ snprintf(json_key, sizeof(json_key), "geoip_lon%s", suffix);
+ sharkd_json_value_anyf(json_key, "%f", lookup->longitude);
+ with_geoip = TRUE;
+ }
+
return with_geoip;
}
+struct sharkd_analyse_rtp_items
+{
+ guint32 frame_num;
+ guint32 sequence_num;
+
+ double delta;
+ double jitter;
+ double skew;
+ double bandwidth;
+ gboolean marker;
+
+ double arrive_offset;
+
+ /* from tap_rtp_stat_t */
+ guint32 flags;
+ guint16 pt;
+};
+
+struct sharkd_analyse_rtp
+{
+ const char *tap_name;
+ rtpstream_id_t id;
+
+ GSList *packets;
+ double start_time;
+ tap_rtp_stat_t statinfo;
+};
+
+static void
+sharkd_session_process_tap_rtp_free_cb(void *tapdata)
+{
+ struct sharkd_analyse_rtp *rtp_req = (struct sharkd_analyse_rtp *) tapdata;
+
+ g_slist_free_full(rtp_req->packets, g_free);
+ g_free(rtp_req);
+}
+
+static tap_packet_status
+sharkd_session_packet_tap_rtp_analyse_cb(void *tapdata, packet_info *pinfo, epan_dissect_t *edt _U_, const void *pointer)
+{
+ struct sharkd_analyse_rtp *rtp_req = (struct sharkd_analyse_rtp *) tapdata;
+ const struct _rtp_info *rtp_info = (const struct _rtp_info *) pointer;
+
+ if (rtpstream_id_equal_pinfo_rtp_info(&rtp_req->id, pinfo, rtp_info))
+ {
+ tap_rtp_stat_t *statinfo = &(rtp_req->statinfo);
+ struct sharkd_analyse_rtp_items *item;
+
+ rtppacket_analyse(statinfo, pinfo, rtp_info);
+
+ item = (struct sharkd_analyse_rtp_items *) g_malloc(sizeof(struct sharkd_analyse_rtp_items));
+
+ if (!rtp_req->packets)
+ rtp_req->start_time = nstime_to_sec(&pinfo->abs_ts);
+
+ item->frame_num = pinfo->num;
+ item->sequence_num = rtp_info->info_seq_num;
+ item->delta = (statinfo->flags & STAT_FLAG_FIRST) ? 0.0 : statinfo->delta;
+ item->jitter = (statinfo->flags & STAT_FLAG_FIRST) ? 0.0 : statinfo->jitter;
+ item->skew = (statinfo->flags & STAT_FLAG_FIRST) ? 0.0 : statinfo->skew;
+ item->bandwidth = statinfo->bandwidth;
+ item->marker = rtp_info->info_marker_set ? TRUE : FALSE;
+ item->arrive_offset= nstime_to_sec(&pinfo->abs_ts) - rtp_req->start_time;
+
+ item->flags = statinfo->flags;
+ item->pt = statinfo->pt;
+
+ /* XXX, O(n) optimize */
+ rtp_req->packets = g_slist_append(rtp_req->packets, item);
+ }
+
+ return TAP_PACKET_REDRAW;
+}
+
+/**
+ * sharkd_session_process_tap_rtp_analyse_cb()
+ *
+ * Output rtp analyse tap:
+ * (m) tap - tap name
+ * (m) type - tap output type
+ * (m) ssrc - RTP SSRC
+ * (m) max_delta - Max delta (ms)
+ * (m) max_delta_nr - Max delta packet #
+ * (m) max_jitter - Max jitter (ms)
+ * (m) mean_jitter - Mean jitter (ms)
+ * (m) max_skew - Max skew (ms)
+ * (m) total_nr - Total number of RTP packets
+ * (m) seq_err - Number of sequence errors
+ * (m) duration - Duration (ms)
+ * (m) items - array of object with attributes:
+ * (m) f - frame number
+ * (m) o - arrive offset
+ * (m) sn - sequence number
+ * (m) d - delta
+ * (m) j - jitter
+ * (m) sk - skew
+ * (m) bw - bandwidth
+ * (o) s - status string
+ * (o) t - status type
+ * (o) mark - rtp mark
+ */
+static void
+sharkd_session_process_tap_rtp_analyse_cb(void *tapdata)
+{
+ const int RTP_TYPE_CN = 1;
+ const int RTP_TYPE_ERROR = 2;
+ const int RTP_TYPE_WARN = 3;
+ const int RTP_TYPE_PT_EVENT = 4;
+
+ const struct sharkd_analyse_rtp *rtp_req = (struct sharkd_analyse_rtp *) tapdata;
+ const tap_rtp_stat_t *statinfo = &rtp_req->statinfo;
+
+ GSList *l;
+
+ json_dumper_begin_object(&dumper);
+
+ sharkd_json_value_string("tap", rtp_req->tap_name);
+ sharkd_json_value_string("type", "rtp-analyse");
+ sharkd_json_value_anyf("ssrc", "%u", rtp_req->id.ssrc);
+
+ sharkd_json_value_anyf("max_delta", "%f", statinfo->max_delta);
+ sharkd_json_value_anyf("max_delta_nr", "%u", statinfo->max_nr);
+ sharkd_json_value_anyf("max_jitter", "%f", statinfo->max_jitter);
+ sharkd_json_value_anyf("mean_jitter", "%f", statinfo->mean_jitter);
+ sharkd_json_value_anyf("max_skew", "%f", statinfo->max_skew);
+ sharkd_json_value_anyf("total_nr", "%u", statinfo->total_nr);
+ sharkd_json_value_anyf("seq_err", "%u", statinfo->sequence);
+ sharkd_json_value_anyf("duration", "%f", statinfo->time - statinfo->start_time);
+
+ sharkd_json_array_open("items");
+ for (l = rtp_req->packets; l; l = l->next)
+ {
+ struct sharkd_analyse_rtp_items *item = (struct sharkd_analyse_rtp_items *) l->data;
+
+ json_dumper_begin_object(&dumper);
+
+ sharkd_json_value_anyf("f", "%u", item->frame_num);
+ sharkd_json_value_anyf("o", "%.9f", item->arrive_offset);
+ sharkd_json_value_anyf("sn", "%u", item->sequence_num);
+ sharkd_json_value_anyf("d", "%.2f", item->delta);
+ sharkd_json_value_anyf("j", "%.2f", item->jitter);
+ sharkd_json_value_anyf("sk", "%.2f", item->skew);
+ sharkd_json_value_anyf("bw", "%.2f", item->bandwidth);
+
+ if (item->pt == PT_CN)
+ {
+ sharkd_json_value_string("s", "Comfort noise (PT=13, RFC 3389)");
+ sharkd_json_value_anyf("t", "%d", RTP_TYPE_CN);
+ }
+ else if (item->pt == PT_CN_OLD)
+ {
+ sharkd_json_value_string("s", "Comfort noise (PT=19, reserved)");
+ sharkd_json_value_anyf("t", "%d", RTP_TYPE_CN);
+ }
+ else if (item->flags & STAT_FLAG_WRONG_SEQ)
+ {
+ sharkd_json_value_string("s", "Wrong sequence number");
+ sharkd_json_value_anyf("t", "%d", RTP_TYPE_ERROR);
+ }
+ else if (item->flags & STAT_FLAG_DUP_PKT)
+ {
+ sharkd_json_value_string("s", "Suspected duplicate (MAC address) only delta time calculated");
+ sharkd_json_value_anyf("t", "%d", RTP_TYPE_WARN);
+ }
+ else if (item->flags & STAT_FLAG_REG_PT_CHANGE)
+ {
+ sharkd_json_value_stringf("s", "Payload changed to PT=%u%s",
+ item->pt,
+ (item->flags & STAT_FLAG_PT_T_EVENT) ? " telephone/event" : "");
+ sharkd_json_value_anyf("t", "%d", RTP_TYPE_WARN);
+ }
+ else if (item->flags & STAT_FLAG_WRONG_TIMESTAMP)
+ {
+ sharkd_json_value_string("s", "Incorrect timestamp");
+ sharkd_json_value_anyf("t", "%d", RTP_TYPE_WARN);
+ }
+ else if ((item->flags & STAT_FLAG_PT_CHANGE)
+ && !(item->flags & STAT_FLAG_FIRST)
+ && !(item->flags & STAT_FLAG_PT_CN)
+ && (item->flags & STAT_FLAG_FOLLOW_PT_CN)
+ && !(item->flags & STAT_FLAG_MARKER))
+ {
+ sharkd_json_value_string("s", "Marker missing?");
+ sharkd_json_value_anyf("t", "%d", RTP_TYPE_WARN);
+ }
+ else if (item->flags & STAT_FLAG_PT_T_EVENT)
+ {
+ sharkd_json_value_stringf("s", "PT=%u telephone/event", item->pt);
+ sharkd_json_value_anyf("t", "%d", RTP_TYPE_PT_EVENT);
+ }
+ else if (item->flags & STAT_FLAG_MARKER)
+ {
+ sharkd_json_value_anyf("t", "%d", RTP_TYPE_WARN);
+ }
+
+ if (item->marker)
+ sharkd_json_value_anyf("mark", "1");
+
+ json_dumper_end_object(&dumper);
+ }
+ sharkd_json_array_close();
+
+ json_dumper_end_object(&dumper);
+}
+
/**
* sharkd_session_process_tap_conv_cb()
*
* (m) type - tap output type
* (m) proto - protocol short name
* (o) filter - filter string
+ * (o) geoip - whether GeoIP information is available, boolean
*
* (o) convs - array of object with attributes:
* (m) saddr - source address
* (m) rxb - RX bytes
* (m) start - (relative) first packet time
* (m) stop - (relative) last packet time
+ * (o) filter - conversation filter
*
* (o) hosts - array of object with attributes:
* (m) host - host address
int with_geoip = 0;
+ json_dumper_begin_object(&dumper);
+ sharkd_json_value_string("tap", iu->type);
+
if (!strncmp(iu->type, "conv:", 5))
{
- printf("{\"tap\":\"%s\",\"type\":\"conv\"", iu->type);
- printf(",\"convs\":[");
+ sharkd_json_value_string("type", "conv");
+ sharkd_json_array_open("convs");
proto = iu->type + 5;
}
else if (!strncmp(iu->type, "endpt:", 6))
{
- printf("{\"tap\":\"%s\",\"type\":\"host\"", iu->type);
- printf(",\"hosts\":[");
+ sharkd_json_value_string("type", "host");
+ sharkd_json_array_open("hosts");
proto = iu->type + 6;
}
else
{
- printf("{\"tap\":\"%s\",\"type\":\"err\"", iu->type);
+ sharkd_json_value_string("type", "err");
proto = "";
}
char *src_port, *dst_port;
char *filter_str;
- printf("%s{", i ? "," : "");
+ json_dumper_begin_object(&dumper);
- printf("\"saddr\":\"%s\"", (src_addr = get_conversation_address(NULL, &iui->src_address, iu->resolve_name)));
- printf(",\"daddr\":\"%s\"", (dst_addr = get_conversation_address(NULL, &iui->dst_address, iu->resolve_name)));
+ sharkd_json_value_string("saddr", (src_addr = get_conversation_address(NULL, &iui->src_address, iu->resolve_name)));
+ sharkd_json_value_string("daddr", (dst_addr = get_conversation_address(NULL, &iui->dst_address, iu->resolve_name)));
if (proto_with_port)
{
- printf(",\"sport\":\"%s\"", (src_port = get_conversation_port(NULL, iui->src_port, iui->ptype, iu->resolve_port)));
- printf(",\"dport\":\"%s\"", (dst_port = get_conversation_port(NULL, iui->dst_port, iui->ptype, iu->resolve_port)));
+ sharkd_json_value_string("sport", (src_port = get_conversation_port(NULL, iui->src_port, iui->etype, iu->resolve_port)));
+ sharkd_json_value_string("dport", (dst_port = get_conversation_port(NULL, iui->dst_port, iui->etype, iu->resolve_port)));
wmem_free(NULL, src_port);
wmem_free(NULL, dst_port);
}
- printf(",\"rxf\":%" G_GUINT64_FORMAT, iui->rx_frames);
- printf(",\"rxb\":%" G_GUINT64_FORMAT, iui->rx_bytes);
+ sharkd_json_value_anyf("rxf", "%" G_GUINT64_FORMAT, iui->rx_frames);
+ sharkd_json_value_anyf("rxb", "%" G_GUINT64_FORMAT, iui->rx_bytes);
- printf(",\"txf\":%" G_GUINT64_FORMAT, iui->tx_frames);
- printf(",\"txb\":%" G_GUINT64_FORMAT, iui->tx_bytes);
+ sharkd_json_value_anyf("txf", "%" G_GUINT64_FORMAT, iui->tx_frames);
+ sharkd_json_value_anyf("txb", "%" G_GUINT64_FORMAT, iui->tx_bytes);
- printf(",\"start\":%.9f", nstime_to_sec(&iui->start_time));
- printf(",\"stop\":%.9f", nstime_to_sec(&iui->stop_time));
+ sharkd_json_value_anyf("start", "%.9f", nstime_to_sec(&iui->start_time));
+ sharkd_json_value_anyf("stop", "%.9f", nstime_to_sec(&iui->stop_time));
filter_str = get_conversation_filter(iui, CONV_DIR_A_TO_FROM_B);
if (filter_str)
{
- printf(",\"filter\":\"%s\"", filter_str);
+ sharkd_json_value_string("filter", filter_str);
g_free(filter_str);
}
if (sharkd_session_geoip_addr(&(iui->dst_address), "2"))
with_geoip = 1;
- printf("}");
+ json_dumper_end_object(&dumper);
}
}
else if (iu->hash.conv_array != NULL && !strncmp(iu->type, "endpt:", 6))
char *host_str, *port_str;
char *filter_str;
- printf("%s{", i ? "," : "");
+ json_dumper_begin_object(&dumper);
- printf("\"host\":\"%s\"", (host_str = get_conversation_address(NULL, &host->myaddress, iu->resolve_name)));
+ sharkd_json_value_string("host", (host_str = get_conversation_address(NULL, &host->myaddress, iu->resolve_name)));
if (proto_with_port)
{
- printf(",\"port\":\"%s\"", (port_str = get_conversation_port(NULL, host->port, host->ptype, iu->resolve_port)));
+ sharkd_json_value_string("port", (port_str = get_conversation_port(NULL, host->port, host->etype, iu->resolve_port)));
wmem_free(NULL, port_str);
}
- printf(",\"rxf\":%" G_GUINT64_FORMAT, host->rx_frames);
- printf(",\"rxb\":%" G_GUINT64_FORMAT, host->rx_bytes);
+ sharkd_json_value_anyf("rxf", "%" G_GUINT64_FORMAT, host->rx_frames);
+ sharkd_json_value_anyf("rxb", "%" G_GUINT64_FORMAT, host->rx_bytes);
- printf(",\"txf\":%" G_GUINT64_FORMAT, host->tx_frames);
- printf(",\"txb\":%" G_GUINT64_FORMAT, host->tx_bytes);
+ sharkd_json_value_anyf("txf", "%" G_GUINT64_FORMAT, host->tx_frames);
+ sharkd_json_value_anyf("txb", "%" G_GUINT64_FORMAT, host->tx_bytes);
filter_str = get_hostlist_filter(host);
if (filter_str)
{
- printf(",\"filter\":\"%s\"", filter_str);
+ sharkd_json_value_string("filter", filter_str);
g_free(filter_str);
}
if (sharkd_session_geoip_addr(&(host->myaddress), ""))
with_geoip = 1;
- printf("}");
+ json_dumper_end_object(&dumper);
}
}
+ sharkd_json_array_close();
+
+ sharkd_json_value_string("proto", proto);
+ sharkd_json_value_anyf("geoip", with_geoip ? "true" : "false");
+
+ json_dumper_end_object(&dumper);
+}
+
+static void
+sharkd_session_free_tap_conv_cb(void *arg)
+{
+ conv_hash_t *hash = (conv_hash_t *) arg;
+ struct sharkd_conv_tap_data *iu = (struct sharkd_conv_tap_data *) hash->user_data;
+
+ if (!strncmp(iu->type, "conv:", 5))
+ {
+ reset_conversation_table_data(hash);
+ }
+ else if (!strncmp(iu->type, "endpt:", 6))
+ {
+ reset_hostlist_table_data(hash);
+ }
- printf("],\"proto\":\"%s\",\"geoip\":%s},", proto, with_geoip ? "true" : "false");
+ g_free(iu);
}
/**
- * sharkd_session_process_tap()
- *
- * Process tap request
- *
- * Input:
- * (m) tap0 - First tap request
- * (o) tap1...tap15 - Other tap requests
+ * sharkd_session_process_tap_nstat_cb()
*
- * Output object with attributes:
- * (m) taps - array of object with attributes:
- * (m) tap - tap name
- * (m) type - tap output type
- * ...
- * for type:stats see sharkd_session_process_tap_stats_cb()
- * for type:conv see sharkd_session_process_tap_conv_cb()
- * for type:host see sharkd_session_process_tap_conv_cb()
+ * Output nstat tap:
+ * (m) tap - tap name
+ * (m) type - tap output type
+ * (m) fields: array of objects with attributes:
+ * (m) c - name
*
- * (m) err - error code
+ * (m) tables: array of object with attributes:
+ * (m) t - table title
+ * (m) i - array of items
*/
static void
-sharkd_session_process_tap(char *buf, const jsmntok_t *tokens, int count)
+sharkd_session_process_tap_nstat_cb(void *arg)
{
- void *taps_data[16];
- int taps_count = 0;
- int i;
+ stat_data_t *stat_data = (stat_data_t *) arg;
+ guint i, j, k;
- for (i = 0; i < 16; i++)
+ json_dumper_begin_object(&dumper);
+ sharkd_json_value_stringf("tap", "nstat:%s", stat_data->stat_tap_data->cli_string);
+ sharkd_json_value_string("type", "nstat");
+
+ sharkd_json_array_open("fields");
+ for (i = 0; i < stat_data->stat_tap_data->nfields; i++)
{
- char tapbuf[32];
- const char *tok_tap;
+ stat_tap_table_item *field = &(stat_data->stat_tap_data->fields[i]);
- tap_packet_cb tap_func = NULL;
- void *tap_data = NULL;
- const char *tap_filter = "";
- GString *tap_error = NULL;
+ json_dumper_begin_object(&dumper);
+ sharkd_json_value_string("c", field->column_name);
+ json_dumper_end_object(&dumper);
+ }
+ sharkd_json_array_close();
- taps_data[i] = NULL;
+ sharkd_json_array_open("tables");
+ for (i = 0; i < stat_data->stat_tap_data->tables->len; i++)
+ {
+ stat_tap_table *table = g_array_index(stat_data->stat_tap_data->tables, stat_tap_table *, i);
- ws_snprintf(tapbuf, sizeof(tapbuf), "tap%d", i);
- tok_tap = json_find_attr(buf, tokens, count, tapbuf);
- if (!tok_tap)
- break;
+ json_dumper_begin_object(&dumper);
- if (!strncmp(tok_tap, "stat:", 5))
+ sharkd_json_value_string("t", table->title);
+
+ sharkd_json_array_open("i");
+ for (j = 0; j < table->num_elements; j++)
{
- stats_tree_cfg *cfg = stats_tree_get_cfg_by_abbr(tok_tap + 5);
- stats_tree *st;
+ stat_tap_table_item_type *field_data;
- if (!cfg)
- {
- fprintf(stderr, "sharkd_session_process_tap() stat %s not found\n", tok_tap + 5);
+ field_data = stat_tap_get_field_data(table, j, 0);
+ if (field_data == NULL || field_data->type == TABLE_ITEM_NONE) /* Nothing for us here */
continue;
- }
- st = stats_tree_new(cfg, NULL, tap_filter);
+ sharkd_json_array_open(NULL);
+ for (k = 0; k < table->num_fields; k++)
+ {
+ field_data = stat_tap_get_field_data(table, j, k);
- tap_error = register_tap_listener(st->cfg->tapname, st, st->filter, st->cfg->flags, stats_tree_reset, stats_tree_packet, sharkd_session_process_tap_stats_cb);
+ switch (field_data->type)
+ {
+ case TABLE_ITEM_UINT:
+ sharkd_json_value_anyf(NULL, "%u", field_data->value.uint_value);
+ break;
- tap_data = st;
+ case TABLE_ITEM_INT:
+ sharkd_json_value_anyf(NULL, "%d", field_data->value.int_value);
+ break;
- if (!tap_error && cfg->init)
- cfg->init(st);
- }
- else if (!strncmp(tok_tap, "conv:", 5) || !strncmp(tok_tap, "endpt:", 6))
- {
- struct register_ct *ct = NULL;
- const char *ct_tapname;
- struct sharkd_conv_tap_data *ct_data;
+ case TABLE_ITEM_STRING:
+ sharkd_json_value_string(NULL, field_data->value.string_value);
+ break;
- if (!strncmp(tok_tap, "conv:", 5))
- {
- ct = _get_conversation_table_by_name(tok_tap + 5);
+ case TABLE_ITEM_FLOAT:
+ sharkd_json_value_anyf(NULL, "%f", field_data->value.float_value);
+ break;
- if (!ct || !(tap_func = get_conversation_packet_func(ct)))
- {
- fprintf(stderr, "sharkd_session_process_tap() conv %s not found\n", tok_tap + 5);
- continue;
+ case TABLE_ITEM_ENUM:
+ sharkd_json_value_anyf(NULL, "%d", field_data->value.enum_value);
+ break;
+
+ case TABLE_ITEM_NONE:
+ sharkd_json_value_anyf(NULL, "null");
+ break;
+ }
+ }
+
+ sharkd_json_array_close();
+ }
+ sharkd_json_array_close();
+ json_dumper_end_object(&dumper);
+ }
+ sharkd_json_array_close();
+
+ json_dumper_end_object(&dumper);
+}
+
+static void
+sharkd_session_free_tap_nstat_cb(void *arg)
+{
+ stat_data_t *stat_data = (stat_data_t *) arg;
+
+ free_stat_tables(stat_data->stat_tap_data);
+}
+
+/**
+ * sharkd_session_process_tap_rtd_cb()
+ *
+ * Output rtd tap:
+ * (m) tap - tap name
+ * (m) type - tap output type
+ * (m) stats - statistics rows - array object with attributes:
+ * (m) type - statistic name
+ * (m) num - number of messages
+ * (m) min - minimum SRT time
+ * (m) max - maximum SRT time
+ * (m) tot - total SRT time
+ * (m) min_frame - minimal SRT
+ * (m) max_frame - maximum SRT
+ * (o) open_req - Open Requests
+ * (o) disc_rsp - Discarded Responses
+ * (o) req_dup - Duplicated Requests
+ * (o) rsp_dup - Duplicated Responses
+ * (o) open_req - Open Requests
+ * (o) disc_rsp - Discarded Responses
+ * (o) req_dup - Duplicated Requests
+ * (o) rsp_dup - Duplicated Responses
+ */
+static void
+sharkd_session_process_tap_rtd_cb(void *arg)
+{
+ rtd_data_t *rtd_data = (rtd_data_t *) arg;
+ register_rtd_t *rtd = (register_rtd_t *) rtd_data->user_data;
+
+ guint i, j;
+
+ const char *filter = proto_get_protocol_filter_name(get_rtd_proto_id(rtd));
+
+ /* XXX, some dissectors are having single table and multiple timestats (mgcp, megaco),
+ * some multiple table and single timestat (radius, h225)
+ * and it seems that value_string is used one for timestamp-ID, other one for table-ID
+ * I wonder how it will gonna work with multiple timestats and multiple tables...
+ * (for usage grep for: register_rtd_table)
+ */
+ const value_string *vs = get_rtd_value_string(rtd);
+
+ json_dumper_begin_object(&dumper);
+ sharkd_json_value_stringf("tap", "rtd:%s", filter);
+ sharkd_json_value_string("type", "rtd");
+
+ if (rtd_data->stat_table.num_rtds == 1)
+ {
+ const rtd_timestat *ms = &rtd_data->stat_table.time_stats[0];
+
+ sharkd_json_value_anyf("open_req", "%u", ms->open_req_num);
+ sharkd_json_value_anyf("disc_rsp", "%u", ms->disc_rsp_num);
+ sharkd_json_value_anyf("req_dup", "%u", ms->req_dup_num);
+ sharkd_json_value_anyf("rsp_dup", "%u", ms->rsp_dup_num);
+ }
+
+ sharkd_json_array_open("stats");
+ for (i = 0; i < rtd_data->stat_table.num_rtds; i++)
+ {
+ const rtd_timestat *ms = &rtd_data->stat_table.time_stats[i];
+
+ for (j = 0; j < ms->num_timestat; j++)
+ {
+ const char *type_str;
+
+ if (ms->rtd[j].num == 0)
+ continue;
+
+ json_dumper_begin_object(&dumper);
+
+ if (rtd_data->stat_table.num_rtds == 1)
+ type_str = val_to_str_const(j, vs, "Other"); /* 1 table - description per row */
+ else
+ type_str = val_to_str_const(i, vs, "Other"); /* multiple table - description per table */
+ sharkd_json_value_string("type", type_str);
+
+ sharkd_json_value_anyf("num", "%u", ms->rtd[j].num);
+ sharkd_json_value_anyf("min", "%.9f", nstime_to_sec(&(ms->rtd[j].min)));
+ sharkd_json_value_anyf("max", "%.9f", nstime_to_sec(&(ms->rtd[j].max)));
+ sharkd_json_value_anyf("tot", "%.9f", nstime_to_sec(&(ms->rtd[j].tot)));
+ sharkd_json_value_anyf("min_frame", "%u", ms->rtd[j].min_num);
+ sharkd_json_value_anyf("max_frame", "%u", ms->rtd[j].max_num);
+
+ if (rtd_data->stat_table.num_rtds != 1)
+ {
+ /* like in tshark, display it on every row */
+ sharkd_json_value_anyf("open_req", "%u", ms->open_req_num);
+ sharkd_json_value_anyf("disc_rsp", "%u", ms->disc_rsp_num);
+ sharkd_json_value_anyf("req_dup", "%u", ms->req_dup_num);
+ sharkd_json_value_anyf("rsp_dup", "%u", ms->rsp_dup_num);
+ }
+
+ json_dumper_end_object(&dumper);
+ }
+ }
+ sharkd_json_array_close();
+
+ json_dumper_end_object(&dumper);
+}
+
+static void
+sharkd_session_free_tap_rtd_cb(void *arg)
+{
+ rtd_data_t *rtd_data = (rtd_data_t *) arg;
+
+ free_rtd_table(&rtd_data->stat_table);
+ g_free(rtd_data);
+}
+
+/**
+ * sharkd_session_process_tap_srt_cb()
+ *
+ * Output srt tap:
+ * (m) tap - tap name
+ * (m) type - tap output type
+ *
+ * (m) tables - array of object with attributes:
+ * (m) n - table name
+ * (m) f - table filter
+ * (o) c - table column name
+ * (m) r - table rows - array object with attributes:
+ * (m) n - row name
+ * (m) idx - procedure index
+ * (m) num - number of events
+ * (m) min - minimum SRT time
+ * (m) max - maximum SRT time
+ * (m) tot - total SRT time
+ */
+static void
+sharkd_session_process_tap_srt_cb(void *arg)
+{
+ srt_data_t *srt_data = (srt_data_t *) arg;
+ register_srt_t *srt = (register_srt_t *) srt_data->user_data;
+
+ const char *filter = proto_get_protocol_filter_name(get_srt_proto_id(srt));
+
+ guint i;
+
+ json_dumper_begin_object(&dumper);
+ sharkd_json_value_stringf("tap", "srt:%s", filter);
+ sharkd_json_value_string("type", "srt");
+
+ sharkd_json_array_open("tables");
+ for (i = 0; i < srt_data->srt_array->len; i++)
+ {
+ /* SRT table */
+ srt_stat_table *rst = g_array_index(srt_data->srt_array, srt_stat_table *, i);
+
+ int j;
+
+ json_dumper_begin_object(&dumper);
+
+ if (rst->name)
+ sharkd_json_value_string("n", rst->name);
+ else if (rst->short_name)
+ sharkd_json_value_string("n", rst->short_name);
+ else
+ sharkd_json_value_stringf("n", "table%u", i);
+
+ if (rst->filter_string)
+ sharkd_json_value_string("f", rst->filter_string);
+
+ if (rst->proc_column_name)
+ sharkd_json_value_string("c", rst->proc_column_name);
+
+ sharkd_json_array_open("r");
+ for (j = 0; j < rst->num_procs; j++)
+ {
+ /* SRT row */
+ srt_procedure_t *proc = &rst->procedures[j];
+
+ if (proc->stats.num == 0)
+ continue;
+
+ json_dumper_begin_object(&dumper);
+
+ sharkd_json_value_string("n", proc->procedure);
+
+ if (rst->filter_string)
+ sharkd_json_value_anyf("idx", "%d", proc->proc_index);
+
+ sharkd_json_value_anyf("num", "%u", proc->stats.num);
+
+ sharkd_json_value_anyf("min", "%.9f", nstime_to_sec(&proc->stats.min));
+ sharkd_json_value_anyf("max", "%.9f", nstime_to_sec(&proc->stats.max));
+ sharkd_json_value_anyf("tot", "%.9f", nstime_to_sec(&proc->stats.tot));
+
+ json_dumper_end_object(&dumper);
+ }
+ sharkd_json_array_close();
+
+ json_dumper_end_object(&dumper);
+ }
+ sharkd_json_array_close();
+
+ json_dumper_end_object(&dumper);
+}
+
+static void
+sharkd_session_free_tap_srt_cb(void *arg)
+{
+ srt_data_t *srt_data = (srt_data_t *) arg;
+ register_srt_t *srt = (register_srt_t *) srt_data->user_data;
+
+ free_srt_table(srt, srt_data->srt_array);
+ g_array_free(srt_data->srt_array, TRUE);
+ g_free(srt_data);
+}
+
+struct sharkd_export_object_list
+{
+ struct sharkd_export_object_list *next;
+
+ char *type;
+ const char *proto;
+ GSList *entries;
+};
+
+static struct sharkd_export_object_list *sharkd_eo_list;
+
+/**
+ * sharkd_session_process_tap_eo_cb()
+ *
+ * Output eo tap:
+ * (m) tap - tap name
+ * (m) type - tap output type
+ * (m) proto - protocol short name
+ * (m) objects - array of object with attributes:
+ * (m) pkt - packet number
+ * (o) hostname - hostname
+ * (o) type - content type
+ * (o) filename - filename
+ * (m) len - object length
+ */
+static void
+sharkd_session_process_tap_eo_cb(void *tapdata)
+{
+ export_object_list_t *tap_object = (export_object_list_t *) tapdata;
+ struct sharkd_export_object_list *object_list = (struct sharkd_export_object_list *) tap_object->gui_data;
+ GSList *slist;
+ int i = 0;
+
+ json_dumper_begin_object(&dumper);
+ sharkd_json_value_string("tap", object_list->type);
+ sharkd_json_value_string("type", "eo");
+
+ sharkd_json_value_string("proto", object_list->proto);
+
+ sharkd_json_array_open("objects");
+ for (slist = object_list->entries; slist; slist = slist->next)
+ {
+ const export_object_entry_t *eo_entry = (export_object_entry_t *) slist->data;
+
+ json_dumper_begin_object(&dumper);
+
+ sharkd_json_value_anyf("pkt", "%u", eo_entry->pkt_num);
+
+ if (eo_entry->hostname)
+ sharkd_json_value_string("hostname", eo_entry->hostname);
+
+ if (eo_entry->content_type)
+ sharkd_json_value_string("type", eo_entry->content_type);
+
+ if (eo_entry->filename)
+ sharkd_json_value_string("filename", eo_entry->filename);
+
+ sharkd_json_value_stringf("_download", "%s_%d", object_list->type, i);
+
+ sharkd_json_value_anyf("len", "%" G_GINT64_FORMAT, eo_entry->payload_len);
+
+ json_dumper_end_object(&dumper);
+
+ i++;
+ }
+ sharkd_json_array_close();
+
+ json_dumper_end_object(&dumper);
+}
+
+static void
+sharkd_eo_object_list_add_entry(void *gui_data, export_object_entry_t *entry)
+{
+ struct sharkd_export_object_list *object_list = (struct sharkd_export_object_list *) gui_data;
+
+ object_list->entries = g_slist_append(object_list->entries, entry);
+}
+
+static export_object_entry_t *
+sharkd_eo_object_list_get_entry(void *gui_data, int row)
+{
+ struct sharkd_export_object_list *object_list = (struct sharkd_export_object_list *) gui_data;
+
+ return (export_object_entry_t *) g_slist_nth_data(object_list->entries, row);
+}
+
+/**
+ * sharkd_session_process_tap_rtp_cb()
+ *
+ * Output RTP streams tap:
+ * (m) tap - tap name
+ * (m) type - tap output type
+ * (m) streams - array of object with attributes:
+ * (m) ssrc - RTP synchronization source identifier
+ * (m) payload - stream payload
+ * (m) saddr - source address
+ * (m) sport - source port
+ * (m) daddr - destination address
+ * (m) dport - destination port
+ * (m) pkts - packets count
+ * (m) max_delta - max delta (ms)
+ * (m) max_jitter - max jitter (ms)
+ * (m) mean_jitter - mean jitter (ms)
+ * (m) expectednr -
+ * (m) totalnr -
+ * (m) problem - if analyser found the problem
+ * (m) ipver - address IP version (4 or 6)
+ */
+static void
+sharkd_session_process_tap_rtp_cb(void *arg)
+{
+ rtpstream_tapinfo_t *rtp_tapinfo = (rtpstream_tapinfo_t *) arg;
+
+ GList *listx;
+
+ json_dumper_begin_object(&dumper);
+ sharkd_json_value_string("tap", "rtp-streams");
+ sharkd_json_value_string("type", "rtp-streams");
+
+ sharkd_json_array_open("streams");
+ for (listx = g_list_first(rtp_tapinfo->strinfo_list); listx; listx = listx->next)
+ {
+ rtpstream_info_t *streaminfo = (rtpstream_info_t *) listx->data;
+ rtpstream_info_calc_t calc;
+
+ rtpstream_info_calculate(streaminfo, &calc);
+
+ json_dumper_begin_object(&dumper);
+
+ sharkd_json_value_anyf("ssrc", "%u", calc.ssrc);
+ sharkd_json_value_string("payload", calc.all_payload_type_names);
+
+ sharkd_json_value_string("saddr", calc.src_addr_str);
+ sharkd_json_value_anyf("sport", "%u", calc.src_port);
+ sharkd_json_value_string("daddr", calc.dst_addr_str);
+ sharkd_json_value_anyf("dport", "%u", calc.dst_port);
+
+ sharkd_json_value_anyf("pkts", "%u", calc.packet_count);
+
+ sharkd_json_value_anyf("max_delta", "%f",calc.max_delta);
+ sharkd_json_value_anyf("max_jitter", "%f", calc.max_jitter);
+ sharkd_json_value_anyf("mean_jitter", "%f", calc.mean_jitter);
+
+ sharkd_json_value_anyf("expectednr", "%u", calc.packet_expected);
+ sharkd_json_value_anyf("totalnr", "%u", calc.total_nr);
+
+ sharkd_json_value_anyf("problem", calc.problem ? "true" : "false");
+
+ /* for filter */
+ sharkd_json_value_anyf("ipver", "%d", (streaminfo->id.src_addr.type == AT_IPv6) ? 6 : 4);
+
+ rtpstream_info_calc_free(&calc);
+
+ json_dumper_end_object(&dumper);
+ }
+ sharkd_json_array_close();
+
+ json_dumper_end_object(&dumper);
+}
+
+/**
+ * sharkd_session_process_tap()
+ *
+ * Process tap request
+ *
+ * Input:
+ * (m) tap0 - First tap request
+ * (o) tap1...tap15 - Other tap requests
+ *
+ * Output object with attributes:
+ * (m) taps - array of object with attributes:
+ * (m) tap - tap name
+ * (m) type - tap output type
+ * ...
+ * for type:stats see sharkd_session_process_tap_stats_cb()
+ * for type:nstat see sharkd_session_process_tap_nstat_cb()
+ * for type:conv see sharkd_session_process_tap_conv_cb()
+ * for type:host see sharkd_session_process_tap_conv_cb()
+ * for type:rtp-streams see sharkd_session_process_tap_rtp_cb()
+ * for type:rtp-analyse see sharkd_session_process_tap_rtp_analyse_cb()
+ * for type:eo see sharkd_session_process_tap_eo_cb()
+ * for type:expert see sharkd_session_process_tap_expert_cb()
+ * for type:rtd see sharkd_session_process_tap_rtd_cb()
+ * for type:srt see sharkd_session_process_tap_srt_cb()
+ * for type:flow see sharkd_session_process_tap_flow_cb()
+ *
+ * (m) err - error code
+ */
+static void
+sharkd_session_process_tap(char *buf, const jsmntok_t *tokens, int count)
+{
+ void *taps_data[16];
+ GFreeFunc taps_free[16];
+ int taps_count = 0;
+ int i;
+
+ rtpstream_tapinfo_t rtp_tapinfo =
+ { NULL, NULL, NULL, NULL, 0, NULL, 0, TAP_ANALYSE, NULL, NULL, NULL, FALSE };
+
+ for (i = 0; i < 16; i++)
+ {
+ char tapbuf[32];
+ const char *tok_tap;
+
+ void *tap_data = NULL;
+ GFreeFunc tap_free = NULL;
+ const char *tap_filter = "";
+ GString *tap_error = NULL;
+
+ ws_snprintf(tapbuf, sizeof(tapbuf), "tap%d", i);
+ tok_tap = json_find_attr(buf, tokens, count, tapbuf);
+ if (!tok_tap)
+ break;
+
+ if (!strncmp(tok_tap, "stat:", 5))
+ {
+ stats_tree_cfg *cfg = stats_tree_get_cfg_by_abbr(tok_tap + 5);
+ stats_tree *st;
+
+ if (!cfg)
+ {
+ fprintf(stderr, "sharkd_session_process_tap() stat %s not found\n", tok_tap + 5);
+ continue;
+ }
+
+ st = stats_tree_new(cfg, NULL, tap_filter);
+
+ tap_error = register_tap_listener(st->cfg->tapname, st, st->filter, st->cfg->flags, stats_tree_reset, stats_tree_packet, sharkd_session_process_tap_stats_cb, NULL);
+
+ if (!tap_error && cfg->init)
+ cfg->init(st);
+
+ tap_data = st;
+ tap_free = sharkd_session_free_tap_stats_cb;
+ }
+ else if (!strcmp(tok_tap, "expert"))
+ {
+ struct sharkd_expert_tap *expert_tap;
+
+ expert_tap = g_new0(struct sharkd_expert_tap, 1);
+ expert_tap->text = g_string_chunk_new(100);
+
+ tap_error = register_tap_listener("expert", expert_tap, NULL, 0, NULL, sharkd_session_packet_tap_expert_cb, sharkd_session_process_tap_expert_cb, NULL);
+
+ tap_data = expert_tap;
+ tap_free = sharkd_session_free_tap_expert_cb;
+ }
+ else if (!strncmp(tok_tap, "seqa:", 5))
+ {
+ seq_analysis_info_t *graph_analysis;
+ register_analysis_t *analysis;
+ const char *tap_name;
+ tap_packet_cb tap_func;
+ guint tap_flags;
+
+ analysis = sequence_analysis_find_by_name(tok_tap + 5);
+ if (!analysis)
+ {
+ fprintf(stderr, "sharkd_session_process_tap() seq analysis %s not found\n", tok_tap + 5);
+ continue;
+ }
+
+ graph_analysis = sequence_analysis_info_new();
+ graph_analysis->name = tok_tap + 5;
+ /* TODO, make configurable */
+ graph_analysis->any_addr = FALSE;
+
+ tap_name = sequence_analysis_get_tap_listener_name(analysis);
+ tap_flags = sequence_analysis_get_tap_flags(analysis);
+ tap_func = sequence_analysis_get_packet_func(analysis);
+
+ tap_error = register_tap_listener(tap_name, graph_analysis, NULL, tap_flags, NULL, tap_func, sharkd_session_process_tap_flow_cb, NULL);
+
+ tap_data = graph_analysis;
+ tap_free = sharkd_session_free_tap_flow_cb;
+ }
+ else if (!strncmp(tok_tap, "conv:", 5) || !strncmp(tok_tap, "endpt:", 6))
+ {
+ struct register_ct *ct = NULL;
+ const char *ct_tapname;
+ struct sharkd_conv_tap_data *ct_data;
+ tap_packet_cb tap_func = NULL;
+
+ if (!strncmp(tok_tap, "conv:", 5))
+ {
+ ct = get_conversation_by_proto_id(proto_get_id_by_short_name(tok_tap + 5));
+
+ if (!ct || !(tap_func = get_conversation_packet_func(ct)))
+ {
+ fprintf(stderr, "sharkd_session_process_tap() conv %s not found\n", tok_tap + 5);
+ continue;
}
}
else if (!strncmp(tok_tap, "endpt:", 6))
{
- ct = _get_conversation_table_by_name(tok_tap + 6);
+ ct = get_conversation_by_proto_id(proto_get_id_by_short_name(tok_tap + 6));
+
+ if (!ct || !(tap_func = get_hostlist_packet_func(ct)))
+ {
+ fprintf(stderr, "sharkd_session_process_tap() endpt %s not found\n", tok_tap + 6);
+ continue;
+ }
+ }
+ else
+ {
+ fprintf(stderr, "sharkd_session_process_tap() conv/endpt(?): %s not found\n", tok_tap);
+ continue;
+ }
+
+ ct_tapname = proto_get_protocol_filter_name(get_conversation_proto_id(ct));
+
+ ct_data = (struct sharkd_conv_tap_data *) g_malloc0(sizeof(struct sharkd_conv_tap_data));
+ ct_data->type = tok_tap;
+ ct_data->hash.user_data = ct_data;
+
+ /* XXX: make configurable */
+ ct_data->resolve_name = TRUE;
+ ct_data->resolve_port = TRUE;
+
+ tap_error = register_tap_listener(ct_tapname, &ct_data->hash, tap_filter, 0, NULL, tap_func, sharkd_session_process_tap_conv_cb, NULL);
+
+ tap_data = &ct_data->hash;
+ tap_free = sharkd_session_free_tap_conv_cb;
+ }
+ else if (!strncmp(tok_tap, "nstat:", 6))
+ {
+ stat_tap_table_ui *stat_tap = stat_tap_by_name(tok_tap + 6);
+ stat_data_t *stat_data;
+
+ if (!stat_tap)
+ {
+ fprintf(stderr, "sharkd_session_process_tap() nstat=%s not found\n", tok_tap + 6);
+ continue;
+ }
+
+ stat_tap->stat_tap_init_cb(stat_tap);
+
+ stat_data = g_new0(stat_data_t, 1);
+ stat_data->stat_tap_data = stat_tap;
+ stat_data->user_data = NULL;
+
+ tap_error = register_tap_listener(stat_tap->tap_name, stat_data, tap_filter, 0, NULL, stat_tap->packet_func, sharkd_session_process_tap_nstat_cb, NULL);
+
+ tap_data = stat_data;
+ tap_free = sharkd_session_free_tap_nstat_cb;
+ }
+ else if (!strncmp(tok_tap, "rtd:", 4))
+ {
+ register_rtd_t *rtd = get_rtd_table_by_name(tok_tap + 4);
+ rtd_data_t *rtd_data;
+ char *err;
+
+ if (!rtd)
+ {
+ fprintf(stderr, "sharkd_session_process_tap() rtd=%s not found\n", tok_tap + 4);
+ continue;
+ }
+
+ rtd_table_get_filter(rtd, "", &tap_filter, &err);
+ if (err != NULL)
+ {
+ fprintf(stderr, "sharkd_session_process_tap() rtd=%s err=%s\n", tok_tap + 4, err);
+ g_free(err);
+ continue;
+ }
+
+ rtd_data = g_new0(rtd_data_t, 1);
+ rtd_data->user_data = rtd;
+ rtd_table_dissector_init(rtd, &rtd_data->stat_table, NULL, NULL);
+
+ tap_error = register_tap_listener(get_rtd_tap_listener_name(rtd), rtd_data, tap_filter, 0, NULL, get_rtd_packet_func(rtd), sharkd_session_process_tap_rtd_cb, NULL);
+
+ tap_data = rtd_data;
+ tap_free = sharkd_session_free_tap_rtd_cb;
+ }
+ else if (!strncmp(tok_tap, "srt:", 4))
+ {
+ register_srt_t *srt = get_srt_table_by_name(tok_tap + 4);
+ srt_data_t *srt_data;
+ char *err;
+
+ if (!srt)
+ {
+ fprintf(stderr, "sharkd_session_process_tap() srt=%s not found\n", tok_tap + 4);
+ continue;
+ }
+
+ srt_table_get_filter(srt, "", &tap_filter, &err);
+ if (err != NULL)
+ {
+ fprintf(stderr, "sharkd_session_process_tap() srt=%s err=%s\n", tok_tap + 4, err);
+ g_free(err);
+ continue;
+ }
+
+ srt_data = g_new0(srt_data_t, 1);
+ srt_data->srt_array = g_array_new(FALSE, TRUE, sizeof(srt_stat_table *));
+ srt_data->user_data = srt;
+ srt_table_dissector_init(srt, srt_data->srt_array);
+
+ tap_error = register_tap_listener(get_srt_tap_listener_name(srt), srt_data, tap_filter, 0, NULL, get_srt_packet_func(srt), sharkd_session_process_tap_srt_cb, NULL);
+
+ tap_data = srt_data;
+ tap_free = sharkd_session_free_tap_srt_cb;
+ }
+ else if (!strncmp(tok_tap, "eo:", 3))
+ {
+ register_eo_t *eo = get_eo_by_name(tok_tap + 3);
+ export_object_list_t *eo_object;
+ struct sharkd_export_object_list *object_list;
+
+ if (!eo)
+ {
+ fprintf(stderr, "sharkd_session_process_tap() eo=%s not found\n", tok_tap + 3);
+ continue;
+ }
- if (!ct || !(tap_func = get_hostlist_packet_func(ct)))
+ for (object_list = sharkd_eo_list; object_list; object_list = object_list->next)
+ {
+ if (!strcmp(object_list->type, tok_tap))
{
- fprintf(stderr, "sharkd_session_process_tap() endpt %s not found\n", tok_tap + 5);
- continue;
+ g_slist_free_full(object_list->entries, (GDestroyNotify) eo_free_entry);
+ object_list->entries = NULL;
+ break;
}
}
- else
+
+ if (!object_list)
{
- fprintf(stderr, "sharkd_session_process_tap() conv/endpt(?): %s not found\n", tok_tap);
- continue;
+ object_list = g_new(struct sharkd_export_object_list, 1);
+ object_list->type = g_strdup(tok_tap);
+ object_list->proto = proto_get_protocol_short_name(find_protocol_by_id(get_eo_proto_id(eo)));
+ object_list->entries = NULL;
+ object_list->next = sharkd_eo_list;
+ sharkd_eo_list = object_list;
}
- ct_tapname = proto_get_protocol_filter_name(get_conversation_proto_id(ct));
+ eo_object = g_new0(export_object_list_t, 1);
+ eo_object->add_entry = sharkd_eo_object_list_add_entry;
+ eo_object->get_entry = sharkd_eo_object_list_get_entry;
+ eo_object->gui_data = (void *) object_list;
- ct_data = (struct sharkd_conv_tap_data *) g_malloc0(sizeof(struct sharkd_conv_tap_data));
- ct_data->type = tok_tap;
- ct_data->hash.user_data = ct_data;
+ tap_error = register_tap_listener(get_eo_tap_listener_name(eo), eo_object, NULL, 0, NULL, get_eo_packet_func(eo), sharkd_session_process_tap_eo_cb, NULL);
- /* XXX: make configurable */
- ct_data->resolve_name = TRUE;
- ct_data->resolve_port = TRUE;
+ tap_data = eo_object;
+ tap_free = g_free; /* need to free only eo_object, object_list need to be kept for potential download */
+ }
+ else if (!strcmp(tok_tap, "rtp-streams"))
+ {
+ tap_error = register_tap_listener("rtp", &rtp_tapinfo, tap_filter, 0, rtpstream_reset_cb, rtpstream_packet_cb, sharkd_session_process_tap_rtp_cb, NULL);
- tap_error = register_tap_listener(ct_tapname, &ct_data->hash, tap_filter, 0, NULL, tap_func, sharkd_session_process_tap_conv_cb);
+ tap_data = &rtp_tapinfo;
+ tap_free = rtpstream_reset_cb;
+ }
+ else if (!strncmp(tok_tap, "rtp-analyse:", 12))
+ {
+ struct sharkd_analyse_rtp *rtp_req;
- tap_data = &ct_data->hash;
+ rtp_req = (struct sharkd_analyse_rtp *) g_malloc0(sizeof(*rtp_req));
+ if (!sharkd_rtp_match_init(&rtp_req->id, tok_tap + 12))
+ {
+ rtpstream_id_free(&rtp_req->id);
+ g_free(rtp_req);
+ continue;
+ }
+
+ rtp_req->tap_name = tok_tap;
+ rtp_req->statinfo.first_packet = TRUE;
+ rtp_req->statinfo.reg_pt = PT_UNDEFINED;
+
+ tap_error = register_tap_listener("rtp", rtp_req, tap_filter, 0, NULL, sharkd_session_packet_tap_rtp_analyse_cb, sharkd_session_process_tap_rtp_analyse_cb, NULL);
+
+ tap_data = rtp_req;
+ tap_free = sharkd_session_process_tap_rtp_free_cb;
}
else
{
if (tap_error)
{
- /* XXX, tap data memleaks */
fprintf(stderr, "sharkd_session_process_tap() name=%s error=%s", tok_tap, tap_error->str);
g_string_free(tap_error, TRUE);
+ if (tap_free)
+ tap_free(tap_data);
continue;
}
- taps_data[i] = tap_data;
+ taps_data[taps_count] = tap_data;
+ taps_free[taps_count] = tap_free;
taps_count++;
}
if (taps_count == 0)
return;
- printf("{\"taps\":[");
+ json_dumper_begin_object(&dumper);
+
+ sharkd_json_array_open("taps");
sharkd_retap();
- printf("null],\"err\":0}\n");
+ sharkd_json_array_close();
- for (i = 0; i < 16; i++)
+ sharkd_json_value_anyf("err", "0");
+
+ json_dumper_end_object(&dumper);
+ json_dumper_finish(&dumper);
+
+ for (i = 0; i < taps_count; i++)
{
if (taps_data[i])
remove_tap_listener(taps_data[i]);
- /* XXX, taps data memleaks */
+ if (taps_free[i])
+ taps_free[i](taps_data[i]);
+ }
+}
+
+/**
+ * sharkd_session_process_follow()
+ *
+ * Process follow request
+ *
+ * Input:
+ * (m) follow - follow protocol request (e.g. HTTP)
+ * (m) filter - filter request (e.g. tcp.stream == 1)
+ *
+ * Output object with attributes:
+ *
+ * (m) err - error code
+ * (m) shost - server host
+ * (m) sport - server port
+ * (m) sbytes - server send bytes count
+ * (m) chost - client host
+ * (m) cport - client port
+ * (m) cbytes - client send bytes count
+ * (o) payloads - array of object with attributes:
+ * (o) s - set if server sent, else client
+ * (m) n - packet number
+ * (m) d - data base64 encoded
+ */
+static void
+sharkd_session_process_follow(char *buf, const jsmntok_t *tokens, int count)
+{
+ const char *tok_follow = json_find_attr(buf, tokens, count, "follow");
+ const char *tok_filter = json_find_attr(buf, tokens, count, "filter");
+
+ register_follow_t *follower;
+ GString *tap_error;
+
+ follow_info_t *follow_info;
+ const char *host;
+ char *port;
+
+ if (!tok_follow || !tok_filter)
+ return;
+
+ follower = get_follow_by_name(tok_follow);
+ if (!follower)
+ {
+ fprintf(stderr, "sharkd_session_process_follow() follower=%s not found\n", tok_follow);
+ return;
+ }
+
+ /* follow_reset_stream ? */
+ follow_info = g_new0(follow_info_t, 1);
+ /* gui_data, filter_out_filter not set, but not used by dissector */
+
+ tap_error = register_tap_listener(get_follow_tap_string(follower), follow_info, tok_filter, 0, NULL, get_follow_tap_handler(follower), NULL, NULL);
+ if (tap_error)
+ {
+ fprintf(stderr, "sharkd_session_process_follow() name=%s error=%s", tok_follow, tap_error->str);
+ g_string_free(tap_error, TRUE);
+ g_free(follow_info);
+ return;
+ }
+
+ sharkd_retap();
+
+ json_dumper_begin_object(&dumper);
+
+ sharkd_json_value_anyf("err", "0");
+
+ /* Server information: hostname, port, bytes sent */
+ host = address_to_name(&follow_info->server_ip);
+ sharkd_json_value_string("shost", host);
+
+ port = get_follow_port_to_display(follower)(NULL, follow_info->server_port);
+ sharkd_json_value_string("sport", port);
+ wmem_free(NULL, port);
+
+ sharkd_json_value_anyf("sbytes", "%u", follow_info->bytes_written[0]);
+
+ /* Client information: hostname, port, bytes sent */
+ host = address_to_name(&follow_info->client_ip);
+ sharkd_json_value_string("chost", host);
+
+ port = get_follow_port_to_display(follower)(NULL, follow_info->client_port);
+ sharkd_json_value_string("cport", port);
+ wmem_free(NULL, port);
+
+ sharkd_json_value_anyf("cbytes", "%u", follow_info->bytes_written[1]);
+
+ if (follow_info->payload)
+ {
+ follow_record_t *follow_record;
+ GList *cur;
+
+ sharkd_json_array_open("payloads");
+ for (cur = g_list_last(follow_info->payload); cur; cur = g_list_previous(cur))
+ {
+ follow_record = (follow_record_t *) cur->data;
+
+ json_dumper_begin_object(&dumper);
+
+ sharkd_json_value_anyf("n", "%u", follow_record->packet_num);
+ sharkd_json_value_base64("d", follow_record->data->data, follow_record->data->len);
+
+ if (follow_record->is_server)
+ sharkd_json_value_anyf("s", "%d", 1);
+
+ json_dumper_end_object(&dumper);
+ }
+ sharkd_json_array_close();
}
+
+ json_dumper_end_object(&dumper);
+ json_dumper_finish(&dumper);
+
+ remove_tap_listener(follow_info);
+ follow_info_free(follow_info);
}
static void
-sharkd_session_process_frame_cb_tree(proto_tree *tree, tvbuff_t **tvbs)
+sharkd_session_process_frame_cb_tree(epan_dissect_t *edt, proto_tree *tree, tvbuff_t **tvbs, gboolean display_hidden)
{
proto_node *node;
- const char *sepa = "";
- printf("[");
+ sharkd_json_array_open(NULL);
for (node = tree->first_child; node; node = node->next)
{
field_info *finfo = PNODE_FINFO(node);
if (!finfo)
continue;
- /* XXX, for now always skip hidden */
- if (FI_GET_FLAG(finfo, FI_HIDDEN))
+ if (!display_hidden && FI_GET_FLAG(finfo, FI_HIDDEN))
continue;
- printf("%s{", sepa);
+ json_dumper_begin_object(&dumper);
- printf("\"l\":");
if (!finfo->rep)
{
char label_str[ITEM_LABEL_LENGTH];
label_str[0] = '\0';
proto_item_fill_label(finfo, label_str);
- json_puts_string(label_str);
+ sharkd_json_value_string("l", label_str);
}
else
{
- json_puts_string(finfo->rep->representation);
+ sharkd_json_value_string("l", finfo->rep->representation);
}
if (finfo->ds_tvb && tvbs && tvbs[0] != finfo->ds_tvb)
{
if (tvbs[idx] == finfo->ds_tvb)
{
- printf(",\"ds\":%d", idx);
+ sharkd_json_value_anyf("ds", "%d", idx);
break;
}
}
}
if (finfo->start >= 0 && finfo->length > 0)
- printf(",\"h\":[%u,%u]", finfo->start, finfo->length);
+ sharkd_json_value_anyf("h", "[%d,%d]", finfo->start, finfo->length);
if (finfo->appendix_start >= 0 && finfo->appendix_length > 0)
- printf(",\"i\":[%u,%u]", finfo->appendix_start, finfo->appendix_length);
+ sharkd_json_value_anyf("i", "[%d,%d]", finfo->appendix_start, finfo->appendix_length);
- if (finfo->hfinfo && finfo->hfinfo->type == FT_PROTOCOL)
- printf(",\"t\":\"proto\"");
- if (FI_GET_FLAG(finfo, PI_SEVERITY_MASK))
+ if (finfo->hfinfo)
{
- const char *severity = NULL;
+ char *filter;
- switch (FI_GET_FLAG(finfo, PI_SEVERITY_MASK))
+ if (finfo->hfinfo->type == FT_PROTOCOL)
{
- case PI_COMMENT:
- severity = "comment";
- break;
+ sharkd_json_value_string("t", "proto");
+ }
+ else if (finfo->hfinfo->type == FT_FRAMENUM)
+ {
+ sharkd_json_value_string("t", "framenum");
+ sharkd_json_value_anyf("fnum", "%u", finfo->value.value.uinteger);
+ }
+ else if (FI_GET_FLAG(finfo, FI_URL) && IS_FT_STRING(finfo->hfinfo->type))
+ {
+ char *url = fvalue_to_string_repr(NULL, &finfo->value, FTREPR_DISPLAY, finfo->hfinfo->display);
- case PI_CHAT:
- severity = "chat";
- break;
+ sharkd_json_value_string("t", "url");
+ sharkd_json_value_string("url", url);
+ wmem_free(NULL, url);
+ }
- case PI_NOTE:
- severity = "note";
- break;
+ filter = proto_construct_match_selected_string(finfo, edt);
+ if (filter)
+ {
+ sharkd_json_value_string("f", filter);
+ wmem_free(NULL, filter);
+ }
+ }
- case PI_WARN:
- severity = "warn";
- break;
+ if (FI_GET_FLAG(finfo, FI_GENERATED))
+ sharkd_json_value_anyf("g", "true");
+
+ if (FI_GET_FLAG(finfo, FI_HIDDEN))
+ sharkd_json_value_anyf("v", "true");
+
+ if (FI_GET_FLAG(finfo, PI_SEVERITY_MASK))
+ {
+ const char *severity = try_val_to_str(FI_GET_FLAG(finfo, PI_SEVERITY_MASK), expert_severity_vals);
- case PI_ERROR:
- severity = "error";
- break;
- }
g_assert(severity != NULL);
- printf(",\"s\":\"%s\"", severity);
+ sharkd_json_value_string("s", severity);
}
- if (((proto_tree *) node)->first_child) {
+ if (((proto_tree *) node)->first_child)
+ {
if (finfo->tree_type != -1)
- printf(",\"e\":%d", finfo->tree_type);
- printf(",\"n\":");
- sharkd_session_process_frame_cb_tree((proto_tree *) node, tvbs);
+ sharkd_json_value_anyf("e", "%d", finfo->tree_type);
+
+ sharkd_json_value_anyf("n", NULL);
+ sharkd_session_process_frame_cb_tree(edt, (proto_tree *) node, tvbs, display_hidden);
}
- printf("}");
- sepa = ",";
+ json_dumper_end_object(&dumper);
+ }
+ sharkd_json_array_close();
+}
+
+static gboolean
+sharkd_follower_visit_layers_cb(const void *key _U_, void *value, void *user_data)
+{
+ register_follow_t *follower = (register_follow_t *) value;
+ packet_info *pi = (packet_info *) user_data;
+
+ const int proto_id = get_follow_proto_id(follower);
+
+ guint32 ignore_stream;
+
+ if (proto_is_frame_protocol(pi->layers, proto_get_protocol_filter_name(proto_id)))
+ {
+ const char *layer_proto = proto_get_protocol_short_name(find_protocol_by_id(proto_id));
+ char *follow_filter;
+
+ follow_filter = get_follow_conv_func(follower)(pi, &ignore_stream);
+
+ json_dumper_begin_array(&dumper);
+ json_dumper_value_string(&dumper, layer_proto);
+ json_dumper_value_string(&dumper, follow_filter);
+ json_dumper_end_array(&dumper);
+
+ g_free(follow_filter);
}
- printf("]");
+
+ return FALSE;
}
+struct sharkd_frame_request_data
+{
+ gboolean display_hidden;
+};
+
static void
-sharkd_session_process_frame_cb(packet_info *pi, proto_tree *tree, struct epan_column_info *cinfo, const GSList *data_src, void *data)
+sharkd_session_process_frame_cb(epan_dissect_t *edt, proto_tree *tree, struct epan_column_info *cinfo, const GSList *data_src, void *data)
{
- (void) pi;
- (void) data;
+ packet_info *pi = &edt->pi;
+ frame_data *fdata = pi->fd;
+ const char *pkt_comment = NULL;
+
+ const struct sharkd_frame_request_data * const req_data = (const struct sharkd_frame_request_data * const) data;
+ const gboolean display_hidden = (req_data) ? req_data->display_hidden : FALSE;
- printf("{");
+ json_dumper_begin_object(&dumper);
- printf("\"err\":0");
+ sharkd_json_value_anyf("err", "0");
+
+ if (fdata->has_user_comment)
+ pkt_comment = sharkd_get_user_comment(fdata);
+ else if (fdata->has_phdr_comment)
+ pkt_comment = pi->rec->opt_comment;
+
+ if (pkt_comment)
+ sharkd_json_value_string("comment", pkt_comment);
if (tree)
{
tvbuff_t **tvbs = NULL;
- printf(",\"tree\":");
+ /* arrayize data src, to speedup searching for ds_tvb index */
+ if (data_src && data_src->next /* only needed if there are more than one data source */)
+ {
+ guint count = g_slist_length((GSList *) data_src);
+ guint i;
+
+ tvbs = (tvbuff_t **) g_malloc((count + 1) * sizeof(*tvbs));
+
+ for (i = 0; i < count; i++)
+ {
+ const struct data_source *src = (const struct data_source *) g_slist_nth_data((GSList *) data_src, i);
+
+ tvbs[i] = get_data_source_tvb(src);
+ }
+
+ tvbs[count] = NULL;
+ }
+
+ sharkd_json_value_anyf("tree", NULL);
+ sharkd_session_process_frame_cb_tree(edt, tree, tvbs, display_hidden);
+
+ g_free(tvbs);
+ }
+
+ if (cinfo)
+ {
+ int col;
+
+ sharkd_json_array_open("col");
+ for (col = 0; col < cinfo->num_cols; ++col)
+ {
+ const col_item_t *col_item = &cinfo->columns[col];
+
+ sharkd_json_value_string(NULL, col_item->col_data);
+ }
+ sharkd_json_array_close();
+ }
+
+ if (fdata->ignored)
+ sharkd_json_value_anyf("i", "true");
+
+ if (fdata->marked)
+ sharkd_json_value_anyf("m", "true");
+
+ if (fdata->color_filter)
+ {
+ sharkd_json_value_stringf("bg", "%x", color_t_to_rgb(&fdata->color_filter->bg_color));
+ sharkd_json_value_stringf("fg", "%x", color_t_to_rgb(&fdata->color_filter->fg_color));
+ }
+
+ if (data_src)
+ {
+ struct data_source *src = (struct data_source *) data_src->data;
+ gboolean ds_open = FALSE;
+
+ tvbuff_t *tvb;
+ guint length;
+
+ tvb = get_data_source_tvb(src);
+ length = tvb_captured_length(tvb);
+
+ if (length != 0)
+ {
+ const guchar *cp = tvb_get_ptr(tvb, 0, length);
+
+ /* XXX pi.fd->encoding */
+ sharkd_json_value_base64("bytes", cp, length);
+ }
+ else
+ {
+ sharkd_json_value_base64("bytes", "", 0);
+ }
+
+ data_src = data_src->next;
+ if (data_src)
+ {
+ sharkd_json_array_open("ds");
+ ds_open = TRUE;
+ }
+
+ while (data_src)
+ {
+ src = (struct data_source *) data_src->data;
+
+ json_dumper_begin_object(&dumper);
+
+ {
+ char *src_name = get_data_source_name(src);
+
+ sharkd_json_value_string("name", src_name);
+ wmem_free(NULL, src_name);
+ }
+
+ tvb = get_data_source_tvb(src);
+ length = tvb_captured_length(tvb);
+
+ if (length != 0)
+ {
+ const guchar *cp = tvb_get_ptr(tvb, 0, length);
+
+ /* XXX pi.fd->encoding */
+ sharkd_json_value_base64("bytes", cp, length);
+ }
+ else
+ {
+ sharkd_json_value_base64("bytes", "", 0);
+ }
+
+ json_dumper_end_object(&dumper);
+
+ data_src = data_src->next;
+ }
+
+ /* close ds, only if was opened */
+ if (ds_open)
+ sharkd_json_array_close();
+ }
+
+ sharkd_json_array_open("fol");
+ follow_iterate_followers(sharkd_follower_visit_layers_cb, pi);
+ sharkd_json_array_close();
+
+ json_dumper_end_object(&dumper);
+ json_dumper_finish(&dumper);
+}
+
+#define SHARKD_IOGRAPH_MAX_ITEMS 250000 /* 250k limit of items is taken from wireshark-qt, on x86_64 sizeof(io_graph_item_t) is 152, so single graph can take max 36 MB */
+
+struct sharkd_iograph
+{
+ /* config */
+ int hf_index;
+ io_graph_item_unit_t calc_type;
+ guint32 interval;
+
+ /* result */
+ int space_items;
+ int num_items;
+ io_graph_item_t *items;
+ GString *error;
+};
+
+static tap_packet_status
+sharkd_iograph_packet(void *g, packet_info *pinfo, epan_dissect_t *edt, const void *dummy _U_)
+{
+ struct sharkd_iograph *graph = (struct sharkd_iograph *) g;
+ int idx;
+ gboolean update_succeeded;
+
+ idx = get_io_graph_index(pinfo, graph->interval);
+ if (idx < 0 || idx >= SHARKD_IOGRAPH_MAX_ITEMS)
+ return TAP_PACKET_DONT_REDRAW;
+
+ if (idx + 1 > graph->num_items)
+ {
+ if (idx + 1 > graph->space_items)
+ {
+ int new_size = idx + 1024;
+
+ graph->items = (io_graph_item_t *) g_realloc(graph->items, sizeof(io_graph_item_t) * new_size);
+ reset_io_graph_items(&graph->items[graph->space_items], new_size - graph->space_items);
+
+ graph->space_items = new_size;
+ }
+ else if (graph->items == NULL)
+ {
+ graph->items = (io_graph_item_t *) g_malloc(sizeof(io_graph_item_t) * graph->space_items);
+ reset_io_graph_items(graph->items, graph->space_items);
+ }
+
+ graph->num_items = idx + 1;
+ }
+
+ update_succeeded = update_io_graph_item(graph->items, idx, pinfo, edt, graph->hf_index, graph->calc_type, graph->interval);
+ /* XXX - TAP_PACKET_FAILED if the item couldn't be updated, with an error message? */
+ return update_succeeded ? TAP_PACKET_REDRAW : TAP_PACKET_DONT_REDRAW;
+}
+
+/**
+ * sharkd_session_process_iograph()
+ *
+ * Process iograph request
+ *
+ * Input:
+ * (o) interval - interval time in ms, if not specified: 1000ms
+ * (m) graph0 - First graph request
+ * (o) graph1...graph9 - Other graph requests
+ * (o) filter0 - First graph filter
+ * (o) filter1...filter9 - Other graph filters
+ *
+ * Graph requests can be one of: "packets", "bytes", "bits", "sum:<field>", "frames:<field>", "max:<field>", "min:<field>", "avg:<field>", "load:<field>",
+ * if you use variant with <field>, you need to pass field name in filter request.
+ *
+ * Output object with attributes:
+ * (m) iograph - array of graph results with attributes:
+ * errmsg - graph cannot be constructed
+ * items - graph values, zeros are skipped, if value is not a number it's next index encoded as hex string
+ */
+static void
+sharkd_session_process_iograph(char *buf, const jsmntok_t *tokens, int count)
+{
+ const char *tok_interval = json_find_attr(buf, tokens, count, "interval");
+ struct sharkd_iograph graphs[10];
+ gboolean is_any_ok = FALSE;
+ int graph_count;
+
+ guint32 interval_ms = 1000; /* default: one per second */
+ int i;
+
+ if (tok_interval)
+ {
+ if (!ws_strtou32(tok_interval, NULL, &interval_ms) || interval_ms == 0)
+ {
+ fprintf(stderr, "Invalid interval parameter: %s.\n", tok_interval);
+ return;
+ }
+ }
+
+ for (i = graph_count = 0; i < (int) G_N_ELEMENTS(graphs); i++)
+ {
+ struct sharkd_iograph *graph = &graphs[graph_count];
- /* arrayize data src, to speedup searching for ds_tvb index */
- if (data_src && data_src->next /* only needed if there are more than one data source */)
- {
- guint count = g_slist_length((GSList *) data_src);
- guint i;
+ const char *tok_graph;
+ const char *tok_filter;
+ char tok_format_buf[32];
+ const char *field_name;
- tvbs = (tvbuff_t **) g_malloc((count + 1) * sizeof(*tvbs));
+ snprintf(tok_format_buf, sizeof(tok_format_buf), "graph%d", i);
+ tok_graph = json_find_attr(buf, tokens, count, tok_format_buf);
+ if (!tok_graph)
+ break;
- for (i = 0; i < count; i++)
- {
- struct data_source *src = (struct data_source *) g_slist_nth_data((GSList *) data_src, i);
+ snprintf(tok_format_buf, sizeof(tok_format_buf), "filter%d", i);
+ tok_filter = json_find_attr(buf, tokens, count, tok_format_buf);
+
+ if (!strcmp(tok_graph, "packets"))
+ graph->calc_type = IOG_ITEM_UNIT_PACKETS;
+ else if (!strcmp(tok_graph, "bytes"))
+ graph->calc_type = IOG_ITEM_UNIT_BYTES;
+ else if (!strcmp(tok_graph, "bits"))
+ graph->calc_type = IOG_ITEM_UNIT_BITS;
+ else if (g_str_has_prefix(tok_graph, "sum:"))
+ graph->calc_type = IOG_ITEM_UNIT_CALC_SUM;
+ else if (g_str_has_prefix(tok_graph, "frames:"))
+ graph->calc_type = IOG_ITEM_UNIT_CALC_FRAMES;
+ else if (g_str_has_prefix(tok_graph, "fields:"))
+ graph->calc_type = IOG_ITEM_UNIT_CALC_FIELDS;
+ else if (g_str_has_prefix(tok_graph, "max:"))
+ graph->calc_type = IOG_ITEM_UNIT_CALC_MAX;
+ else if (g_str_has_prefix(tok_graph, "min:"))
+ graph->calc_type = IOG_ITEM_UNIT_CALC_MIN;
+ else if (g_str_has_prefix(tok_graph, "avg:"))
+ graph->calc_type = IOG_ITEM_UNIT_CALC_AVERAGE;
+ else if (g_str_has_prefix(tok_graph, "load:"))
+ graph->calc_type = IOG_ITEM_UNIT_CALC_LOAD;
+ else
+ break;
- tvbs[i] = get_data_source_tvb(src);
- }
+ field_name = strchr(tok_graph, ':');
+ if (field_name)
+ field_name = field_name + 1;
- tvbs[count] = NULL;
- }
+ graph->interval = interval_ms;
- sharkd_session_process_frame_cb_tree(tree, tvbs);
+ graph->hf_index = -1;
+ graph->error = check_field_unit(field_name, &graph->hf_index, graph->calc_type);
- g_free(tvbs);
- }
+ graph->space_items = 0; /* TODO, can avoid realloc()s in sharkd_iograph_packet() by calculating: capture_time / interval */
+ graph->num_items = 0;
+ graph->items = NULL;
- if (cinfo)
- {
- int col;
+ if (!graph->error)
+ graph->error = register_tap_listener("frame", graph, tok_filter, TL_REQUIRES_PROTO_TREE, NULL, sharkd_iograph_packet, NULL, NULL);
- printf(",\"col\":[");
- for (col = 0; col < cinfo->num_cols; ++col)
- {
- const col_item_t *col_item = &cinfo->columns[col];
+ graph_count++;
- printf("%s\"%s\"", (col) ? "," : "", col_item->col_data);
- }
- printf("]");
+ if (graph->error == NULL)
+ is_any_ok = TRUE;
}
- if (data_src)
- {
- struct data_source *src = (struct data_source *)data_src->data;
- const char *ds_sepa = NULL;
-
- tvbuff_t *tvb;
- guint length;
+ /* retap only if we have at least one ok */
+ if (is_any_ok)
+ sharkd_retap();
- tvb = get_data_source_tvb(src);
- length = tvb_captured_length(tvb);
+ json_dumper_begin_object(&dumper);
- printf(",\"bytes\":");
- if (length != 0)
- {
- const guchar *cp = tvb_get_ptr(tvb, 0, length);
+ sharkd_json_array_open("iograph");
+ for (i = 0; i < graph_count; i++)
+ {
+ struct sharkd_iograph *graph = &graphs[i];
- /* XXX pi.fd->flags.encoding */
- json_print_base64(cp, length);
- }
- else
- {
- json_print_base64("", 0);
- }
+ json_dumper_begin_object(&dumper);
- data_src = data_src->next;
- if (data_src)
+ if (graph->error)
{
- printf(",\"ds\":[");
- ds_sepa = "";
+ sharkd_json_value_string("errmsg", graph->error->str);
+ g_string_free(graph->error, TRUE);
}
-
- while (data_src)
+ else
{
- src = (struct data_source *)data_src->data;
+ int idx;
+ int next_idx = 0;
+ sharkd_json_array_open("items");
+ for (idx = 0; idx < graph->num_items; idx++)
{
- char *src_name = get_data_source_name(src);
+ double val;
- printf("%s{\"name\":", ds_sepa);
- json_puts_string(src_name);
- wmem_free(NULL, src_name);
- }
+ val = get_io_graph_item(graph->items, graph->calc_type, idx, graph->hf_index, &cfile, graph->interval, graph->num_items);
- tvb = get_data_source_tvb(src);
- length = tvb_captured_length(tvb);
+ /* if it's zero, don't display */
+ if (val == 0.0)
+ continue;
- printf(",\"bytes\":");
- if (length != 0)
- {
- const guchar *cp = tvb_get_ptr(tvb, 0, length);
+ /* cause zeros are not printed, need to output index */
+ if (next_idx != idx)
+ sharkd_json_value_stringf(NULL, "%x", idx);
- /* XXX pi.fd->flags.encoding */
- json_print_base64(cp, length);
- }
- else
- {
- json_print_base64("", 0);
+ sharkd_json_value_anyf(NULL, "%f", val);
+ next_idx = idx + 1;
}
-
- printf("}");
- ds_sepa = ",";
-
- data_src = data_src->next;
+ sharkd_json_array_close();
}
+ json_dumper_end_object(&dumper);
- /* close ds, only if was opened */
- if (ds_sepa != NULL)
- printf("]");
+ remove_tap_listener(graph);
+ g_free(graph->items);
}
+ sharkd_json_array_close();
- printf("}\n");
+ json_dumper_end_object(&dumper);
+ json_dumper_finish(&dumper);
}
/**
guint64 bytes;
} st, st_total;
- nstime_t *start_ts = NULL;
+ nstime_t *start_ts;
guint32 interval_ms = 1000; /* default: one per second */
- const char *sepa = "";
unsigned int framenum;
gint64 idx;
gint64 max_idx = 0;
- if (tok_interval) {
- if (!ws_strtou32(tok_interval, NULL, &interval_ms) || interval_ms == 0) {
+ if (tok_interval)
+ {
+ if (!ws_strtou32(tok_interval, NULL, &interval_ms) || interval_ms == 0)
+ {
fprintf(stderr, "Invalid interval parameter: %s.\n", tok_interval);
return;
}
if (tok_filter)
{
- filter_data = sharkd_session_filter_data(tok_filter);
- if (!filter_data)
+ const struct sharkd_filter_item *filter_item;
+
+ filter_item = sharkd_session_filter_data(tok_filter);
+ if (!filter_item)
return;
+ filter_data = filter_item->filtered;
}
st_total.frames = 0;
idx = 0;
- printf("{\"intervals\":[");
+ json_dumper_begin_object(&dumper);
+ sharkd_json_array_open("intervals");
+
+ start_ts = (cfile.count >= 1) ? &(sharkd_get_frame(1)->abs_ts) : NULL;
for (framenum = 1; framenum <= cfile.count; framenum++)
{
- frame_data *fdata = frame_data_sequence_find(cfile.frames, framenum);
+ frame_data *fdata;
gint64 msec_rel;
gint64 new_idx;
- if (start_ts == NULL)
- start_ts = &fdata->abs_ts;
-
if (filter_data && !(filter_data[framenum / 8] & (1 << (framenum % 8))))
continue;
- msec_rel = (fdata->abs_ts.secs - start_ts->secs) * 1000 + (fdata->abs_ts.nsecs - start_ts->nsecs) / 1000000;
+ fdata = sharkd_get_frame(framenum);
+
+ msec_rel = (fdata->abs_ts.secs - start_ts->secs) * (gint64) 1000 + (fdata->abs_ts.nsecs - start_ts->nsecs) / 1000000;
new_idx = msec_rel / interval_ms;
if (idx != new_idx)
{
if (st.frames != 0)
{
- printf("%s[%" G_GINT64_FORMAT ",%u,%" G_GUINT64_FORMAT "]", sepa, idx, st.frames, st.bytes);
- sepa = ",";
+ sharkd_json_value_anyf(NULL, "[%" G_GINT64_FORMAT ",%u,%" G_GUINT64_FORMAT "]", idx, st.frames, st.bytes);
}
idx = new_idx;
if (st.frames != 0)
{
- printf("%s[%" G_GINT64_FORMAT ",%u,%" G_GUINT64_FORMAT "]", sepa, idx, st.frames, st.bytes);
- /* sepa = ","; */
+ sharkd_json_value_anyf(NULL, "[%" G_GINT64_FORMAT ",%u,%" G_GUINT64_FORMAT "]", idx, st.frames, st.bytes);
}
+ sharkd_json_array_close();
- printf("],\"last\":%" G_GINT64_FORMAT ",\"frames\":%u,\"bytes\":%" G_GUINT64_FORMAT "}\n", max_idx, st_total.frames, st_total.bytes);
+ sharkd_json_value_anyf("last", "%" G_GINT64_FORMAT, max_idx);
+ sharkd_json_value_anyf("frames", "%u", st_total.frames);
+ sharkd_json_value_anyf("bytes", "%" G_GUINT64_FORMAT, st_total.bytes);
+
+ json_dumper_end_object(&dumper);
+ json_dumper_finish(&dumper);
}
/**
*
* Input:
* (m) frame - requested frame number
+ * (o) ref_frame - time reference frame number
+ * (o) prev_frame - previously displayed frame number
* (o) proto - set if output frame tree
* (o) columns - set if output frame columns
+ * (o) color - set if output color-filter bg/fg
* (o) bytes - set if output frame bytes
+ * (o) hidden - set if output hidden tree fields
*
* Output object with attributes:
* (m) err - 0 if succeed
* (o) tree - array of frame nodes with attributes:
* l - label
- * t: 'proto'
+ * t: 'proto', 'framenum', 'url' - type of node
+ * f - filter string
* s - severity
* e - subtree ett index
* n - array of subtree nodes
* i - two item array: (appendix start, appendix length)
* p - [RESERVED] two item array: (protocol start, protocol length)
* ds- data src index
+ * url - only for t:'url', url
+ * fnum - only for t:'framenum', frame number
+ * g - if field is generated by Wireshark
+ * v - if field is hidden
*
* (o) col - array of column data
* (o) bytes - base64 of frame bytes
* (o) ds - array of other data srcs
+ * (o) comment - frame comment
+ * (o) fol - array of follow filters:
+ * [0] - protocol
+ * [1] - filter string
+ * (o) i - if frame is ignored
+ * (o) m - if frame is marked
+ * (o) bg - color filter - background color in hex
+ * (o) fg - color filter - foreground color in hex
*/
static void
sharkd_session_process_frame(char *buf, const jsmntok_t *tokens, int count)
{
const char *tok_frame = json_find_attr(buf, tokens, count, "frame");
- int tok_proto = (json_find_attr(buf, tokens, count, "proto") != NULL);
- int tok_bytes = (json_find_attr(buf, tokens, count, "bytes") != NULL);
- int tok_columns = (json_find_attr(buf, tokens, count, "columns") != NULL);
+ const char *tok_ref_frame = json_find_attr(buf, tokens, count, "ref_frame");
+ const char *tok_prev_frame = json_find_attr(buf, tokens, count, "prev_frame");
- guint32 framenum;
+ guint32 framenum, ref_frame_num, prev_dis_num;
+ guint32 dissect_flags = SHARKD_DISSECT_FLAG_NULL;
+ struct sharkd_frame_request_data req_data;
if (!tok_frame || !ws_strtou32(tok_frame, NULL, &framenum) || framenum == 0)
return;
- sharkd_dissect_request(framenum, &sharkd_session_process_frame_cb, tok_bytes, tok_columns, tok_proto, NULL);
+ ref_frame_num = (framenum != 1) ? 1 : 0;
+ if (tok_ref_frame && (!ws_strtou32(tok_ref_frame, NULL, &ref_frame_num) || ref_frame_num > framenum))
+ return;
+
+ prev_dis_num = framenum - 1;
+ if (tok_prev_frame && (!ws_strtou32(tok_prev_frame, NULL, &prev_dis_num) || prev_dis_num >= framenum))
+ return;
+
+ if (json_find_attr(buf, tokens, count, "proto") != NULL)
+ dissect_flags |= SHARKD_DISSECT_FLAG_PROTO_TREE;
+ if (json_find_attr(buf, tokens, count, "bytes") != NULL)
+ dissect_flags |= SHARKD_DISSECT_FLAG_BYTES;
+ if (json_find_attr(buf, tokens, count, "columns") != NULL)
+ dissect_flags |= SHARKD_DISSECT_FLAG_COLUMNS;
+ if (json_find_attr(buf, tokens, count, "color") != NULL)
+ dissect_flags |= SHARKD_DISSECT_FLAG_COLOR;
+
+ req_data.display_hidden = (json_find_attr(buf, tokens, count, "v") != NULL);
+
+ sharkd_dissect_request(framenum, ref_frame_num, prev_dis_num, &sharkd_session_process_frame_cb, dissect_flags, &req_data);
}
/**
*
* Input:
* (o) filter - filter to be checked
+ * (o) field - field to be checked
*
* Output object with attributes:
* (m) err - always 0
* (o) filter - 'ok', 'warn' or error message
+ * (o) field - 'ok', or 'notfound'
*/
static int
sharkd_session_process_check(char *buf, const jsmntok_t *tokens, int count)
{
const char *tok_filter = json_find_attr(buf, tokens, count, "filter");
+ const char *tok_field = json_find_attr(buf, tokens, count, "field");
+
+ json_dumper_begin_object(&dumper);
+ sharkd_json_value_anyf("err", "0");
- printf("{\"err\":0");
if (tok_filter != NULL)
{
char *err_msg = NULL;
{
const char *s = "ok";
- if (dfilter_deprecated_tokens(dfp))
+ if (dfp && dfilter_deprecated_tokens(dfp))
s = "warn";
- printf(",\"filter\":\"%s\"", s);
+ sharkd_json_value_string("filter", s);
dfilter_free(dfp);
}
else
{
- printf(",\"filter\":");
- json_puts_string(err_msg);
+ sharkd_json_value_string("filter", err_msg);
g_free(err_msg);
}
}
- printf("}\n");
+ if (tok_field != NULL)
+ {
+ header_field_info *hfi = proto_registrar_get_byname(tok_field);
+
+ sharkd_json_value_string("field", (hfi) ? "ok" : "notfound");
+ }
+
+ json_dumper_end_object(&dumper);
+ json_dumper_finish(&dumper);
+
return 0;
}
{
const char *module;
const char *pref;
- const char *sepa;
};
static guint
if (strncmp(data->pref, module->name, strlen(data->pref)) != 0)
return 0;
- printf("%s{\"f\":\"%s\",\"d\":\"%s\"}", data->sepa, module->name, module->title);
- data->sepa = ",";
+ json_dumper_begin_object(&dumper);
+ sharkd_json_value_string("f", module->name);
+ sharkd_json_value_string("d", module->title);
+ json_dumper_end_object(&dumper);
return 0;
}
if (strncmp(data->pref, pref_name, strlen(data->pref)) != 0)
return 0;
- printf("%s{\"f\":\"%s.%s\",\"d\":\"%s\"}", data->sepa, data->module, pref_name, pref_title);
- data->sepa = ",";
+ json_dumper_begin_object(&dumper);
+ sharkd_json_value_stringf("f", "%s.%s", data->module, pref_name);
+ sharkd_json_value_string("d", pref_title);
+ json_dumper_end_object(&dumper);
return 0; /* continue */
}
const char *tok_field = json_find_attr(buf, tokens, count, "field");
const char *tok_pref = json_find_attr(buf, tokens, count, "pref");
- printf("{\"err\":0");
+ json_dumper_begin_object(&dumper);
+ sharkd_json_value_anyf("err", "0");
+
if (tok_field != NULL && tok_field[0])
{
const size_t filter_length = strlen(tok_field);
void *proto_cookie;
void *field_cookie;
int proto_id;
- const char *sepa = "";
- printf(",\"field\":[");
+ sharkd_json_array_open("field");
for (proto_id = proto_get_first_protocol(&proto_cookie); proto_id != -1; proto_id = proto_get_next_protocol(&proto_cookie))
{
if (strlen(protocol_filter) >= filter_length && !g_ascii_strncasecmp(tok_field, protocol_filter, filter_length))
{
- printf("%s{", sepa);
+ json_dumper_begin_object(&dumper);
{
- printf("\"f\":");
- json_puts_string(protocol_filter);
- printf(",\"t\":%d", FT_PROTOCOL);
- printf(",\"n\":");
- json_puts_string(protocol_name);
+ sharkd_json_value_string("f", protocol_filter);
+ sharkd_json_value_anyf("t", "%d", FT_PROTOCOL);
+ sharkd_json_value_string("n", protocol_name);
}
- printf("}");
- sepa = ",";
+ json_dumper_end_object(&dumper);
}
if (!filter_with_dot)
if (strlen(hfinfo->abbrev) >= filter_length && !g_ascii_strncasecmp(tok_field, hfinfo->abbrev, filter_length))
{
- printf("%s{", sepa);
+ json_dumper_begin_object(&dumper);
{
- printf("\"f\":");
- json_puts_string(hfinfo->abbrev);
+ sharkd_json_value_string("f", hfinfo->abbrev);
/* XXX, skip displaying name, if there are multiple (to not confuse user) */
if (hfinfo->same_name_next == NULL)
{
- printf(",\"t\":%d", hfinfo->type);
- printf(",\"n\":");
- json_puts_string(hfinfo->name);
+ sharkd_json_value_anyf("t", "%d", hfinfo->type);
+ sharkd_json_value_string("n", hfinfo->name);
}
}
- printf("}");
- sepa = ",";
+ json_dumper_end_object(&dumper);
}
}
}
- printf("]");
+ sharkd_json_array_close();
}
if (tok_pref != NULL && tok_pref[0])
data.module = tok_pref;
data.pref = tok_pref;
- data.sepa = "";
-
- printf(",\"pref\":[");
+ sharkd_json_array_open("pref");
if ((dot_sepa = strchr(tok_pref, '.')))
{
module_t *pref_mod;
{
prefs_modules_foreach(sharkd_session_process_complete_pref_cb, &data);
}
-
- printf("]");
+ sharkd_json_array_close();
}
+ json_dumper_end_object(&dumper);
+ json_dumper_finish(&dumper);
- printf("}\n");
return 0;
}
+/**
+ * sharkd_session_process_setcomment()
+ *
+ * Process setcomment request
+ *
+ * Input:
+ * (m) frame - frame number
+ * (o) comment - user comment
+ *
+ * Output object with attributes:
+ * (m) err - error code: 0 succeed
+ */
+static void
+sharkd_session_process_setcomment(char *buf, const jsmntok_t *tokens, int count)
+{
+ const char *tok_frame = json_find_attr(buf, tokens, count, "frame");
+ const char *tok_comment = json_find_attr(buf, tokens, count, "comment");
+
+ guint32 framenum;
+ frame_data *fdata;
+ int ret;
+
+ if (!tok_frame || !ws_strtou32(tok_frame, NULL, &framenum) || framenum == 0)
+ return;
+
+ fdata = sharkd_get_frame(framenum);
+ if (!fdata)
+ return;
+
+ ret = sharkd_set_user_comment(fdata, tok_comment);
+
+ sharkd_json_simple_reply(ret, NULL);
+}
+
/**
* sharkd_session_process_setconf()
*
const char *tok_name = json_find_attr(buf, tokens, count, "name");
const char *tok_value = json_find_attr(buf, tokens, count, "value");
char pref[4096];
+ char *errmsg = NULL;
prefs_set_pref_e ret;
ws_snprintf(pref, sizeof(pref), "%s:%s", tok_name, tok_value);
- ret = prefs_set_pref(pref);
- printf("{\"err\":%d}\n", ret);
+ ret = prefs_set_pref(pref, &errmsg);
+
+ sharkd_json_simple_reply(ret, errmsg);
+ g_free(errmsg);
}
struct sharkd_session_process_dumpconf_data
{
module_t *module;
- const char *sepa;
};
static guint
struct sharkd_session_process_dumpconf_data *data = (struct sharkd_session_process_dumpconf_data *) d;
const char *pref_name = prefs_get_name(pref);
- printf("%s\"%s.%s\":{", data->sepa, data->module->name, pref_name);
+ char json_pref_key[512];
+
+ snprintf(json_pref_key, sizeof(json_pref_key), "%s.%s", data->module->name, pref_name);
+ json_dumper_set_member_name(&dumper, json_pref_key);
+ json_dumper_begin_object(&dumper);
switch (prefs_get_type(pref))
{
case PREF_UINT:
case PREF_DECODE_AS_UINT:
- printf("\"u\":%u", prefs_get_uint_value_real(pref, pref_current));
+ sharkd_json_value_anyf("u", "%u", prefs_get_uint_value_real(pref, pref_current));
if (prefs_get_uint_base(pref) != 10)
- printf(",\"ub\":%d", prefs_get_uint_base(pref));
+ sharkd_json_value_anyf("ub", "%u", prefs_get_uint_base(pref));
break;
case PREF_BOOL:
- printf("\"b\":%s", prefs_get_bool_value(pref, pref_current) ? "1" : "0");
+ sharkd_json_value_anyf("b", prefs_get_bool_value(pref, pref_current) ? "1" : "0");
break;
case PREF_STRING:
- printf("\"s\":");
- json_puts_string(prefs_get_string_value(pref, pref_current));
+ case PREF_SAVE_FILENAME:
+ case PREF_OPEN_FILENAME:
+ case PREF_DIRNAME:
+ sharkd_json_value_string("s", prefs_get_string_value(pref, pref_current));
break;
case PREF_ENUM:
{
const enum_val_t *enums;
- const char *enum_sepa = "";
- printf("\"e\":[");
+ sharkd_json_array_open("e");
for (enums = prefs_get_enumvals(pref); enums->name; enums++)
{
- printf("%s{\"v\":%d", enum_sepa, enums->value);
+ json_dumper_begin_object(&dumper);
+
+ sharkd_json_value_anyf("v", "%d", enums->value);
if (enums->value == prefs_get_enum_value(pref, pref_current))
- printf(",\"s\":1");
+ sharkd_json_value_anyf("s", "1");
- printf(",\"d\":");
- json_puts_string(enums->description);
+ sharkd_json_value_string("d", enums->description);
- printf("}");
- enum_sepa = ",";
+ json_dumper_end_object(&dumper);
}
- printf("]");
+ sharkd_json_array_close();
break;
}
case PREF_DECODE_AS_RANGE:
{
char *range_str = range_convert_range(NULL, prefs_get_range_value_real(pref, pref_current));
- printf("\"r\":\"%s\"", range_str);
+ sharkd_json_value_string("r", range_str);
wmem_free(NULL, range_str);
break;
}
case PREF_UAT:
+ {
+ uat_t *uat = prefs_get_uat_value(pref);
+ guint idx;
+
+ sharkd_json_array_open("t");
+ for (idx = 0; idx < uat->raw_data->len; idx++)
+ {
+ void *rec = UAT_INDEX_PTR(uat, idx);
+ guint colnum;
+
+ sharkd_json_array_open(NULL);
+ for (colnum = 0; colnum < uat->ncols; colnum++)
+ {
+ char *str = uat_fld_tostr(rec, &(uat->fields[colnum]));
+
+ sharkd_json_value_string(NULL, str);
+ g_free(str);
+ }
+
+ sharkd_json_array_close();
+ }
+
+ sharkd_json_array_close();
+ break;
+ }
+
case PREF_COLOR:
case PREF_CUSTOM:
case PREF_STATIC_TEXT:
}
#if 0
- printf(",\"t\":");
- json_puts_string(prefs_get_title(pref));
+ sharkd_json_value_string("t", prefs_get_title(pref));
#endif
- printf("}");
- data->sepa = ",";
+ json_dumper_end_object(&dumper);
return 0; /* continue */
}
* Output object with attributes:
* (o) prefs - object with module preferences
* (m) [KEY] - preference name
- * (o) u - preference value (only for PREF_UINT)
- * (o) ub - preference value suggested base for display (only for PREF_UINT) and if different than 10
+ * (o) u - preference value (for PREF_UINT, PREF_DECODE_AS_UINT)
+ * (o) ub - preference value suggested base for display (for PREF_UINT, PREF_DECODE_AS_UINT) and if different than 10
* (o) b - preference value (only for PREF_BOOL) (1 true, 0 false)
- * (o) s - preference value (only for PREF_STRING)
+ * (o) s - preference value (for PREF_STRING, PREF_SAVE_FILENAME, PREF_OPEN_FILENAME, PREF_DIRNAME)
* (o) e - preference possible values (only for PREF_ENUM)
- * (o) r - preference value (only for PREF_RANGE)
+ * (o) r - preference value (for PREF_RANGE, PREF_DECODE_AS_RANGE)
* (o) t - preference value (only for PREF_UAT)
*/
static void
struct sharkd_session_process_dumpconf_data data;
data.module = NULL;
- data.sepa = "";
- printf("{\"prefs\":{");
+ json_dumper_begin_object(&dumper);
+
+ sharkd_json_value_anyf("prefs", NULL);
+ json_dumper_begin_object(&dumper);
prefs_modules_foreach(sharkd_session_process_dumpconf_mod_cb, &data);
- printf("}}\n");
+ json_dumper_end_object(&dumper);
+
+ json_dumper_end_object(&dumper);
+ json_dumper_finish(&dumper);
return;
}
struct sharkd_session_process_dumpconf_data data;
data.module = pref_mod;
- data.sepa = "";
- printf("{\"prefs\":{");
+ json_dumper_begin_object(&dumper);
+
+ sharkd_json_value_anyf("prefs", NULL);
+ json_dumper_begin_object(&dumper);
sharkd_session_process_dumpconf_cb(pref, &data);
- printf("}}\n");
+ json_dumper_end_object(&dumper);
+
+ json_dumper_end_object(&dumper);
+ json_dumper_finish(&dumper);
}
return;
struct sharkd_session_process_dumpconf_data data;
data.module = pref_mod;
- data.sepa = "";
- printf("{\"prefs\":{");
+ json_dumper_begin_object(&dumper);
+
+ sharkd_json_value_anyf("prefs", NULL);
+ json_dumper_begin_object(&dumper);
prefs_pref_foreach(pref_mod, sharkd_session_process_dumpconf_cb, &data);
- printf("}}\n");
- }
+ json_dumper_end_object(&dumper);
+
+ json_dumper_end_object(&dumper);
+ json_dumper_finish(&dumper);
+ }
+}
+
+struct sharkd_download_rtp
+{
+ rtpstream_id_t id;
+ GSList *packets;
+ double start_time;
+};
+
+static void
+sharkd_rtp_download_free_items(void *ptr)
+{
+ rtp_packet_t *rtp_packet = (rtp_packet_t *) ptr;
+
+ g_free(rtp_packet->info);
+ g_free(rtp_packet->payload_data);
+ g_free(rtp_packet);
+}
+
+static void
+sharkd_rtp_download_decode(struct sharkd_download_rtp *req)
+{
+ /* based on RtpAudioStream::decode() 6e29d874f8b5e6ebc59f661a0bb0dab8e56f122a */
+ /* TODO, for now only without silence (timing_mode_ = Uninterrupted) */
+
+ static const int sample_bytes_ = sizeof(SAMPLE) / sizeof(char);
+
+ guint32 audio_out_rate_ = 0;
+ struct _GHashTable *decoders_hash_ = rtp_decoder_hash_table_new();
+ struct SpeexResamplerState_ *audio_resampler_ = NULL;
+
+ gsize resample_buff_len = 0x1000;
+ SAMPLE *resample_buff = (SAMPLE *) g_malloc(resample_buff_len);
+ spx_uint32_t cur_in_rate = 0;
+ char *write_buff = NULL;
+ gint64 write_bytes = 0;
+ unsigned channels = 0;
+ unsigned sample_rate = 0;
+
+ GSList *l;
+
+ for (l = req->packets; l; l = l->next)
+ {
+ rtp_packet_t *rtp_packet = (rtp_packet_t *) l->data;
+
+ SAMPLE *decode_buff = NULL;
+ size_t decoded_bytes;
+
+ decoded_bytes = decode_rtp_packet(rtp_packet, &decode_buff, decoders_hash_, &channels, &sample_rate);
+ if (decoded_bytes == 0 || sample_rate == 0)
+ {
+ /* We didn't decode anything. Clean up and prep for the next packet. */
+ g_free(decode_buff);
+ continue;
+ }
+
+ if (audio_out_rate_ == 0)
+ {
+ guint32 tmp32;
+ guint16 tmp16;
+ char wav_hdr[44];
+
+ /* First non-zero wins */
+ audio_out_rate_ = sample_rate;
+
+ RTP_STREAM_DEBUG("Audio sample rate is %u", audio_out_rate_);
+
+ /* write WAVE header */
+ memset(&wav_hdr, 0, sizeof(wav_hdr));
+ memcpy(&wav_hdr[0], "RIFF", 4);
+ memcpy(&wav_hdr[4], "\xFF\xFF\xFF\xFF", 4); /* XXX, unknown */
+ memcpy(&wav_hdr[8], "WAVE", 4);
+
+ memcpy(&wav_hdr[12], "fmt ", 4);
+ memcpy(&wav_hdr[16], "\x10\x00\x00\x00", 4); /* PCM */
+ memcpy(&wav_hdr[20], "\x01\x00", 2); /* PCM */
+ /* # channels */
+ tmp16 = channels;
+ memcpy(&wav_hdr[22], &tmp16, 2);
+ /* sample rate */
+ tmp32 = sample_rate;
+ memcpy(&wav_hdr[24], &tmp32, 4);
+ /* byte rate */
+ tmp32 = sample_rate * channels * sample_bytes_;
+ memcpy(&wav_hdr[28], &tmp32, 4);
+ /* block align */
+ tmp16 = channels * sample_bytes_;
+ memcpy(&wav_hdr[32], &tmp16, 2);
+ /* bits per sample */
+ tmp16 = 8 * sample_bytes_;
+ memcpy(&wav_hdr[34], &tmp16, 2);
+
+ memcpy(&wav_hdr[36], "data", 4);
+ memcpy(&wav_hdr[40], "\xFF\xFF\xFF\xFF", 4); /* XXX, unknown */
+
+ json_dumper_write_base64(&dumper, wav_hdr, sizeof(wav_hdr));
+ }
+
+ // Write samples to our file.
+ write_buff = (char *) decode_buff;
+ write_bytes = decoded_bytes;
+
+ if (audio_out_rate_ != sample_rate)
+ {
+ spx_uint32_t in_len, out_len;
+
+ /* Resample the audio to match our previous output rate. */
+ if (!audio_resampler_)
+ {
+ audio_resampler_ = speex_resampler_init(1, sample_rate, audio_out_rate_, 10, NULL);
+ speex_resampler_skip_zeros(audio_resampler_);
+ RTP_STREAM_DEBUG("Started resampling from %u to (out) %u Hz.", sample_rate, audio_out_rate_);
+ }
+ else
+ {
+ spx_uint32_t audio_out_rate;
+ speex_resampler_get_rate(audio_resampler_, &cur_in_rate, &audio_out_rate);
+
+ if (sample_rate != cur_in_rate)
+ {
+ speex_resampler_set_rate(audio_resampler_, sample_rate, audio_out_rate);
+ RTP_STREAM_DEBUG("Changed input rate from %u to %u Hz. Out is %u.", cur_in_rate, sample_rate, audio_out_rate_);
+ }
+ }
+ in_len = (spx_uint32_t)rtp_packet->info->info_payload_len;
+ out_len = (audio_out_rate_ * (spx_uint32_t)rtp_packet->info->info_payload_len / sample_rate) + (audio_out_rate_ % sample_rate != 0);
+ if (out_len * sample_bytes_ > resample_buff_len)
+ {
+ while ((out_len * sample_bytes_ > resample_buff_len))
+ resample_buff_len *= 2;
+ resample_buff = (SAMPLE *) g_realloc(resample_buff, resample_buff_len);
+ }
+
+ speex_resampler_process_int(audio_resampler_, 0, decode_buff, &in_len, resample_buff, &out_len);
+ write_buff = (char *) resample_buff;
+ write_bytes = out_len * sample_bytes_;
+ }
+
+ /* Write the decoded, possibly-resampled audio */
+ json_dumper_write_base64(&dumper, write_buff, write_bytes);
+
+ g_free(decode_buff);
+ }
+
+ g_free(resample_buff);
+ g_hash_table_destroy(decoders_hash_);
+}
+
+static tap_packet_status
+sharkd_session_packet_download_tap_rtp_cb(void *tapdata, packet_info *pinfo, epan_dissect_t *edt _U_, const void *data)
+{
+ const struct _rtp_info *rtp_info = (const struct _rtp_info *) data;
+ struct sharkd_download_rtp *req_rtp = (struct sharkd_download_rtp *) tapdata;
+
+ /* do not consider RTP packets without a setup frame */
+ if (rtp_info->info_setup_frame_num == 0)
+ return TAP_PACKET_DONT_REDRAW;
+
+ if (rtpstream_id_equal_pinfo_rtp_info(&req_rtp->id, pinfo, rtp_info))
+ {
+ rtp_packet_t *rtp_packet;
+
+ rtp_packet = g_new0(rtp_packet_t, 1);
+ rtp_packet->info = (struct _rtp_info *) g_memdup(rtp_info, sizeof(struct _rtp_info));
+
+ if (rtp_info->info_all_data_present && rtp_info->info_payload_len != 0)
+ rtp_packet->payload_data = (guint8 *) g_memdup(&(rtp_info->info_data[rtp_info->info_payload_offset]), rtp_info->info_payload_len);
+
+ if (!req_rtp->packets)
+ req_rtp->start_time = nstime_to_sec(&pinfo->abs_ts);
+
+ rtp_packet->frame_num = pinfo->num;
+ rtp_packet->arrive_offset = nstime_to_sec(&pinfo->abs_ts) - req_rtp->start_time;
+
+ /* XXX, O(n) optimize */
+ req_rtp->packets = g_slist_append(req_rtp->packets, rtp_packet);
+ }
+
+ return TAP_PACKET_DONT_REDRAW;
+}
+
+/**
+ * sharkd_session_process_download()
+ *
+ * Process download request
+ *
+ * Input:
+ * (m) token - token to download
+ *
+ * Output object with attributes:
+ * (o) file - suggested name of file
+ * (o) mime - suggested content type
+ * (o) data - payload base64 encoded
+ */
+static void
+sharkd_session_process_download(char *buf, const jsmntok_t *tokens, int count)
+{
+ const char *tok_token = json_find_attr(buf, tokens, count, "token");
+
+ if (!tok_token)
+ return;
+
+ if (!strncmp(tok_token, "eo:", 3))
+ {
+ struct sharkd_export_object_list *object_list;
+ const export_object_entry_t *eo_entry = NULL;
+
+ for (object_list = sharkd_eo_list; object_list; object_list = object_list->next)
+ {
+ size_t eo_type_len = strlen(object_list->type);
+
+ if (!strncmp(tok_token, object_list->type, eo_type_len) && tok_token[eo_type_len] == '_')
+ {
+ int row;
+
+ if (sscanf(&tok_token[eo_type_len + 1], "%d", &row) != 1)
+ break;
+
+ eo_entry = (export_object_entry_t *) g_slist_nth_data(object_list->entries, row);
+ break;
+ }
+ }
+
+ if (eo_entry)
+ {
+ const char *mime = (eo_entry->content_type) ? eo_entry->content_type : "application/octet-stream";
+ const char *filename = (eo_entry->filename) ? eo_entry->filename : tok_token;
+
+ json_dumper_begin_object(&dumper);
+ sharkd_json_value_string("file", filename);
+ sharkd_json_value_string("mime", mime);
+ sharkd_json_value_base64("data", eo_entry->payload_data, (size_t) eo_entry->payload_len);
+ json_dumper_end_object(&dumper);
+ json_dumper_finish(&dumper);
+ }
+ }
+ else if (!strcmp(tok_token, "ssl-secrets"))
+ {
+ char *str = ssl_export_sessions();
+
+ if (str)
+ {
+ const char *mime = "text/plain";
+ const char *filename = "keylog.txt";
+
+ json_dumper_begin_object(&dumper);
+ sharkd_json_value_string("file", filename);
+ sharkd_json_value_string("mime", mime);
+ sharkd_json_value_base64("data", str, strlen(str));
+ json_dumper_end_object(&dumper);
+ json_dumper_finish(&dumper);
+ }
+ g_free(str);
+ }
+ else if (!strncmp(tok_token, "rtp:", 4))
+ {
+ struct sharkd_download_rtp rtp_req;
+ GString *tap_error;
+
+ memset(&rtp_req, 0, sizeof(rtp_req));
+ if (!sharkd_rtp_match_init(&rtp_req.id, tok_token + 4))
+ {
+ fprintf(stderr, "sharkd_session_process_download() rtp tokenizing error %s\n", tok_token);
+ return;
+ }
+
+ tap_error = register_tap_listener("rtp", &rtp_req, NULL, 0, NULL, sharkd_session_packet_download_tap_rtp_cb, NULL, NULL);
+ if (tap_error)
+ {
+ fprintf(stderr, "sharkd_session_process_download() rtp error=%s", tap_error->str);
+ g_string_free(tap_error, TRUE);
+ return;
+ }
+
+ sharkd_retap();
+ remove_tap_listener(&rtp_req);
+
+ if (rtp_req.packets)
+ {
+ const char *mime = "audio/x-wav";
+ const char *filename = tok_token;
+
+ json_dumper_begin_object(&dumper);
+ sharkd_json_value_string("file", filename);
+ sharkd_json_value_string("mime", mime);
+
+ sharkd_json_value_anyf("data", NULL);
+ json_dumper_begin_base64(&dumper);
+ sharkd_rtp_download_decode(&rtp_req);
+ json_dumper_end_base64(&dumper);
+
+ json_dumper_end_object(&dumper);
+ json_dumper_finish(&dumper);
+
+ g_slist_free_full(rtp_req.packets, sharkd_rtp_download_free_items);
+ }
+ }
}
static void
return;
}
+ if (tokens[i + 1].type != JSMN_STRING && tokens[i + 1].type != JSMN_PRIMITIVE)
+ {
+ fprintf(stderr, "sanity check(3a): [%d] wrong type\n", i + 1);
+ return;
+ }
+
buf[tokens[i + 0].end] = '\0';
buf[tokens[i + 1].end] = '\0';
- json_unescape_str(&buf[tokens[i + 0].start]);
- json_unescape_str(&buf[tokens[i + 1].start]);
+ /* unescape only value, as keys are simple strings */
+ if (tokens[i + 1].type == JSMN_STRING && !json_decode_string_inplace(&buf[tokens[i + 1].start]))
+ {
+ fprintf(stderr, "sanity check(3b): [%d] cannot unescape string\n", i + 1);
+ return;
+ }
}
{
sharkd_session_process_frames(buf, tokens, count);
else if (!strcmp(tok_req, "tap"))
sharkd_session_process_tap(buf, tokens, count);
+ else if (!strcmp(tok_req, "follow"))
+ sharkd_session_process_follow(buf, tokens, count);
+ else if (!strcmp(tok_req, "iograph"))
+ sharkd_session_process_iograph(buf, tokens, count);
else if (!strcmp(tok_req, "intervals"))
sharkd_session_process_intervals(buf, tokens, count);
else if (!strcmp(tok_req, "frame"))
sharkd_session_process_frame(buf, tokens, count);
+ else if (!strcmp(tok_req, "setcomment"))
+ sharkd_session_process_setcomment(buf, tokens, count);
else if (!strcmp(tok_req, "setconf"))
sharkd_session_process_setconf(buf, tokens, count);
else if (!strcmp(tok_req, "dumpconf"))
sharkd_session_process_dumpconf(buf, tokens, count);
+ else if (!strcmp(tok_req, "download"))
+ sharkd_session_process_download(buf, tokens, count);
else if (!strcmp(tok_req, "bye"))
exit(0);
else
fprintf(stderr, "::: req = %s\n", tok_req);
/* reply for every command are 0+ lines of JSON reply (outputed above), finished by empty new line */
- printf("\n");
+ json_dumper_finish(&dumper);
/*
* We do an explicit fflush after every line, because
int
sharkd_session_main(void)
{
- char buf[16 * 1024];
+ char buf[2 * 1024];
jsmntok_t *tokens = NULL;
int tokens_max = -1;
fprintf(stderr, "Hello in child.\n");
+ dumper.output_file = stdout;
+
+ filter_table = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, sharkd_session_filter_free);
+
+#ifdef HAVE_MAXMINDDB
+ /* mmdbresolve was stopped before fork(), force starting it */
+ uat_get_table_by_name("MaxMind Database Paths")->post_update_cb();
+#endif
+
while (fgets(buf, sizeof(buf), stdin))
{
/* every command is line seperated JSON */
int ret;
- ret = wsjsmn_parse(buf, NULL, 0);
+ ret = json_parse(buf, NULL, 0);
if (ret < 0)
{
fprintf(stderr, "invalid JSON -> closing\n");
memset(tokens, 0, ret * sizeof(jsmntok_t));
- ret = wsjsmn_parse(buf, tokens, ret);
+ ret = json_parse(buf, tokens, ret);
if (ret < 0)
{
fprintf(stderr, "invalid JSON(2) -> closing\n");
return 2;
}
+#if defined(HAVE_C_ARES) || defined(HAVE_MAXMINDDB)
+ host_name_lookup_process();
+#endif
+
sharkd_session_process(buf, tokens, ret);
}
+ g_hash_table_destroy(filter_table);
g_free(tokens);
return 0;
git.samba.org / metze / wireshark / wip.git / blobdiff