Skip to content

Commit ab7bfb7

Browse files
authored
fix(wireguard): add wireguard device in list by zones (#106)
This fixes netifyd interfaces reconfiguration on network changes allowing wireguard to be monitored for flows
1 parent 4c245d9 commit ab7bfb7

File tree

2 files changed

+13
-10
lines changed

2 files changed

+13
-10
lines changed

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
setup(
99
name = 'nethsec',
10-
version = '1.4.1',
10+
version = '1.4.2',
1111
author = 'Giacomo Sanchietti',
1212
author_email = 'giacomo.sanchietti@nethesis.it',
1313
description = 'Utilities for NethSecurity development',

src/nethsec/utils/__init__.py

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -202,15 +202,18 @@ def get_all_devices_by_zone(uci, zone, exclude_aliases=False):
202202
devices = devices + list(uci.get("firewall", section, "device", list=True, default=[]))
203203
networks = uci.get("firewall", section, "network", list=True, default=[])
204204
for network in networks:
205-
device = uci.get("network", network, "device", default="")
206-
if exclude_aliases and device.startswith("@"):
207-
continue
208-
if device != "":
209-
devices.append(device)
210-
else:
211-
name = uci.get("network", network, "name", default="")
212-
if name != "":
213-
devices.append(name)
205+
if uci.get('network', network, 'proto', default='') == 'wireguard':
206+
devices.append(network)
207+
continue
208+
device = uci.get("network", network, "device", default="")
209+
if exclude_aliases and device.startswith("@"):
210+
continue
211+
if device != "":
212+
devices.append(device)
213+
else:
214+
name = uci.get("network", network, "name", default="")
215+
if name != "":
216+
devices.append(name)
214217

215218
# remove duplicates
216219
return list(set(devices))

0 commit comments

Comments
 (0)