public-mirrors
/
innernet
mirror of https://github.com/tonarino/innernet.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

server: fix clippy nit in linux-only code

pull/239/head
Jake McGinty 2022-09-23 23:05:23 -05:00
parent 1aa16c84f5
commit f36eb301ce
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/main.rs
View File

@ -641,7 +641,7 @@ async fn serve(
/// See https://github.com/tonarino/innernet/issues/26 for more details. /// See https://github.com/tonarino/innernet/issues/26 for more details.
#[cfg(target_os = "linux")] #[cfg(target_os = "linux")]
fn get_listener(addr: SocketAddr, interface: &InterfaceName) -> Result<TcpListener, Error> { fn get_listener(addr: SocketAddr, interface: &InterfaceName) -> Result<TcpListener, Error> {
let listener = TcpListener::bind(&addr)?; let listener = TcpListener::bind(addr)?;
listener.set_nonblocking(true)?; listener.set_nonblocking(true)?;
let sock = socket2::Socket::from(listener); let sock = socket2::Socket::from(listener);
sock.bind_device(Some(interface.as_str_lossy().as_bytes()))?; sock.bind_device(Some(interface.as_str_lossy().as_bytes()))?;

2
server/src/test.rs
View File

@ -104,7 +104,7 @@ impl Server {
let interface = interface.parse().unwrap(); let interface = interface.parse().unwrap();
// Add developer CIDR and user CIDR and some peers for testing. // Add developer CIDR and user CIDR and some peers for testing.
let db = Connection::open(&conf.database_path(&interface))?; let db = Connection::open(&conf.database_path(&interface))?;
db.pragma_update(None, "foreign_keys", &1)?; db.pragma_update(None, "foreign_keys", 1)?;
assert_eq!(ADMIN_CIDR_ID, create_cidr(&db, "admin", ADMIN_CIDR)?.id); assert_eq!(ADMIN_CIDR_ID, create_cidr(&db, "admin", ADMIN_CIDR)?.id);
assert_eq!( assert_eq!(
ADMIN_PEER_ID, ADMIN_PEER_ID,