37 Commits

Author SHA1 Message Date
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
Peter Haag
ff0e855bd1 Fix security issues in netflow_v9.c and ipfix.c 2016-05-07 08:35:34 +02:00
Peter Haag
aeb703c762 Fix shared library build issue. --enable-shared=no and yes are honored correctly. 2016-05-06 15:06:08 +02:00
Adam Lamar
83e31800dc Add header guard to nfxstat 2016-03-14 11:23:12 -06:00
Peter Haag
09729c7216 Merge pull request #9 from simonflood/patch-2
Update sfcapd.c - typo
2016-02-03 09:21:01 +01:00
Simon Flood
bfa4453876 Update sfcapd.c
Fix typo in error message
2016-01-29 18:12:16 +00:00
Simon Flood
0e7540fe7d Update nfcapd.c
Fix typo in error message
2016-01-29 18:10:10 +00:00
Peter Haag
ef7697f000 Fix build issues on various Linux/*BSD 2016-01-10 16:28:37 +01:00
Peter Haag
a12087c1e9 Add -Z in nfcapd/sfcapd for timezone extension. Breaks expire for now 2016-01-10 12:42:40 +01:00
Peter Haag
3b72bdac13 sflow: fix timestamp overflow. Build: cleanup check files. 2016-01-10 11:24:24 +01:00
Peter Haag
cc8315eab5 Add nfdump library. Fix fragments iin sflow 2015-12-23 12:31:59 +01:00
Peter Haag
6f5ea0464d Fix help for -z -j description 2015-11-21 13:58:29 +01:00
phaag
7f17ef9d7e Cleanup 2015-10-03 16:05:30 +02:00
phaag
b9641c11d5 Add code for 1.6.14 to GitHub 2015-10-03 15:56:21 +02:00
phaag
758237b450 Initial git release 1.6.13 2015-10-03 14:06:34 +02:00