#include <wsutil/wsjson.h>
#include <wsutil/ws_printf.h>
+#include <wsutil/json_dumper.h>
#include <file.h>
#include <epan/epan_dissect.h>
static GHashTable *filter_table = NULL;
-static gboolean
-json_unescape_str(char *input)
-{
- return wsjson_unescape_json_string(input, input);
-}
+static json_dumper dumper = {0};
static const char *
json_find_attr(const char *buf, const jsmntok_t *tokens, int count, const char *attr)
return NULL;
}
-static void
-json_puts_string(const char *str)
-{
- 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;
-
- default:
- putchar(str[i]);
- break;
- }
- }
-
- putchar('"');
-}
-
-static void
-json_print_base64_step(const guint8 *data, int *state1, int *state2)
-{
- gchar buf[(1 / 3 + 1) * 4 + 4 + 1];
- gsize wrote;
-
- if (data)
- wrote = g_base64_encode_step(data, 1, FALSE, buf, state1, state2);
- else
- wrote = g_base64_encode_close(FALSE, buf, state1, state2);
-
- if (wrote > 0)
- {
- buf[wrote] = '\0';
- printf("%s", buf);
- }
-}
-
static void
json_print_base64(const guint8 *data, size_t len)
{
- size_t i;
- int base64_state1 = 0;
- int base64_state2 = 0;
-
- putchar('"');
-
- for (i = 0; i < len; i++)
- json_print_base64_step(&data[i], &base64_state1, &base64_state2);
-
- json_print_base64_step(NULL, &base64_state1, &base64_state2);
-
- putchar('"');
+ json_dumper_begin_base64(&dumper);
+ json_dumper_write_base64(&dumper, data, len);
+ json_dumper_end_base64(&dumper);
}
-static void G_GNUC_PRINTF(3, 4)
-sharkd_json_value_anyf(gboolean sepa, const char *key, const char *valuef, ...)
+static void G_GNUC_PRINTF(2, 3)
+sharkd_json_value_anyf(const char *key, const char *format, ...)
{
if (key)
- printf("%s\"%s\":", (sepa) ? "," : "", key);
- else
- printf("%s", (sepa) ? "," : "");
+ json_dumper_set_member_name(&dumper, key);
- if (valuef && *valuef)
- {
+ if (format) {
va_list ap;
-
- va_start(ap, valuef);
- vprintf(valuef, ap);
+ va_start(ap, format);
+ json_dumper_value_va_list(&dumper, format, ap);
va_end(ap);
}
}
static void
-sharkd_json_value_string(gboolean sepa, const char *key, const char *str)
+sharkd_json_value_string(const char *key, const char *str)
{
- sharkd_json_value_anyf(sepa, key, NULL);
- json_puts_string(str);
+ if (key)
+ json_dumper_set_member_name(&dumper, key);
+ if (str)
+ json_dumper_value_string(&dumper, str);
}
static void
-sharkd_json_value_base64(gboolean sepa, const char *key, const guint8 *data, size_t len)
+sharkd_json_value_base64(const char *key, const guint8 *data, size_t len)
{
- sharkd_json_value_anyf(sepa, key, NULL);
+ if (key)
+ json_dumper_set_member_name(&dumper, key);
json_print_base64(data, len);
}
-static void G_GNUC_PRINTF(3, 4)
-sharkd_json_value_stringf(gboolean sepa, const char *key, const char *format, ...)
+static void G_GNUC_PRINTF(2, 3)
+sharkd_json_value_stringf(const char *key, const char *format, ...)
{
- va_list ap;
-
- sharkd_json_value_anyf(sepa, key, NULL);
+ if (key)
+ json_dumper_set_member_name(&dumper, key);
- va_start(ap, format);
- putchar('"');
- vprintf(format, ap);
- putchar('"');
- va_end(ap);
+ 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);
+ }
}
static void
-sharkd_json_array_open(gboolean sepa, const char *key)
+sharkd_json_array_open(const char *key)
{
- sharkd_json_value_anyf(sepa, key, "[");
+ if (key)
+ json_dumper_set_member_name(&dumper, key);
+ json_dumper_begin_array(&dumper);
}
static void
sharkd_json_array_close(void)
{
- printf("]");
+ json_dumper_end_array(&dumper);
}
static void
-sharkd_json_object_open(gboolean sepa)
+sharkd_json_simple_reply(int err, const char *errmsg)
{
- sharkd_json_value_anyf(sepa, NULL, "{");
-}
+ json_dumper_begin_object(&dumper);
+ sharkd_json_value_anyf("err", "%d", err);
+ if (errmsg)
+ sharkd_json_value_string("errmsg", errmsg);
-static void
-sharkd_json_object_close(void)
-{
- printf("}");
+ json_dumper_end_object(&dumper);
+ json_dumper_finish(&dumper);
}
static void
}
static gboolean
-sharkd_session_process_info_nstat_cb(const void *key, void *value, void *userdata)
+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;
- int *pi = (int *) userdata;
- sharkd_json_object_open(*pi != 0);
- sharkd_json_value_stringf(FALSE, "name", "%s", stat_tap->title);
- sharkd_json_value_stringf(TRUE, "tap", "nstat:%s", (const char *) key);
- sharkd_json_object_close();
+ 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);
- *pi = *pi + 1;
return FALSE;
}
static gboolean
-sharkd_session_process_info_conv_cb(const void* key, void* value, void* userdata)
+sharkd_session_process_info_conv_cb(const void* key, void* value, void* userdata _U_)
{
struct register_ct *table = (struct register_ct *) value;
- int *pi = (int *) userdata;
const char *label = (const char *) key;
if (get_conversation_packet_func(table))
{
- sharkd_json_object_open(*pi != 0);
- sharkd_json_value_stringf(FALSE, "name", "Conversation List/%s", label);
- sharkd_json_value_stringf(TRUE, "tap", "conv:%s", label);
- sharkd_json_object_close();
-
- *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))
{
- sharkd_json_object_open(*pi != 0);
- sharkd_json_value_stringf(FALSE, "name", "Endpoint/%s", label);
- sharkd_json_value_stringf(TRUE, "tap", "endpt:%s", label);
- sharkd_json_object_close();
-
- *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)
+sharkd_session_seq_analysis_cb(const void *key, void *value, void *userdata _U_)
{
register_analysis_t *analysis = (register_analysis_t *) value;
- int *pi = (int *) userdata;
- sharkd_json_object_open(*pi != 0);
- sharkd_json_value_stringf(FALSE, "name", "%s", sequence_analysis_get_ui_name(analysis));
- sharkd_json_value_stringf(TRUE, "tap", "seqa:%s", (const char *) key);
- sharkd_json_object_close();
+ 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);
- *pi = *pi + 1;
return FALSE;
}
static gboolean
-sharkd_export_object_visit_cb(const void *key _U_, void *value, void *user_data)
+sharkd_export_object_visit_cb(const void *key _U_, void *value, void *user_data _U_)
{
register_eo_t *eo = (register_eo_t *) value;
- int *pi = (int *) user_data;
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));
- sharkd_json_object_open(*pi != 0);
- sharkd_json_value_stringf(FALSE, "name", "Export Object/%s", label);
- sharkd_json_value_stringf(TRUE, "tap", "eo:%s", filter);
- sharkd_json_object_close();
+ 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);
- *pi = *pi + 1;
return FALSE;
}
static gboolean
-sharkd_srt_visit_cb(const void *key _U_, void *value, void *user_data)
+sharkd_srt_visit_cb(const void *key _U_, void *value, void *user_data _U_)
{
register_srt_t *srt = (register_srt_t *) value;
- int *pi = (int *) user_data;
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));
- sharkd_json_object_open(*pi != 0);
- sharkd_json_value_stringf(FALSE, "name", "Service Response Time/%s", label);
- sharkd_json_value_stringf(TRUE, "tap", "srt:%s", filter);
- sharkd_json_object_close();
+ 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);
- *pi = *pi + 1;
return FALSE;
}
static gboolean
-sharkd_rtd_visit_cb(const void *key _U_, void *value, void *user_data)
+sharkd_rtd_visit_cb(const void *key _U_, void *value, void *user_data _U_)
{
register_rtd_t *rtd = (register_rtd_t *) value;
- int *pi = (int *) user_data;
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));
- sharkd_json_object_open(*pi != 0);
- sharkd_json_value_stringf(FALSE, "name", "Response Time Delay/%s", label);
- sharkd_json_value_stringf(TRUE, "tap", "rtd:%s", filter);
- sharkd_json_object_close();
+ 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);
- *pi = *pi + 1;
return FALSE;
}
static gboolean
-sharkd_follower_visit_cb(const void *key _U_, void *value, void *user_data)
+sharkd_follower_visit_cb(const void *key _U_, void *value, void *user_data _U_)
{
register_follow_t *follower = (register_follow_t *) value;
- int *pi = (int *) user_data;
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 */
- sharkd_json_object_open(*pi != 0);
- sharkd_json_value_stringf(FALSE, "name", "Follow/%s", label);
- sharkd_json_value_stringf(TRUE, "tap", "follow:%s", filter);
- sharkd_json_object_close();
+ 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);
- *pi = *pi + 1;
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' - sequence analysis name
* 'tap' - sharkd tap-name
*
- * (m) taps - available taps, array of object with attributes:
+ * (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:
+ * (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;
- sharkd_json_object_open(FALSE);
+ json_dumper_begin_object(&dumper);
- sharkd_json_array_open(FALSE, "columns");
+ 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);
- sharkd_json_object_open(i != 0);
- sharkd_json_value_stringf(FALSE, "name", "%s", col_descr);
- sharkd_json_value_stringf(TRUE, "format", "%s", col_format);
- sharkd_json_object_close();
+ json_dumper_begin_object(&dumper);
+ sharkd_json_value_string("name", col_descr);
+ sharkd_json_value_string("format", col_format);
+ json_dumper_end_object(&dumper);
}
sharkd_json_array_close();
- sharkd_json_array_open(TRUE, "stats");
+ sharkd_json_array_open("stats");
{
GList *cfg_list = stats_tree_get_cfg_list();
GList *l;
- gboolean sepa = FALSE;
for (l = cfg_list; l; l = l->next)
{
stats_tree_cfg *cfg = (stats_tree_cfg *) l->data;
- sharkd_json_object_open(sepa);
- sharkd_json_value_stringf(FALSE, "name", "%s", cfg->name);
- sharkd_json_value_stringf(TRUE, "tap", "stat:%s", cfg->abbr);
- sharkd_json_object_close();
- sepa = TRUE;
+ 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);
}
sharkd_json_array_close();
- sharkd_json_array_open(TRUE, "ftypes");
+ sharkd_json_array_open("ftypes");
for (i = 0; i < FT_NUM_TYPES; i++)
- sharkd_json_value_string(i != 0, NULL, ftype_name((ftenum_t) i));
+ sharkd_json_value_string(NULL, ftype_name((ftenum_t) i));
sharkd_json_array_close();
- sharkd_json_value_string(TRUE, "version", sharkd_version());
+ sharkd_json_value_string("version", sharkd_version());
- sharkd_json_array_open(TRUE, "nstat");
+ 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(TRUE, "convs");
+ 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(TRUE, "seqa");
+ 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(TRUE, "taps");
+ sharkd_json_array_open("taps");
{
- printf("{\"name\":\"%s\",\"tap\":\"%s\"}", "RTP streams", "rtp-streams");
- printf(",{\"name\":\"%s\",\"tap\":\"%s\"}", "Expert Information", "expert");
+ 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);
}
sharkd_json_array_close();
- sharkd_json_array_open(TRUE, "eo");
+ sharkd_json_array_open("eo");
i = 0;
eo_iterate_tables(sharkd_export_object_visit_cb, &i);
sharkd_json_array_close();
- sharkd_json_array_open(TRUE, "srt");
+ sharkd_json_array_open("srt");
i = 0;
srt_table_iterate_tables(sharkd_srt_visit_cb, &i);
sharkd_json_array_close();
- sharkd_json_array_open(TRUE, "rtd");
+ sharkd_json_array_open("rtd");
i = 0;
rtd_table_iterate_tables(sharkd_rtd_visit_cb, &i);
sharkd_json_array_close();
- sharkd_json_array_open(TRUE, "follow");
+ 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);
}
/**
static void
sharkd_session_process_status(void)
{
- printf("{\"frames\":%u", cfile.count);
+ json_dumper_begin_object(&dumper);
- sharkd_json_value_anyf(TRUE, "duration", "%.9f", nstime_to_sec(&cfile.elapsed_time));
+ 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(TRUE, "filename", name);
+ sharkd_json_value_string("filename", name);
g_free(name);
}
gint64 file_size = wtap_file_size(cfile.provider.wth, NULL);
if (file_size > 0)
- sharkd_json_value_anyf(TRUE, "filesize", "%" G_GINT64_FORMAT, file_size);
+ sharkd_json_value_anyf("filesize", "%" G_GINT64_FORMAT, file_size);
}
- printf("}\n");
+ json_dumper_end_object(&dumper);
+ json_dumper_finish(&dumper);
}
struct sharkd_analyse_data
if (!g_hash_table_lookup_extended(analyser->protocols_set, GUINT_TO_POINTER(proto_id), NULL, NULL))
{
- guint proto_count = g_hash_table_size(analyser->protocols_set);
-
g_hash_table_insert(analyser->protocols_set, GUINT_TO_POINTER(proto_id), GUINT_TO_POINTER(proto_id));
-
- sharkd_json_value_string(proto_count != 0, NULL, 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\":%u", cfile.count);
+ json_dumper_begin_object(&dumper);
- sharkd_json_array_open(TRUE, "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, (framenum != 1) ? 1 : 0, framenum - 1, &sharkd_session_process_analyse_cb, SHARKD_DISSECT_FLAG_NULL, &analyser);
sharkd_json_array_close();
if (analyser.first_time)
- sharkd_json_value_anyf(TRUE, "first", "%.9f", nstime_to_sec(analyser.first_time));
+ sharkd_json_value_anyf("first", "%.9f", nstime_to_sec(analyser.first_time));
if (analyser.last_time)
- sharkd_json_value_anyf(TRUE, "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);
}
const guint8 *filter_data = NULL;
- const char *frame_sepa = "";
int col;
guint32 framenum, prev_dis_num = 0;
return;
}
- sharkd_json_array_open(FALSE, NULL);
+ sharkd_json_array_open(NULL);
for (framenum = 1; framenum <= cfile.count; framenum++)
{
frame_data *fdata;
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];
- sharkd_json_value_string(col != 0, NULL, col_item->col_data);
+ sharkd_json_value_string(NULL, col_item->col_data);
}
- printf("],\"num\":%u", framenum);
+ sharkd_json_array_close();
+
+ sharkd_json_value_anyf("num", "%u", framenum);
- if (fdata->flags.has_user_comment || fdata->flags.has_phdr_comment)
+ if (fdata->has_user_comment || fdata->has_phdr_comment)
{
- if (!fdata->flags.has_user_comment || sharkd_get_user_comment(fdata) != NULL)
- sharkd_json_value_anyf(TRUE, "ct", "true");
+ if (!fdata->has_user_comment || sharkd_get_user_comment(fdata) != NULL)
+ sharkd_json_value_anyf("ct", "true");
}
- if (fdata->flags.ignored)
- sharkd_json_value_anyf(TRUE, "i", "true");
+ if (fdata->ignored)
+ sharkd_json_value_anyf("i", "true");
- if (fdata->flags.marked)
- sharkd_json_value_anyf(TRUE, "m", "true");
+ if (fdata->marked)
+ sharkd_json_value_anyf("m", "true");
if (fdata->color_filter)
{
- sharkd_json_value_stringf(TRUE, "bg", "%x", color_t_to_rgb(&fdata->color_filter->bg_color));
- sharkd_json_value_stringf(TRUE, "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));
}
- sharkd_json_object_close();
- 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 = "";
- sharkd_json_array_open(FALSE, NULL);
+ 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);
- sharkd_json_value_anyf(TRUE, "count", "%d", 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))
{
- sharkd_json_value_anyf(TRUE, "avg", "%.2f", ((float)node->total) / node->counter);
- sharkd_json_value_anyf(TRUE, "min", "%d", node->minvalue);
- sharkd_json_value_anyf(TRUE, "max", "%d", 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)
- sharkd_json_value_anyf(TRUE, "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)
- sharkd_json_value_anyf(TRUE, "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))
- sharkd_json_value_anyf(TRUE, "perc", "100");
+ sharkd_json_value_anyf("perc", "100");
if (prefs.st_enable_burstinfo && node->max_burst)
{
if (prefs.st_burst_showcount)
- sharkd_json_value_anyf(TRUE, "burstcount", "%d", node->max_burst);
+ sharkd_json_value_anyf("burstcount", "%d", node->max_burst);
else
- sharkd_json_value_anyf(TRUE, "burstrate", "%.4f", ((double)node->max_burst) / prefs.st_burst_windowlen);
+ sharkd_json_value_anyf("burstrate", "%.4f", ((double)node->max_burst) / prefs.st_burst_windowlen);
- sharkd_json_value_anyf(TRUE, "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);
}
- sharkd_json_object_close();
- sepa = ",";
+ json_dumper_end_object(&dumper);
}
sharkd_json_array_close();
}
{
stats_tree *st = (stats_tree *) psp;
- printf("{\"tap\":\"stats:%s\",\"type\":\"stats\"", st->cfg->abbr);
+ json_dumper_begin_object(&dumper);
- printf(",\"name\":\"%s\",\"stats\":", st->cfg->name);
+ sharkd_json_value_stringf("tap", "stats:%s", st->cfg->abbr);
+ sharkd_json_value_string("type", "stats");
+ sharkd_json_value_string("name", st->cfg->name);
+
+ sharkd_json_value_anyf("stats", NULL);
sharkd_session_process_tap_stats_node_cb(&st->root);
- printf("},");
+
+ json_dumper_end_object(&dumper);
}
static void
{
struct sharkd_expert_tap *etd = (struct sharkd_expert_tap *) tapdata;
GSList *list;
- gboolean sepa = FALSE;
- printf("{\"tap\":\"%s\",\"type\":\"%s\"", "expert", "expert");
+ json_dumper_begin_object(&dumper);
+
+ sharkd_json_value_string("tap", "expert");
+ sharkd_json_value_string("type", "expert");
- sharkd_json_array_open(TRUE, "details");
+ 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;
- sharkd_json_object_open(sepa);
+ json_dumper_begin_object(&dumper);
- printf("\"f\":%u,", ei->packet_num);
+ sharkd_json_value_anyf("f", "%u", ei->packet_num);
tmp = try_val_to_str(ei->severity, expert_severity_vals);
if (tmp)
- printf("\"s\":\"%s\",", tmp);
+ sharkd_json_value_string("s", tmp);
tmp = try_val_to_str(ei->group, expert_group_vals);
if (tmp)
- printf("\"g\":\"%s\",", tmp);
+ sharkd_json_value_string("g", tmp);
- sharkd_json_value_string(FALSE, "m", ei->summary);
+ sharkd_json_value_string("m", ei->summary);
if (ei->protocol)
- sharkd_json_value_string(TRUE, "p", ei->protocol);
+ sharkd_json_value_string("p", ei->protocol);
- sharkd_json_object_close();
- sepa = TRUE;
+ json_dumper_end_object(&dumper);
}
sharkd_json_array_close();
- printf("},");
+ json_dumper_end_object(&dumper);
}
-static gboolean
+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;
expert_info_t *ei_copy;
if (ei == NULL)
- return FALSE;
+ return TAP_PACKET_DONT_REDRAW;
ei_copy = g_new(expert_info_t, 1);
/* Note: this is a shallow copy */
etd->details = g_slist_prepend(etd->details, ei_copy);
- return TRUE;
+ return TAP_PACKET_REDRAW;
}
static void
GList *flow_list;
guint i;
- gboolean sepa = FALSE;
-
sequence_analysis_get_nodes(graph_analysis);
- printf("{\"tap\":\"seqa:%s\",\"type\":\"%s\"", graph_analysis->name, "flow");
+ 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(TRUE, "nodes");
+ sharkd_json_array_open("nodes");
for (i = 0; i < graph_analysis->num_nodes; i++)
{
char *addr_str;
addr_str = address_to_display(NULL, &(graph_analysis->nodes[i]));
- sharkd_json_value_string(i != 0, NULL, addr_str);
+ sharkd_json_value_string(NULL, addr_str);
wmem_free(NULL, addr_str);
}
sharkd_json_array_close();
- sharkd_json_array_open(TRUE, "flows");
+ sharkd_json_array_open("flows");
flow_list = g_queue_peek_nth_link(graph_analysis->items, 0);
while (flow_list)
{
if (!sai->display)
continue;
- sharkd_json_object_open(sepa);
+ json_dumper_begin_object(&dumper);
- sharkd_json_value_stringf(FALSE, "t", "%s", sai->time_str);
- sharkd_json_value_anyf(TRUE, "n", "[%u,%u]", sai->src_node, sai->dst_node);
- sharkd_json_value_anyf(TRUE, "pn", "[%u,%u]", sai->port_src, sai->port_dst);
+ 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);
if (sai->comment)
- sharkd_json_value_string(TRUE, "c", sai->comment);
+ sharkd_json_value_string("c", sai->comment);
- sharkd_json_object_close();
- sepa = TRUE;
+ json_dumper_end_object(&dumper);
}
sharkd_json_array_close();
- printf("},");
+ json_dumper_end_object(&dumper);
}
static void
{
const mmdb_lookup_t *lookup = NULL;
gboolean with_geoip = FALSE;
+ char json_key[64];
if (addr->type == AT_IPv4)
{
if (lookup->country)
{
- printf(",\"geoip_country%s\":", suffix);
- json_puts_string(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)
{
- printf(",\"geoip_country_iso%s\":", suffix);
- json_puts_string(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)
{
- printf(",\"geoip_city%s\":", suffix);
- json_puts_string(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)
{
- printf(",\"geoip_as_org%s\":", suffix);
- json_puts_string(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)
{
- printf(",\"geoip_as%s\":%u", suffix, lookup->as_number);
+ 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)
{
- printf(",\"geoip_lat%s\":%f", suffix, lookup->latitude);
+ 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)
{
- printf(",\"geoip_lon%s\":%f", suffix, lookup->longitude);
+ snprintf(json_key, sizeof(json_key), "geoip_lon%s", suffix);
+ sharkd_json_value_anyf(json_key, "%f", lookup->longitude);
with_geoip = TRUE;
}
g_free(rtp_req);
}
-static gboolean
+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;
rtp_req->packets = g_slist_append(rtp_req->packets, item);
}
- return TRUE;
+ return TAP_PACKET_REDRAW;
}
/**
const struct sharkd_analyse_rtp *rtp_req = (struct sharkd_analyse_rtp *) tapdata;
const tap_rtp_stat_t *statinfo = &rtp_req->statinfo;
- gboolean sepa = FALSE;
GSList *l;
- printf("{\"tap\":\"%s\",\"type\":\"rtp-analyse\"", rtp_req->tap_name);
+ json_dumper_begin_object(&dumper);
- sharkd_json_value_anyf(TRUE, "ssrc", "%u", rtp_req->id.ssrc);
+ 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(TRUE, "max_delta", "%f", statinfo->max_delta);
- sharkd_json_value_anyf(TRUE, "max_delta_nr", "%u", statinfo->max_nr);
- sharkd_json_value_anyf(TRUE, "max_jitter", "%f", statinfo->max_jitter);
- sharkd_json_value_anyf(TRUE, "mean_jitter", "%f", statinfo->mean_jitter);
- sharkd_json_value_anyf(TRUE, "max_skew", "%f", statinfo->max_skew);
- sharkd_json_value_anyf(TRUE, "total_nr", "%u", statinfo->total_nr);
- sharkd_json_value_anyf(TRUE, "seq_err", "%u", statinfo->sequence);
- sharkd_json_value_anyf(TRUE, "duration", "%f", statinfo->time - statinfo->start_time);
+ 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(TRUE, "items");
+ 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;
- sharkd_json_object_open(sepa);
+ json_dumper_begin_object(&dumper);
- sharkd_json_value_anyf(FALSE, "f", "%u", item->frame_num);
- sharkd_json_value_anyf(TRUE, "o", "%.9f", item->arrive_offset);
- sharkd_json_value_anyf(TRUE, "sn", "%u", item->sequence_num);
- sharkd_json_value_anyf(TRUE, "d", "%.2f", item->delta);
- sharkd_json_value_anyf(TRUE, "j", "%.2f", item->jitter);
- sharkd_json_value_anyf(TRUE, "sk", "%.2f", item->skew);
- sharkd_json_value_anyf(TRUE, "bw", "%.2f", item->bandwidth);
+ 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)
- printf(",\"s\":\"%s\",\"t\":%d", "Comfort noise (PT=13, RFC 3389)", RTP_TYPE_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)
- printf(",\"s\":\"%s\",\"t\":%d", "Comfort noise (PT=19, reserved)", RTP_TYPE_CN);
+ {
+ 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)
- printf(",\"s\":\"%s\",\"t\":%d", "Wrong sequence number", RTP_TYPE_ERROR);
+ {
+ 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)
- printf(",\"s\":\"%s\",\"t\":%d", "Suspected duplicate (MAC address) only delta time calculated", RTP_TYPE_WARN);
+ {
+ 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)
- printf(",\"s\":\"Payload changed to PT=%u%s\",\"t\":%d",
+ {
+ sharkd_json_value_stringf("s", "Payload changed to PT=%u%s",
item->pt,
- (item->flags & STAT_FLAG_PT_T_EVENT) ? " telephone/event" : "",
- RTP_TYPE_WARN);
+ (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)
- printf(",\"s\":\"%s\",\"t\":%d", "Incorrect timestamp", RTP_TYPE_WARN);
+ {
+ 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))
{
- printf(",\"s\":\"%s\",\"t\":%d", "Marker missing?", RTP_TYPE_WARN);
+ 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)
- printf(",\"s\":\"PT=%u telephone/event\",\"t\":%d", item->pt, RTP_TYPE_PT_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(TRUE, "t", "%d", RTP_TYPE_WARN);
+ {
+ sharkd_json_value_anyf("t", "%d", RTP_TYPE_WARN);
+ }
if (item->marker)
- sharkd_json_value_anyf(TRUE, "mark", "1");
+ sharkd_json_value_anyf("mark", "1");
- sharkd_json_object_close();
- sepa = TRUE;
+ json_dumper_end_object(&dumper);
}
sharkd_json_array_close();
- printf("},");
+ json_dumper_end_object(&dumper);
}
/**
* (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);
- sharkd_json_array_open(TRUE, "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);
- sharkd_json_array_open(TRUE, "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;
- sharkd_json_object_open(i != 0);
+ json_dumper_begin_object(&dumper);
- sharkd_json_value_stringf(FALSE, "saddr", "%s", (src_addr = get_conversation_address(NULL, &iui->src_address, iu->resolve_name)));
- sharkd_json_value_stringf(TRUE, "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)
{
- sharkd_json_value_stringf(TRUE, "sport", "%s", (src_port = get_conversation_port(NULL, iui->src_port, iui->etype, iu->resolve_port)));
- sharkd_json_value_stringf(TRUE, "dport", "%s", (dst_port = get_conversation_port(NULL, iui->dst_port, iui->etype, 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);
}
- sharkd_json_value_anyf(TRUE, "rxf", "%" G_GUINT64_FORMAT, iui->rx_frames);
- sharkd_json_value_anyf(TRUE, "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);
- sharkd_json_value_anyf(TRUE, "txf", "%" G_GUINT64_FORMAT, iui->tx_frames);
- sharkd_json_value_anyf(TRUE, "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);
- sharkd_json_value_anyf(TRUE, "start", "%.9f", nstime_to_sec(&iui->start_time));
- sharkd_json_value_anyf(TRUE, "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)
{
- sharkd_json_value_stringf(TRUE, "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;
- sharkd_json_object_close();
+ 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;
- sharkd_json_object_open(i != 0);
+ json_dumper_begin_object(&dumper);
- sharkd_json_value_stringf(FALSE, "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)
{
- sharkd_json_value_stringf(TRUE, "port", "%s", (port_str = get_conversation_port(NULL, host->port, host->etype, 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);
}
- sharkd_json_value_anyf(TRUE, "rxf", "%" G_GUINT64_FORMAT, host->rx_frames);
- sharkd_json_value_anyf(TRUE, "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);
- sharkd_json_value_anyf(TRUE, "txf", "%" G_GUINT64_FORMAT, host->tx_frames);
- sharkd_json_value_anyf(TRUE, "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)
{
- sharkd_json_value_stringf(TRUE, "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;
- sharkd_json_object_close();
+ json_dumper_end_object(&dumper);
}
}
+ sharkd_json_array_close();
- printf("],\"proto\":\"%s\",\"geoip\":%s},", proto, with_geoip ? "true" : "false");
+ sharkd_json_value_string("proto", proto);
+ sharkd_json_value_anyf("geoip", with_geoip ? "true" : "false");
+
+ json_dumper_end_object(&dumper);
}
static void
stat_data_t *stat_data = (stat_data_t *) arg;
guint i, j, k;
- printf("{\"tap\":\"nstat:%s\",\"type\":\"nstat\"", stat_data->stat_tap_data->cli_string);
+ 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(TRUE, "fields");
+ sharkd_json_array_open("fields");
for (i = 0; i < stat_data->stat_tap_data->nfields; i++)
{
stat_tap_table_item *field = &(stat_data->stat_tap_data->fields[i]);
- sharkd_json_object_open(i != 0);
- sharkd_json_value_string(FALSE, "c", field->column_name);
- sharkd_json_object_close();
+ json_dumper_begin_object(&dumper);
+ sharkd_json_value_string("c", field->column_name);
+ json_dumper_end_object(&dumper);
}
sharkd_json_array_close();
- sharkd_json_array_open(TRUE, "tables");
+ 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);
- gboolean sepa = FALSE;
- sharkd_json_object_open(i != 0);
+ json_dumper_begin_object(&dumper);
- sharkd_json_value_stringf(FALSE, "t", "%s", table->title);
+ sharkd_json_value_string("t", table->title);
- sharkd_json_array_open(TRUE, "i");
+ sharkd_json_array_open("i");
for (j = 0; j < table->num_elements; j++)
{
stat_tap_table_item_type *field_data;
if (field_data == NULL || field_data->type == TABLE_ITEM_NONE) /* Nothing for us here */
continue;
- sharkd_json_array_open(sepa, NULL);
+ sharkd_json_array_open(NULL);
for (k = 0; k < table->num_fields; k++)
{
field_data = stat_tap_get_field_data(table, j, k);
- if (k)
- printf(",");
-
switch (field_data->type)
{
case TABLE_ITEM_UINT:
- printf("%u", field_data->value.uint_value);
+ sharkd_json_value_anyf(NULL, "%u", field_data->value.uint_value);
break;
case TABLE_ITEM_INT:
- printf("%d", field_data->value.int_value);
+ sharkd_json_value_anyf(NULL, "%d", field_data->value.int_value);
break;
case TABLE_ITEM_STRING:
- json_puts_string(field_data->value.string_value);
+ sharkd_json_value_string(NULL, field_data->value.string_value);
break;
case TABLE_ITEM_FLOAT:
- printf("%f", field_data->value.float_value);
+ sharkd_json_value_anyf(NULL, "%f", field_data->value.float_value);
break;
case TABLE_ITEM_ENUM:
- printf("%d", field_data->value.enum_value);
+ sharkd_json_value_anyf(NULL, "%d", field_data->value.enum_value);
break;
case TABLE_ITEM_NONE:
- printf("null");
+ sharkd_json_value_anyf(NULL, "null");
break;
}
}
sharkd_json_array_close();
- sepa = TRUE;
}
sharkd_json_array_close();
- sharkd_json_object_close();
+ json_dumper_end_object(&dumper);
}
+ sharkd_json_array_close();
- printf("]},");
+ json_dumper_end_object(&dumper);
}
static void
* (for usage grep for: register_rtd_table)
*/
const value_string *vs = get_rtd_value_string(rtd);
- gboolean sepa = FALSE;
- printf("{\"tap\":\"rtd:%s\",\"type\":\"rtd\"", filter);
+ 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(TRUE, "open_req", "%u", ms->open_req_num);
- sharkd_json_value_anyf(TRUE, "disc_rsp", "%u", ms->disc_rsp_num);
- sharkd_json_value_anyf(TRUE, "req_dup", "%u", ms->req_dup_num);
- sharkd_json_value_anyf(TRUE, "rsp_dup", "%u", ms->rsp_dup_num);
+ 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(TRUE, "stats");
+ 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];
if (ms->rtd[j].num == 0)
continue;
- sharkd_json_object_open(sepa);
+ 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(FALSE, "type", type_str);
+ sharkd_json_value_string("type", type_str);
- sharkd_json_value_anyf(TRUE, "num", "%u", ms->rtd[j].num);
- sharkd_json_value_anyf(TRUE, "min", "%.9f", nstime_to_sec(&(ms->rtd[j].min)));
- sharkd_json_value_anyf(TRUE, "max", "%.9f", nstime_to_sec(&(ms->rtd[j].max)));
- sharkd_json_value_anyf(TRUE, "tot", "%.9f", nstime_to_sec(&(ms->rtd[j].tot)));
- sharkd_json_value_anyf(TRUE, "min_frame", "%u", ms->rtd[j].min_num);
- sharkd_json_value_anyf(TRUE, "max_frame", "%u", ms->rtd[j].max_num);
+ 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(TRUE, "open_req", "%u", ms->open_req_num);
- sharkd_json_value_anyf(TRUE, "disc_rsp", "%u", ms->disc_rsp_num);
- sharkd_json_value_anyf(TRUE, "req_dup", "%u", ms->req_dup_num);
- sharkd_json_value_anyf(TRUE, "rsp_dup", "%u", ms->rsp_dup_num);
+ 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_object_close();
- sepa = TRUE;
+ json_dumper_end_object(&dumper);
}
}
- printf("]},");
+ sharkd_json_array_close();
+
+ json_dumper_end_object(&dumper);
}
static void
guint i;
- printf("{\"tap\":\"srt:%s\",\"type\":\"srt\"", filter);
+ json_dumper_begin_object(&dumper);
+ sharkd_json_value_stringf("tap", "srt:%s", filter);
+ sharkd_json_value_string("type", "srt");
- sharkd_json_array_open(TRUE, "tables");
+ 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);
- gboolean sepa = FALSE;
int j;
- sharkd_json_object_open(i != 0);
+ json_dumper_begin_object(&dumper);
if (rst->name)
- sharkd_json_value_string(FALSE, "n", rst->name);
+ sharkd_json_value_string("n", rst->name);
else if (rst->short_name)
- sharkd_json_value_string(FALSE, "n", rst->short_name);
+ sharkd_json_value_string("n", rst->short_name);
else
- sharkd_json_value_stringf(FALSE, "n", "table%u", i);
+ sharkd_json_value_stringf("n", "table%u", i);
if (rst->filter_string)
- sharkd_json_value_string(TRUE, "f", rst->filter_string);
+ sharkd_json_value_string("f", rst->filter_string);
if (rst->proc_column_name)
- sharkd_json_value_string(TRUE, "c", rst->proc_column_name);
+ sharkd_json_value_string("c", rst->proc_column_name);
- sharkd_json_array_open(TRUE, "r");
+ sharkd_json_array_open("r");
for (j = 0; j < rst->num_procs; j++)
{
/* SRT row */
if (proc->stats.num == 0)
continue;
- sharkd_json_object_open(sepa);
+ json_dumper_begin_object(&dumper);
- sharkd_json_value_string(FALSE, "n", proc->procedure);
+ sharkd_json_value_string("n", proc->procedure);
if (rst->filter_string)
- sharkd_json_value_anyf(TRUE, "idx", "%d", proc->proc_index);
+ sharkd_json_value_anyf("idx", "%d", proc->proc_index);
- sharkd_json_value_anyf(TRUE, "num", "%u", proc->stats.num);
+ sharkd_json_value_anyf("num", "%u", proc->stats.num);
- sharkd_json_value_anyf(TRUE, "min", "%.9f", nstime_to_sec(&proc->stats.min));
- sharkd_json_value_anyf(TRUE, "max", "%.9f", nstime_to_sec(&proc->stats.max));
- sharkd_json_value_anyf(TRUE, "tot", "%.9f", nstime_to_sec(&proc->stats.tot));
+ 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));
- sharkd_json_object_close();
- sepa = TRUE;
+ json_dumper_end_object(&dumper);
}
sharkd_json_array_close();
- sharkd_json_object_close();
+ json_dumper_end_object(&dumper);
}
sharkd_json_array_close();
- printf("},");
+ json_dumper_end_object(&dumper);
}
static void
GSList *slist;
int i = 0;
- printf("{\"tap\":\"%s\",\"type\":\"eo\"", object_list->type);
- sharkd_json_value_stringf(TRUE, "proto", "%s", object_list->proto);
+ 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(TRUE, "objects");
+ 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;
- sharkd_json_object_open(i != 0);
+ json_dumper_begin_object(&dumper);
- sharkd_json_value_anyf(FALSE, "pkt", "%u", eo_entry->pkt_num);
+ sharkd_json_value_anyf("pkt", "%u", eo_entry->pkt_num);
if (eo_entry->hostname)
- sharkd_json_value_string(TRUE, "hostname", eo_entry->hostname);
+ sharkd_json_value_string("hostname", eo_entry->hostname);
if (eo_entry->content_type)
- sharkd_json_value_string(TRUE, "type", eo_entry->content_type);
+ sharkd_json_value_string("type", eo_entry->content_type);
if (eo_entry->filename)
- sharkd_json_value_string(TRUE, "filename", eo_entry->filename);
+ sharkd_json_value_string("filename", eo_entry->filename);
- sharkd_json_value_stringf(TRUE, "_download", "%s_%d", object_list->type, i);
+ sharkd_json_value_stringf("_download", "%s_%d", object_list->type, i);
- sharkd_json_value_anyf(TRUE, "len", "%" G_GINT64_FORMAT, eo_entry->payload_len);
+ sharkd_json_value_anyf("len", "%" G_GINT64_FORMAT, eo_entry->payload_len);
- sharkd_json_object_close();
+ json_dumper_end_object(&dumper);
i++;
}
sharkd_json_array_close();
- printf("},");
+ json_dumper_end_object(&dumper);
}
static void
rtpstream_tapinfo_t *rtp_tapinfo = (rtpstream_tapinfo_t *) arg;
GList *listx;
- const char *sepa = "";
- printf("{\"tap\":\"%s\",\"type\":\"%s\"", "rtp-streams", "rtp-streams");
+ json_dumper_begin_object(&dumper);
+ sharkd_json_value_string("tap", "rtp-streams");
+ sharkd_json_value_string("type", "rtp-streams");
- sharkd_json_array_open(TRUE, "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_calculate(streaminfo, &calc);
- printf("%s{\"ssrc\":%u", sepa, calc.ssrc);
- sharkd_json_value_stringf(TRUE, "payload", "%s", calc.all_payload_type_names);
+ json_dumper_begin_object(&dumper);
- sharkd_json_value_stringf(TRUE, "saddr", "%s", calc.src_addr_str);
- sharkd_json_value_anyf(TRUE, "sport", "%u", calc.src_port);
- sharkd_json_value_stringf(TRUE, "daddr", "%s", calc.dst_addr_str);
- sharkd_json_value_anyf(TRUE, "dport", "%u", calc.dst_port);
+ sharkd_json_value_anyf("ssrc", "%u", calc.ssrc);
+ sharkd_json_value_string("payload", calc.all_payload_type_names);
- sharkd_json_value_anyf(TRUE, "pkts", "%u", calc.packet_count);
+ 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(TRUE, "max_delta", "%f",calc.max_delta);
- sharkd_json_value_anyf(TRUE, "max_jitter", "%f", calc.max_jitter);
- sharkd_json_value_anyf(TRUE, "mean_jitter", "%f", calc.mean_jitter);
+ sharkd_json_value_anyf("pkts", "%u", calc.packet_count);
- sharkd_json_value_anyf(TRUE, "expectednr", "%u", calc.packet_expected);
- sharkd_json_value_anyf(TRUE, "totalnr", "%u", calc.total_nr);
+ 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(TRUE, "problem", calc.problem ? "true" : "false");
+ 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(TRUE, "ipver", "%d", (streaminfo->id.src_addr.type == AT_IPv6) ? 6 : 4);
+ sharkd_json_value_anyf("ipver", "%d", (streaminfo->id.src_addr.type == AT_IPv6) ? 6 : 4);
rtpstream_info_calc_free(&calc);
- sharkd_json_object_close();
- sepa = ",";
+ json_dumper_end_object(&dumper);
}
sharkd_json_array_close();
- printf("},");
+ json_dumper_end_object(&dumper);
}
/**
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();
+
+ sharkd_json_value_anyf("err", "0");
+
+ json_dumper_end_object(&dumper);
+ json_dumper_finish(&dumper);
for (i = 0; i < taps_count; i++)
{
sharkd_retap();
- sharkd_json_object_open(FALSE);
+ json_dumper_begin_object(&dumper);
- sharkd_json_value_anyf(FALSE, "err", "0");
+ sharkd_json_value_anyf("err", "0");
/* Server information: hostname, port, bytes sent */
host = address_to_name(&follow_info->server_ip);
- sharkd_json_value_string(TRUE, "shost", host);
+ sharkd_json_value_string("shost", host);
port = get_follow_port_to_display(follower)(NULL, follow_info->server_port);
- sharkd_json_value_string(TRUE, "sport", port);
+ sharkd_json_value_string("sport", port);
wmem_free(NULL, port);
- sharkd_json_value_anyf(TRUE, "sbytes", "%u", follow_info->bytes_written[0]);
+ 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(TRUE, "chost", host);
+ sharkd_json_value_string("chost", host);
port = get_follow_port_to_display(follower)(NULL, follow_info->client_port);
- sharkd_json_value_string(TRUE, "cport", port);
+ sharkd_json_value_string("cport", port);
wmem_free(NULL, port);
- sharkd_json_value_anyf(TRUE, "cbytes", "%u", follow_info->bytes_written[1]);
+ sharkd_json_value_anyf("cbytes", "%u", follow_info->bytes_written[1]);
if (follow_info->payload)
{
follow_record_t *follow_record;
GList *cur;
- gboolean sepa = FALSE;
- sharkd_json_array_open(TRUE, "payloads");
+ 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;
- sharkd_json_object_open(sepa);
+ json_dumper_begin_object(&dumper);
- sharkd_json_value_anyf(FALSE, "n", "%u", follow_record->packet_num);
- sharkd_json_value_base64(TRUE, "d", follow_record->data->data, follow_record->data->len);
+ 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(TRUE, "s", "%d", 1);
+ sharkd_json_value_anyf("s", "%d", 1);
- sharkd_json_object_close();
- sepa = TRUE;
+ json_dumper_end_object(&dumper);
}
sharkd_json_array_close();
}
- printf("}\n");
+ json_dumper_end_object(&dumper);
+ json_dumper_finish(&dumper);
remove_tap_listener(follow_info);
follow_info_free(follow_info);
sharkd_session_process_frame_cb_tree(epan_dissect_t *edt, proto_tree *tree, tvbuff_t **tvbs, gboolean display_hidden)
{
proto_node *node;
- gboolean sepa = FALSE;
- sharkd_json_array_open(FALSE, NULL);
+ sharkd_json_array_open(NULL);
for (node = tree->first_child; node; node = node->next)
{
field_info *finfo = PNODE_FINFO(node);
if (!display_hidden && FI_GET_FLAG(finfo, FI_HIDDEN))
continue;
- sharkd_json_object_open(sepa);
+ json_dumper_begin_object(&dumper);
if (!finfo->rep)
{
label_str[0] = '\0';
proto_item_fill_label(finfo, label_str);
- sharkd_json_value_string(FALSE, "l", label_str);
+ sharkd_json_value_string("l", label_str);
}
else
{
- sharkd_json_value_string(FALSE, "l", 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)
{
- sharkd_json_value_anyf(TRUE, "ds", "%d", idx);
+ sharkd_json_value_anyf("ds", "%d", idx);
break;
}
}
}
if (finfo->start >= 0 && finfo->length > 0)
- sharkd_json_value_anyf(TRUE, "h", "[%d,%d]", finfo->start, finfo->length);
+ sharkd_json_value_anyf("h", "[%d,%d]", finfo->start, finfo->length);
if (finfo->appendix_start >= 0 && finfo->appendix_length > 0)
- sharkd_json_value_anyf(TRUE, "i", "[%d,%d]", finfo->appendix_start, finfo->appendix_length);
+ sharkd_json_value_anyf("i", "[%d,%d]", finfo->appendix_start, finfo->appendix_length);
if (finfo->hfinfo)
if (finfo->hfinfo->type == FT_PROTOCOL)
{
- sharkd_json_value_stringf(TRUE, "t", "proto");
+ sharkd_json_value_string("t", "proto");
}
else if (finfo->hfinfo->type == FT_FRAMENUM)
{
- printf(",\"t\":\"framenum\",\"fnum\":%u", finfo->value.value.uinteger);
+ 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);
- sharkd_json_value_string(TRUE, "t", "url");
- sharkd_json_value_string(TRUE, "url", url);
+ sharkd_json_value_string("t", "url");
+ sharkd_json_value_string("url", url);
wmem_free(NULL, url);
}
filter = proto_construct_match_selected_string(finfo, edt);
if (filter)
{
- sharkd_json_value_string(TRUE, "f", filter);
+ sharkd_json_value_string("f", filter);
wmem_free(NULL, filter);
}
}
if (FI_GET_FLAG(finfo, FI_GENERATED))
- sharkd_json_value_anyf(TRUE, "g", "true");
+ sharkd_json_value_anyf("g", "true");
if (FI_GET_FLAG(finfo, FI_HIDDEN))
- sharkd_json_value_anyf(TRUE, "v", "true");
+ sharkd_json_value_anyf("v", "true");
if (FI_GET_FLAG(finfo, PI_SEVERITY_MASK))
{
g_assert(severity != NULL);
- sharkd_json_value_stringf(TRUE, "s", "%s", severity);
+ sharkd_json_value_string("s", severity);
}
if (((proto_tree *) node)->first_child)
{
if (finfo->tree_type != -1)
- sharkd_json_value_anyf(TRUE, "e", "%d", finfo->tree_type);
- printf(",\"n\":");
+ 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);
}
- sharkd_json_object_close();
- sepa = TRUE;
+ json_dumper_end_object(&dumper);
}
sharkd_json_array_close();
}
follow_filter = get_follow_conv_func(follower)(pi, &ignore_stream);
- sharkd_json_array_open(TRUE, NULL);
- sharkd_json_value_string(FALSE, NULL, layer_proto);
- sharkd_json_value_string(TRUE, NULL, follow_filter);
- sharkd_json_array_close();
+ 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);
}
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;
- sharkd_json_object_open(FALSE);
+ json_dumper_begin_object(&dumper);
- sharkd_json_value_anyf(FALSE, "err", "0");
+ sharkd_json_value_anyf("err", "0");
- if (fdata->flags.has_user_comment)
+ if (fdata->has_user_comment)
pkt_comment = sharkd_get_user_comment(fdata);
- else if (fdata->flags.has_phdr_comment)
+ else if (fdata->has_phdr_comment)
pkt_comment = pi->rec->opt_comment;
if (pkt_comment)
- sharkd_json_value_string(TRUE, "comment", 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 */)
{
tvbs[count] = NULL;
}
+ sharkd_json_value_anyf("tree", NULL);
sharkd_session_process_frame_cb_tree(edt, tree, tvbs, display_hidden);
g_free(tvbs);
{
int col;
- sharkd_json_array_open(TRUE, "col");
+ sharkd_json_array_open("col");
for (col = 0; col < cinfo->num_cols; ++col)
{
const col_item_t *col_item = &cinfo->columns[col];
- printf("%s\"%s\"", (col) ? "," : "", col_item->col_data);
+ sharkd_json_value_string(NULL, col_item->col_data);
}
sharkd_json_array_close();
}
- if (fdata->flags.ignored)
- sharkd_json_value_anyf(TRUE, "i", "true");
+ if (fdata->ignored)
+ sharkd_json_value_anyf("i", "true");
- if (fdata->flags.marked)
- sharkd_json_value_anyf(TRUE, "m", "true");
+ if (fdata->marked)
+ sharkd_json_value_anyf("m", "true");
if (fdata->color_filter)
{
- sharkd_json_value_stringf(TRUE, "bg", "%x", color_t_to_rgb(&fdata->color_filter->bg_color));
- sharkd_json_value_stringf(TRUE, "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));
}
if (data_src)
{
struct data_source *src = (struct data_source *) data_src->data;
- const char *ds_sepa = NULL;
+ gboolean ds_open = FALSE;
tvbuff_t *tvb;
guint length;
{
const guchar *cp = tvb_get_ptr(tvb, 0, length);
- /* XXX pi.fd->flags.encoding */
- sharkd_json_value_base64(TRUE, "bytes", cp, length);
+ /* XXX pi.fd->encoding */
+ sharkd_json_value_base64("bytes", cp, length);
}
else
{
- sharkd_json_value_base64(TRUE, "bytes", "", 0);
+ sharkd_json_value_base64("bytes", "", 0);
}
data_src = data_src->next;
if (data_src)
{
- sharkd_json_array_open(TRUE, "ds");
- ds_sepa = "";
+ 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);
- printf("%s{\"name\":", ds_sepa);
- json_puts_string(src_name);
+ sharkd_json_value_string("name", src_name);
wmem_free(NULL, src_name);
}
{
const guchar *cp = tvb_get_ptr(tvb, 0, length);
- /* XXX pi.fd->flags.encoding */
- sharkd_json_value_base64(TRUE, "bytes", cp, length);
+ /* XXX pi.fd->encoding */
+ sharkd_json_value_base64("bytes", cp, length);
}
else
{
- sharkd_json_value_base64(TRUE, "bytes", "", 0);
+ sharkd_json_value_base64("bytes", "", 0);
}
- sharkd_json_object_close();
- ds_sepa = ",";
+ json_dumper_end_object(&dumper);
data_src = data_src->next;
}
/* close ds, only if was opened */
- if (ds_sepa != NULL)
+ if (ds_open)
sharkd_json_array_close();
}
- sharkd_json_array_open(TRUE, "fol");
- sharkd_json_value_anyf(FALSE, NULL, "0");
+ sharkd_json_array_open("fol");
follow_iterate_followers(sharkd_follower_visit_layers_cb, pi);
sharkd_json_array_close();
- printf("}\n");
+ 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 */
GString *error;
};
-static gboolean
+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 FALSE;
+ return TAP_PACKET_DONT_REDRAW;
if (idx + 1 > graph->num_items)
{
graph->num_items = idx + 1;
}
- return update_io_graph_item(graph->items, idx, pinfo, edt, graph->hf_index, graph->calc_type, graph->interval);
+ 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;
}
/**
if (is_any_ok)
sharkd_retap();
- sharkd_json_object_open(FALSE);
+ json_dumper_begin_object(&dumper);
- sharkd_json_array_open(TRUE, "iograph");
+ sharkd_json_array_open("iograph");
for (i = 0; i < graph_count; i++)
{
struct sharkd_iograph *graph = &graphs[i];
- sharkd_json_object_open(i != 0);
+ json_dumper_begin_object(&dumper);
if (graph->error)
{
- sharkd_json_value_string(FALSE, "errmsg", graph->error->str);
+ sharkd_json_value_string("errmsg", graph->error->str);
g_string_free(graph->error, TRUE);
}
else
{
int idx;
int next_idx = 0;
- const char *sepa = "";
- sharkd_json_array_open(FALSE, "items");
+ sharkd_json_array_open("items");
for (idx = 0; idx < graph->num_items; idx++)
{
double val;
if (val == 0.0)
continue;
- printf("%s", sepa);
-
/* cause zeros are not printed, need to output index */
if (next_idx != idx)
- printf("\"%x\",", idx);
+ sharkd_json_value_stringf(NULL, "%x", idx);
- printf("%f", val);
+ sharkd_json_value_anyf(NULL, "%f", val);
next_idx = idx + 1;
- sepa = ",";
}
sharkd_json_array_close();
}
- sharkd_json_object_close();
+ json_dumper_end_object(&dumper);
remove_tap_listener(graph);
g_free(graph->items);
}
sharkd_json_array_close();
- printf("}\n");
+ json_dumper_end_object(&dumper);
+ json_dumper_finish(&dumper);
}
/**
guint32 interval_ms = 1000; /* default: one per second */
- const char *sepa = "";
unsigned int framenum;
gint64 idx;
gint64 max_idx = 0;
idx = 0;
- sharkd_json_object_open(FALSE);
- sharkd_json_array_open(FALSE, "intervals");
+ json_dumper_begin_object(&dumper);
+ sharkd_json_array_open("intervals");
start_ts = (cfile.count >= 1) ? &(sharkd_get_frame(1)->abs_ts) : NULL;
{
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);
}
/**
const char *tok_filter = json_find_attr(buf, tokens, count, "filter");
const char *tok_field = json_find_attr(buf, tokens, count, "field");
- printf("{\"err\":0");
+ json_dumper_begin_object(&dumper);
+ sharkd_json_value_anyf("err", "0");
if (tok_filter != NULL)
{
if (dfp && dfilter_deprecated_tokens(dfp))
s = "warn";
- sharkd_json_value_stringf(TRUE, "filter", "%s", s);
+ sharkd_json_value_string("filter", s);
dfilter_free(dfp);
}
else
{
- sharkd_json_value_string(TRUE, "filter", err_msg);
+ sharkd_json_value_string("filter", err_msg);
g_free(err_msg);
}
}
{
header_field_info *hfi = proto_registrar_get_byname(tok_field);
- sharkd_json_value_stringf(TRUE, "field", (hfi) ? "ok" : "notfound");
+ sharkd_json_value_string("field", (hfi) ? "ok" : "notfound");
}
- printf("}\n");
+ 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;
- gboolean sepa = FALSE;
- sharkd_json_array_open(TRUE, "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))
{
- sharkd_json_object_open(sepa);
+ json_dumper_begin_object(&dumper);
{
- sharkd_json_value_string(FALSE, "f", protocol_filter);
- sharkd_json_value_anyf(TRUE, "t", "%d", FT_PROTOCOL);
- sharkd_json_value_string(TRUE, "n", protocol_name);
+ sharkd_json_value_string("f", protocol_filter);
+ sharkd_json_value_anyf("t", "%d", FT_PROTOCOL);
+ sharkd_json_value_string("n", protocol_name);
}
- sharkd_json_object_close();
- sepa = TRUE;
+ json_dumper_end_object(&dumper);
}
if (!filter_with_dot)
if (strlen(hfinfo->abbrev) >= filter_length && !g_ascii_strncasecmp(tok_field, hfinfo->abbrev, filter_length))
{
- sharkd_json_object_open(sepa);
+ json_dumper_begin_object(&dumper);
{
- sharkd_json_value_string(FALSE, "f", 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)
{
- sharkd_json_value_anyf(TRUE, "t", "%d", hfinfo->type);
- sharkd_json_value_string(TRUE, "n", hfinfo->name);
+ sharkd_json_value_anyf("t", "%d", hfinfo->type);
+ sharkd_json_value_string("n", hfinfo->name);
}
}
- sharkd_json_object_close();
- sepa = TRUE;
+ json_dumper_end_object(&dumper);
}
}
}
data.module = tok_pref;
data.pref = tok_pref;
- data.sepa = "";
- sharkd_json_array_open(TRUE, "pref");
+ sharkd_json_array_open("pref");
if ((dot_sepa = strchr(tok_pref, '.')))
{
module_t *pref_mod;
sharkd_json_array_close();
}
+ json_dumper_end_object(&dumper);
+ json_dumper_finish(&dumper);
- printf("}\n");
return 0;
}
return;
ret = sharkd_set_user_comment(fdata, tok_comment);
- printf("{\"err\":%d}\n", ret);
+
+ sharkd_json_simple_reply(ret, NULL);
}
/**
ws_snprintf(pref, sizeof(pref), "%s:%s", tok_name, tok_value);
ret = prefs_set_pref(pref, &errmsg);
- printf("{\"err\":%d", ret);
- if (errmsg)
- {
- /* Add error message for some syntax errors. */
- sharkd_json_value_string(TRUE, "errmsg", errmsg);
- }
- printf("}\n");
+
+ 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:
- sharkd_json_value_anyf(FALSE, "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)
- sharkd_json_value_anyf(TRUE, "ub", "%u", prefs_get_uint_base(pref));
+ sharkd_json_value_anyf("ub", "%u", prefs_get_uint_base(pref));
break;
case PREF_BOOL:
- sharkd_json_value_anyf(FALSE, "b", 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:
case PREF_SAVE_FILENAME:
case PREF_OPEN_FILENAME:
case PREF_DIRNAME:
- sharkd_json_value_string(FALSE, "s", prefs_get_string_value(pref, pref_current));
+ 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 = "";
- sharkd_json_array_open(FALSE, "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))
- sharkd_json_value_anyf(TRUE, "s", "1");
+ sharkd_json_value_anyf("s", "1");
- sharkd_json_value_string(TRUE, "d", enums->description);
+ sharkd_json_value_string("d", enums->description);
- sharkd_json_object_close();
- enum_sepa = ",";
+ json_dumper_end_object(&dumper);
}
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));
- sharkd_json_value_stringf(FALSE, "r", "%s", range_str);
+ sharkd_json_value_string("r", range_str);
wmem_free(NULL, range_str);
break;
}
uat_t *uat = prefs_get_uat_value(pref);
guint idx;
- sharkd_json_array_open(FALSE, "t");
+ 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(idx != 0, NULL);
+ 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(colnum != 0, NULL, str);
+ sharkd_json_value_string(NULL, str);
g_free(str);
}
}
#if 0
- sharkd_json_value_string(TRUE, "t", prefs_get_title(pref));
+ sharkd_json_value_string("t", prefs_get_title(pref));
#endif
- sharkd_json_object_close();
- data->sepa = ",";
+ json_dumper_end_object(&dumper);
return 0; /* continue */
}
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);
}
}
unsigned channels = 0;
unsigned sample_rate = 0;
- int i;
- int base64_state1 = 0;
- int base64_state2 = 0;
-
GSList *l;
for (l = req->packets; l; l = l->next)
memcpy(&wav_hdr[36], "data", 4);
memcpy(&wav_hdr[40], "\xFF\xFF\xFF\xFF", 4); /* XXX, unknown */
- for (i = 0; i < (int) sizeof(wav_hdr); i++)
- json_print_base64_step(&wav_hdr[i], &base64_state1, &base64_state2);
+ json_dumper_write_base64(&dumper, wav_hdr, sizeof(wav_hdr));
}
// Write samples to our file.
}
/* Write the decoded, possibly-resampled audio */
- for (i = 0; i < write_bytes; i++)
- json_print_base64_step(&write_buff[i], &base64_state1, &base64_state2);
+ json_dumper_write_base64(&dumper, write_buff, write_bytes);
g_free(decode_buff);
}
- json_print_base64_step(NULL, &base64_state1, &base64_state2);
-
g_free(resample_buff);
g_hash_table_destroy(decoders_hash_);
}
-static gboolean
+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;
/* do not consider RTP packets without a setup frame */
if (rtp_info->info_setup_frame_num == 0)
- return FALSE;
+ return TAP_PACKET_DONT_REDRAW;
if (rtpstream_id_equal_pinfo_rtp_info(&req_rtp->id, pinfo, rtp_info))
{
req_rtp->packets = g_slist_append(req_rtp->packets, rtp_packet);
}
- return FALSE;
+ return TAP_PACKET_DONT_REDRAW;
}
/**
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;
- sharkd_json_object_open(FALSE);
- sharkd_json_value_string(FALSE, "file", filename);
- sharkd_json_value_string(TRUE, "mime", mime);
- sharkd_json_value_base64(TRUE, "data", eo_entry->payload_data, (size_t) eo_entry->payload_len);
- printf("}\n");
+ 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"))
const char *mime = "text/plain";
const char *filename = "keylog.txt";
- sharkd_json_object_open(FALSE);
- sharkd_json_value_string(FALSE, "file", filename);
- sharkd_json_value_string(TRUE, "mime", mime);
- sharkd_json_value_base64(TRUE, "data", str, strlen(str));
- printf("}\n");
+ 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);
}
const char *mime = "audio/x-wav";
const char *filename = tok_token;
- sharkd_json_object_open(FALSE);
- sharkd_json_value_string(FALSE, "file", filename);
- sharkd_json_value_string(TRUE, "mime", mime);
+ json_dumper_begin_object(&dumper);
+ sharkd_json_value_string("file", filename);
+ sharkd_json_value_string("mime", mime);
- printf(",\"data\":");
- putchar('"');
+ sharkd_json_value_anyf("data", NULL);
+ json_dumper_begin_base64(&dumper);
sharkd_rtp_download_decode(&rtp_req);
- putchar('"');
+ json_dumper_end_base64(&dumper);
- printf("}\n");
+ json_dumper_end_object(&dumper);
+ json_dumper_finish(&dumper);
g_slist_free_full(rtp_req.packets, sharkd_rtp_download_free_items);
}
buf[tokens[i + 1].end] = '\0';
/* unescape only value, as keys are simple strings */
- if (tokens[i + 1].type == JSMN_STRING && !json_unescape_str(&buf[tokens[i + 1].start]))
+ 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;
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
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
/* every command is line seperated JSON */
int ret;
- ret = wsjson_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 = wsjson_parse(buf, tokens, ret);
+ ret = json_parse(buf, tokens, ret);
if (ret < 0)
{
fprintf(stderr, "invalid JSON(2) -> closing\n");
git.samba.org / metze / wireshark / wip.git / blobdiff