From adfd5e9631437ce25f5b83c190254395934470b6 Mon Sep 17 00:00:00 2001 From: Peter Haag Date: Thu, 21 Dec 2017 16:32:08 +0100 Subject: [PATCH] Add x-late src/dst ip aggregation, if compiled with NSEL support --- ChangeLog | 3 +++ bin/nflowcache.c | 6 ++++++ man/nfdump.1 | 4 ++++ 3 files changed, 13 insertions(+) diff --git a/ChangeLog b/ChangeLog index 52f711f..efc0971 100755 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +2017-12-21 +- Add x-late src/dst ip aggregation, if compiled with NSEL support + 2017-12-17 - Add ipfix sampling. Process option template/record with sampling elements 34 and 35 - Report updates on existing samplers in v9 only if values change. issue 84 diff --git a/bin/nflowcache.c b/bin/nflowcache.c index db60a87..3aa2480 100755 --- a/bin/nflowcache.c +++ b/bin/nflowcache.c @@ -115,6 +115,12 @@ static struct aggregate_info_s { { "srcip", { 8, OffsetSrcIPv6b, MaskIPv6, ShiftIPv6 }, -1, 0, NULL }, { "dstip", { 8, OffsetDstIPv6a, MaskIPv6, ShiftIPv6 }, -1, 0, "%da" }, { "dstip", { 8, OffsetDstIPv6b, MaskIPv6, ShiftIPv6 }, -1, 0, NULL }, +#ifdef NSEL + { "xsrcip", { 8, OffsetXLATESRCv6a, MaskIPv6, ShiftIPv6 }, -1, 0, "%xsa" }, + { "xsrcip", { 8, OffsetXLATESRCv6b, MaskIPv6, ShiftIPv6 }, -1, 0, NULL }, + { "xdstip", { 8, OffsetXLATEDSTv6a, MaskIPv6, ShiftIPv6 }, -1, 0, "%xda" }, + { "xdstip", { 8, OffsetXLATESRCv6b, MaskIPv6, ShiftIPv6 }, -1, 0, NULL }, +#endif { "dstip4", { 8, OffsetDstIPv6a, MaskIPv6, ShiftIPv6 }, 0, 0, "%da" }, { "dstip4", { 8, OffsetDstIPv6b, MaskIPv6, ShiftIPv6 }, 1, 0, NULL }, { "dstip6", { 8, OffsetDstIPv6a, MaskIPv6, ShiftIPv6 }, 0, 0, "%da" }, diff --git a/man/nfdump.1 b/man/nfdump.1 index 52e5ec4..ffe3c40 100755 --- a/man/nfdump.1 +++ b/man/nfdump.1 @@ -206,6 +206,10 @@ mpls9 MPLS label 9 mpls10 MPLS label 10 .br router Exporting router IP +.br +xsrcip X-late source IP address, if compiled with NSEL support +.br +xdstip X-late destination IP address, if compiled with NSEL support .RE .RS 3 .P