Skip to content

fix(nm): support VLAN interfaces in NetworkManager backend #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
apostroll wants to merge 1 commit into
base: stable
Choose a base branch
from
+11 −4
Open

fix(nm): support VLAN interfaces in NetworkManager backend #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion proton/vpn/backend/networkmanager/core/nmclient.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,8 @@ def is_physical_connection(active_connection):
NM.SETTING_WIRELESS_SETTING_NAME, # Wifi
NM.SETTING_GSM_SETTING_NAME, # USB+Dongle
NM.SETTING_CDMA_SETTING_NAME, # USB+Dongle
NM.SETTING_BRIDGE_SETTING_NAME # Bridge
NM.SETTING_BRIDGE_SETTING_NAME, # Bridge
NM.SETTING_VLAN_SETTING_NAME # VLAN
)

for active_connection in self._nm_client.get_active_connections():
Expand Down
12 changes: 9 additions & 3 deletions proton/vpn/backend/networkmanager/killswitch/wireguard/nmclient.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,18 +215,24 @@ def _add_connection_async():
return future_conn_activated

def get_physical_devices(self) -> List[NM.Device]:
"""Returns all the active ethernet/wifi devices."""
"""Returns all the active ethernet/wifi/vlan devices."""
return [
device for device in self._nm_client.get_devices() if (
device.get_device_type() in (NM.DeviceType.ETHERNET, NM.DeviceType.WIFI)
device.get_device_type() in (
NM.DeviceType.ETHERNET,
NM.DeviceType.WIFI,
NM.DeviceType.VLAN,
)
and device.get_state() is NM.DeviceState.ACTIVATED
and device.get_active_connection() # Maybe this is redundant.
)
]

def _is_ethernet_or_wifi_connection(self, active_connection: NM.ActiveConnection):
return active_connection.props.type in (
NM.SETTING_WIRED_SETTING_NAME, NM.SETTING_WIRELESS_SETTING_NAME
NM.SETTING_WIRED_SETTING_NAME,
NM.SETTING_WIRELESS_SETTING_NAME,
NM.SETTING_VLAN_SETTING_NAME,
)

def get_ethernet_and_wifi_connections(self) -> List[NM.ActiveConnection]:
Expand Down