|
 |
47f735 |
From 1cbe39d4260c633da4b7110d6e2e7722b8454af4 Mon Sep 17 00:00:00 2001
|
|
|
47f735 |
From: Eric Garver <eric@garver.life>
|
|
|
47f735 |
Date: Tue, 27 Apr 2021 08:56:13 -0400
|
|
|
47f735 |
Subject: [PATCH 27/30] fix(nm): reload: only consider NM connections with a
|
|
|
47f735 |
real interface
|
|
|
47f735 |
|
|
|
47f735 |
Where real interface means linux interface capable of having an IP
|
|
|
47f735 |
address and does not exceed IFNAMSIZ.
|
|
|
47f735 |
|
|
|
47f735 |
Fixes: rhbz 1928860
|
|
|
47f735 |
(cherry picked from commit f18f1cc96503fbc5d42f30ecdc6f0da4c56aac4d)
|
|
|
47f735 |
(cherry picked from commit 7e9c4a5072ee3fd1aaf4162ef6ef1bf84b8a82eb)
|
|
|
47f735 |
---
|
|
|
47f735 |
src/firewall/core/fw_nm.py | 8 ++++++--
|
|
|
47f735 |
1 file changed, 6 insertions(+), 2 deletions(-)
|
|
|
47f735 |
|
|
|
47f735 |
diff --git a/src/firewall/core/fw_nm.py b/src/firewall/core/fw_nm.py
|
|
|
47f735 |
index 37282a1a7711..0e38dd47e927 100644
|
|
|
47f735 |
--- a/src/firewall/core/fw_nm.py
|
|
|
47f735 |
+++ b/src/firewall/core/fw_nm.py
|
|
|
47f735 |
@@ -141,7 +141,9 @@ def nm_get_connections(connections, connections_name):
|
|
|
47f735 |
|
|
|
47f735 |
connections_name[uuid] = name
|
|
|
47f735 |
for dev in devices:
|
|
|
47f735 |
- connections[dev.get_iface()] = uuid
|
|
|
47f735 |
+ ip_iface = dev.get_ip_iface()
|
|
|
47f735 |
+ if ip_iface:
|
|
|
47f735 |
+ connections[ip_iface] = uuid
|
|
|
47f735 |
|
|
|
47f735 |
def nm_get_interfaces():
|
|
|
47f735 |
"""Get active interfaces from NM
|
|
|
47f735 |
@@ -169,7 +171,9 @@ def nm_get_interfaces():
|
|
|
47f735 |
continue
|
|
|
47f735 |
|
|
|
47f735 |
for dev in active_con.get_devices():
|
|
|
47f735 |
- active_interfaces.append(dev.get_iface())
|
|
|
47f735 |
+ ip_iface = dev.get_ip_iface()
|
|
|
47f735 |
+ if ip_iface:
|
|
|
47f735 |
+ active_interfaces.append(ip_iface)
|
|
|
47f735 |
|
|
|
47f735 |
return active_interfaces
|
|
|
47f735 |
|
|
|
47f735 |
--
|
|
|
47f735 |
2.27.0
|
|
|
47f735 |
|