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 /doc | |
| 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 'doc')
| -rw-r--r-- | doc/tshark.pod | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/tshark.pod b/doc/tshark.pod index 2ee54edbc3..7e6d0247d5 100644 --- a/doc/tshark.pod +++ b/doc/tshark.pod @@ -22,7 +22,7 @@ S<[ B<-g> ]> S<[ B<-h> ]> S<[ B<-H> E<lt>input hosts fileE<gt> ]> S<[ B<-i> E<lt>capture interfaceE<gt>|- ]> -S<[ B<-j> E<lt>json match filterE<gt> ]> +S<[ B<-j> E<lt>protocol match filterE<gt> ]> S<[ B<-I> ]> S<[ B<-K> E<lt>keytabE<gt> ]> S<[ B<-l> ]> @@ -535,10 +535,10 @@ If used after an B<-i> option, it enables the monitor mode for the interface specified by the last B<-i> option occurring before this option. -=item -j E<lt>json match filterE<gt> +=item -j E<lt>protocol match filterE<gt> -JSON match filter used for json|ek output file types. -JSON parent node containing multiple child nodes is only included, +Protocol match filter used for ek|json|pdml output file types. +Parent node containing multiple child nodes is only included, if the name is found in the filter. Example: B<-j "http tcp ip"> |