Commit 87991e29 authored by nanamicat's avatar nanamicat

tcp

parent 2fdc99d8
mod router; mod router;
use crate::router::{Meta, Router, META_SIZE, SECRET_LENGTH};
use crate::Schema::{TCP, UDP}; use crate::Schema::{TCP, UDP};
use crate::router::{META_SIZE, Meta, Router, SECRET_LENGTH};
use anyhow::{Context, Result}; use anyhow::{Context, Result};
use crossbeam::epoch::{Owned, pin}; use crossbeam::epoch::{pin, Owned};
use crossbeam_utils::thread; use crossbeam_utils::thread;
use itertools::Itertools; use itertools::Itertools;
use serde::{Deserialize, Deserializer}; use serde::{Deserialize, Deserializer};
use socket2::Domain; use socket2::Domain;
use std::net::Shutdown; use std::net::Shutdown;
use std::sync::Arc;
use std::sync::atomic::Ordering; use std::sync::atomic::Ordering;
use std::sync::Arc;
use std::time::Duration; use std::time::Duration;
use std::{collections::HashMap, env, mem::MaybeUninit}; use std::{collections::HashMap, env, mem::MaybeUninit};
...@@ -64,7 +64,7 @@ fn main() -> Result<()> { ...@@ -64,7 +64,7 @@ fn main() -> Result<()> {
let config = serde_json::from_str::<Config>(env::args().nth(1).context("need param")?.as_str())?; let config = serde_json::from_str::<Config>(env::args().nth(1).context("need param")?.as_str())?;
let local_secret: [u8; SECRET_LENGTH] = Router::create_secret(config.local_secret.as_str())?; let local_secret: [u8; SECRET_LENGTH] = Router::create_secret(config.local_secret.as_str())?;
let routers = config let routers = &config
.routers .routers
.iter() .iter()
.cloned() .cloned()
...@@ -118,12 +118,11 @@ fn main() -> Result<()> { ...@@ -118,12 +118,11 @@ fn main() -> Result<()> {
.filter(|&r| r.config.schema == TCP && r.config.dst_port == 0) .filter(|&r| r.config.schema == TCP && r.config.dst_port == 0)
.unique_by(|r| r.config.src_port) .unique_by(|r| r.config.src_port)
{ {
s.spawn(|_| { s.spawn(|s| {
// accept 出错直接 panic // accept 出错直接 panic
loop { loop {
let (connection, _) = router.socket.accept().unwrap(); let (connection, _) = router.socket.accept().unwrap();
thread::scope(|s| { s.spawn(move |_| {
s.spawn(|_| {
connection.set_tcp_nodelay(true).unwrap(); connection.set_tcp_nodelay(true).unwrap();
let mut meta_bytes = [MaybeUninit::uninit(); META_SIZE]; let mut meta_bytes = [MaybeUninit::uninit(); META_SIZE];
...@@ -154,8 +153,6 @@ fn main() -> Result<()> { ...@@ -154,8 +153,6 @@ fn main() -> Result<()> {
}); });
} }
}); });
})
.unwrap();
} }
}); });
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment