osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
wireshark/tools
History
Martin Kacer cd7d159c2e 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>
 		2017-02-25 19:11:01 +00:00
..
cppcheck
…
dftestfiles
…
dftestlib Make the dfilter time tests work regardless of what time zone the tests are 2015-11-10 09:04:48 +00:00
json2pcap json2pcap support added 2017-02-25 19:11:01 +00:00
lemon lemon: Fix Dereference of null pointer found by Clang analyzer 2016-12-30 00:56:18 +00:00
npl new_create_dissector_handle -> create_dissector_handle for plugins. 2015-12-11 03:42:52 +00:00
pidl Rename tvb_new_subset() to tvb_new_subset_length_caplen(). 2017-01-10 06:19:37 +00:00
tpg Remove Nmake build system 2016-06-15 19:21:57 +00:00
.gitattributes
…
Get-HardenFlags.ps1 Remove remnants of g_spawn_helper support 2016-07-05 16:11:13 +00:00
Makefile.am tools: add rpm-setup.sh. 2016-12-19 13:13:24 +00:00
SkinnyProtocolOptimized.xml [skinny]: Fix tvb struct size guard value 2017-02-22 05:39:53 +00:00
WiresharkXML.py
…
asn2deb Fix FSF address. 2016-08-05 20:16:51 +00:00
asn2wrs.py asn2wrs: put back parsetab.py file in ASN.1 source folder 2016-08-04 18:54:05 +00:00
checkAPIs.pl checkAPI: move atoi from soft-deprecated to prohibited. 2016-10-27 15:11:06 +00:00
checkfiltername.pl checkfiltername: Add llc.bluetooth_pid to the whitelist 2017-02-06 12:41:53 +00:00
checkhf.pl Cleanup and extend the regex for matching expert info entries. 2016-07-10 15:06:20 +00:00
checklicenses.py Documentation with unset license is under project's license (GPL-2+) 2016-08-23 15:02:31 +00:00
colorfilters2js.pl
…
commit-msg Update tools/commit-msg. 2016-12-15 19:46:37 +00:00
compare-abis.sh
…
compress-pngs.sh Recompress PNGs. 2016-06-30 15:41:32 +00:00
convert-proto-tree-new.awk
…
convert_expert_add_info_format.pl
…
convert_proto_tree_add_text.pl tvb_bytes_to_ep_str -> tvb_bytes_to_str 2015-01-07 18:16:23 +00:00
debian-setup.sh codecs: Add support for G.722 and G.726 2016-12-06 17:51:47 +00:00
delete_includes.py Remove Nmake build system 2016-06-15 19:21:57 +00:00
dfilter-test.py
…
extract_asn1_from_spec.pl LTE RRC: upgrade dissector to v12.5.0 2015-03-31 21:40:10 +00:00
fix-encoding-args.pl Add proto_tree_add_bitmask_with_flags. 2014-12-08 01:13:02 +00:00
fixhf.pl Update my email address in a couple more spots. 2014-06-25 02:15:55 +00:00
ftsanity.py Support bitfields for FT_CHAR. 2016-09-19 04:16:39 +00:00
fuzz-test.sh Fuzz: Fix the capinfos check (again). 2017-01-23 23:24:17 +00:00
gen-bugnote Escape opening curly braces in gen-bugnote. 2017-01-04 17:52:04 +00:00
generate-bacnet-vendors.py [tools] Add missing GPL license to generate-bacnet-vendors.py 2014-10-08 10:52:38 +00:00
generate-sysdig-event.py Initial Sysdig syscall (event) support. 2015-11-10 20:59:53 +00:00
generate_authors.pl Fix out-of-tree "gen-authors" target 2016-03-28 22:13:59 +00:00
git-compare-abis.sh
…
git-export-release.sh
…
gtk.suppression tools: add a Gtk/GNOME suppression file. 2017-02-02 12:42:01 +00:00
html2text.py html2text.py: Python 2.5 compatibility, improve Unicode support 2015-03-26 07:14:20 +00:00
idl2deb Update FSF address. 2016-08-05 20:25:12 +00:00
idl2wrs
…
indexcap.py indexcap.py: fix tmpdir handling, python 3 compat 2015-03-25 07:09:41 +00:00
install_rpms_for_devel.sh tools: add rpm-setup.sh. 2016-12-19 13:13:24 +00:00
lex.py Ply parser updated to 3.8 from http://www.dabeaz.com/ply/ 2016-08-04 08:20:24 +00:00
licensecheck.pl checklicenses: Remove whitelisted licenses not being used 2016-08-09 02:41:30 +00:00
list_protos_in_cap.sh indexcap.py: fix tmpdir handling, python 3 compat 2015-03-25 07:09:41 +00:00
macos-setup-brew.sh Make Libgcrypt a mandatory dependency 2017-02-13 18:35:47 +00:00
make-dissector-reg.py Do not update register.c's timestamp if it is unchanged, otherwise it gets recompiled 2016-10-19 08:51:27 +00:00
make-manuf make-manuf: Add more sanity checks. 2016-10-02 19:05:46 +00:00
make-pixbuf-csource.pl Make sure our shell, Perl, & Python tools are executable. 2016-03-03 20:11:25 +00:00
make-services.pl
…
make-services.py
…
make-sminmpec.pl
…
make-tap-reg.py
…
make-usb.py Fixup make-usb.py 2015-07-19 20:24:08 +00:00
make_charset_table.c Use %zu, not %zd, to print a size_t value (%zd would be for ssize_t). 2015-06-06 19:20:19 +00:00
msnchat
…
ncp2222.py ncp: convert GHashTable to wmem_map_t. 2017-02-02 15:33:20 +00:00
netscreen2dump.py
…
parse_xml2skinny_dissector.py [skinny]: Fix tvb struct size guard value 2017-02-22 05:39:53 +00:00
pkt-from-core.py More spelling fixes found by lintian 2015-11-20 05:47:29 +00:00
pre-commit Update message on outdated precommit hook 2016-11-28 16:00:03 +00:00
pre-commit-ignore.conf Combine Decode As and port preferences for tcp.port dissector table. 2016-10-08 02:44:53 +00:00
pre-commit-ignore.py pre-commit: Ignore missing pre-commit-ignore.py 2016-08-18 11:00:27 +00:00
process-x11-fields.pl Support building the X11 dissector outside the source tree. 2015-11-29 11:20:39 +00:00
process-x11-xcb.pl X11: Fix last indent issue on X11 generator 2016-06-16 03:08:07 +00:00
randpkt-test.sh randpkt-test: Fix our optstring 2016-10-05 18:35:44 +00:00
rdps.py
…
rpm_setup.sh tools: add rpm-setup.sh. 2016-12-19 13:13:24 +00:00
runa2x.sh Make sure our shell, Perl, & Python tools are executable. 2016-03-03 20:11:25 +00:00
runlex.sh Cleanup runlex.sh to use builtin POSIX functions instead of sed 2017-02-15 20:58:43 +00:00
setuid-root.pl.in No need for execute bit on setuid-root.pl.in 2016-02-03 14:49:08 +00:00
test-captures.sh Add an initial "shellcheck" target. 2016-09-26 23:17:02 +00:00
test-common.sh Boost the max CPU time. 2016-12-10 03:29:22 +00:00
textify.ps1 Modified script to not use PS 3.0 constructs 2014-08-20 06:24:44 +00:00
update-tx remove Wireshark.pro, modify update-tx accordingly 2016-06-30 05:32:29 +00:00
usb-ptp-extract-models.pl
…
usb-ptp-extract-models.txt
…
valgrind-wireshark.sh tools: add options validation. 2017-02-24 13:49:56 +00:00
validate-diameter-xml.sh Validate the Diameter XML files in the pre-commit script. 2016-11-02 04:42:47 +00:00
vg-suppressions tools: add suppressions to valgrind. 2017-02-13 16:43:44 +00:00
win-setup.ps1 Windows: update GnuTLS to 3.4.11 and Libgcrypt to 1.7.6 2017-02-15 17:32:36 +00:00
wireshark_be.py Spelling fixes for errors found by lintian 2015-12-07 07:11:54 +00:00
wireshark_gen.py Spelling fixes for errors found by lintian 2015-12-07 07:11:54 +00:00
ws-coding-style.cfg We now support C++/C99-style comments. 2016-09-06 02:44:32 +00:00
yacc.py Ply parser updated to 3.8 from http://www.dabeaz.com/ply/ 2016-08-04 08:20:24 +00:00