aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge remote-tracking branch 'upstream/dev' into devHidde van der Heide2018-01-10
|\
| * Merge pull request #506 from cavedon/devMichele Campus2018-01-09
| |\
| | * Fix MPLS header parsing in ndpiReader.Ludovico Cavedon2018-01-09
| |/
| * add missing check for free TCP/UDP root in treeCampus2018-01-05
| * added diameter protocol dissectorCampus2018-01-02
| * Added third party libsLuca Deri2017-12-25
| * Added simplified makefileLuca Deri2017-12-25
| * Merged categories network and network_tool (way too similar)Luca Deri2017-12-23
* | Merge remote-tracking branch 'upstream/dev' into devHidde van der Heide2017-12-20
|\|
| * Merge branch 'qianguozheng-dev' into devCampus2017-12-19
| |\
| | * Fix ndpiReader long run crash due to dupilicate nodes exist, causeqianguozheng2017-12-19
| |/
| * Merge branch 'madpilot78-fix_symbols' into devCampus2017-12-15
| |\
| | * Merge branch 'fix_symbols' of https://github.com/madpilot78/nDPI into madpilo...Campus2017-12-15
| |/|
| | * Add ndpi_set_proto_category, which is actually uses by ntopng.Guido Falsi2017-12-05
| * | Implemented GooglePlus support that replaced ancient Quake protocol now obsoleteLuca Deri2017-12-15
| * | Compilation fixesLuca Deri2017-12-13
| * | Implements ndpi_get_category_idSimone Mainardi2017-12-11
| * | Simplified IPv6 datatypesLuca Deri2017-12-08
| * | Merge branch 'vel21ripn-dev' into devCampus2017-12-07
| |\ \
| | * \ Merge branch 'dev' into devMichele Campus2017-12-07
| | |\ \ | | |/ / | |/| |
| * | | Merge branch 'dev' of https://github.com/ntop/nDPI into devLuca2017-12-07
| |\ \ \
| | * | | Improved Apple update patternLuca Deri2017-12-06
| | | |/ | | |/|
| * / | Fix for #491 (SpeedTest/Ookla)Luca2017-12-07
| |/ /
| * | Fixed invalid symbolic categoriesLuca Deri2017-12-05
| * | Bump to version 2.3Simone Mainardi2017-12-03
| * | 2.2 changelogSimone Mainardi2017-12-03
| * | Merge branch 'dsokoloski-pull-request' into devCampus2017-11-30
| |\ \
| | * | Return before calling ndpi_match_host_subprotocol when dns_dissect_response e...Darryl Sokoloski2017-11-30
| |/ /
| * | Added test pcap for check_mk protocolLuca2017-11-30
| * | Compilation fixesLuca Deri2017-11-28
| * | Merge pull request #496 from cymaniac/check_mkLuca Deri2017-11-28
| |\ \
| | * | Added dissector for protocol check_mkcymaniac2017-11-28
| |/ /
| * | Merge pull request #493 from evengx/devLuca Deri2017-11-28
| |\ \
| | * | Changed MinGW __forceinline strategy to something with less side effectsJacob Masen-Smith2017-11-23
| | * | Fixed ndpi_win32.h so that it compiles on MinGW+GCCJacob Masen-Smith2017-11-22
| * | | Minor optimizationsLuca Deri2017-11-28
| * | | Warning fixLuca2017-11-23
| * | | Further check if a STUN flow will eventually become RTPLuca Deri2017-11-23
| * | | STUN improvementsLuca Deri2017-11-23
| |/ /
| * | add ICQ (instant messaging client) detection - deleted unused skyfile protocolCampus2017-11-20
| * | Improved ndpiReader outputLuca Deri2017-11-19
| * | Added YouTube Upload protocol (used the identified unused by NDPI_PROTOCOL_SK...Luca Deri2017-11-19
| * | update Telegram matchCampus2017-11-11
| * | removed bigrams for src/lib/ndpi_content_match.c.incCampus2017-11-11
| | * Merge branch 'dev' into devVitaly Lavrov2017-11-02
| | |\
| | * | Refactoring the debugging output.Vitaly Lavrov2017-10-26
* | | | Merge remote-tracking branch 'upstream/dev' into devHidde van der Heide2017-11-09
|\| | |
| * | | Fixed begin/end type when capturing live trafficLuca2017-11-03
| * | | Fixes #485Luca Deri2017-11-03
| | |/ | |/|
| * | Merge pull request #486 from vel21ripn/dev-sipMichele Campus2017-11-01
| |\ \