From cd7d159c2ee180be6654a7acbf7c83f902216462 Mon Sep 17 00:00:00 2001
From: Martin Kacer <kacer.martin@gmail.com>
Date: Mon, 13 Feb 2017 09:36:02 +0100
Subject: json2pcap support added

Modified tshark -T json -x output
Added tshark -T jsonraw output
json2pcap.py (can be used for basic packet editing by modifying json)

The modification in tshark -T json -x and new tshark -T jsonraw output
add into  hex-data output in JSON also information on which position
each field is dissected in the original frame, what is the field length,
bitmask (for not byte aligned fields) and type. This information can be
used for latter processing. One use-case is json2pcap script which
assembles the protocol layers back together from upper to lowers layers,
which allows the basic packet modification/editing/rewriting.

Change-Id: Ibf948eb8fc7e3b0b51c12df6c3855f705a9c7925
Reviewed-on: https://code.wireshark.org/review/19990
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
---
 AUTHORS.src | 1 +
 1 file changed, 1 insertion(+)

(limited to 'AUTHORS.src')

diff --git a/AUTHORS.src b/AUTHORS.src
index fee90622e0..076fce214d 100644
--- a/AUTHORS.src
+++ b/AUTHORS.src
@@ -3685,6 +3685,7 @@ Barbu Paul - Gheorghe	<barbu.paul.gheorghe[AT]gmail.com> {
 
 Martin Kacer	<kacer.martin[AT]gmail.com> {
 	JSON and Elasticsearch tshark output
+	json2pcap
 }
 Ben Stewart		<bst[AT]google.com> {
 	SCTE-35 dissector
-- 
cgit v1.2.3