|
 |
63f414 |
From 44442eace5a5a4330fb40d47cd9fb3c561d38c56 Mon Sep 17 00:00:00 2001
|
|
|
63f414 |
From: Fabrizio D'Angelo <fdangelo@redhat.com>
|
|
|
63f414 |
Date: Mon, 12 Apr 2021 13:56:00 -0400
|
|
|
63f414 |
Subject: [PATCH 25/30] fix(ipset): fix hash:net,net functionality
|
|
|
63f414 |
|
|
|
63f414 |
Fixes: rhbz 1936896
|
|
|
63f414 |
|
|
|
63f414 |
Signed-off-by: Fabrizio D'Angelo <fdangelo@redhat.com>
|
|
|
63f414 |
(cherry picked from commit 36f3d50d729d3329ce99653d8227e3f52a02a43f)
|
|
|
63f414 |
(cherry picked from commit 3ea4779dc4a957f9c0eb795ab0b00e67d653b772)
|
|
|
63f414 |
---
|
|
|
63f414 |
src/firewall/core/nftables.py | 2 +-
|
|
|
63f414 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
63f414 |
|
|
|
63f414 |
diff --git a/src/firewall/core/nftables.py b/src/firewall/core/nftables.py
|
|
|
63f414 |
index e6907421e111..e3ae988bbdab 100644
|
|
|
63f414 |
--- a/src/firewall/core/nftables.py
|
|
|
63f414 |
+++ b/src/firewall/core/nftables.py
|
|
|
63f414 |
@@ -1742,8 +1742,8 @@ class nftables(object):
|
|
|
63f414 |
"hash:ip,mark" : [ipv_addr[ipv], "mark"],
|
|
|
63f414 |
|
|
|
63f414 |
"hash:net" : ipv_addr[ipv],
|
|
|
63f414 |
+ "hash:net,net" : [ipv_addr[ipv], ipv_addr[ipv]],
|
|
|
63f414 |
"hash:net,port" : [ipv_addr[ipv], "inet_proto", "inet_service"],
|
|
|
63f414 |
- "hash:net,port,ip" : [ipv_addr[ipv], "inet_proto", "inet_service", ipv_addr[ipv]],
|
|
|
63f414 |
"hash:net,port,net" : [ipv_addr[ipv], "inet_proto", "inet_service", ipv_addr[ipv]],
|
|
|
63f414 |
"hash:net,iface" : [ipv_addr[ipv], "ifname"],
|
|
|
63f414 |
|
|
|
63f414 |
--
|
|
|
63f414 |
2.27.0
|
|
|
63f414 |
|