diff options
| author | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2016-10-15 20:48:17 +0200 |
|---|---|---|
| committer | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2017-01-25 07:19:05 +0000 |
| commit | e2930f3b78cd47ac4044f3ece059e7dbe83f3f02 (patch) | |
| tree | 8f64e87b1a44d3ab52509dc92fcc8155a0923c25 /wsutil | |
| parent | 11574208e7f11d76bb1dbe460577396b8c06e3fb (diff) | |
| download | wireshark-e2930f3b78cd47ac4044f3ece059e7dbe83f3f02.tar.gz | |
Add sharkd - daemon variant
sharkd listens on UNIX socket and allows external clients
to run commands like: loading file, analysing frames or running TAP(s).
Change-Id: I443b2865e4adfd1c11f4f57d09ff7fce6b1e8766
Reviewed-on: https://code.wireshark.org/review/18208
Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
Diffstat (limited to 'wsutil')
| -rw-r--r-- | wsutil/wsjsmn.c | 10 | ||||
| -rw-r--r-- | wsutil/wsjsmn.h | 4 |
2 files changed, 14 insertions, 0 deletions
diff --git a/wsutil/wsjsmn.c b/wsutil/wsjsmn.c index e18bd45a4e..949b983efc 100644 --- a/wsutil/wsjsmn.c +++ b/wsutil/wsjsmn.c @@ -23,6 +23,8 @@ */ #include "wsjsmn.h" + +#include <string.h> #include <wsutil/jsmn.h> #include "log.h" @@ -66,6 +68,14 @@ gboolean jsmn_is_json(const guint8* buf, const size_t len) return ret; } +int wsjsmn_parse(const char *buf, jsmntok_t *tokens, unsigned int max_tokens) +{ + jsmn_parser p; + + jsmn_init(&p); + return jsmn_parse(&p, buf, strlen(buf), tokens, max_tokens); +} + /* * Editor modelines - https://www.wireshark.org/tools/modelines.html * diff --git a/wsutil/wsjsmn.h b/wsutil/wsjsmn.h index 84e63ebf3c..4b4d9054db 100644 --- a/wsutil/wsjsmn.h +++ b/wsutil/wsjsmn.h @@ -28,6 +28,8 @@ #include "ws_symbol_export.h" #include <glib.h> +#include "jsmn.h" + #ifdef __cplusplus extern "C" { #endif @@ -37,6 +39,8 @@ extern "C" { */ WS_DLL_PUBLIC gboolean jsmn_is_json(const guint8* buf, const size_t len); +WS_DLL_PUBLIC int wsjsmn_parse(const char *buf, jsmntok_t *tokens, unsigned int max_tokens); + #ifdef __cplusplus } #endif |