diff options
| author | Dario Lombardo <lomato@gmail.com> | 2015-01-19 19:54:41 +0100 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2015-02-17 11:08:51 +0000 |
| commit | bd911096bd469b70ffedef409746cff8bce68c8a (patch) | |
| tree | fea66dad0b2882bbe17220357d24533509a572a9 /wiretap/wtap.c | |
| parent | 1478db03d50d4507b47eb06636502836390c7f94 (diff) | |
| download | wireshark-bd911096bd469b70ffedef409746cff8bce68c8a.tar.gz | |
Added JSON native file support.
libjsmn has also been moved from epan/ to wsutil/ to make it visible from wiretap.
Change-Id: I59abb3419acb1baa83194b38152d3651ed5c123c
Bug: 10878
Reviewed-on: https://code.wireshark.org/review/6716
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'wiretap/wtap.c')
| -rw-r--r-- | wiretap/wtap.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/wiretap/wtap.c b/wiretap/wtap.c index 6b0cf92610..4de71ee723 100644 --- a/wiretap/wtap.c +++ b/wiretap/wtap.c @@ -740,6 +740,9 @@ static struct encap_type_info encap_table_base[] = { /* WTAP_ENCAP_LOOP */ { "OpenBSD loopback", "loop" }, + + /* WTAP_ENCAP_JSON */ + { "JavaScript Object Notation", "json" } }; WS_DLL_LOCAL |