aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Added simple python json out example used for comparing JSON output.Toni Uhlig2021-01-20
| | | | Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
* Added internal/external packet processing modes. #2Toni Uhlig2021-01-10
| | | | | | * fixed incorrect handling of skipped flows Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
* Increased network buffer size for python scripts (and raise exception if ↵Toni Uhlig2021-01-08
| | | | | | capacity reached). Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
* Added internal/external packet processing modes.Toni Uhlig2021-01-06
| | | | | | | | * only IPv4 supported for now * refactored nDPId's internal IP address storage * use fresh ndpi_free_flow_data() to free nDPI's dynamic allocated data Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
* Declared nDPI id and flow structs in nDPId flow info struct.Toni Uhlig2020-12-30
| | | | | | | | Two reasons: * reduce heap memory allocations * nDPId flow info struct may be inflated in the future (more bytes to compress) Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
* Set an optional bpf filter string for pcap based packet capture.Toni Uhlig2020-12-29
| | | | | | * serialize and send datalink layer type Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
* nDPIsrvd: Distributor clients which are too slow can cause buffer bloat.Toni Uhlig2020-12-19
| | | | | | | | | Switching back to blocking mode works as a quick fix but is not sufficient. See comments. * nDPId prints more accurate error messages if command line argument validation failed Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
* Improved testing capabilities via Makefile.Toni Uhlig2020-12-15
| | | | | | * increased nDPId_MAX_READER_THREADS to 32 Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
* nDPId option validation is now less restrictiveToni Uhlig2020-12-14
| | | | Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
* Generic nDPIsrvd.h event handling integration and flow tracking with uthash.Toni Uhlig2020-12-06
| | | | | | * aims to be re-usable for many different apps and use-cases Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
* Merge commit 'c8bf38e5fb717d40635a2a89b22ed71b0de4266b' as 'dependencies/uthash'Toni Uhlig2020-12-01
|\
| * Squashed 'dependencies/uthash/' content from commit 8e67cedToni Uhlig2020-12-01
| | | | | git-subtree-dir: dependencies/uthash git-subtree-split: 8e67ced1d1c5bd8141c542a22630e6de78aa6b90
* Removed all LUA leftover as preparation for UTHASH.Toni Uhlig2020-12-01
| | | | | | * Added UNIX socket support for nDPIsrvd.h (and c-captured) Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
* Set rpath when compiling with use of pkg-config.Toni Uhlig2020-12-01
| | | | | | * New Makefile target: mocksrvd, fake nDPIsrvd instamce Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
* Let travis use pcap files from nDPI to produce some JSON output. (disabled, ↵Toni Uhlig2020-12-01
| | | | | | | | | | | needs further testing..) * Added pcap diff script * Added \n to JSON string end (useful for debugging and readability) * Use first host/server name character for hash calculation as well * Removed error'ing EPOLLHUP handling in nDPIsrvd (connection closing will be detected via read()) Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
* Moved datalink layer processing into a separate function.Toni Uhlig2020-11-18
| | | | Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
* Increased serialization buffer size as required for recent nDPI builds.Toni Uhlig2020-11-18
| | | | | | | * added .gitignore to prevent SCM check-ins of unwanted files * fixed invalid include path for python examples Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
* Refactored Makefile pkg-config part to be able to work with multiple ↵Toni Uhlig2020-11-18
| | | | | | | | | pkg-config based projects. * added lua as new dependency for examples/c-captured * improved `make help' print Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
* Provide functionality do deal with tokens from JSMN.Toni Uhlig2020-11-17
| | | | Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
* Fixed inconsistent callback function call if a token parsed.Toni Uhlig2020-11-13
| | | | Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
* Add 'dependencies/jsmn/' from commit '053d3cd29200edb1bfd181d917d140c16c1f8834'Toni Uhlig2020-11-13
|\ | | | | | | | | | | git-subtree-dir: dependencies/jsmn git-subtree-mainline: f79991d70c66040426cb2c59876d0c48f80fdfe6 git-subtree-split: 053d3cd29200edb1bfd181d917d140c16c1f8834
| * Merge pull request #175 from pks-t/pks/struct-typeP4t2020-04-02
| |\ | | | | | | jsmn: declare struct names to allow forward decls
| | * jsmn: declare struct names to allow forward declsPatrick Steinhardt2019-11-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Both `jsmntok_t` and `jsmn_parser` are declared as anonymous structures that are typedeffed to their actual name. This forces all downstream users of jsmn to always use the typedef name, instead of using e.g. `struct jsmn_parser`. While this might be considered a matter of taste, using typedefs only has the technical downside of disallowing forward declarations. E.g. if a dependent whishes to declare a pointer to `jsmntok_t` without actually pulling in the "jsmn.h" header, then he is not able to do so because there is no way in C to provide a forward declaration for typedefs to anonymous structs. Fix this by providing names for both `jsmntok_t` and `jsmn_parser` structures.
| * | fix gcc/clang warning and unnecessary implicit type conversion to different ↵Toni Uhlig2020-03-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | size/signedness (#187) * fixed gcc/clang warnings regarding implicit numeric to enum type conversion * fixed unnecessary implicit type casts regarding size and signedness Co-authored-by: Toni Uhlig <Toni.Uhlig@rohde-schwarz.com>
| * | Fixed a typo (value -> number) (#186)Alexey Radkov2020-02-19
| |/
| * Merge pull request #162 from ghane/Case-WarningP4t2019-07-14
| |\ | | | | | | Add default case for a switch statement to avoid complaints from the compiler.
| | * Quieten a warning from the compilerSanjeev Gupta2019-07-13
| |/ | | | | | | | | gcc (and others) like a default case for switch statement, even if it is empty.
| * Modernize (#149)Serge Zaitsev2019-04-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add .clang-format for automated code formatting * automatic code formatting * move config.mk below all target to allow custom non-default build targets * add license to the top of the file * use correct header file guards syntax * convert to single-header, header-only library * update makefile to use jsmn as a header-only library * update readme * add changed from PR #143 * fix clang warnings * add changes from PR #142 * add consts as per PR #134
| * Merge pull request #139 from BenBE/patch-1Serge Zaitsev2018-10-02
| |\ | | | | | | Minor typo in jsmn.c
| | * Typo in commentBenBE2018-10-01
| |/ | | | | Fixes #84
| * Merge pull request #126 from abalkin/patch-1Serge Zaitsev2018-02-12
| |\ | | | | | | Fixed two typos in a comment.
| | * Fixed two typos in a comment.Alexander Belopolsky2018-02-10
| |/
| * Merge pull request #123 from drbitboy/btc/typosSerge Zaitsev2018-01-25
| |\ | | | | | | btc/typos - JSON_ERROR_... should be JSMN_ERROR_... in README.md
| | * btc/typos - JSON_ERROR_... should be JSMN_ERROR_... in README.mdBrian Carcich2018-01-25
| |/
| * added travis badgeSerge A. Zaitsev2017-05-01
| |
| * added travis.ymlSerge A. Zaitsev2017-05-01
| |
| * Merge pull request #99 from prubel/strict-unmatched-brackets-test-fixSerge Zaitsev2017-04-30
| |\ | | | | | | strict checking fails a test, add {}s to fix it
| | * strict checking fails a test, add {}s to fix itPaul Rubel2016-12-13
| |/ | | | | | | | | | | | | The current test looks for success, but since there are no surrounding {}s the test fails. Add them in and add a test like the one that we replace but only in the non-strict code path.
| * Merge pull request #94 from pt300/masterSerge Zaitsev2016-10-12
| |\ | | | | | | Fix for no error with unmatched closing bracket with PARENT_LINKS
| | * Changed unmatched bracket testspt3002016-10-02
| | |
| | * Merge pull request #1 from zlolik/masterPat2016-10-02
| | |\ | | | | | | | | some tests for unmatched brackets added
| | | * some tests for unmatched brackets addedzlolik2016-10-02
| | |/
| | * Seems to actually fix zserge/jsmn#81pt3002016-10-01
| | |
| | * Partialy fixes zserge/jsmn#81pt3002016-10-01
| | | | | | | | | | | | Still will report invalid amount if we fetch it with something like "{"key 1": 1234}}"
| * | Merge pull request #95 from crondaemon/doc-fixSerge Zaitsev2016-10-06
| |\ \ | | |/ | |/| Fix issue in documentation.
| | * Fix issue in documentation.Dario Lombardo2016-10-06
| |/
| * Merge pull request #87 from RyDroid/makeSerge Zaitsev2016-08-10
| |\ | | | | | | Very minor changes to Makefile
| | * Very minor changes to MakefileNicola Spanti (RyDroid)2016-08-08
| | |
| * | Merge pull request #88 from RyDroid/minor-cSerge Zaitsev2016-08-10
| |\ \ | | |/ | |/| Very minor changes to C source code
| | * Very minor changes to C source codeNicola Spanti (RyDroid)2016-08-08
| |/
Powered by cgit, Themed by Ted Yin.