Commit 8109eeef authored by nanahira's avatar nanahira

increase id size

parent 2a4d4c0a
Pipeline #40638 failed with stages
in 1 minute and 25 seconds
...@@ -11,8 +11,8 @@ use std::sync::Arc; ...@@ -11,8 +11,8 @@ use std::sync::Arc;
#[repr(C)] #[repr(C)]
pub struct Meta { pub struct Meta {
pub src_id: u16, pub src_id: u32,
pub dst_id: u16, pub dst_id: u32,
pub reversed: u16, pub reversed: u16,
} }
...@@ -20,8 +20,8 @@ use serde::Deserialize; ...@@ -20,8 +20,8 @@ use serde::Deserialize;
#[derive(Deserialize)] #[derive(Deserialize)]
pub struct ConfigRouter { pub struct ConfigRouter {
pub local_id: u16, pub local_id: u32,
pub remote_id: u16, pub remote_id: u32,
pub proto: i32, pub proto: i32,
pub family: u8, pub family: u8,
pub mark: u32, pub mark: u32,
...@@ -65,15 +65,15 @@ fn main() -> Result<(), Box<dyn Error>> { ...@@ -65,15 +65,15 @@ fn main() -> Result<(), Box<dyn Error>> {
println!("Read config"); println!("Read config");
let mut sockets: HashMap<u16, Arc<Socket>> = HashMap::new(); let mut sockets: HashMap<u16, Arc<Socket>> = HashMap::new();
println!("Ready"); println!("Ready");
let routers: HashMap<u16, Router> = config let routers: HashMap<u32, Router> = config
.routers .routers
.iter() .iter()
.map(|c| Router::new(c, &mut sockets).map(|router| (c.remote_id, router))) .map(|c| Router::new(c, &mut sockets).map(|router| (c.remote_id, router)))
.collect::<Result<_, _>>()?; .collect::<Result<_, _>>()?;
println!("Created routers"); println!("Created routers");
let (mut router_readers, router_writers): ( let (mut router_readers, router_writers): (
HashMap<u16, RouterReader>, HashMap<u32, RouterReader>,
HashMap<u16, RouterWriter>, HashMap<u32, RouterWriter>,
) = routers ) = routers
.into_iter() .into_iter()
.map(|(id, router)| { .map(|(id, router)| {
...@@ -82,7 +82,7 @@ fn main() -> Result<(), Box<dyn Error>> { ...@@ -82,7 +82,7 @@ fn main() -> Result<(), Box<dyn Error>> {
}) })
.unzip(); .unzip();
println!("Created sockets"); println!("Created sockets");
let router_writers3: Vec<(Arc<Socket>, HashMap<u16, RouterWriter>)> = router_writers let router_writers3: Vec<(Arc<Socket>, HashMap<u32, RouterWriter>)> = router_writers
.into_iter() .into_iter()
.grouping_by(|(_, v)| v.key()) .grouping_by(|(_, v)| v.key())
.into_iter() .into_iter()
......
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