osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

sharkd: use json_dumper for output. 

Change-Id: I457613ea154a86098f536b57844ad6606c595a46
Reviewed-on: https://code.wireshark.org/review/31035
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Dario Lombardo <lomato@gmail.com>
This commit is contained in:
Dario Lombardo 2018-12-12 15:33:44 +01:00
parent 711eb94438
commit 4b42a45ebc
2 changed files with 544 additions and 710 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1249
sharkd_session.c
View File

File diff suppressed because it is too large Load Diff

5
test/suite_sharkd.py
View File

@ -228,8 +228,6 @@ class case_sharkd(subprocesstest.SubprocessTestCase):
}
],
},
# XXX remove the last null element, it is not part of the interface.
None
]
},
))
@ -323,8 +321,7 @@ class case_sharkd(subprocesstest.SubprocessTestCase):
{"req": "frame", "frame": 2},
), (
{"err": 0},
# XXX remove the first 0 element, it is not part of the interface.
{"err": 0, "fol": [0, ["UDP", "udp.stream eq 1"]]},
{"err": 0, "fol": [["UDP", "udp.stream eq 1"]]},
))
def test_sharkd_req_frame_proto(self, check_sharkd_session, capture_file):