Commit Graph
2209 Commits
Author SHA1 Message Date
Campus 284bb21d61 Merge branch 'deselmo-dev' into dev 2017-06-01 16:45:24 +02:00
Campus f6eebb9c81 Merge branch 'dev' of https://github.com/deselmo/nDPI into deselmo-dev 2017-05-31 09:57:00 +02:00
William Guglielmo b08fbe46c0 Delete test.c 2017-05-30 21:04:57 +02:00
William Guglielmo 4a751f9d05 Updated libcache 2017-05-30 19:17:41 +02:00
Luca c5c417e526 Snapchat is now detected as sociaal network 2017-05-30 07:03:55 +02:00
William Guglielmo 46284e1537 Update ndpi_typedefs.h 2017-05-29 21:30:30 +02:00
William Guglielmo 694bc039e8 Added tinc protocol detection 2017-05-29 19:09:32 +02:00
Luca d21dbee102 TYpo 2017-05-29 18:58:02 +02:00
Luca 2b9f8f6a89 Fixed nDPI report formatting 2017-05-29 16:46:28 +02:00
Luca Deri 61f8f56719 Implemented network latency dissector 2017-05-26 12:46:19 +02:00
Luca Deri d67d3eed3c Compilation fix for systems that do not have JSON-C installed 2017-05-26 12:11:37 +02:00
Campus 4829222e73 update results after modifications 2017-05-26 11:26:22 +02:00
Campus 554278e678 Merge branch 'beratx-dev' into dev 2017-05-26 11:24:01 +02:00
berat b1ecc45e4f Added timestamp, flow count and app. level protocol to (-b) diagnose statistics 2017-05-26 02:47:46 +02:00
Campus d17ea73273 update 2017-05-25 17:13:43 +02:00
Luca Deri 07b1a93026 Latency calculation (work in progress) 2017-05-25 16:44:48 +02:00
Luca Deri 98dcfd8393 Reworked MAC stats 2017-05-25 10:55:41 +02:00
Luca Deri e1efee8594 Added check for searching JSON-C in home directory if not installed
Fixed type
2017-05-24 10:11:04 -07:00
Luca 993605d4f3 Fixed bug that was forcing the reader to pass several times the same flow
renamed some variables
2017-05-24 18:53:51 +02:00
Luca Deri 904210e87c Split src2dst / dst2src traffic 2017-05-24 16:06:23 +02:00
Luca Deri 50e26ca400 Implemented MAC stats 2017-05-24 00:51:21 +02:00
Luca Deri c723f7e668 Added VLAN / ARP stats 2017-05-23 23:31:43 +02:00
Alfredo Cardigliano 1a20029c82 compilation fixes 2017-05-23 18:56:43 +02:00
Alfredo Cardigliano 26bd42a71c crc32 fix 2017-05-23 18:02:53 +02:00
cardigliano 601f7f59ff forcing quiet mode in extcap mode 2017-05-22 16:55:48 +02:00
Luca Deri b39eb67836 Moved to 2.1.0
Updated test results
2017-05-22 14:44:31 +02:00
Luca Deri cb6aabbf19 Fixed JSON format when -v 3 and -b is used 2017-05-22 14:14:45 +02:00
Luca Deri b89a2dce6f Removed warning 2017-05-22 01:16:38 +02:00
Campus 97a57ac68d Merge branch 'beratx-dev' into dev 2017-05-20 10:20:16 +02:00
Campus a487a58884 Merge branch 'dev' of https://github.com/beratx/nDPI into beratx-dev 2017-05-20 10:19:44 +02:00
Michele Campus ccfe37870c Merge pull request #386 from Manouchehri/brew
Added HEAD for homebrew.
2017-05-20 10:08:34 +02:00
David Manouchehri 867acf717a Added HEAD for homebrew. 2017-05-19 19:34:52 -04:00
berat 6f27a48721 Added -b for saving port based diagnose statistics in json 2017-05-19 23:26:02 +02:00
Michele Campus 185cd4fb30 Merge pull request #383 from pavlosantoniou/dev
Remove unused variable and clarify operator precedence in ndpi_util.c
2017-05-18 16:52:57 +02:00
Pavlos Antoniou 73b3ee51d1 Remove unused variable and clarify operator precedence in ndpi_util.c 2017-05-18 14:08:01 +03:00
Michele Campus b579408711 Merge pull request #382 from pavlosantoniou/dev
Remove redundant check from btlib.c
2017-05-18 12:16:30 +02:00
Pavlos Antoniou ec0e6f98d4 Remove redundant check from btlib.c 2017-05-18 13:08:45 +03:00
Campus b4b682a4bf Merge branch 'pavlosantoniou-dev' into dev 2017-05-18 10:47:17 +02:00
Pavlos Antoniou 167732cae4 Check pointer for NULL before dereferencing 2017-05-18 11:09:56 +03:00
Michele Campus 2b128a2f1b Merge pull request #380 from pavlosantoniou/dev
Use correct subscripts when checking IP array in ndpi_main.c
2017-05-18 10:06:12 +02:00
Pavlos Antoniou f4bba23ba7 use correct subscripts when checking IP array in ndpi_main.c 2017-05-18 10:42:23 +03:00
Luca Deri 724d182939 Restored file selection as the wireshark bug seems to be fixed in 2.3.x wireshark series 2017-05-17 22:33:44 +02:00
Campus ebb6d4499a update Snapchat detection 2017-05-17 17:33:16 +02:00
Campus b2282a49b5 Merge branch 'dev' of https://github.com/ntop/nDPI into dev 2017-05-17 17:20:47 +02:00
Campus a044178b47 Merge branch 'pavlosantoniou-dev' into dev 2017-05-17 17:17:38 +02:00
Luca a874e7869c Typo 2017-05-17 17:12:22 +02:00
Luca cef42b4050 Updated tests instruction 2017-05-17 17:11:54 +02:00
Pavlos Antoniou 0a2cbe4926 Fix buffer overflows in http.c 2017-05-17 18:11:25 +03:00
Luca Deri 99c9f1d36b Updated results are ndpiReader output has been modified 2017-05-17 15:53:52 +02:00
Luca Deri 0091f35e02 Reworked flow structure handler 2017-05-17 15:50:59 +02:00