Wireshark-commits: [Wireshark-commits] master c3f3bd7: tshark JSON and Elasticsearch output fix
Date Index · Thread Index · Other Months · All Mailing Lists
Date Prev · Date Next · Thread Prev · Thread Next
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Tue, 21 Jun 2016 16:58:25 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=c3f3bd7fa89af1ccd15440cf401697fc32814ed6
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

c3f3bd7 by Martin Kacer (kacer.martin@xxxxxxxxx):

    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@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Pascal Quantin <pascal.quantin@xxxxxxxxx>
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    

Actions performed:

    from  df231d9   libcodecs and libwsutil are DLLs, not static libraries
    adds  c3f3bd7   tshark JSON and Elasticsearch output fix


Summary of changes:
 doc/tshark.pod |    8 +--
 epan/print.c   |  160 +++++++++++++++++++++++++++++++++++++++++++-------------
 epan/print.h   |    6 +--
 file.c         |    2 +-
 tfshark.c      |    2 +-
 tshark.c       |   12 ++---
 6 files changed, 140 insertions(+), 50 deletions(-)