shimun/wireguard-user
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

added feature to Cargo.toml
Some checks are pending
continuous-integration/drone/push Build is failing
Details

Browse Source
This commit is contained in:
shimunn 2019-01-19 22:47:23 +01:00
parent 8300e94414
commit fa84103e8a
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wg-event-gen/Cargo.toml
View File

@ -12,4 +12,8 @@ structopt = "0.2.14"
structopt-derive = "0.2.14" structopt-derive = "0.2.14"
[profile.release] [profile.release]
lto = false lto = true
[features]
addrem = []

14
wg-event-gen/src/gen.rs
View File

@ -25,7 +25,7 @@ pub(crate) fn gen_events(
.chain(prev.keys().map(String::as_ref)) .chain(prev.keys().map(String::as_ref))
.collect::<HashSet<&str>>() .collect::<HashSet<&str>>()
.iter() .iter()
.map(|p| (p.to_owned(), (prev.get(*p), state.get(*p)))) .map(|p| (*p, (prev.get(*p), state.get(*p))))
.collect::<HashMap<&str, (Option<&Peer>, Option<&Peer>)>>() .collect::<HashMap<&str, (Option<&Peer>, Option<&Peer>)>>()
}; };
for (_id, (prev, cur)) in side_by_side { for (_id, (prev, cur)) in side_by_side {
@ -37,6 +37,12 @@ pub(crate) fn gen_events(
_ => true, _ => true,
}; };
if let (Some(prev_addr), Some(cur_addr)) = (prev.endpoint, cur.endpoint) {
if prev_addr != cur_addr {
listeners.roaming(&cur, prev_addr);
}
}
if !timedout(&prev) && timedout(&cur) { if !timedout(&prev) && timedout(&cur) {
listeners.disconnected(&cur); listeners.disconnected(&cur);
continue; continue;
@ -45,12 +51,6 @@ pub(crate) fn gen_events(
if timedout(&prev) && !timedout(&cur) { if timedout(&prev) && !timedout(&cur) {
listeners.connected(&cur); listeners.connected(&cur);
} }
if prev.endpoint != cur.endpoint {
if let (Some(prev_addr), Some(_)) = (prev.endpoint, cur.endpoint) {
listeners.roaming(&cur, prev_addr);
}
}
} }
(None, Some(cur)) => listeners.added(&cur), (None, Some(cur)) => listeners.added(&cur),
(Some(prev), None) => listeners.removed(&prev), (Some(prev), None) => listeners.removed(&prev),