diff options
| author | Martin Kacer <kacer.martin@gmail.com> | 2016-06-26 21:13:06 +0200 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2016-06-27 05:36:32 +0000 |
| commit | 148d5860a142a88d4ce355dfeba2a763b900a4b4 (patch) | |
| tree | f9b858790652cb1725687adb60e572f843cdba7b /epan/print.c | |
| parent | 619659599ac199f5f496e050a4cf30c23164cd80 (diff) | |
| download | wireshark-148d5860a142a88d4ce355dfeba2a763b900a4b4.tar.gz | |
json: corrected json output format.
Some pcaps caused invalid json and ek files.
Bug: 11754
Change-Id: Id4c4d744b4d07fe4e8b6423688be1bb10a803844
Reviewed-on: https://code.wireshark.org/review/16152
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/print.c')
| -rw-r--r-- | epan/print.c | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/epan/print.c b/epan/print.c index 070702e71d..0c472c165d 100644 --- a/epan/print.c +++ b/epan/print.c @@ -660,6 +660,7 @@ proto_tree_write_node_json(proto_node *node, gpointer data) field_info *fi = PNODE_FINFO(node); write_json_data *pdata = (write_json_data*) data; const gchar *label_ptr; + gchar label_str[ITEM_LABEL_LENGTH]; char *dfilter_string; int i; @@ -762,6 +763,21 @@ proto_tree_write_node_json(proto_node *node, gpointer data) case FT_PROTOCOL: if (node->first_child != NULL) { fputs("\": {\n", pdata->fh); + } else { + fputs("\": \"", pdata->fh); + if (fi->rep) { + print_escaped_json(pdata->fh, fi->rep->representation); + } + else { + label_ptr = label_str; + proto_item_fill_label(fi, label_str); + print_escaped_json(pdata->fh, label_ptr); + } + if (node->next == NULL) { + fputs("\"\n", pdata->fh); + } else { + fputs("\",\n", pdata->fh); + } } break; case FT_NONE: @@ -845,6 +861,7 @@ proto_tree_write_node_ek(proto_node *node, gpointer data) field_info *fi_parent = PNODE_FINFO(node->parent); write_json_data *pdata = (write_json_data*) data; const gchar *label_ptr; + gchar label_str[ITEM_LABEL_LENGTH]; char *dfilter_string; int i; gchar *abbrev_escaped = NULL; @@ -958,6 +975,21 @@ proto_tree_write_node_ek(proto_node *node, gpointer data) case FT_PROTOCOL: if (node->first_child != NULL) { fputs("\": {", pdata->fh); + } else { + fputs("\": \"", pdata->fh); + if (fi->rep) { + print_escaped_json(pdata->fh, fi->rep->representation); + } + else { + label_ptr = label_str; + proto_item_fill_label(fi, label_str); + print_escaped_json(pdata->fh, label_ptr); + } + if (node->next == NULL) { + fputs("\"", pdata->fh); + } else { + fputs("\",", pdata->fh); + } } break; case FT_NONE: |