Skip to content

Use socket addr as foca addr #393

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
somtochiama wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Use socket addr as foca addr #393

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
24 changes: 2 additions & 22 deletions crates/corro-types/src/actor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,35 +199,15 @@ impl From<SocketAddr> for Actor {
}
}

pub struct ActorAddr {
id: ActorId,
addr: SocketAddr,
}

impl PartialEq for ActorAddr {
fn eq(&self, other: &Self) -> bool {
// this happens if we're announcing ourselves to another node
// we don't yet have any info about them, except their gossip addr
if self.id.is_nil() || other.id.is_nil() {
self.addr.eq(&other.addr)
} else {
self.id.eq(&other.id)
}
}
}

impl Identity for Actor {
type Addr = ActorAddr;
type Addr = SocketAddr;

// Since a client outside the cluster will not be aware of our
// `bump` field, we implement the optional trait method
// `has_same_prefix` to allow anyone that knows our `addr`
// to join our cluster.
fn addr(&self) -> Self::Addr {
ActorAddr {
id: self.id,
addr: self.addr,
}
self.addr
}

// And by implementing `renew` we enable automatic rejoining:
Expand Down
Loading