Commit graph

116 commits

Author SHA1 Message Date
Alfredo Cardigliano
acb23221e2 Add support for SRC_AS DST_AS BGP_NEXT_ADJACENT_ASN BGP_PREV_ADJACENT_ASN information elements 2020-04-29 09:35:27 +00:00
emanuele-f
5f5a7abdb7 Add warning for missing fields in the ZMQ template
Closes #3514
2020-03-05 18:18:29 +01:00
Alfredo Cardigliano
21462270e2 Fix use after free in zmq_remote_stats (#3496) 2020-03-03 13:50:02 +00:00
emanuele-f
b4dbb88492 Fix invalid source_id_last_zmq_remote_stats map item delete
Also fixes:
 - Missing source_id_last_zmq_remote_stats cleanup on shutdown
 - Leak in Ntop::registerInterface when maximum interfaces number is reached
 - Concurrent access to Ntop::registerInterface from registerSubInterface

Fixes #3495
2020-03-03 13:00:54 +01:00
Alfredo Cardigliano
ef16436576 Support for EXPORTER_IPV6_ADDRESS parsing and disaggregation 2020-02-28 18:47:46 +01:00
Alfredo Cardigliano
765474fa70 Option -F nindex;{dump,load} to dump and load json flows (for debugging only) 2020-02-27 18:51:59 +01:00
Alfredo Cardigliano
731278448a Handle stats from multiple ZMQ producers in the same endpoint (fix #3409) 2020-02-18 12:26:50 +01:00
emanuele-f
a206dea517 Add safety checks to avoid ZMQParserInterface parse leaks
Leak trace:

Direct leak of 14 byte(s) in 1 object(s) allocated from:
    #0 0x564eb47ef589 in strdup (/home/emanuele/src/ntopng/ntopng+0x15a589)
    #1 0x564eb4ad5d85 in ZMQParserInterface::parsePENNtopField(ParsedFlow*, unsigned int, ParsedValue*) const /home/emanuele/src/ntopng/src/ZMQParserInterface.cpp:556:25
    #2 0x564eb4adae10 in ZMQParserInterface::parseSingleTLVFlow(ndpi_serializer*, unsigned char) /home/emanuele/src/ntopng/src/ZMQParserInterface.cpp:1237:14
    #3 0x564eb4adbd3e in ZMQParserInterface::parseTLVFlow(char const*, int, unsigned char, void*) /home/emanuele/src/ntopng/src/ZMQParserInterface.cpp:1423:8
    #4 0x564eb4ad06a1 in ZMQCollectorInterface::collect_flows() /home/emanuele/src/ntopng/src/ZMQCollectorInterface.cpp:421:38
    #5 0x564eb4ad105f in packetPollLoop(void*) /home/emanuele/src/ntopng/src/ZMQCollectorInterface.cpp:469:10
    #6 0x7fc0b4a0b46e in start_thread (/usr/lib/libpthread.so.0+0x946e)
2020-02-17 19:14:27 +01:00
Simone Mainardi
dd99966e78 Removes a debug print in parseTLVFlow 2020-02-05 11:58:34 +01:00
Luca Deri
e12f7b7fc3 Merge branch 'dev' of https://github.com/ntop/ntopng into dev 2020-02-04 22:58:16 +01:00
Luca Deri
3fcd016ace ZMQ debug code 2020-02-04 22:58:06 +01:00
Alfredo Cardigliano
af135d2909 Replace break with return in case of failures to avoid printing a misleading message 2020-02-04 17:56:34 +01:00
emanuele-f
9b45950c74 Add missing breaks causing case fallthrough 2020-02-04 17:52:19 +01:00
Luca Deri
57e6a93065 Improved scheduling algorithm to guarantee minimum service time when number of entries allow
Updated (C)
2020-01-06 23:36:36 +01:00
Alfredo Cardigliano
a8d7353a07 TLV string key decoding fix 2019-12-23 12:55:25 +01:00
Alfredo Cardigliano
6359bc9ab0 Fix displayed RTP MOS with TLV (this also fixes other fields formatting with JSON) 2019-12-02 12:09:37 +01:00
Alfredo Cardigliano
e38835a603 Rename SSL to TLS (fix #3013) 2019-11-15 12:40:01 +01:00
Simone Mainardi
1eba832869 Fixes flow aggregation after hash tables rework
Fixes #3018
2019-10-29 17:49:52 +01:00
Alfredo Cardigliano
3290bd803b Propagating additional fields to companion interface 2019-10-15 16:41:42 +02:00
Alfredo Cardigliano
a2e74e16a3 New Lua interface.processFlow API, moved processFlow from NetworkInterface to ParserInterface, code cleanup 2019-10-10 12:49:32 +02:00
Alfredo Cardigliano
c5e3d61205 Support for l7 proto name match in sub interfaces 2019-10-08 17:14:10 +02:00
Alfredo Cardigliano
0c2ffc1f94 Dynamic and custom sub-interfaces are now sharing the same data structure (registering through API to the master interface), bug fixes 2019-09-26 15:50:31 +02:00
Alfredo Cardigliano
d672d93750 Sub interfaces support (wip) (#2825) 2019-09-17 10:34:52 +02:00
Alfredo Cardigliano
b7d459dd2b Moved strdup for JSON/TLV strings from Flow to Parser to handle non-null-terminated strings 2019-09-13 12:36:19 +02:00
Alfredo Cardigliano
e31afe72d6 Enabled additional fields serialization to TLV 2019-09-11 12:03:28 +02:00
Alfredo Cardigliano
9bd00fa0ee Support for encoding additional fields to TLV 2019-09-10 20:50:34 +02:00
Simone Mainardi
77a3bdb051 Reworks profiling instrumentation 2019-09-10 19:06:52 +02:00
Simone Mainardi
949d2a1025 Calculates flow idle timeouts using nProbe data for ZMQ interfaces 2019-09-10 18:05:16 +02:00
Alfredo Cardigliano
a707e6a058 Moved end-of-record check with TLV 2019-09-10 16:39:49 +02:00
Alfredo Cardigliano
ddfa56dc50 TLV warning improvements 2019-09-10 15:49:15 +02:00
Alfredo Cardigliano
ab9e6cae3a Checking serialization format for TLV 2019-09-10 15:02:31 +02:00
Alfredo Cardigliano
51ecae22fb Support for the new ndpi_deserialize_* API 2019-09-10 14:50:12 +02:00
Alfredo Cardigliano
32119bda1f Temporarily disabled tlv version check (wip) 2019-09-10 11:11:27 +02:00
Alfredo Cardigliano
8637573838 Warning in case of TLV version mismatch (for the future) 2019-09-10 09:30:07 +02:00
Simone Mainardi
ca56f94cef Implements per-interface updateStats variable frequency 2019-09-04 19:27:55 +02:00
Luca Deri
fa30f76e49 Added check to prevent sampling rate to be 0 2019-09-03 10:04:42 +02:00
Luca Deri
17e4fd0285 Parsing fixes 2019-09-02 08:27:00 +02:00
Simone Mainardi
24cf71a70d Parses and charts UDP socket drops from nProbe 2019-08-30 12:54:41 +02:00
Alfredo Cardigliano
f8af84df2d SyslogParserInterface now supports the companion interface for delivering Suricata alerts to a packet interface (#1928) 2019-08-27 17:53:34 +02:00
Alfredo Cardigliano
dc9978c68d Moved companion interface to ParserInterface to be used by any *ParserInterface 2019-08-27 16:24:46 +02:00
Alfredo Cardigliano
226c9ce621 Support for deserialization of int32/int64/float with uint key 2019-08-26 12:56:05 +02:00
Alfredo Cardigliano
e1b57831eb Optimized getKeyId (25% performance boost with TLV) 2019-08-26 12:05:47 +02:00
Simone Mainardi
e7ff945227 Fixes IPV4_{DST|DST}_MASK handled as strings 2019-08-14 10:54:27 +02:00
Alfredo Cardigliano
bcfcdb2f58 IPV4_{DST|DST}_MASK parsing fix 2019-08-14 10:26:08 +02:00
Alfredo Cardigliano
e1c7392c02 parseSingleTLVFlow cleanup 2019-08-13 11:48:23 +02:00
Alfredo Cardigliano
d0886b1f9e Code cleanup, removed temporary warnings 2019-08-12 10:38:45 +02:00
Alfredo Cardigliano
55cad7ae43 Cleanup and comments to ZMQParserInterface 2019-08-12 09:44:53 +02:00
Luca
db284023b8 Workaround to avoid warning messages 2019-08-10 13:15:51 +02:00
Alfredo Cardigliano
c11c144a68 Reworked ZMQ parser to use ParsedValue instead of string/int/float, JSON-C is now parsing the correct type instead of always string 2019-08-05 13:56:41 +02:00
Simone Mainardi
c9223590d9 Workaround to handle \n forcefully set when decoding ZMQ tlv 2019-07-31 16:06:15 +02:00