diff options
Diffstat (limited to 'net-analyzer/nfdump')
| -rw-r--r-- | net-analyzer/nfdump/Manifest | 1 | ||||
| -rw-r--r-- | net-analyzer/nfdump/files/nfdump-1.6.21-remove-strict-rfc-7011-handling.patch | 49 |
2 files changed, 0 insertions, 50 deletions
diff --git a/net-analyzer/nfdump/Manifest b/net-analyzer/nfdump/Manifest index 2e31899b5ba2..0d46c108bd10 100644 --- a/net-analyzer/nfdump/Manifest +++ b/net-analyzer/nfdump/Manifest @@ -2,7 +2,6 @@ AUX nfcapd.confd 230 BLAKE2B b4ef656a10aeedf1ee9b11b2ac3d429fcf91e2cc6a84ca220e2 AUX nfcapd.initd 1261 BLAKE2B 092b65523720ab0f4790650764e758da8504234dc888aadf8e6512b73f0c934eee27b00ccd717bd0944d2d4aa9574b9d2afe0f3aa7e071ab59e168c7e0cc0cf3 SHA512 5e4fff0829b992be9b1a318da4a77bdc87922a6f5257c87eff41590e32995b52b27efc7fa4e56aedf844c509430cb46103d902017cb3fc5f4885b8117e58feab AUX nfdump-1.6.19-compiler.patch 528 BLAKE2B b289f32a18a03b2725360b84314b294ebe6843f3ecaf3eb6ddffb9ba4e85641167c705682a8fc90560e0ce5d41dfeed7a739d011569361c31107dec9c98bf213 SHA512 300e79fdf994bd6a75c9595417d4e3e12b7e4030d6b1fa685b1b352404f36cfe2f1d8f31796a62f2a465a93dfeab0ab81caaf63a4de56a7851aea255b4607dc8 AUX nfdump-1.6.19-libft.patch 815 BLAKE2B 8b82ce3c93214e016b63fa593e7e8d3c8960e1d2636a9ad0cebd75e9945c73d9d42ebfcf5afe82ec10d62ed3d4bc8334670aaf46f543782b5c86ac2f60d57db1 SHA512 884458ac127497e9c3c7b5f8ed4eca60278d052ba2749efad1d267446c6a62da4417a018aca758bac6633d09ab08e699b54163300ed176510271aabf0769d3c4 -AUX nfdump-1.6.21-remove-strict-rfc-7011-handling.patch 1726 BLAKE2B 6f2d2c0ebb336eafba60aabec9bc2eb120c61b67401704786ed105eaeba090d893004ea4c8be4e40b360cf91c2b306c4cbb9ef9f60dc6b5c3b92fe1c5c5d904f SHA512 e7ca0512b01a0838ec9a6d52710da23ce6db5021af19a354bc59cbaf7c6b246fee50e7c3ae9b71eb34e94396cffba7f1069140c0f476c8a2b61fa9a06113f425 AUX nfdump-1.6.22-libtool-archives-slibtool.patch 3503 BLAKE2B 1118f50a17b134dfbd93cbb66e54c3228906782fabc6e0df174c912569120c588a03170a8bfd715389611b0dcc5b469415d2932f610f8b5398b8424f6e0c5342 SHA512 646606077ef1771b8f4c776939773ab7b2875c4f28710f44df826b7d8d5e5b8a163fff60eb6869ee4dfab8a7edc0f277e19ed88511719d2455b9bc5133e81124 DIST nfdump-1.6.22.tar.gz 563266 BLAKE2B f985a8f8bcbb7ff3ab98d4f01449b121e92914bc47ec7fa07c1a7a068f6722447228b0166d0f2e966c0bab2c93e34133743e8dff7d8dc41a1c70ffac64fbbf6e SHA512 3508e54b4c4785a79118147779300eebd9485532e157b37ed6487255dacaa49959d425c8fc489caa98ff559a4859b9e456e97a6c8a06a1029eb904aa1f9efb61 DIST nfdump-1.6.23.tar.gz 568879 BLAKE2B ca844f87e02fb3761d5b470cac11beada9873b0c7e3e9ca7ccc7899d57f0cfd96329698ac84467a55d683e83ce16c2b114a571845c7cb6069addcdd5d4a43903 SHA512 e3f79af69a170985fcbd1757fab86e90840d040cf7a6214c7f9851ed59695d3844a15269904c3ba989b6b6ed2ddf29fd19a493165d3037e49aa2bb69b831f168 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 a36af2242d42..000000000000 --- 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 <peter@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; |