osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed tshark pdml output. 

Corrected if no protocol filter (-j) specified.

Change-Id: Id20dd255642951633efa935dbb1363e7b9aa9be0
Reviewed-on: https://code.wireshark.org/review/16164
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
This commit is contained in:
Martin Kacer 2016-06-27 06:41:56 +02:00 committed by Jaap Keuter
parent d90e6e74da
commit d8ddf84693
1 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
epan/print.c
View File

@ -605,7 +605,7 @@ proto_tree_write_node_pdml(proto_node *node, gpointer data)
/* We print some levels for PDML. Recurse here. */
if (node->first_child != NULL) {
if(check_protocolfilter(pdata->filter, fi->hfinfo->abbrev)) {
if (pdata->filter == NULL || check_protocolfilter(pdata->filter, fi->hfinfo->abbrev)) {
pdata->level++;
proto_tree_children_foreach(node,
proto_tree_write_node_pdml, pdata);
@ -816,8 +816,7 @@ proto_tree_write_node_json(proto_node *node, gpointer data)
/* We print some levels for JSON. Recurse here. */
if (node->first_child != NULL) {
if (pdata->filter != NULL) {
if(check_protocolfilter(pdata->filter, fi->hfinfo->abbrev)) {
if (pdata->filter == NULL || check_protocolfilter(pdata->filter, fi->hfinfo->abbrev)) {
pdata->level++;
proto_tree_children_foreach(node, proto_tree_write_node_json, pdata);
pdata->level--;
@ -831,12 +830,6 @@ proto_tree_write_node_json(proto_node *node, gpointer data)
print_escaped_ek(pdata->fh, fi->hfinfo->abbrev);
fputs("\"\n", pdata->fh);
}
} else {
pdata->level++;
proto_tree_children_foreach(node,
proto_tree_write_node_json, pdata);
pdata->level--;
}
}
if (node->first_child != NULL) {