64 Commits

Author SHA1 Message Date
Peter Haag
0ea114f8ce IPFIX add fwd status tag #89 compatible to v9 (1byte) 2018-01-01 14:20:39 +01:00
Peter Haag
c400f52d66 IPFIX time stamps - fix offset calculation of unknown time formats 2018-01-01 13:21:58 +01:00
Peter Haag
2a829dfbf9 IPFIX time stamps - Fix elements #21,#22 offset calculation 2018-01-01 12:57:27 +01:00
Peter Haag
31137a3f5b Fix sampling for Juniper MX104. No sampling algorithm required 2017-12-31 12:43:40 +01:00
Peter Haag
13131ffb41 Add new output format json 2017-12-30 15:04:53 +01:00
Peter Haag
fccabf69ab Activate flowlabel in filter syntax 2017-12-29 15:02:00 +01:00
Peter Haag
746d1bcd47 Add sampling tags 302, 304, 305. Add option for filter labels 2017-12-29 11:55:36 +01:00
Peter Haag
0a86642a6e Fix 64bit fts compat issue in fts_compat.c 2017-12-28 18:50:43 +01:00
Peter Haag
cedc8479a8 Cleanup headers. Satify includes for header file 2017-12-28 18:19:27 +01:00
Peter Haag
9c2e7d6f4a Fix compiler warnings from different compilers clang/gcc 2017-12-28 16:47:40 +01:00
Peter Haag
8a9dcb2bc8 Cleanup sflow code - uncomment unnecessary code 2017-12-28 15:56:15 +01:00
Peter Haag
eaa7a857c8 Update sflow code to commit 7322984 of https://github.com/sflow/sflowtool 2017-12-27 19:56:21 +01:00
Peter Haag
020a4d0893 Fix potential memory leaks in nfpcapd 2017-12-22 12:09:56 +01:00
Peter Haag
b776f8df70 Fix wrong offset calculation if unknown options are found 2017-12-21 17:21:44 +01:00
Peter Haag
adfd5e9631 Add x-late src/dst ip aggregation, if compiled with NSEL support 2017-12-21 16:32:08 +01:00
Peter Haag
f1b91aaad7 Fix gcc/clang differences 2017-12-21 09:56:58 +01:00
Peter Haag
959edbcc18 Report updates on existing samplers in v9 only if values change. issue 84 2017-12-17 19:12:00 +01:00
Peter Haag
79d9916c64 Add sampling for IPFIX. See issue #47 2017-12-17 19:03:55 +01:00
Jaap Versteegh
b8111e7c7f Removed generated files 2017-12-13 13:41:28 +01:00
Peter Haag
59e0eaec10 Add lz4 compression. Remove old and experimental xstat code - cleanup 2017-12-12 20:48:33 +01:00
Peter Haag
3bf72967fc Add lz4 compression. Remove old and experimental xstat code 2017-12-11 19:22:10 +01:00
Peter Haag
235fad2e71 Fix minor issues and compiler warnings 2017-12-03 15:53:48 +01:00
Peter Haag
659f582b97 Fix sfcapd time slices < 60 are not allowed 2017-12-03 14:15:35 +01:00
Peter Haag
41e5ec8d20 Fix version tags. update all to 1.6.16 2017-12-03 14:04:25 +01:00
Peter Haag
29e80e48b5 Change -B behaviour as proposed in issue #59. Should not impact with previous use, but is more flexible 2017-11-05 15:41:47 +01:00
Peter Haag
a8bc82decb Add bzip compress switch in usage output of nfpcapd 2017-11-05 14:52:27 +01:00
Peter Haag
a35ecdd129 Fix issue #72 - multiple stat output 2017-11-05 14:25:27 +01:00
Peter Haag
f7a4bc566a Add 8byte timestamps exported by Nexus 7k family 2017-11-05 13:25:17 +01:00
Peter Haag
ad628903c0 Fix memory leak, if nfcapd can not write into directory 2017-03-18 15:16:18 +01:00
Peter Haag
f0666be488 Fix compile issues on some platforms 2017-03-18 02:46:58 +01:00
Peter Haag
f67d99e2e0 For nfpcapd, use more efficient spin locks for thread sync 2016-11-26 18:08:52 +01:00
Peter Haag
4c712ee62a Clean up logging. User Log* routines everywhere 2016-11-26 13:32:28 +01:00
Peter Haag
4cd1ef119d Merge branch 'master' of github.com:phaag/nfdump 2016-11-26 12:17:55 +01:00
Peter Haag
4aa127265d Add latency extension to nfpcapd. Streamline nfpcapd. 2016-11-26 12:17:16 +01:00
Peter Haag
88ed5083d5 Merge pull request #39 from bernhardschmidt/spelling
Fix several typos in manpages and sources
2016-11-19 17:13:40 +01:00
Peter Haag
63e5ee71e4 Push fixes 2016-11-13 15:59:41 +01:00
Peter Haag
4be59e0e69 Add nfdump.test.out to git. Few debug changes in v9 and ipfix 2016-11-13 13:50:08 +01:00
Bernhard Schmidt
365c300439 Fix spelling errors in sources found by Debian lintian 2016-10-03 20:10:40 +02:00
Peter Haag
f8db5a90ea Replace unreliable _ftok in bookkeeper 2016-07-23 16:41:37 +02:00
Brian Candler
5fab7794a3 Aggregate using in+out bytes for bidirectional flows
Some sources of data, e.g.  ASA NSEL, record a bidirectional flow record
with separate counters for in/out bytes and in/out packets.  This patch
makes aggregation over "packets", "bytes", "bps" etc look at the *sum* of
the input and output counters.  Previously they would use only the input
counters.

Query types which explicitly look at one direction, like "ibyte" and
"obyte", are unchanged.

Processing of unidirectional flows is not affected, because these store
values in the "in" counters only - the "out" counters are zero, so using the
sum of in+out is the same.

The resulting code is simpler: it doesn't have to calculate both in/out
values everywhere. It also uses accessor functions for all values, which
means no special cases for r->counter[cindex].
2016-06-13 21:41:06 +06:30
Peter Haag
812651f1fd Cleanup formating of nf_common.c 2016-06-05 12:31:24 +02:00
Peter Haag
0cde713e2c Merge pull request #25 from Opmantek/rawts
added output formats for timestamps in raw format
2016-06-05 12:21:08 +02:00
Peter Haag
68d660e984 Release v1.6.15 2016-06-05 11:52:29 +02:00
Peter Haag
25138d83f6 Fix wrong bps type case in cvs output. Fix opbs ipbs typos 2016-06-05 11:27:35 +02:00
Peter Haag
3039c97c29 Fix obyte, opps and obps output records 2016-06-05 10:17:17 +02:00
Alexander Zangerl
4237451c49 fixed stupid mistake re msec inclusion in start and end timestamps (received was ok) 2016-05-11 14:20:39 +10:00
Alexander Zangerl
69cc9c062c added formats %tsr, %ter and %trr for printing raw, fractional unix timestamps 2016-05-11 14:03:12 +10:00
Peter Haag
6ef51a7405 Merge pull request #19 from adamlamar/nfxstat-header-guard
Add header guard to nfxstat
2016-05-07 11:26:30 +02:00
Peter Haag
0db0d7ffd6 Add %ff record flags to custom output format 2016-05-07 11:18:33 +02:00
Peter Haag
bca76b91b3 Cleanup code in netflow_v9.c 2016-05-07 10:59:48 +02:00