Fix: fallback interface down/up logic#31
Merged
Conversation
Reverse the logic when checking if a recorded interface still exists in the new list to avoid reporting all interfaces as down and then up in the same resync()
mxinden
approved these changes
Mar 30, 2023
mxinden
left a comment
mxinden
left a comment
Member
There was a problem hiding this comment.
Thanks @cafedetal for your work on this! Great debugging work.
Also curious what you are building with if-watch on Android in case you want to share.
Comment on lines
50
to
56
| fn resync(&mut self) -> Result<()> { | ||
| let addrs = if_addrs::get_if_addrs()?; | ||
| for old_addr in self.addrs.clone() { | ||
| if addrs.iter().any(|addr| addr.ip() == old_addr.addr()) { | ||
| if !addrs.iter().any(|addr| addr.ip() == old_addr.addr()) { | ||
| self.addrs.remove(&old_addr); | ||
| self.queue.push_back(IfEvent::Down(old_addr)); | ||
| } |
Member
There was a problem hiding this comment.
A neat idea, though not needed for this patch:
Collect the new addresses into a new set and use HashSet::difference first in one and then the other direction to report Down and Up events:
for down in old.difference(new) {
self.queue.push_back(IfEvent::Down(down))
}
for up in new.difference(old) {
self.queue.push_back(IfEvent::Up(up));
}
Member
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Reverse the logic when checking if a recorded interface still exists in the new list to avoid reporting all interfaces as down and then up in the same resync().
Tested on Android, which uses the fallback code.