Skip to content

refactor(iroh-net): make ControlMsg public #1895

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
divagant-martian merged 1 commit into from
Dec 16, 2023
Merged

refactor(iroh-net): make ControlMsg public #1895

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion iroh-net/src/magicsock.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ mod timer;
pub use crate::net::UdpSocket;

pub use self::metrics::Metrics;
pub use self::peer_map::{ConnectionType, DirectAddrInfo, EndpointInfo};
pub use self::peer_map::{ConnectionType, ControlMsg, DirectAddrInfo, EndpointInfo};
pub use self::timer::Timer;

/// How long we consider a STUN-derived endpoint valid for. UDP NAT mappings typically
Expand Down
2 changes: 1 addition & 1 deletion iroh-net/src/magicsock/peer_map.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ use crate::{
mod best_addr;
mod endpoint;

pub use endpoint::{ConnectionType, DirectAddrInfo, EndpointInfo};
pub use endpoint::{ConnectionType, ControlMsg, DirectAddrInfo, EndpointInfo};
pub(super) use endpoint::{DiscoPingPurpose, PingAction, PingRole, SendPing};

/// Number of nodes that are inactive for which we keep info about. This limit is enforced
Expand Down
1 change: 1 addition & 0 deletions iroh-net/src/magicsock/peer_map/endpoint.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1106,6 +1106,7 @@ pub enum DiscoPingPurpose {
StayinAlive,
}

/// The type of control message we have received.
#[derive(Debug, Clone, Copy, Eq, PartialEq, Serialize, Deserialize, derive_more::Display)]
pub enum ControlMsg {
/// We received a Ping from the node.
Expand Down