Skip to content
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.

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

refactor(iroh-net): portmapper and network monitor are crates #2855

Merged
merged 34 commits into from
Oct 29, 2024
Merged
Changes from 1 commit
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
59457b2
add net member
divagant-martian Oct 24, 2024
4704124
move net files
divagant-martian Oct 24, 2024
38ba7a3
adjust net files
divagant-martian Oct 24, 2024
1cb8a7c
check unused deps in the crate
divagant-martian Oct 24, 2024
887041e
add net as a dep
divagant-martian Oct 24, 2024
2f572e6
adjust visibilities to use
divagant-martian Oct 24, 2024
befdb35
remove unused deps from iroh-net
divagant-martian Oct 24, 2024
69a5f8f
add portmapper as a member
divagant-martian Oct 24, 2024
543fb41
move portmapper files
divagant-martian Oct 24, 2024
d2a6616
adjust files to new structure
divagant-martian Oct 25, 2024
2dda79c
remove portmapping defaults
divagant-martian Oct 25, 2024
7bda3d0
use portmapper directly
divagant-martian Oct 25, 2024
378a72a
remove Some unused deps
divagant-martian Oct 25, 2024
df52737
Merge remote-tracking branch 'n0/main' into netmon-split
divagant-martian Oct 25, 2024
6cbae77
fmt
divagant-martian Oct 25, 2024
fbe28a7
fix net imports
divagant-martian Oct 25, 2024
f2ffed7
add windows deps in net
divagant-martian Oct 25, 2024
9f83aa7
use portmapper and net directly everywhere
divagant-martian Oct 25, 2024
2feeac8
re-add re-exports
divagant-martian Oct 25, 2024
8a1574d
remove dependency on dns alias
divagant-martian Oct 25, 2024
25aaa60
fmt
divagant-martian Oct 25, 2024
15dbac9
remove redundant import
divagant-martian Oct 25, 2024
ea0bad0
add some love to toml file
divagant-martian Oct 28, 2024
dfd457e
Merge branch 'main' into netmon-split-v2
divagant-martian Oct 28, 2024
d61a282
leave it at netwatch with udp
divagant-martian Oct 29, 2024
9b22efe
include in ci
divagant-martian Oct 29, 2024
eb7d3f8
add time to tokio in netwatch
divagant-martian Oct 29, 2024
36c1a87
Merge branch 'main' into netmon-split-v2
divagant-martian Oct 29, 2024
5131a5f
merge and sort imports
divagant-martian Oct 29, 2024
5e1e3e1
add Lincense, Contribution, improve description
divagant-martian Oct 29, 2024
e9959e5
cleanup docs
divagant-martian Oct 29, 2024
682c18d
Merge branch 'main' into netmon-split-v2
divagant-martian Oct 29, 2024
a64f8bc
remove readded reexports rerere as agreed with @dignifiedquire and @flub
divagant-martian Oct 29, 2024
0d04c36
fix missed test
divagant-martian Oct 29, 2024
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
fix missed test
  • Loading branch information
divagant-martian committed Oct 29, 2024
commit 0d04c369ae0a3fd11023227a52f298d029a02bbf
3 changes: 2 additions & 1 deletion iroh-net/src/magicsock/udp_conn.rs
Original file line number Diff line number Diff line change
Expand Up @@ -196,11 +196,12 @@ where
#[cfg(test)]
mod tests {
use anyhow::Result;
use netwatch::IpFamily;
use tokio::sync::mpsc;
use tracing::{info_span, Instrument};

use super::*;
use crate::{key, net::IpFamily, tls};
use crate::{key, tls};

const ALPN: &[u8] = b"n0/test/1";

Expand Down
Loading