Commit graph

1122 commits

Author SHA1 Message Date
Alfredo Cardigliano
3707553906 host_server_name size fix 2018-05-05 10:01:02 +00:00
Luca
3adccc98f7 Implemented custom category loading.
Modified ndpiReader with -c <file> (use mining_hosts.txt as example) for loading name-based categories
2018-04-26 21:10:59 +02:00
Darryl Sokoloski
c54a8f8cfa Moved ndpi_config.h from ndpi_main.h to ndpi_main.c, and example source files. 2018-04-24 10:21:47 -04:00
Yingpei Zeng
076bd3d1f4 Add a new file to Xcode project 2018-04-16 10:48:30 +08:00
Luca
a2acd09263 Added ndpi_get_api_version() API call to be used in applications that
are dynamically linking with nDPI, to make sure the APIs are in sync
2018-03-21 18:33:08 +01:00
Michele Campus
a5dd00eedb
Merge pull request #523 from zyingp/dev
[For Xcode project] Fix some typos and add Macro definitions for Release build as well
2018-02-16 22:14:52 +01:00
Campus
9e47e49ade fix wrong increment for MPLS double header 2018-02-15 21:26:38 +01:00
Yingpei Zeng
053dbd73a6 [For Xcode project] Change some typos in README.md and add macro definition for release build as well 2018-02-11 13:58:09 +08:00
ZengYingpei
5e0880dac6 Reset optind of getopt_long for synthesizing command line input stably in the Xcode project 2018-02-04 15:34:04 +08:00
ZengYingpei
26e36a19bf Unify Copyright declaration for all added files of the Xcode project 2018-02-04 14:35:56 +08:00
ZengYingpei
aea81e4a1a Add an Xcode project for debugging under MacOS (add all missed files) 2018-02-04 14:21:52 +08:00
ZengYingpei
39b9f6752c Add an Xcode project for debugging under MacOS 2018-02-04 14:19:38 +08:00
Luca Deri
78feabfad7 Inital hyperscan work 2018-01-24 22:11:05 +01:00
Hidde van der Heide
d896ce7469 Merge remote-tracking branch 'upstream/dev' into dev 2018-01-10 10:40:54 +01:00
Ludovico Cavedon
35dc6e27ae Fix MPLS header parsing in ndpiReader.
Reported at https://bugs.debian.org/886133.
The current parsing for the MPLS header in examples/ndpi_util.c has
multiple issues:
- the bitfield order is incorrect for little endian architectures
- ntohl() is applied to a 20 bit label, which has unclear purpose
- if multiple labels are detected, the while loop parsing labels will
never exit due to a missing re-read of the mpls label
- the last label is identified by looking inside the label field, while
it should be done by looking at the S bit

This change fixes the above issues.
Notice that bitfield ordering is implementation-dependent, so C
bitfields should not be used in the first place to parse network
packets.
2018-01-09 10:26:10 -08:00
Hidde van der Heide
bf8c9c2625 Merge remote-tracking branch 'upstream/dev' into dev 2017-12-20 13:19:24 +01:00
qianguozheng
9561f37998 Fix ndpiReader long run crash due to dupilicate nodes exist, cause
double free failed.
2017-12-19 17:37:46 +08:00
Luca Deri
61bc528159 Simplified IPv6 datatypes 2017-12-08 18:13:31 +01:00
Michele Campus
cb8f4f87bf
Merge branch 'dev' into dev 2017-12-07 22:45:28 +01:00
Luca Deri
8af18763cc Compilation fixes 2017-11-28 22:05:34 +01:00
Luca Deri
d6176ff668 Improved ndpiReader output
Updated tests
2017-11-19 18:35:26 +01:00
Hidde van der Heide
ee957e0831 Merge remote-tracking branch 'upstream/dev' into dev 2017-11-09 10:14:02 +01:00
Luca
c9f32ee76d Fixed begin/end type when capturing live traffic 2017-11-03 17:15:04 +01:00
Vitaly Lavrov
50645e11d8
Merge branch 'dev' into dev 2017-11-02 10:59:21 +03:00
Alfredo Cardigliano
6e6b623057 Merge branch 'dev' of https://github.com/ntop/nDPI into dev 2017-10-30 11:30:14 +01:00
Alfredo Cardigliano
159e6228fe --ndpi-proto-filter now accepts also protocol name 2017-10-30 11:30:09 +01:00
Luca Deri
cf07c92538 Dropbox and apple improvements
Fixed warning
2017-10-29 18:31:31 +01:00
Vitaly Lavrov
2787c2390c Refactoring the debugging output.
levels of debug output:
 0 - ERROR: Only for errors.
 1 - TRACE: Start of each packets and if found protocol.
 2 - DEBUG: Start of searching each protocol and excluding protocols.
 3 - DEBUG_EXTRA: For all other messages.

Added field ndpi_struct->debug_logging for enable debug output of each protocols.

Simple macros for debugging output are added:
NDPI_LOG_ERR(), NDPI_LOG_INFO(), NDPI_LOG_DBG(), NDPI_LOG_DBG2(),
NDPI_EXCLUDE_PROTO()
2017-10-26 20:41:22 +03:00
Hidde van der Heide
441e43c167 Revert the revert of 2155dd9 after fixing ntopng Travis
This reverts commit 4f72b954da.
2017-10-24 17:05:48 +02:00
Simone Mainardi
4f72b954da Undoes 2155dd9 that breaks ntopng Travis 2017-10-23 15:20:30 +02:00
Hidde van der Heide
2155dd9153 Add libcache to installed headers and removed relative import 2017-10-19 16:10:56 +02:00
berat
d273b67fd7 fixed bug 2017-10-12 11:18:05 +02:00
berat
98d1c762cd extended (-b flag) statistics with top receiver stats 2017-10-09 22:21:40 +02:00
Luca Deri
2476c3c1b6 Fixed bug in someip dissector (access out of boundary)
Fixed memory leak in ndpiReader
2017-10-08 18:55:40 +02:00
Luca Deri
27d66f6845 Typo 2017-10-06 09:51:42 +02:00
Luca Deri
b10e526364 Leak fix 2017-10-05 16:21:32 +02:00
Vitaly Lavrov
b2f0558080 A more predictable sorting of the flows list.
It is necessary for correct testing.
2017-09-29 12:46:27 +03:00
berat
f255b10524 memory improvement again for (-b flag) statistics 2017-09-26 17:20:51 +02:00
berat
4ba6ba70c5 memory usage is improved (-b flag) 2017-09-26 17:01:10 +02:00
Michele Campus
0827a6bf8b Merge pull request #457 from la10736/fix_ndpiReader_dependencies
Fix #456: ndpiReader depend from uthash.h heder
2017-09-25 15:21:51 +02:00
Michele d'Amico
59097a2d30 Fix #456: ndpiReader depend from uthash.h heder 2017-09-25 15:08:55 +02:00
berat
2c014c5693 improved memory usage by (-b flag) statistics 2017-09-25 12:45:30 +02:00
berat
688d7c33e4 improved (-x flag) bpf filter condition 2017-09-25 11:14:57 +02:00
berat
b0f3852fed improved (-x flag) bpf filter condition 2017-09-25 11:06:47 +02:00
berat
807db80afc fixed another memory leak 2017-09-24 18:43:31 +02:00
berat
baae16ec2f memory leak fixed 2017-09-23 19:55:47 +02:00
berat
41b40ddf18 memory leak fixed 2017-09-23 19:50:52 +02:00
berat
f575959cd2 typos and renames 2017-09-22 19:00:27 +02:00
Luca Deri
9fb5981128 Added ndpi_category_set_name() API call 2017-09-19 22:39:00 +02:00
Luca Deri
1a4e57e736 Code rework 2017-09-17 23:34:46 +02:00