Skip to content

Match linux interfaces by pubkey #1014

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

Merged
j-chmielewski merged 1 commit into from
Jul 7, 2026
+81 −23
Merged

Match linux interfaces by pubkey #1014

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
104 changes: 81 additions & 23 deletions src-tauri/enterprise/service-locations/src/linux.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,34 @@ impl ServiceLocationManager {
})
}

fn find_interface_by_peer_pubkey(&self, location_pubkey: &str) -> Option<String> {
let peer_key = match Key::from_str(location_pubkey) {
Ok(peer_key) => peer_key,
Err(err) => {
warn!(
"Failed to parse Linux service location peer pubkey {location_pubkey}: {err}"
);
return None;
}
};

for (ifname, wgapi) in &self.wgapis {
match wgapi.read_interface_data() {
Ok(host) => {
if host.peers.contains_key(&peer_key) {
return Some(ifname.clone());
}
}
Err(err) => warn!(
"Failed to read Linux service location interface {ifname} while looking for peer \
{location_pubkey}: {err}"
),
}
}

None
}

pub fn disconnect_service_locations_by_instance(
&mut self,
instance_id: &str,
Expand All @@ -195,16 +223,24 @@ impl ServiceLocationManager {
};

for location in locations {
let ifname = get_interface_name(&location.name);
debug!("Tearing down Linux service location interface: {ifname}");
if let Some(wgapi) = self.wgapis.remove(&ifname) {
if let Err(err) = wgapi.remove_interface() {
error!("Failed to remove Linux service location interface {ifname}: {err}");
if let Some(ifname) = self.find_interface_by_peer_pubkey(&location.pubkey) {
debug!("Tearing down Linux service location interface: {ifname}");
if let Some(wgapi) = self.wgapis.remove(&ifname) {
if let Err(err) = wgapi.remove_interface() {
error!("Failed to remove Linux service location interface {ifname}: {err}");
} else {
debug!("Linux service location interface {ifname} removed successfully");
}
} else {
debug!("Linux service location interface {ifname} removed successfully");
debug!(
"Linux service location interface {ifname} was not tracked as connected"
);
}
} else {
debug!("Linux service location interface {ifname} was not tracked as connected");
debug!(
"No Linux service location interface found for instance {instance_id}, location '{}'",
location.name
);
}
}

Expand All @@ -216,36 +252,46 @@ impl ServiceLocationManager {
instance_id: &str,
location_pubkey: &str,
) -> Result<(), ServiceLocationError> {
let Some(locations) = self.connected_service_locations.get_mut(instance_id) else {
let Some(position) =
self.connected_service_locations
.get(instance_id)
.and_then(|locations| {
locations
.iter()
.position(|location| location.pubkey == location_pubkey)
})
else {
debug!("No connected Linux service locations found for instance {instance_id}");
return Ok(());
};

let Some(position) = locations
.iter()
.position(|location| location.pubkey == location_pubkey)
else {
debug!(
"Linux service location with pubkey {location_pubkey} for instance {instance_id} is not connected"
);
let ifname = self.find_interface_by_peer_pubkey(location_pubkey);

let Some(locations) = self.connected_service_locations.get_mut(instance_id) else {
warn!("Linux service location for instance {instance_id} disappeared before removal");
return Ok(());
};

let location = locations.remove(position);
if locations.is_empty() {
self.connected_service_locations.remove(instance_id);
}

let ifname = get_interface_name(&location.name);
debug!("Tearing down Linux service location interface: {ifname}");
if let Some(wgapi) = self.wgapis.remove(&ifname) {
if let Err(err) = wgapi.remove_interface() {
error!("Failed to remove Linux service location interface {ifname}: {err}");
if let Some(ifname) = ifname {
debug!("Tearing down Linux service location interface: {ifname}");
if let Some(wgapi) = self.wgapis.remove(&ifname) {
if let Err(err) = wgapi.remove_interface() {
error!("Failed to remove Linux service location interface {ifname}: {err}");
} else {
debug!("Linux service location interface {ifname} removed successfully");
}
} else {
debug!("Linux service location interface {ifname} removed successfully");
debug!("Linux service location interface {ifname} was not tracked as connected");
}
} else {
debug!("Linux service location interface {ifname} was not tracked as connected");
debug!(
"No Linux service location interface found for instance {instance_id}, location '{}'",
location.name
);
}

Ok(())
Expand Down Expand Up @@ -338,6 +384,18 @@ impl ServiceLocationManager {
return Ok(());
}

if self
.find_interface_by_peer_pubkey(&location.pubkey)
.is_some()
{
debug!(
"Skipping Linux service location '{}' because its interface already exists",
location.name
);
self.add_connected_service_location(instance_id, location);
return Ok(());
}

self.setup_service_location_interface(location, private_key)?;
self.add_connected_service_location(instance_id, location);
debug!("Connected Linux service location '{}'", location.name);
Expand Down
Loading