diff options
author | Martin Kacer <kacer.martin@gmail.com> | 2016-06-20 11:03:40 +0200 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2016-06-21 16:57:59 +0000 |
commit | c3f3bd7fa89af1ccd15440cf401697fc32814ed6 (patch) | |
tree | 2b8ada654c02b0a59ae9eb7fde8eba7f16564eab /tools/.gitattributes | |
parent | df231d9c52d8e94d2ef48f83beeef1455a0e7ce9 (diff) |
tshark JSON and Elasticsearch output fix
Fixed json and ek escape function
Fixed -j protocol filter to do exact match
Fixed -T json to correctly close json
Added -j protocol filter also to pdml output
Bug: 11754
Change-Id: I02f274e4a5a02346922b37bbe946c10340c242ea
Reviewed-on: https://code.wireshark.org/review/16034
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'tools/.gitattributes')
0 files changed, 0 insertions, 0 deletions