commit: 7d8754c2bfe3ac71c69d42faf587a2f4f5435ac8 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Mon Jul 12 18:16:05 2021 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Tue Jul 13 21:14:11 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d8754c2
net-analyzer/nfdump: remove unused patch Closes: https://github.com/gentoo/gentoo/pull/21613 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> ...mp-1.6.21-remove-strict-rfc-7011-handling.patch | 49 ---------------------- 1 file changed, 49 deletions(-) diff --git a/net-analyzer/nfdump/files/nfdump-1.6.21-remove-strict-rfc-7011-handling.patch b/net-analyzer/nfdump/files/nfdump-1.6.21-remove-strict-rfc-7011-handling.patch deleted file mode 100644 index a36af2242d4..00000000000 --- a/net-analyzer/nfdump/files/nfdump-1.6.21-remove-strict-rfc-7011-handling.patch +++ /dev/null @@ -1,49 +0,0 @@ -From f5ae2b821c22ebe0c96f3516d4e90f4255633828 Mon Sep 17 00:00:00 2001 -From: Peter Haag <pe...@people.ops-trust.net> -Date: Sat, 8 Aug 2020 16:46:04 +0200 -Subject: [PATCH] Re-address issue #231 - remove strict rule rfc 7011 - ---- - ChangeLog | 3 +++ - bin/ipfix.c | 3 --- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/ChangeLog b/ChangeLog -index a0b2b67..8b92e58 100755 ---- a/ChangeLog -+++ b/ChangeLog -@@ -1,3 +1,6 @@ -+2020-08-02 -+- Re-address issue #231 - remove strict rule rfc 7011 -+ - 2020-08-02 - - Release 1.6.21 - - Address issue #159. Implement rfc 7011 and include sender UDP port into unique template identification -diff --git a/bin/ipfix.c b/bin/ipfix.c -index a730a8b..19c9d63 100644 ---- a/bin/ipfix.c -+++ b/bin/ipfix.c -@@ -158,7 +158,6 @@ typedef struct exporterDomain_s { - - // exporter information - exporter_info_record_t info; -- in_port_t port; // follow rfc 7011 - matching src port - - uint64_t packets; // number of packets sent by this exporter - uint64_t flows; // number of flow records sent by this exporter -@@ -383,7 +382,6 @@ uint32_t ObservationDomain = ntohl(ipfix_header->ObservationDomain); - - while ( *e ) { - if ( (*e)->info.id == ObservationDomain && (*e)->info.version == 10 && -- (*e)->port == fs->port && - (*e)->info.ip.V6[0] == fs->ip.V6[0] && (*e)->info.ip.V6[1] == fs->ip.V6[1]) - return *e; - e = &((*e)->next); -@@ -412,7 +410,6 @@ uint32_t ObservationDomain = ntohl(ipfix_header->ObservationDomain); - (*e)->info.header.size = sizeof(exporter_info_record_t); - (*e)->info.id = ObservationDomain; - (*e)->info.ip = fs->ip; -- (*e)->port = fs->port; - (*e)->info.sa_family = fs->sa_family; - (*e)->info.version = 10; - (*e)->info.sysid = 0;
