Commit f14d907a authored by nanamicat's avatar nanamicat

clean

parent 473945aa
Pipeline #42112 passed with stages
in 2 minutes and 43 seconds
......@@ -79,7 +79,7 @@ async fn main() -> Result<()> {
let mut routers = routers.write().await;
if let Some(router) = routers.get_mut(&report.id) {
if let Some(change) = router.on_message(report, addr, &mut updating) {
println!("2.{} {}", router.id, serde_json::to_string(&change)?);
// println!("2.{} {}", router.id, serde_json::to_string(&change)?);
let len = bincode::encode_into_slice(change, &mut buf, bincode::config::standard())?;
let _ = socket.send_to(&buf[..len], addr).await;
router.seq += 1;
......@@ -93,11 +93,11 @@ async fn main() -> Result<()> {
if updating.router_id != 0 {
let router = routers.get_mut(&updating.router_id).expect("updating router_id should exist");
if now.duration_since(router.time) < TIMEOUT {
println!("3.{}", serde_json::to_string(&updating)?);
// println!("3.{}", serde_json::to_string(&updating)?);
let len = bincode::encode_into_slice(&updating.change, &mut buf, bincode::config::standard())?;
let _ = socket.send_to(&buf[..len], router.addr.unwrap()).await;
} else {
println!("1");
// println!("1");
router.offline();
router.finish(&mut updating);
}
......@@ -105,14 +105,14 @@ async fn main() -> Result<()> {
if updating.router_id == 0 {
for router in routers.values_mut() {
if router.addr != None && now.duration_since(router.time) > TIMEOUT {
println!("2");
// println!("2");
router.offline();
}
}
if let Some((router, change)) = routers.values().find_map(|r|r.update(&routers, &connections).map(|change|(r,change))) {
updating.router_id = router.id;
updating.change = change;
println!("1.{}", serde_json::to_string(&updating)?);
// println!("1.{}", serde_json::to_string(&updating)?);
let len = bincode::encode_into_slice(&updating.change, &mut buf, bincode::config::standard())?;
let _ = socket.send_to(&buf[..len], router.addr.unwrap()).await;
}
......
......@@ -89,11 +89,11 @@ impl Router {
None
}
(false, _, _, _) | (true, true, true, _) => {
if self.addr == None {
println!("3.0");
} else {
println!("3.1");
}
// if self.addr == None {
// println!("3.0");
// } else {
// println!("3.1");
// }
self.offline();
self.finish(updating);
......@@ -118,15 +118,15 @@ impl Router {
None
}
_ => {
println!(
"???, {}, {}, {}, {}, {} != {}",
self.addr != None,
data.syn,
data.peers.len() != 0,
data.ack == self.seq.wrapping_add(1),
data.ack,
self.seq
);
// println!(
// "???, {}, {}, {}, {}, {} != {}",
// self.addr != None,
// data.syn,
// data.peers.len() != 0,
// data.ack == self.seq.wrapping_add(1),
// data.ack,
// self.seq
// );
None
}
}
......
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