Skip to content

Fix log files not working in daemon mode, update some dependencies and silence poll interrupted error #361

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
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Fix log files not working in daemon mode, update some dependencies and silence poll interrupted error #361

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5dc3a55
update epoll code to not care about interrupted response, add some qu…
MemoryLeak55 Aug 24, 2023
c834bd8
clippy lints and formatting
MemoryLeak55 Aug 24, 2023
979b337
match on daemonize outcome instead of is_parent bool
MemoryLeak55 Aug 24, 2023
3b879f2
add env variables for pid file and work dir
MemoryLeak55 Aug 24, 2023
e72992d
allow updating of peers removing a panic
MemoryLeak55 Aug 29, 2023
0618787
merge master and resolve conflicts
MemoryLeak55 Nov 30, 2023
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
Prev Previous commit
Next Next commit
allow updating of peers removing a panic
  • Loading branch information
@MemoryLeak55
MemoryLeak55 committed Aug 29, 2023
commit e72992d06bade75cdd285b4205dc35ca10ae1e90
11 changes: 8 additions & 3 deletions boringtun/src/device/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,10 +319,15 @@ impl Device {
return self.remove_peer(&pub_key);
}

// Update an existing peer
if self.peers.get(&pub_key).is_some() {
if let Some(peer) = self.peers.get(&pub_key) {
// We already have a peer, we need to merge the existing config into the newly created one
panic!("Modifying existing peers is not yet supported. Remove and add again instead.");
let mut peer_mut = peer.lock();

peer_mut.tunnel.set_persistent_keepalive(keepalive);
peer_mut.update(endpoint, allowed_ips, preshared_key);

tracing::info!("Peer updated");
return;
}

let next_index = self.next_index();
Expand Down
15 changes: 15 additions & 0 deletions boringtun/src/device/peer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,21 @@ impl Peer {
}
}

pub fn update(
&mut self,
endpoint: Option<SocketAddr>,
allowed_ips: &[AllowedIP],
preshared_key: Option<[u8; 32]>,
) {

if let Some(addr) = endpoint {
self.set_endpoint(addr);
}
self.allowed_ips = allowed_ips.iter().map(|ip| (ip, ())).collect();
self.preshared_key = preshared_key;

}

pub fn update_timers<'a>(&mut self, dst: &'a mut [u8]) -> TunnResult<'a> {
self.tunnel.update_timers(dst)
}
Expand Down
4 changes: 4 additions & 0 deletions boringtun/src/noise/timers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,4 +332,8 @@ impl Tunn {
None
}
}

pub fn set_persistent_keepalive(&mut self, keepalive: Option<u16>) {
self.timers.persistent_keepalive = usize::from(keepalive.unwrap_or(0));
}
}