Compare commits
No commits in common. "319d8e6d294d5317dd04240179d3875826d9e14e" and "2cc1ed4a9282eef99c006e0a7fd306712d5d9cac" have entirely different histories.
319d8e6d29
...
2cc1ed4a92
|
|
@ -1,6 +1,6 @@
|
||||||
# This file is automatically @generated by Cargo.
|
# This file is automatically @generated by Cargo.
|
||||||
# It is not intended for manual editing.
|
# It is not intended for manual editing.
|
||||||
version = 4
|
version = 3
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "autocfg"
|
name = "autocfg"
|
||||||
|
|
@ -15,10 +15,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
|
checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "bitflags"
|
name = "cc"
|
||||||
version = "2.9.0"
|
version = "1.0.72"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd"
|
checksum = "22a9137b95ea06864e018375b72adfb7db6e6f68cfc8df5a04d00288050485ee"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "cfg-if"
|
name = "cfg-if"
|
||||||
|
|
@ -26,12 +26,6 @@ version = "1.0.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
|
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "cfg_aliases"
|
|
||||||
version = "0.2.1"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "configparser"
|
name = "configparser"
|
||||||
version = "3.0.0"
|
version = "3.0.0"
|
||||||
|
|
@ -71,9 +65,9 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "libc"
|
name = "libc"
|
||||||
version = "0.2.170"
|
version = "0.2.135"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "875b3680cb2f8f71bdcf9a30f38d48282f5d3c95cbf9b3fa57269bb5d5c06828"
|
checksum = "68783febc7782c6c5cb401fbda4de5a9898be1762314da0bb2c10ced61f18b0c"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "log"
|
name = "log"
|
||||||
|
|
@ -91,7 +85,7 @@ dependencies = [
|
||||||
"configparser",
|
"configparser",
|
||||||
"directories",
|
"directories",
|
||||||
"mac_address",
|
"mac_address",
|
||||||
"nix",
|
"nix 0.25.0",
|
||||||
"rand",
|
"rand",
|
||||||
"thiserror",
|
"thiserror",
|
||||||
"tokio",
|
"tokio",
|
||||||
|
|
@ -99,19 +93,19 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "mac_address"
|
name = "mac_address"
|
||||||
version = "1.1.8"
|
version = "1.1.2"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "c0aeb26bf5e836cc1c341c8106051b573f1766dfa05aa87f0b98be5e51b02303"
|
checksum = "89544d9544366f6cda81244514a80809b137b5a179947b73bfa9f2797480de69"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"nix",
|
"nix 0.22.2",
|
||||||
"winapi",
|
"winapi",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "memoffset"
|
name = "memoffset"
|
||||||
version = "0.9.1"
|
version = "0.6.5"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
|
checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"autocfg",
|
"autocfg",
|
||||||
]
|
]
|
||||||
|
|
@ -140,17 +134,31 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "nix"
|
name = "nix"
|
||||||
version = "0.29.0"
|
version = "0.22.2"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
|
checksum = "d3bb9a13fa32bc5aeb64150cd3f32d6cf4c748f8f8a417cce5d2eb976a8370ba"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags 2.9.0",
|
"bitflags",
|
||||||
|
"cc",
|
||||||
"cfg-if",
|
"cfg-if",
|
||||||
"cfg_aliases",
|
|
||||||
"libc",
|
"libc",
|
||||||
"memoffset",
|
"memoffset",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "nix"
|
||||||
|
version = "0.25.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "e322c04a9e3440c327fca7b6c8a63e6890a32fa2ad689db972425f07e0d22abb"
|
||||||
|
dependencies = [
|
||||||
|
"autocfg",
|
||||||
|
"bitflags",
|
||||||
|
"cfg-if",
|
||||||
|
"libc",
|
||||||
|
"memoffset",
|
||||||
|
"pin-utils",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "ntapi"
|
name = "ntapi"
|
||||||
version = "0.3.6"
|
version = "0.3.6"
|
||||||
|
|
@ -166,6 +174,12 @@ version = "0.2.7"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443"
|
checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "pin-utils"
|
||||||
|
version = "0.1.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "ppv-lite86"
|
name = "ppv-lite86"
|
||||||
version = "0.2.15"
|
version = "0.2.15"
|
||||||
|
|
@ -236,7 +250,7 @@ version = "0.2.10"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff"
|
checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags 1.2.1",
|
"bitflags",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
authors = ["Trish"]
|
authors = ["Trish"]
|
||||||
categories = ["command-line-utilities"]
|
categories = ["command-line-utilities"]
|
||||||
description = "Report and find your MAC and IP addresses within LANs"
|
description = "Report and find your MAC and IP addresses within LANs"
|
||||||
edition = "2024"
|
edition = "2021"
|
||||||
homepage = "https://six-five-six-four.com/git/reactor/lookaround"
|
homepage = "https://six-five-six-four.com/git/reactor/lookaround"
|
||||||
keywords = ["address", "discovery", "ip", "network"]
|
keywords = ["address", "discovery", "ip", "network"]
|
||||||
license = "AGPL-3.0"
|
license = "AGPL-3.0"
|
||||||
|
|
@ -14,8 +14,8 @@ version = "0.1.6"
|
||||||
[dependencies]
|
[dependencies]
|
||||||
configparser = "3.0.0"
|
configparser = "3.0.0"
|
||||||
directories = "5.0.0"
|
directories = "5.0.0"
|
||||||
mac_address = "1.1.8"
|
mac_address = "1.1.2"
|
||||||
nix = "0.29.0"
|
nix = "0.25.0"
|
||||||
rand = "0.8.4"
|
rand = "0.8.4"
|
||||||
thiserror = "1.0.30"
|
thiserror = "1.0.30"
|
||||||
tokio = { version = "1.14.0", features = ["fs", "net", "rt", "time"] }
|
tokio = { version = "1.14.0", features = ["fs", "net", "rt", "time"] }
|
||||||
|
|
|
||||||
|
|
@ -1,72 +1,73 @@
|
||||||
use crate::prelude::*;
|
use crate::prelude::*;
|
||||||
|
|
||||||
pub const LOOKAROUND_VERSION: &str = env!("CARGO_PKG_VERSION");
|
pub const LOOKAROUND_VERSION: &str = env! ("CARGO_PKG_VERSION");
|
||||||
|
|
||||||
pub fn find_project_dirs() -> Option<ProjectDirs> {
|
pub fn find_project_dirs () -> Option <ProjectDirs> {
|
||||||
ProjectDirs::from("", "ReactorScram", "LookAround")
|
ProjectDirs::from ("", "ReactorScram", "LookAround")
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, thiserror::Error)]
|
#[derive (Debug, thiserror::Error)]
|
||||||
pub enum AppError {
|
pub enum AppError {
|
||||||
#[error(transparent)]
|
#[error (transparent)]
|
||||||
AddrParse(#[from] std::net::AddrParseError),
|
AddrParse (#[from] std::net::AddrParseError),
|
||||||
#[error(transparent)]
|
#[error (transparent)]
|
||||||
CliArgs(#[from] CliArgError),
|
CliArgs (#[from] CliArgError),
|
||||||
#[error("Operation timed out")]
|
#[error ("Operation timed out")]
|
||||||
Elapsed(#[from] tokio::time::error::Elapsed),
|
Elapsed (#[from] tokio::time::error::Elapsed),
|
||||||
#[error(transparent)]
|
#[error (transparent)]
|
||||||
Io(#[from] std::io::Error),
|
Io (#[from] std::io::Error),
|
||||||
#[error(transparent)]
|
#[error (transparent)]
|
||||||
Ip(#[from] crate::ip::IpError),
|
Ip (#[from] crate::ip::IpError),
|
||||||
#[error(transparent)]
|
#[error (transparent)]
|
||||||
Join(#[from] tokio::task::JoinError),
|
Join (#[from] tokio::task::JoinError),
|
||||||
#[error(transparent)]
|
#[error (transparent)]
|
||||||
MacAddr(#[from] mac_address::MacAddressError),
|
MacAddr (#[from] mac_address::MacAddressError),
|
||||||
#[error(transparent)]
|
#[error (transparent)]
|
||||||
Message(#[from] crate::message::MessageError),
|
Message (#[from] crate::message::MessageError),
|
||||||
#[error(transparent)]
|
#[error (transparent)]
|
||||||
ParseInt(#[from] std::num::ParseIntError),
|
ParseInt (#[from] std::num::ParseIntError),
|
||||||
#[error(transparent)]
|
#[error (transparent)]
|
||||||
Tlv(#[from] crate::tlv::TlvError),
|
Tlv (#[from] crate::tlv::TlvError),
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, thiserror::Error)]
|
#[derive (Debug, thiserror::Error)]
|
||||||
pub enum CliArgError {
|
pub enum CliArgError {
|
||||||
#[error("Missing value for argument `{0}`")]
|
#[error ("Missing value for argument `{0}`")]
|
||||||
MissingArgumentValue(String),
|
MissingArgumentValue (String),
|
||||||
#[error("Missing required argument <{0}>")]
|
#[error ("Missing required argument <{0}>")]
|
||||||
MissingRequiredArg(String),
|
MissingRequiredArg (String),
|
||||||
#[error("First argument should be a subcommand")]
|
#[error ("First argument should be a subcommand")]
|
||||||
MissingSubcommand,
|
MissingSubcommand,
|
||||||
#[error("Unknown subcommand `{0}`")]
|
#[error ("Unknown subcommand `{0}`")]
|
||||||
UnknownSubcommand(String),
|
UnknownSubcommand (String),
|
||||||
#[error("Unrecognized argument `{0}`")]
|
#[error ("Unrecognized argument `{0}`")]
|
||||||
UnrecognizedArgument(String),
|
UnrecognizedArgument (String),
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn recv_msg_from(socket: &UdpSocket) -> Result<(Vec<Message>, SocketAddr), AppError> {
|
pub async fn recv_msg_from (socket: &UdpSocket) -> Result <(Vec <Message>, SocketAddr), AppError>
|
||||||
let mut buf = vec![0u8; PACKET_SIZE];
|
{
|
||||||
let (bytes_recved, remote_addr) = socket.recv_from(&mut buf).await?;
|
let mut buf = vec! [0u8; PACKET_SIZE];
|
||||||
buf.truncate(bytes_recved);
|
let (bytes_recved, remote_addr) = socket.recv_from (&mut buf).await?;
|
||||||
let msgs = Message::from_slice2(&buf)?;
|
buf.truncate (bytes_recved);
|
||||||
|
let msgs = Message::from_slice2 (&buf)?;
|
||||||
|
|
||||||
Ok((msgs, remote_addr))
|
Ok ((msgs, remote_addr))
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Clone)]
|
#[derive (Clone)]
|
||||||
pub struct Params {
|
pub struct Params {
|
||||||
// Servers bind on this port, clients must send to the port
|
// Servers bind on this port, clients must send to the port
|
||||||
pub server_port: u16,
|
pub server_port: u16,
|
||||||
|
|
||||||
// Clients and servers will all join the same multicast addr
|
// Clients and servers will all join the same multicast addr
|
||||||
pub multicast_addr: Ipv4Addr,
|
pub multicast_addr: Ipv4Addr,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Default for Params {
|
impl Default for Params {
|
||||||
fn default() -> Self {
|
fn default () -> Self {
|
||||||
Self {
|
Self {
|
||||||
server_port: 9040,
|
server_port: 9040,
|
||||||
multicast_addr: Ipv4Addr::new(225, 100, 99, 98),
|
multicast_addr: Ipv4Addr::new (225, 100, 99, 98),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,26 +1,40 @@
|
||||||
type Mac = [u8; 6];
|
type Mac = [u8; 6];
|
||||||
|
|
||||||
pub fn debug() {
|
pub fn debug () {
|
||||||
for input in [
|
for input in [
|
||||||
[0, 0, 0, 0, 0, 0],
|
[0, 0, 0, 0, 0, 0],
|
||||||
[0, 0, 0, 0, 0, 1],
|
[0, 0, 0, 0, 0, 1],
|
||||||
[1, 0, 0, 0, 0, 0],
|
[1, 0, 0, 0, 0, 0],
|
||||||
[1, 0, 0, 0, 0, 1],
|
[1, 0, 0, 0, 0, 1],
|
||||||
] {
|
] {
|
||||||
assert_eq!(unmix(mix(input)), input);
|
assert_eq! (unmix (mix (input)), input);
|
||||||
}
|
}
|
||||||
|
|
||||||
println!("Passed");
|
println! ("Passed");
|
||||||
}
|
}
|
||||||
|
|
||||||
// NOT intended for any cryptography or security. This is TRIVIALLY reversible.
|
// NOT intended for any cryptography or security. This is TRIVIALLY reversible.
|
||||||
// It's just to make it easier for humans to tell apart MACs where only a couple
|
// It's just to make it easier for humans to tell apart MACs where only a couple
|
||||||
// numbers differ.
|
// numbers differ.
|
||||||
|
|
||||||
fn mix(i: Mac) -> Mac {
|
fn mix (i: Mac) -> Mac {
|
||||||
[i[0] ^ i[5], i[1] ^ i[4], i[2] ^ i[3], i[3], i[4], i[5]]
|
[
|
||||||
|
i [0] ^ i [5],
|
||||||
|
i [1] ^ i [4],
|
||||||
|
i [2] ^ i [3],
|
||||||
|
i [3],
|
||||||
|
i [4],
|
||||||
|
i [5],
|
||||||
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
fn unmix(i: Mac) -> Mac {
|
fn unmix (i: Mac) -> Mac {
|
||||||
[i[0] ^ i[5], i[1] ^ i[4], i[2] ^ i[3], i[3], i[4], i[5]]
|
[
|
||||||
|
i [0] ^ i [5],
|
||||||
|
i [1] ^ i [4],
|
||||||
|
i [2] ^ i [3],
|
||||||
|
i [3],
|
||||||
|
i [4],
|
||||||
|
i [5],
|
||||||
|
]
|
||||||
}
|
}
|
||||||
|
|
|
||||||
478
src/client.rs
478
src/client.rs
|
|
@ -1,310 +1,300 @@
|
||||||
use crate::prelude::*;
|
use crate::prelude::*;
|
||||||
|
|
||||||
struct ServerResponse {
|
struct ServerResponse {
|
||||||
mac: Option<[u8; 6]>,
|
mac: Option <[u8; 6]>,
|
||||||
nickname: Option<String>,
|
nickname: Option <String>,
|
||||||
}
|
}
|
||||||
|
|
||||||
struct ConfigFile {
|
struct ConfigFile {
|
||||||
nicknames: HashMap<String, String>,
|
nicknames: HashMap <String, String>,
|
||||||
}
|
}
|
||||||
|
|
||||||
struct ClientParams {
|
struct ClientParams {
|
||||||
common: app_common::Params,
|
common: app_common::Params,
|
||||||
bind_addrs: Vec<Ipv4Addr>,
|
bind_addrs: Vec <Ipv4Addr>,
|
||||||
nicknames: HashMap<String, String>,
|
nicknames: HashMap <String, String>,
|
||||||
timeout_ms: u64,
|
timeout_ms: u64,
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn client<I: Iterator<Item = String>>(args: I) -> Result<(), AppError> {
|
pub async fn client <I: Iterator <Item=String>> (args: I) -> Result <(), AppError> {
|
||||||
match get_mac_address() {
|
match get_mac_address() {
|
||||||
Ok(Some(ma)) => {
|
Ok(Some(ma)) => {
|
||||||
println!("Our MAC addr = {}", ma);
|
println!("Our MAC addr = {}", ma);
|
||||||
}
|
}
|
||||||
Ok(None) => println!("No MAC address found."),
|
Ok(None) => println!("No MAC address found."),
|
||||||
Err(e) => println!("{:?}", e),
|
Err(e) => println!("{:?}", e),
|
||||||
}
|
}
|
||||||
|
|
||||||
let params = configure_client(args)?;
|
let params = configure_client (args)?;
|
||||||
let socket = make_socket(¶ms.common, params.bind_addrs).await?;
|
let socket = make_socket (¶ms.common, params.bind_addrs).await?;
|
||||||
let msg = Message::new_request1().to_vec()?;
|
let msg = Message::new_request1 ().to_vec ()?;
|
||||||
tokio::spawn(send_requests(Arc::clone(&socket), params.common, msg));
|
tokio::spawn (send_requests (Arc::clone (&socket), params.common, msg));
|
||||||
|
|
||||||
let mut peers = HashMap::with_capacity(10);
|
let mut peers = HashMap::with_capacity (10);
|
||||||
|
|
||||||
timeout(
|
timeout (Duration::from_millis (params.timeout_ms), listen_for_responses (&*socket, params.nicknames, &mut peers)).await.ok ();
|
||||||
Duration::from_millis(params.timeout_ms),
|
|
||||||
listen_for_responses(&socket, params.nicknames, &mut peers),
|
|
||||||
)
|
|
||||||
.await
|
|
||||||
.ok();
|
|
||||||
|
|
||||||
let mut peers: Vec<_> = peers.into_iter().collect();
|
let mut peers: Vec <_> = peers.into_iter ().collect ();
|
||||||
peers.sort_by_key(|(_, v)| v.mac);
|
peers.sort_by_key (|(_, v)| v.mac);
|
||||||
|
|
||||||
println!("Found {} peers:", peers.len());
|
println! ("Found {} peers:", peers.len ());
|
||||||
for (ip, resp) in peers.into_iter() {
|
for (ip, resp) in peers.into_iter () {
|
||||||
let mac = match resp.mac {
|
let mac = match resp.mac {
|
||||||
None => {
|
None => {
|
||||||
println!("<Unknown> = {}", ip);
|
println! ("<Unknown> = {}", ip);
|
||||||
continue;
|
continue;
|
||||||
}
|
},
|
||||||
Some(x) => x,
|
Some (x) => x,
|
||||||
};
|
};
|
||||||
|
|
||||||
let nickname = match resp.nickname {
|
let nickname = match resp.nickname {
|
||||||
None => {
|
None => {
|
||||||
println!("{} = {}", MacAddress::new(mac), ip.ip());
|
println! ("{} = {}", MacAddress::new (mac), ip.ip ());
|
||||||
continue;
|
continue;
|
||||||
}
|
},
|
||||||
Some(x) => x,
|
Some (x) => x,
|
||||||
};
|
};
|
||||||
|
|
||||||
println!("{} = {} `{}`", MacAddress::new(mac), ip.ip(), nickname);
|
println! ("{} = {} `{}`", MacAddress::new (mac), ip.ip (), nickname);
|
||||||
}
|
}
|
||||||
|
|
||||||
Ok(())
|
Ok (())
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn find_nick<I: Iterator<Item = String>>(mut args: I) -> Result<(), AppError> {
|
pub async fn find_nick <I: Iterator <Item=String>> (mut args: I) -> Result <(), AppError>
|
||||||
let mut nick = None;
|
{
|
||||||
let mut timeout_ms = 500;
|
let mut nick = None;
|
||||||
let ConfigFile { nicknames } = load_config_file();
|
let mut timeout_ms = 500;
|
||||||
|
let ConfigFile {
|
||||||
|
nicknames,
|
||||||
|
} = load_config_file ();
|
||||||
|
|
||||||
while let Some(arg) = args.next() {
|
while let Some (arg) = args.next () {
|
||||||
match arg.as_str() {
|
match arg.as_str () {
|
||||||
"--timeout-ms" => {
|
"--timeout-ms" => {
|
||||||
timeout_ms = match args.next() {
|
timeout_ms = match args.next () {
|
||||||
None => return Err(CliArgError::MissingArgumentValue(arg).into()),
|
None => return Err (CliArgError::MissingArgumentValue (arg).into ()),
|
||||||
Some(x) => u64::from_str(&x)?,
|
Some (x) => u64::from_str (&x)?,
|
||||||
};
|
};
|
||||||
}
|
},
|
||||||
_ => nick = Some(arg),
|
_ => nick = Some (arg),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
let needle_nick =
|
let needle_nick = nick.ok_or_else (|| CliArgError::MissingRequiredArg ("nickname".to_string ()))?;
|
||||||
nick.ok_or_else(|| CliArgError::MissingRequiredArg("nickname".to_string()))?;
|
let needle_nick = Some (needle_nick);
|
||||||
let needle_nick = Some(needle_nick);
|
|
||||||
|
|
||||||
let common_params = Default::default();
|
let common_params = Default::default ();
|
||||||
|
|
||||||
let socket = make_socket(&common_params, get_ips()?).await?;
|
let socket = make_socket (&common_params, get_ips ()?).await?;
|
||||||
let msg = Message::new_request1().to_vec()?;
|
let msg = Message::new_request1 ().to_vec ()?;
|
||||||
tokio::spawn(send_requests(Arc::clone(&socket), common_params, msg));
|
tokio::spawn (send_requests (Arc::clone (&socket), common_params, msg));
|
||||||
|
|
||||||
timeout(Duration::from_millis(timeout_ms), async move {
|
timeout (Duration::from_millis (timeout_ms), async move { loop {
|
||||||
loop {
|
let (msgs, remote_addr) = match recv_msg_from (&socket).await {
|
||||||
let (msgs, remote_addr) = match recv_msg_from(&socket).await {
|
Err (_) => continue,
|
||||||
Err(_) => continue,
|
Ok (x) => x,
|
||||||
Ok(x) => x,
|
};
|
||||||
};
|
|
||||||
|
|
||||||
let mut resp = ServerResponse {
|
let mut resp = ServerResponse {
|
||||||
mac: None,
|
mac: None,
|
||||||
nickname: None,
|
nickname: None,
|
||||||
};
|
};
|
||||||
|
|
||||||
for msg in msgs.into_iter() {
|
for msg in msgs.into_iter () {
|
||||||
match msg {
|
match msg {
|
||||||
Message::Response1(x) => resp.mac = x,
|
Message::Response1 (x) => resp.mac = x,
|
||||||
Message::Response2(x) => resp.nickname = Some(x.nickname),
|
Message::Response2 (x) => resp.nickname = Some (x.nickname),
|
||||||
_ => (),
|
_ => (),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
resp.nickname = get_peer_nickname(&nicknames, resp.mac, resp.nickname);
|
resp.nickname = get_peer_nickname (&nicknames, resp.mac, resp.nickname);
|
||||||
|
|
||||||
if resp.nickname == needle_nick {
|
if resp.nickname == needle_nick {
|
||||||
println!("{}", remote_addr.ip());
|
println! ("{}", remote_addr.ip ());
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}}).await?;
|
||||||
})
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
Ok(())
|
Ok (())
|
||||||
}
|
}
|
||||||
|
|
||||||
fn configure_client<I: Iterator<Item = String>>(mut args: I) -> Result<ClientParams, AppError> {
|
fn configure_client <I: Iterator <Item=String>> (mut args: I)
|
||||||
let mut bind_addrs = vec![];
|
-> Result <ClientParams, AppError>
|
||||||
let mut timeout_ms = 500;
|
{
|
||||||
|
let mut bind_addrs = vec! [];
|
||||||
|
let mut timeout_ms = 500;
|
||||||
|
|
||||||
let ConfigFile { nicknames } = load_config_file();
|
let ConfigFile {
|
||||||
|
nicknames,
|
||||||
|
} = load_config_file ();
|
||||||
|
|
||||||
while let Some(arg) = args.next() {
|
while let Some (arg) = args.next () {
|
||||||
match arg.as_str() {
|
match arg.as_str () {
|
||||||
"--bind-addr" => {
|
"--bind-addr" => {
|
||||||
bind_addrs.push(match args.next() {
|
bind_addrs.push (match args.next () {
|
||||||
None => return Err(CliArgError::MissingArgumentValue(arg).into()),
|
None => return Err (CliArgError::MissingArgumentValue (arg).into ()),
|
||||||
Some(x) => Ipv4Addr::from_str(&x)?,
|
Some (x) => Ipv4Addr::from_str (&x)?,
|
||||||
});
|
});
|
||||||
}
|
},
|
||||||
"--timeout-ms" => {
|
"--timeout-ms" => {
|
||||||
timeout_ms = match args.next() {
|
timeout_ms = match args.next () {
|
||||||
None => return Err(CliArgError::MissingArgumentValue(arg).into()),
|
None => return Err (CliArgError::MissingArgumentValue (arg).into ()),
|
||||||
Some(x) => u64::from_str(&x)?,
|
Some (x) => u64::from_str (&x)?,
|
||||||
};
|
};
|
||||||
}
|
},
|
||||||
_ => return Err(CliArgError::UnrecognizedArgument(arg).into()),
|
_ => return Err (CliArgError::UnrecognizedArgument (arg).into ()),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if bind_addrs.is_empty() {
|
if bind_addrs.is_empty () {
|
||||||
bind_addrs = get_ips()?;
|
bind_addrs = get_ips ()?;
|
||||||
}
|
}
|
||||||
|
|
||||||
Ok(ClientParams {
|
Ok (ClientParams {
|
||||||
common: Default::default(),
|
common: Default::default (),
|
||||||
bind_addrs,
|
bind_addrs,
|
||||||
nicknames,
|
nicknames,
|
||||||
timeout_ms,
|
timeout_ms,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
fn load_config_file() -> ConfigFile {
|
fn load_config_file () -> ConfigFile {
|
||||||
let mut nicknames: HashMap<String, String> = Default::default();
|
let mut nicknames: HashMap <String, String> = Default::default ();
|
||||||
|
|
||||||
if let Some(proj_dirs) = find_project_dirs() {
|
if let Some (proj_dirs) = find_project_dirs () {
|
||||||
let mut ini = Ini::new_cs();
|
let mut ini = Ini::new_cs ();
|
||||||
let path = proj_dirs.config_local_dir().join("client.ini");
|
let path = proj_dirs.config_local_dir ().join ("client.ini");
|
||||||
if ini.load(&path).is_ok() {
|
if ini.load (&path).is_ok () {
|
||||||
let map_ref = ini.get_map_ref();
|
let map_ref = ini.get_map_ref ();
|
||||||
if let Some(x) = map_ref.get("nicknames") {
|
if let Some (x) = map_ref.get ("nicknames") {
|
||||||
for (k, v) in x {
|
for (k, v) in x {
|
||||||
if let Some(v) = v {
|
if let Some (v) = v {
|
||||||
let k = k.replace('-', ":");
|
let k = k.replace ('-', ":");
|
||||||
nicknames.insert(k, v.to_string());
|
nicknames.insert (k, v.to_string ());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ConfigFile { nicknames }
|
ConfigFile {
|
||||||
|
nicknames,
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn make_socket(
|
async fn make_socket (
|
||||||
common_params: &app_common::Params,
|
common_params: &app_common::Params,
|
||||||
bind_addrs: Vec<Ipv4Addr>,
|
bind_addrs: Vec <Ipv4Addr>,
|
||||||
) -> Result<Arc<UdpSocket>, AppError> {
|
) -> Result <Arc <UdpSocket>, AppError> {
|
||||||
let socket = UdpSocket::bind(SocketAddrV4::new(Ipv4Addr::UNSPECIFIED, 0)).await?;
|
let socket = UdpSocket::bind (SocketAddrV4::new (Ipv4Addr::UNSPECIFIED, 0)).await?;
|
||||||
|
|
||||||
for bind_addr in &bind_addrs {
|
for bind_addr in &bind_addrs {
|
||||||
if let Err(e) = socket.join_multicast_v4(common_params.multicast_addr, *bind_addr) {
|
if let Err (e) = socket.join_multicast_v4 (common_params.multicast_addr, *bind_addr) {
|
||||||
println!(
|
println! ("Error joining multicast group with iface {}: {:?}", bind_addr, e);
|
||||||
"Error joining multicast group with iface {}: {:?}",
|
}
|
||||||
bind_addr, e
|
}
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Ok(Arc::new(socket))
|
Ok (Arc::new (socket))
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn send_requests(
|
async fn send_requests (
|
||||||
socket: Arc<UdpSocket>,
|
socket: Arc <UdpSocket>,
|
||||||
params: app_common::Params,
|
params: app_common::Params,
|
||||||
msg: Vec<u8>,
|
msg: Vec <u8>,
|
||||||
) -> Result<(), AppError> {
|
)
|
||||||
for _ in 0..10 {
|
-> Result <(), AppError>
|
||||||
socket
|
{
|
||||||
.send_to(&msg, (params.multicast_addr, params.server_port))
|
for _ in 0..10 {
|
||||||
.await?;
|
socket.send_to (&msg, (params.multicast_addr, params.server_port)).await?;
|
||||||
sleep(Duration::from_millis(100)).await;
|
sleep (Duration::from_millis (100)).await;
|
||||||
}
|
}
|
||||||
|
|
||||||
Ok::<_, AppError>(())
|
Ok::<_, AppError> (())
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn listen_for_responses(
|
async fn listen_for_responses (
|
||||||
socket: &UdpSocket,
|
socket: &UdpSocket,
|
||||||
nicknames: HashMap<String, String>,
|
nicknames: HashMap <String, String>,
|
||||||
peers: &mut HashMap<SocketAddr, ServerResponse>,
|
peers: &mut HashMap <SocketAddr, ServerResponse>
|
||||||
) {
|
) {
|
||||||
loop {
|
loop {
|
||||||
let (msgs, remote_addr) = match recv_msg_from(socket).await {
|
let (msgs, remote_addr) = match recv_msg_from (socket).await {
|
||||||
Err(_) => continue,
|
Err (_) => continue,
|
||||||
Ok(x) => x,
|
Ok (x) => x,
|
||||||
};
|
};
|
||||||
|
|
||||||
let mut resp = ServerResponse {
|
let mut resp = ServerResponse {
|
||||||
mac: None,
|
mac: None,
|
||||||
nickname: None,
|
nickname: None,
|
||||||
};
|
};
|
||||||
|
|
||||||
for msg in msgs.into_iter() {
|
for msg in msgs.into_iter () {
|
||||||
match msg {
|
match msg {
|
||||||
Message::Response1(x) => resp.mac = x,
|
Message::Response1 (x) => resp.mac = x,
|
||||||
Message::Response2(x) => resp.nickname = Some(x.nickname),
|
Message::Response2 (x) => resp.nickname = Some (x.nickname),
|
||||||
_ => (),
|
_ => (),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
resp.nickname = get_peer_nickname(&nicknames, resp.mac, resp.nickname);
|
resp.nickname = get_peer_nickname (&nicknames, resp.mac, resp.nickname);
|
||||||
|
|
||||||
peers.insert(remote_addr, resp);
|
peers.insert (remote_addr, resp);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn get_peer_nickname(
|
fn get_peer_nickname (
|
||||||
nicknames: &HashMap<String, String>,
|
nicknames: &HashMap <String, String>,
|
||||||
mac: Option<[u8; 6]>,
|
mac: Option <[u8; 6]>,
|
||||||
peer_nickname: Option<String>,
|
peer_nickname: Option <String>
|
||||||
) -> Option<String> {
|
) -> Option <String>
|
||||||
match peer_nickname.as_deref() {
|
{
|
||||||
None => (),
|
match peer_nickname.as_deref () {
|
||||||
Some("") => (),
|
None => (),
|
||||||
_ => return peer_nickname,
|
Some ("") => (),
|
||||||
}
|
_ => return peer_nickname,
|
||||||
|
}
|
||||||
|
|
||||||
if let Some(mac) = &mac {
|
if let Some (mac) = &mac {
|
||||||
return nicknames
|
return nicknames.get (&format! ("{}", MacAddress::new (*mac))).cloned ()
|
||||||
.get(&format!("{}", MacAddress::new(*mac)))
|
}
|
||||||
.cloned();
|
|
||||||
}
|
|
||||||
|
|
||||||
None
|
None
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg (test)]
|
||||||
mod test {
|
mod test {
|
||||||
use super::*;
|
use super::*;
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_nicknames() {
|
fn test_nicknames () {
|
||||||
let mut nicks = HashMap::new();
|
let mut nicks = HashMap::new ();
|
||||||
|
|
||||||
for (k, v) in [("01:01:01:01:01:01", "phoenix")] {
|
for (k, v) in [
|
||||||
nicks.insert(k.to_string(), v.to_string());
|
("01:01:01:01:01:01", "phoenix")
|
||||||
}
|
] {
|
||||||
|
nicks.insert (k.to_string (), v.to_string ());
|
||||||
|
}
|
||||||
|
|
||||||
for (num, (mac, peer_nickname), expected) in [
|
for (num, (mac, peer_nickname), expected) in [
|
||||||
// Somehow the server returns no MAC nor nick. In this case we are helpless
|
// Somehow the server returns no MAC nor nick. In this case we are helpless
|
||||||
(1, (None, None), None),
|
( 1, (None, None), None),
|
||||||
// If the server tells us its MAC, we can look up our nickname for it
|
// If the server tells us its MAC, we can look up our nickname for it
|
||||||
(2, (Some([1, 1, 1, 1, 1, 1]), None), Some("phoenix")),
|
( 2, (Some ([1, 1, 1, 1, 1, 1]), None), Some ("phoenix")),
|
||||||
// Unless it's not in our nick list.
|
// Unless it's not in our nick list.
|
||||||
(3, (Some([1, 1, 1, 1, 1, 2]), None), None),
|
( 3, (Some ([1, 1, 1, 1, 1, 2]), None), None),
|
||||||
// If the server tells us its nickname, that always takes priority
|
// If the server tells us its nickname, that always takes priority
|
||||||
(4, (None, Some("snowflake")), Some("snowflake")),
|
( 4, (None, Some ("snowflake")), Some ("snowflake")),
|
||||||
(
|
( 5, (Some ([1, 1, 1, 1, 1, 1]), Some ("snowflake")), Some ("snowflake")),
|
||||||
5,
|
( 6, (Some ([1, 1, 1, 1, 1, 2]), Some ("snowflake")), Some ("snowflake")),
|
||||||
(Some([1, 1, 1, 1, 1, 1]), Some("snowflake")),
|
// But blank nicknames are treated like None
|
||||||
Some("snowflake"),
|
( 7, (None, Some ("")), None),
|
||||||
),
|
( 8, (Some ([1, 1, 1, 1, 1, 1]), Some ("")), Some ("phoenix")),
|
||||||
(
|
( 9, (Some ([1, 1, 1, 1, 1, 2]), Some ("")), None),
|
||||||
6,
|
] {
|
||||||
(Some([1, 1, 1, 1, 1, 2]), Some("snowflake")),
|
let actual = get_peer_nickname (&nicks, mac, peer_nickname.map (str::to_string));
|
||||||
Some("snowflake"),
|
assert_eq! (actual.as_ref ().map (String::as_str), expected, "{}", num);
|
||||||
),
|
}
|
||||||
// But blank nicknames are treated like None
|
}
|
||||||
(7, (None, Some("")), None),
|
|
||||||
(8, (Some([1, 1, 1, 1, 1, 1]), Some("")), Some("phoenix")),
|
|
||||||
(9, (Some([1, 1, 1, 1, 1, 2]), Some("")), None),
|
|
||||||
] {
|
|
||||||
let actual = get_peer_nickname(&nicks, mac, peer_nickname.map(str::to_string));
|
|
||||||
assert_eq!(actual.as_ref().map(String::as_str), expected, "{}", num);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
162
src/ip.rs
162
src/ip.rs
|
|
@ -1,112 +1,122 @@
|
||||||
use std::{net::Ipv4Addr, process::Command, str::FromStr};
|
use std::{
|
||||||
|
net::Ipv4Addr,
|
||||||
|
process::Command,
|
||||||
|
str::FromStr,
|
||||||
|
};
|
||||||
|
|
||||||
#[derive(Debug, thiserror::Error)]
|
#[derive (Debug, thiserror::Error)]
|
||||||
pub enum IpError {
|
pub enum IpError {
|
||||||
#[error(transparent)]
|
#[error (transparent)]
|
||||||
Io(#[from] std::io::Error),
|
Io (#[from] std::io::Error),
|
||||||
#[error(transparent)]
|
#[error (transparent)]
|
||||||
FromUtf8(#[from] std::string::FromUtf8Error),
|
FromUtf8 (#[from] std::string::FromUtf8Error),
|
||||||
#[error("Self-IP detection is not implemented on Mac OS")]
|
#[error ("Self-IP detection is not implemented on Mac OS")]
|
||||||
NotImplementedOnMac,
|
NotImplementedOnMac,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(target_os = "linux")]
|
#[cfg(target_os = "linux")]
|
||||||
pub fn get_ips() -> Result<Vec<Ipv4Addr>, IpError> {
|
pub fn get_ips () -> Result <Vec <Ipv4Addr>, IpError> {
|
||||||
let output = linux::get_ip_addr_output()?;
|
let output = linux::get_ip_addr_output ()?;
|
||||||
|
|
||||||
Ok(linux::parse_ip_addr_output(&output))
|
Ok (linux::parse_ip_addr_output (&output))
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(target_os = "macos")]
|
#[cfg(target_os = "macos")]
|
||||||
pub fn get_ips() -> Result<Vec<Ipv4Addr>, IpError> {
|
pub fn get_ips () -> Result <Vec <Ipv4Addr>, IpError> {
|
||||||
Err(IpError::NotImplementedOnMac)
|
Err (IpError::NotImplementedOnMac)
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(target_os = "windows")]
|
#[cfg(target_os = "windows")]
|
||||||
pub fn get_ips() -> Result<Vec<Ipv4Addr>, IpError> {
|
pub fn get_ips () -> Result <Vec <Ipv4Addr>, IpError> {
|
||||||
let output = windows::get_ip_config_output()?;
|
let output = windows::get_ip_config_output ()?;
|
||||||
|
|
||||||
Ok(windows::parse_ip_config_output(&output))
|
Ok (windows::parse_ip_config_output (&output))
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(target_os = "linux")]
|
#[cfg(target_os = "linux")]
|
||||||
pub mod linux {
|
pub mod linux {
|
||||||
use super::*;
|
use super::*;
|
||||||
|
|
||||||
pub fn get_ip_addr_output() -> Result<String, IpError> {
|
pub fn get_ip_addr_output () -> Result <String, IpError> {
|
||||||
let output = Command::new("ip").arg("addr").output()?;
|
let output = Command::new ("ip")
|
||||||
let output = output.stdout.as_slice();
|
.arg ("addr")
|
||||||
let output = String::from_utf8(output.to_vec())?;
|
.output ()?;
|
||||||
Ok(output)
|
let output = output.stdout.as_slice ();
|
||||||
}
|
let output = String::from_utf8 (output.to_vec ())?;
|
||||||
|
Ok (output)
|
||||||
|
}
|
||||||
|
|
||||||
pub fn parse_ip_addr_output(output: &str) -> Vec<Ipv4Addr> {
|
pub fn parse_ip_addr_output (output: &str) -> Vec <Ipv4Addr> {
|
||||||
// I wrote this in FP style because I was bored.
|
// I wrote this in FP style because I was bored.
|
||||||
|
|
||||||
output
|
output.lines ()
|
||||||
.lines()
|
.map (|l| l.trim_start ())
|
||||||
.map(|l| l.trim_start())
|
.filter_map (|l| l.strip_prefix ("inet "))
|
||||||
.filter_map(|l| l.strip_prefix("inet "))
|
.filter_map (|l| l.find ('/').map (|x| &l [0..x]))
|
||||||
.filter_map(|l| l.find('/').map(|x| &l[0..x]))
|
.filter_map (|l| Ipv4Addr::from_str (l).ok ())
|
||||||
.filter_map(|l| Ipv4Addr::from_str(l).ok())
|
.filter (|a| ! a.is_loopback ())
|
||||||
.filter(|a| !a.is_loopback())
|
.collect ()
|
||||||
.collect()
|
}
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(target_os = "windows")]
|
#[cfg(target_os = "windows")]
|
||||||
pub mod windows {
|
pub mod windows {
|
||||||
use super::*;
|
use super::*;
|
||||||
|
|
||||||
pub fn get_ip_config_output() -> Result<String, IpError> {
|
pub fn get_ip_config_output () -> Result <String, IpError> {
|
||||||
let output = Command::new("ipconfig").output()?;
|
let output = Command::new ("ipconfig")
|
||||||
let output = output.stdout.as_slice();
|
.output ()?;
|
||||||
let output = String::from_utf8(output.to_vec())?;
|
let output = output.stdout.as_slice ();
|
||||||
Ok(output)
|
let output = String::from_utf8 (output.to_vec ())?;
|
||||||
}
|
Ok (output)
|
||||||
|
}
|
||||||
|
|
||||||
pub fn parse_ip_config_output(output: &str) -> Vec<Ipv4Addr> {
|
pub fn parse_ip_config_output (output: &str) -> Vec <Ipv4Addr> {
|
||||||
let mut addrs = vec![];
|
let mut addrs = vec! [];
|
||||||
|
|
||||||
for line in output.lines() {
|
for line in output.lines () {
|
||||||
let line = line.trim_start();
|
let line = line.trim_start ();
|
||||||
|
|
||||||
// Maybe only works on English locales?
|
// Maybe only works on English locales?
|
||||||
if !line.starts_with("IPv4 Address") {
|
if ! line.starts_with ("IPv4 Address") {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
let colon_pos = match line.find(':') {
|
let colon_pos = match line.find (':') {
|
||||||
None => continue,
|
None => continue,
|
||||||
Some(x) => x,
|
Some (x) => x,
|
||||||
};
|
};
|
||||||
let line = &line[colon_pos + 2..];
|
let line = &line [colon_pos + 2..];
|
||||||
|
|
||||||
let addr = match Ipv4Addr::from_str(line) {
|
let addr = match Ipv4Addr::from_str (line) {
|
||||||
Err(_) => continue,
|
Err (_) => continue,
|
||||||
Ok(x) => x,
|
Ok (x) => x,
|
||||||
};
|
};
|
||||||
|
|
||||||
addrs.push(addr);
|
addrs.push (addr);
|
||||||
}
|
}
|
||||||
|
|
||||||
addrs
|
addrs
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg (test)]
|
||||||
mod test {
|
mod test {
|
||||||
use super::*;
|
use super::*;
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test() {
|
fn test () {
|
||||||
for (input, expected) in [(
|
for (input, expected) in [
|
||||||
r"
|
(
|
||||||
|
r"
|
||||||
IPv4 Address . . .. . . . : 192.168.1.1
|
IPv4 Address . . .. . . . : 192.168.1.1
|
||||||
",
|
",
|
||||||
vec![Ipv4Addr::new(192, 168, 1, 1)],
|
vec! [
|
||||||
)] {
|
Ipv4Addr::new (192, 168, 1, 1),
|
||||||
let actual = parse_ip_config_output(input);
|
]
|
||||||
assert_eq!(actual, expected);
|
),
|
||||||
}
|
] {
|
||||||
}
|
let actual = parse_ip_config_output (input);
|
||||||
}
|
assert_eq! (actual, expected);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
70
src/main.rs
70
src/main.rs
|
|
@ -9,51 +9,53 @@ mod prelude;
|
||||||
mod server;
|
mod server;
|
||||||
pub mod tlv;
|
pub mod tlv;
|
||||||
|
|
||||||
fn main() -> Result<(), AppError> {
|
fn main () -> Result <(), AppError> {
|
||||||
let rt = tokio::runtime::Builder::new_current_thread()
|
let rt = tokio::runtime::Builder::new_current_thread ()
|
||||||
.enable_io()
|
.enable_io ()
|
||||||
.enable_time()
|
.enable_time ()
|
||||||
.build()?;
|
.build ()?;
|
||||||
|
|
||||||
rt.block_on(async_main())?;
|
rt.block_on (async_main ())?;
|
||||||
|
|
||||||
Ok(())
|
Ok (())
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn async_main() -> Result<(), AppError> {
|
async fn async_main () -> Result <(), AppError> {
|
||||||
let mut args = env::args();
|
let mut args = env::args ();
|
||||||
|
|
||||||
let _exe_name = args.next();
|
let _exe_name = args.next ();
|
||||||
|
|
||||||
let subcommand: Option<String> = args.next();
|
let subcommand: Option <String> = args.next ();
|
||||||
|
|
||||||
match subcommand.as_ref().map(|x| &x[..]) {
|
match subcommand.as_ref ().map (|x| &x[..]) {
|
||||||
None => return Err(CliArgError::MissingSubcommand.into()),
|
None => return Err (CliArgError::MissingSubcommand.into ()),
|
||||||
Some("--version") => println!("lookaround v{}", LOOKAROUND_VERSION),
|
Some ("--version") => println! ("lookaround v{}", LOOKAROUND_VERSION),
|
||||||
Some("client") => client::client(args).await?,
|
Some ("client") => client::client (args).await?,
|
||||||
Some("config") => config(),
|
Some ("config") => config (),
|
||||||
Some("debug-avalanche") => avalanche::debug(),
|
Some ("debug-avalanche") => avalanche::debug (),
|
||||||
Some("find-nick") => client::find_nick(args).await?,
|
Some ("find-nick") => client::find_nick (args).await?,
|
||||||
Some("my-ips") => my_ips()?,
|
Some ("my-ips") => my_ips ()?,
|
||||||
Some("server") => server::server(args).await?,
|
Some ("server") => server::server (args).await?,
|
||||||
Some(x) => return Err(CliArgError::UnknownSubcommand(x.to_string()).into()),
|
Some (x) => return Err (CliArgError::UnknownSubcommand (x.to_string ()).into ()),
|
||||||
}
|
}
|
||||||
|
|
||||||
Ok(())
|
Ok (())
|
||||||
}
|
}
|
||||||
|
|
||||||
fn config() {
|
fn config () {
|
||||||
if let Some(proj_dirs) = ProjectDirs::from("", "ReactorScram", "LookAround") {
|
if let Some (proj_dirs) = ProjectDirs::from ("", "ReactorScram", "LookAround") {
|
||||||
println!("Using config dir {:?}", proj_dirs.config_local_dir());
|
println! ("Using config dir {:?}", proj_dirs.config_local_dir ());
|
||||||
} else {
|
}
|
||||||
println!("Can't detect config dir.");
|
else {
|
||||||
}
|
println! ("Can't detect config dir.");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn my_ips() -> Result<(), AppError> {
|
fn my_ips () -> Result <(), AppError> {
|
||||||
for addr in ip::get_ips()? {
|
for addr in ip::get_ips ()?
|
||||||
println!("{:?}", addr);
|
{
|
||||||
}
|
println! ("{:?}", addr);
|
||||||
|
}
|
||||||
|
|
||||||
Ok(())
|
Ok (())
|
||||||
}
|
}
|
||||||
|
|
|
||||||
543
src/message.rs
543
src/message.rs
|
|
@ -5,302 +5,343 @@ pub const PACKET_SIZE: usize = 1024;
|
||||||
|
|
||||||
type Mac = [u8; 6];
|
type Mac = [u8; 6];
|
||||||
|
|
||||||
#[derive(Debug, PartialEq)]
|
#[derive (Debug, PartialEq)]
|
||||||
pub enum Message {
|
pub enum Message {
|
||||||
// 1
|
// 1
|
||||||
Request1 { idem_id: [u8; 8], mac: Option<Mac> },
|
Request1 {
|
||||||
// 2
|
idem_id: [u8; 8],
|
||||||
Response1(Option<Mac>),
|
mac: Option <Mac>
|
||||||
// 3
|
},
|
||||||
Response2(Response2),
|
// 2
|
||||||
|
Response1 (Option <Mac>),
|
||||||
|
// 3
|
||||||
|
Response2 (Response2),
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Message {
|
impl Message {
|
||||||
pub fn new_request1() -> Message {
|
pub fn new_request1 () -> Message {
|
||||||
let mut idem_id = [0u8; 8];
|
let mut idem_id = [0u8; 8];
|
||||||
rand::thread_rng().fill_bytes(&mut idem_id);
|
rand::thread_rng ().fill_bytes (&mut idem_id);
|
||||||
|
|
||||||
Message::Request1 { idem_id, mac: None }
|
Message::Request1 {
|
||||||
}
|
idem_id,
|
||||||
|
mac: None,
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, PartialEq)]
|
#[derive (Debug, PartialEq)]
|
||||||
pub struct Response2 {
|
pub struct Response2 {
|
||||||
pub idem_id: [u8; 8],
|
pub idem_id: [u8; 8],
|
||||||
pub nickname: String,
|
pub nickname: String,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, thiserror::Error)]
|
#[derive (Debug, thiserror::Error)]
|
||||||
pub enum MessageError {
|
pub enum MessageError {
|
||||||
#[error(transparent)]
|
#[error (transparent)]
|
||||||
Io(#[from] std::io::Error),
|
Io (#[from] std::io::Error),
|
||||||
#[error("Length prefix too long")]
|
#[error ("Length prefix too long")]
|
||||||
LengthPrefixTooLong((usize, usize)),
|
LengthPrefixTooLong ((usize, usize)),
|
||||||
#[error(transparent)]
|
#[error (transparent)]
|
||||||
Tlv(#[from] tlv::TlvError),
|
Tlv (#[from] tlv::TlvError),
|
||||||
#[error(transparent)]
|
#[error (transparent)]
|
||||||
TryFromInt(#[from] std::num::TryFromIntError),
|
TryFromInt (#[from] std::num::TryFromIntError),
|
||||||
#[error("Unknown type")]
|
#[error ("Unknown type")]
|
||||||
UnknownType,
|
UnknownType,
|
||||||
#[error(transparent)]
|
#[error (transparent)]
|
||||||
FromUtf8(#[from] std::string::FromUtf8Error),
|
FromUtf8 (#[from] std::string::FromUtf8Error),
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Default)]
|
#[derive (Default)]
|
||||||
struct DummyWriter {
|
struct DummyWriter {
|
||||||
position: usize,
|
position: usize,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Write for DummyWriter {
|
impl Write for DummyWriter {
|
||||||
fn flush(&mut self) -> std::io::Result<()> {
|
fn flush (&mut self) -> std::io::Result <()> {
|
||||||
Ok(())
|
Ok (())
|
||||||
}
|
}
|
||||||
|
|
||||||
fn write(&mut self, buf: &[u8]) -> std::io::Result<usize> {
|
fn write (&mut self, buf: &[u8]) -> std::io::Result <usize> {
|
||||||
self.position += buf.len();
|
self.position += buf.len ();
|
||||||
Ok(buf.len())
|
Ok (buf.len ())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Message {
|
impl Message {
|
||||||
pub fn write<T>(&self, w: &mut Cursor<T>) -> Result<(), MessageError>
|
pub fn write <T> (&self, w: &mut Cursor <T>) -> Result <(), MessageError>
|
||||||
where
|
where Cursor <T>: Write
|
||||||
Cursor<T>: Write,
|
{
|
||||||
{
|
match self {
|
||||||
match self {
|
Self::Request1 {
|
||||||
Self::Request1 { idem_id, mac } => {
|
idem_id,
|
||||||
w.write_all(&[1])?;
|
mac,
|
||||||
w.write_all(&idem_id[..])?;
|
}=> {
|
||||||
Self::write_mac_opt(w, *mac)?;
|
w.write_all (&[1])?;
|
||||||
}
|
w.write_all (&idem_id[..])?;
|
||||||
Self::Response1(mac) => {
|
Self::write_mac_opt (w, *mac)?;
|
||||||
w.write_all(&[2])?;
|
},
|
||||||
Self::write_mac_opt(w, *mac)?;
|
Self::Response1 (mac) => {
|
||||||
}
|
w.write_all (&[2])?;
|
||||||
Self::Response2(x) => {
|
Self::write_mac_opt (w, *mac)?;
|
||||||
w.write_all(&[3])?;
|
},
|
||||||
// Measure length with dummy writes
|
Self::Response2 (x) => {
|
||||||
// This is dumb, I'm just messing around to see if I can do
|
w.write_all (&[3])?;
|
||||||
// this without allocating.
|
// Measure length with dummy writes
|
||||||
let mut dummy_writer = DummyWriter::default();
|
// This is dumb, I'm just messing around to see if I can do
|
||||||
|
// this without allocating.
|
||||||
|
let mut dummy_writer = DummyWriter::default ();
|
||||||
|
|
||||||
Self::write_response_2(&mut dummy_writer, x)?;
|
Self::write_response_2 (&mut dummy_writer, x)?;
|
||||||
|
|
||||||
// Write length and real params to real output
|
// Write length and real params to real output
|
||||||
let len = u32::try_from(dummy_writer.position)?;
|
let len = u32::try_from (dummy_writer.position)?;
|
||||||
w.write_all(&len.to_le_bytes())?;
|
w.write_all (&len.to_le_bytes ())?;
|
||||||
Self::write_response_2(w, x)?;
|
Self::write_response_2 (w, x)?;
|
||||||
}
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
Ok(())
|
Ok (())
|
||||||
}
|
}
|
||||||
|
|
||||||
fn write_response_2<W: Write>(w: &mut W, params: &Response2) -> Result<(), MessageError> {
|
fn write_response_2 <W: Write> (w: &mut W, params: &Response2)
|
||||||
w.write_all(¶ms.idem_id)?;
|
-> Result <(), MessageError>
|
||||||
let nickname = params.nickname.as_bytes();
|
{
|
||||||
tlv::Writer::<_>::lv_bytes(w, nickname)?;
|
w.write_all (¶ms.idem_id)?;
|
||||||
Ok(())
|
let nickname = params.nickname.as_bytes ();
|
||||||
}
|
tlv::Writer::<_>::lv_bytes (w, nickname)?;
|
||||||
|
Ok (())
|
||||||
|
}
|
||||||
|
|
||||||
fn write_mac_opt<W: Write>(w: &mut W, mac: Option<[u8; 6]>) -> Result<(), std::io::Error> {
|
fn write_mac_opt <W: Write> (w: &mut W, mac: Option <[u8; 6]>) -> Result <(), std::io::Error>
|
||||||
match mac {
|
{
|
||||||
Some(mac) => {
|
match mac {
|
||||||
w.write_all(&[1])?;
|
Some (mac) => {
|
||||||
w.write_all(&mac[..])?;
|
w.write_all (&[1])?;
|
||||||
}
|
w.write_all (&mac[..])?;
|
||||||
None => w.write_all(&[0])?,
|
},
|
||||||
}
|
None => w.write_all (&[0])?,
|
||||||
Ok(())
|
}
|
||||||
}
|
Ok (())
|
||||||
|
}
|
||||||
|
|
||||||
pub fn to_vec(&self) -> Result<Vec<u8>, MessageError> {
|
pub fn to_vec (&self) -> Result <Vec <u8>, MessageError> {
|
||||||
let mut cursor = Cursor::new(Vec::with_capacity(PACKET_SIZE));
|
let mut cursor = Cursor::new (Vec::with_capacity (PACKET_SIZE));
|
||||||
cursor.write_all(&MAGIC_NUMBER)?;
|
cursor.write_all (&MAGIC_NUMBER)?;
|
||||||
self.write(&mut cursor)?;
|
self.write (&mut cursor)?;
|
||||||
Ok(cursor.into_inner())
|
Ok (cursor.into_inner ())
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn many_to_vec(msgs: &[Self]) -> Result<Vec<u8>, MessageError> {
|
pub fn many_to_vec (msgs: &[Self]) -> Result <Vec <u8>, MessageError> {
|
||||||
let mut cursor = Cursor::new(Vec::with_capacity(PACKET_SIZE));
|
let mut cursor = Cursor::new (Vec::with_capacity (PACKET_SIZE));
|
||||||
cursor.write_all(&MAGIC_NUMBER)?;
|
cursor.write_all (&MAGIC_NUMBER)?;
|
||||||
for msg in msgs {
|
for msg in msgs {
|
||||||
msg.write(&mut cursor)?;
|
msg.write (&mut cursor)?;
|
||||||
}
|
}
|
||||||
Ok(cursor.into_inner())
|
Ok (cursor.into_inner ())
|
||||||
}
|
}
|
||||||
|
|
||||||
fn read2<R: std::io::Read>(r: &mut R) -> Result<Self, MessageError> {
|
fn read2 <R: std::io::Read> (r: &mut R) -> Result <Self, MessageError> {
|
||||||
let t = tlv::Reader::u8(r)?;
|
let t = tlv::Reader::u8 (r)?;
|
||||||
|
|
||||||
Ok(match t {
|
Ok (match t {
|
||||||
1 => {
|
1 => {
|
||||||
let mut idem_id = [0u8; 8];
|
let mut idem_id = [0u8; 8];
|
||||||
r.read_exact(&mut idem_id)?;
|
r.read_exact (&mut idem_id)?;
|
||||||
|
|
||||||
let mac = Self::read_mac_opt(r)?;
|
let mac = Self::read_mac_opt (r)?;
|
||||||
Self::Request1 { idem_id, mac }
|
Self::Request1 {
|
||||||
}
|
idem_id,
|
||||||
2 => {
|
mac,
|
||||||
let mac = Self::read_mac_opt(r)?;
|
}
|
||||||
Self::Response1(mac)
|
},
|
||||||
}
|
2 => {
|
||||||
3 => {
|
let mac = Self::read_mac_opt (r)?;
|
||||||
tlv::Reader::<_>::length(r)?;
|
Self::Response1 (mac)
|
||||||
|
},
|
||||||
|
3 => {
|
||||||
|
tlv::Reader::<_>::length (r)?;
|
||||||
|
|
||||||
let mut idem_id = [0; 8];
|
let mut idem_id = [0; 8];
|
||||||
r.read_exact(&mut idem_id)?;
|
r.read_exact (&mut idem_id)?;
|
||||||
|
|
||||||
let nickname = tlv::Reader::<_>::lv_bytes_to_vec(r, 64)?;
|
let nickname = tlv::Reader::<_>::lv_bytes_to_vec (r, 64)?;
|
||||||
let nickname = String::from_utf8(nickname)?;
|
let nickname = String::from_utf8 (nickname)?;
|
||||||
|
|
||||||
Self::Response2(Response2 { idem_id, nickname })
|
Self::Response2 (Response2 {
|
||||||
}
|
idem_id,
|
||||||
_ => return Err(MessageError::UnknownType),
|
nickname,
|
||||||
})
|
})
|
||||||
}
|
},
|
||||||
|
_ => return Err (MessageError::UnknownType),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
fn read_mac_opt<R: std::io::Read>(r: &mut R) -> Result<Option<[u8; 6]>, std::io::Error> {
|
fn read_mac_opt <R: std::io::Read> (r: &mut R)
|
||||||
Ok(if tlv::Reader::u8(r)? == 1 {
|
-> Result <Option <[u8; 6]>, std::io::Error>
|
||||||
let mut mac = [0u8; 6];
|
{
|
||||||
r.read_exact(&mut mac)?;
|
Ok (if tlv::Reader::u8 (r)? == 1 {
|
||||||
Some(mac)
|
let mut mac = [0u8; 6];
|
||||||
} else {
|
r.read_exact (&mut mac)?;
|
||||||
None
|
Some (mac)
|
||||||
})
|
}
|
||||||
}
|
else {
|
||||||
|
None
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
pub fn from_slice2(buf: &[u8]) -> Result<Vec<Self>, MessageError> {
|
pub fn from_slice2 (buf: &[u8]) -> Result <Vec <Self>, MessageError> {
|
||||||
let mut cursor = Cursor::new(buf);
|
let mut cursor = Cursor::new (buf);
|
||||||
tlv::Reader::expect(&mut cursor, &MAGIC_NUMBER)?;
|
tlv::Reader::expect (&mut cursor, &MAGIC_NUMBER)?;
|
||||||
|
|
||||||
let mut msgs = Vec::with_capacity(2);
|
let mut msgs = Vec::with_capacity (2);
|
||||||
|
|
||||||
while cursor.position() < u64::try_from(buf.len())? {
|
while cursor.position () < u64::try_from (buf.len ())? {
|
||||||
let msg = Self::read2(&mut cursor)?;
|
let msg = Self::read2 (&mut cursor)?;
|
||||||
msgs.push(msg);
|
msgs.push (msg);
|
||||||
}
|
}
|
||||||
Ok(msgs)
|
Ok (msgs)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg (test)]
|
||||||
mod test {
|
mod test {
|
||||||
use super::*;
|
use super::*;
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_write_2() -> Result<(), MessageError> {
|
fn test_write_2 () -> Result <(), MessageError> {
|
||||||
for (input, expected) in [
|
for (input, expected) in [
|
||||||
(
|
(
|
||||||
vec![Message::Request1 {
|
vec! [
|
||||||
idem_id: [1, 2, 3, 4, 5, 6, 7, 8],
|
Message::Request1 {
|
||||||
mac: None,
|
idem_id: [1, 2, 3, 4, 5, 6, 7, 8,],
|
||||||
}],
|
mac: None,
|
||||||
vec![
|
},
|
||||||
154, 74, 67, 129, // Request tag
|
],
|
||||||
1, // Idem ID
|
vec! [
|
||||||
1, 2, 3, 4, 5, 6, 7, 8, // MAC is None
|
154, 74, 67, 129,
|
||||||
0,
|
// Request tag
|
||||||
],
|
1,
|
||||||
),
|
// Idem ID
|
||||||
(
|
1, 2, 3, 4, 5, 6, 7, 8,
|
||||||
vec![
|
// MAC is None
|
||||||
Message::Response1(Some([0x11, 0x22, 0x33, 0x44, 0x55, 0x66])),
|
0,
|
||||||
Message::Response2(Response2 {
|
],
|
||||||
idem_id: [1, 2, 3, 4, 5, 6, 7, 8],
|
),
|
||||||
nickname: ":V".to_string(),
|
(
|
||||||
}),
|
vec! [
|
||||||
],
|
Message::Response1 (Some ([0x11, 0x22, 0x33, 0x44, 0x55, 0x66])),
|
||||||
vec![
|
Message::Response2 (Response2 {
|
||||||
// Magic number for LookAround packets
|
idem_id: [1, 2, 3, 4, 5, 6, 7, 8,],
|
||||||
154, 74, 67, 129, // Response1 tag
|
nickname: ":V".to_string (),
|
||||||
2, // MAC is Some
|
}),
|
||||||
1, // MAC
|
],
|
||||||
17, 34, 51, 68, 85, 102, // Response2 tag
|
vec! [
|
||||||
3, // Length prefix
|
// Magic number for LookAround packets
|
||||||
14, 0, 0, 0, // Idem ID
|
154, 74, 67, 129,
|
||||||
1, 2, 3, 4, 5, 6, 7, 8, // Length-prefixed string
|
// Response1 tag
|
||||||
2, 0, 0, 0, 58, 86,
|
2,
|
||||||
],
|
// MAC is Some
|
||||||
),
|
1,
|
||||||
] {
|
// MAC
|
||||||
let actual = Message::many_to_vec(&input)?;
|
17, 34, 51, 68, 85, 102,
|
||||||
assert_eq!(actual, expected, "{:?}", input);
|
// Response2 tag
|
||||||
}
|
3,
|
||||||
|
// Length prefix
|
||||||
|
14, 0, 0, 0,
|
||||||
|
// Idem ID
|
||||||
|
1, 2, 3, 4, 5, 6, 7, 8,
|
||||||
|
// Length-prefixed string
|
||||||
|
2, 0, 0, 0,
|
||||||
|
58, 86,
|
||||||
|
],
|
||||||
|
),
|
||||||
|
] {
|
||||||
|
let actual = Message::many_to_vec (&input)?;
|
||||||
|
assert_eq! (actual, expected, "{:?}", input);
|
||||||
|
}
|
||||||
|
|
||||||
Ok(())
|
Ok (())
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_write_1() -> Result<(), MessageError> {
|
fn test_write_1 () -> Result <(), MessageError> {
|
||||||
for (input, expected) in [
|
for (input, expected) in [
|
||||||
(
|
(
|
||||||
Message::Request1 {
|
Message::Request1 {
|
||||||
idem_id: [0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08],
|
idem_id: [0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08],
|
||||||
mac: None,
|
mac: None,
|
||||||
},
|
},
|
||||||
vec![
|
vec! [
|
||||||
154, 74, 67, 129, // Request tag
|
154, 74, 67, 129,
|
||||||
1, // Idem ID
|
// Request tag
|
||||||
1, 2, 3, 4, 5, 6, 7, 8, // MAC is None
|
1,
|
||||||
0,
|
// Idem ID
|
||||||
],
|
1, 2, 3, 4, 5, 6, 7, 8,
|
||||||
),
|
// MAC is None
|
||||||
(
|
0,
|
||||||
Message::Response1(Some([0x11, 0x22, 0x33, 0x44, 0x55, 0x66])),
|
],
|
||||||
vec![
|
),
|
||||||
// Magic number for LookAround packets
|
(
|
||||||
154, 74, 67, 129, // Response tag
|
Message::Response1 (Some ([0x11, 0x22, 0x33, 0x44, 0x55, 0x66])),
|
||||||
2, // MAC is Some
|
vec! [
|
||||||
1, // MAC
|
// Magic number for LookAround packets
|
||||||
17, 34, 51, 68, 85, 102,
|
154, 74, 67, 129,
|
||||||
],
|
// Response tag
|
||||||
),
|
2,
|
||||||
(
|
// MAC is Some
|
||||||
Message::Response1(None),
|
1,
|
||||||
vec![
|
// MAC
|
||||||
// Magic number for LookAround packets
|
17, 34, 51, 68, 85, 102,
|
||||||
154, 74, 67, 129, // Response tag
|
],
|
||||||
2, // MAC is None
|
),
|
||||||
0,
|
(
|
||||||
],
|
Message::Response1 (None),
|
||||||
),
|
vec! [
|
||||||
]
|
// Magic number for LookAround packets
|
||||||
.into_iter()
|
154, 74, 67, 129,
|
||||||
{
|
// Response tag
|
||||||
let actual = input.to_vec()?;
|
2,
|
||||||
assert_eq!(actual, expected, "{:?}", input);
|
// MAC is None
|
||||||
}
|
0,
|
||||||
|
],
|
||||||
|
),
|
||||||
|
].into_iter () {
|
||||||
|
let actual = input.to_vec ()?;
|
||||||
|
assert_eq! (actual, expected, "{:?}", input);
|
||||||
|
}
|
||||||
|
|
||||||
Ok(())
|
Ok (())
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_read_2() -> Result<(), MessageError> {
|
fn test_read_2 () -> Result <(), MessageError> {
|
||||||
for input in [
|
for input in [
|
||||||
vec![Message::Request1 {
|
vec! [
|
||||||
idem_id: [0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08],
|
Message::Request1 {
|
||||||
mac: None,
|
idem_id: [0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08],
|
||||||
}],
|
mac: None,
|
||||||
vec![Message::Response1(Some([
|
},
|
||||||
0x11, 0x22, 0x33, 0x44, 0x55, 0x66,
|
],
|
||||||
]))],
|
vec! [
|
||||||
vec![Message::Response1(None)],
|
Message::Response1 (Some ([0x11, 0x22, 0x33, 0x44, 0x55, 0x66])),
|
||||||
vec![
|
],
|
||||||
Message::Response1(Some([0x11, 0x22, 0x33, 0x44, 0x55, 0x66])),
|
vec! [
|
||||||
Message::Response2(Response2 {
|
Message::Response1 (None),
|
||||||
idem_id: [1, 2, 3, 4, 5, 6, 7, 8],
|
],
|
||||||
nickname: ":V".to_string(),
|
vec! [
|
||||||
}),
|
Message::Response1 (Some ([0x11, 0x22, 0x33, 0x44, 0x55, 0x66])),
|
||||||
],
|
Message::Response2 (Response2 {
|
||||||
]
|
idem_id: [1, 2, 3, 4, 5, 6, 7, 8,],
|
||||||
.into_iter()
|
nickname: ":V".to_string (),
|
||||||
{
|
}),
|
||||||
let encoded = Message::many_to_vec(&input)?;
|
],
|
||||||
let decoded = Message::from_slice2(&encoded)?;
|
].into_iter () {
|
||||||
assert_eq!(input, decoded);
|
let encoded = Message::many_to_vec (&input)?;
|
||||||
}
|
let decoded = Message::from_slice2 (&encoded)?;
|
||||||
|
assert_eq! (input, decoded);
|
||||||
|
}
|
||||||
|
|
||||||
Ok(())
|
Ok (())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,27 +1,52 @@
|
||||||
pub use std::{
|
pub use std::{
|
||||||
collections::HashMap,
|
collections::HashMap,
|
||||||
env,
|
env,
|
||||||
io::{Cursor, Write},
|
io::{
|
||||||
net::{Ipv4Addr, SocketAddr, SocketAddrV4},
|
Cursor,
|
||||||
str::FromStr,
|
Write,
|
||||||
sync::Arc,
|
},
|
||||||
time::Duration,
|
net::{
|
||||||
|
Ipv4Addr,
|
||||||
|
SocketAddr,
|
||||||
|
SocketAddrV4,
|
||||||
|
},
|
||||||
|
str::FromStr,
|
||||||
|
sync::Arc,
|
||||||
|
time::{
|
||||||
|
Duration,
|
||||||
|
Instant,
|
||||||
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
pub use configparser::ini::Ini;
|
pub use configparser::ini::Ini;
|
||||||
pub use directories::ProjectDirs;
|
pub use directories::ProjectDirs;
|
||||||
pub use mac_address::{MacAddress, get_mac_address};
|
pub use mac_address::{
|
||||||
|
MacAddress,
|
||||||
|
get_mac_address,
|
||||||
|
};
|
||||||
pub use rand::RngCore;
|
pub use rand::RngCore;
|
||||||
pub use tokio::{
|
pub use tokio::{
|
||||||
net::UdpSocket,
|
net::UdpSocket,
|
||||||
time::{sleep, timeout},
|
time::{
|
||||||
|
sleep,
|
||||||
|
timeout,
|
||||||
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
pub use crate::{
|
pub use crate::{
|
||||||
app_common::{
|
app_common::{
|
||||||
self, AppError, CliArgError, LOOKAROUND_VERSION, find_project_dirs, recv_msg_from,
|
self,
|
||||||
},
|
LOOKAROUND_VERSION,
|
||||||
ip::get_ips,
|
AppError,
|
||||||
message::{self, Message, PACKET_SIZE},
|
CliArgError,
|
||||||
tlv,
|
find_project_dirs,
|
||||||
|
recv_msg_from,
|
||||||
|
},
|
||||||
|
ip::get_ips,
|
||||||
|
message::{
|
||||||
|
self,
|
||||||
|
PACKET_SIZE,
|
||||||
|
Message,
|
||||||
|
},
|
||||||
|
tlv,
|
||||||
};
|
};
|
||||||
|
|
|
||||||
249
src/server.rs
249
src/server.rs
|
|
@ -1,149 +1,148 @@
|
||||||
use crate::prelude::*;
|
use crate::prelude::*;
|
||||||
|
|
||||||
#[derive(Clone)]
|
#[derive (Clone)]
|
||||||
struct Params {
|
struct Params {
|
||||||
common: app_common::Params,
|
common: app_common::Params,
|
||||||
bind_addrs: Vec<Ipv4Addr>,
|
bind_addrs: Vec <Ipv4Addr>,
|
||||||
nickname: String,
|
nickname: String,
|
||||||
our_mac: Option<[u8; 6]>,
|
our_mac: Option <[u8; 6]>,
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn server<I: Iterator<Item = String>>(args: I) -> Result<(), AppError> {
|
pub async fn server <I: Iterator <Item=String>> (args: I) -> Result <(), AppError>
|
||||||
match get_mac_address() {
|
{
|
||||||
Ok(Some(ma)) => {
|
match get_mac_address() {
|
||||||
println!("Our MAC addr = {}", ma);
|
Ok(Some(ma)) => {
|
||||||
}
|
println!("Our MAC addr = {}", ma);
|
||||||
Ok(None) => println!("No MAC address found."),
|
}
|
||||||
Err(e) => println!("{:?}", e),
|
Ok(None) => println!("No MAC address found."),
|
||||||
}
|
Err(e) => println!("{:?}", e),
|
||||||
|
}
|
||||||
|
|
||||||
let params = configure(args)?;
|
let params = configure (args)?;
|
||||||
|
|
||||||
let socket = UdpSocket::bind(SocketAddrV4::new(
|
let socket = UdpSocket::bind (SocketAddrV4::new (Ipv4Addr::UNSPECIFIED, params.common.server_port)).await?;
|
||||||
Ipv4Addr::UNSPECIFIED,
|
|
||||||
params.common.server_port,
|
|
||||||
))
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
for bind_addr in ¶ms.bind_addrs {
|
for bind_addr in ¶ms.bind_addrs {
|
||||||
if let Err(e) = socket.join_multicast_v4(params.common.multicast_addr, *bind_addr) {
|
if let Err (e) = socket.join_multicast_v4 (params.common.multicast_addr, *bind_addr) {
|
||||||
println!(
|
println! ("Error joining multicast group with iface {}: {:?}", bind_addr, e);
|
||||||
"Error joining multicast group with iface {}: {:?}",
|
}
|
||||||
bind_addr, e
|
}
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
serve_interface(params, socket).await?;
|
serve_interface (params, socket).await?;
|
||||||
|
|
||||||
Ok(())
|
Ok (())
|
||||||
}
|
}
|
||||||
|
|
||||||
fn configure<I: Iterator<Item = String>>(mut args: I) -> Result<Params, AppError> {
|
fn configure <I: Iterator <Item=String>> (mut args: I) -> Result <Params, AppError>
|
||||||
let common = app_common::Params::default();
|
{
|
||||||
let mut bind_addrs = vec![];
|
let common = app_common::Params::default ();
|
||||||
let mut nickname = String::new();
|
let mut bind_addrs = vec![];
|
||||||
|
let mut nickname = String::new ();
|
||||||
|
|
||||||
if let Some(proj_dirs) = find_project_dirs() {
|
if let Some (proj_dirs) = find_project_dirs () {
|
||||||
let mut ini = Ini::new_cs();
|
let mut ini = Ini::new_cs ();
|
||||||
let path = proj_dirs.config_local_dir().join("server.ini");
|
let path = proj_dirs.config_local_dir ().join ("server.ini");
|
||||||
if ini.load(&path).is_ok() {
|
if ini.load (&path).is_ok () {
|
||||||
if let Some(x) = ini.get("server", "nickname") {
|
if let Some (x) = ini.get ("server", "nickname") {
|
||||||
nickname = x;
|
nickname = x;
|
||||||
eprintln!("Loaded nickname {:?}", nickname);
|
eprintln! ("Loaded nickname {:?}", nickname);
|
||||||
}
|
}
|
||||||
} else {
|
}
|
||||||
eprintln!(
|
else {
|
||||||
"Can't load ini from {:?}, didn't load default configs",
|
eprintln! ("Can't load ini from {:?}, didn't load default configs", path);
|
||||||
path
|
}
|
||||||
);
|
}
|
||||||
}
|
else {
|
||||||
} else {
|
eprintln! ("Can't find config dir, didn't load default configs");
|
||||||
eprintln!("Can't find config dir, didn't load default configs");
|
}
|
||||||
}
|
|
||||||
|
|
||||||
while let Some(arg) = args.next() {
|
while let Some (arg) = args.next () {
|
||||||
match arg.as_str() {
|
match arg.as_str () {
|
||||||
"--bind-addr" => {
|
"--bind-addr" => {
|
||||||
bind_addrs.push(match args.next() {
|
bind_addrs.push (match args.next () {
|
||||||
None => return Err(CliArgError::MissingArgumentValue(arg).into()),
|
None => return Err (CliArgError::MissingArgumentValue (arg).into ()),
|
||||||
Some(x) => Ipv4Addr::from_str(&x)?,
|
Some (x) => Ipv4Addr::from_str (&x)?,
|
||||||
});
|
});
|
||||||
}
|
},
|
||||||
"--nickname" => {
|
"--nickname" => {
|
||||||
nickname = match args.next() {
|
nickname = match args.next () {
|
||||||
None => return Err(CliArgError::MissingArgumentValue(arg).into()),
|
None => return Err (CliArgError::MissingArgumentValue (arg).into ()),
|
||||||
Some(x) => x,
|
Some (x) => x
|
||||||
};
|
};
|
||||||
}
|
},
|
||||||
_ => return Err(CliArgError::UnrecognizedArgument(arg).into()),
|
_ => return Err (CliArgError::UnrecognizedArgument (arg).into ()),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
let our_mac = get_mac_address()?.map(|x| x.bytes());
|
let our_mac = get_mac_address ()?.map (|x| x.bytes ());
|
||||||
if our_mac.is_none() {
|
if our_mac.is_none () {
|
||||||
println!(
|
println! ("Warning: Can't find our own MAC address. We won't be able to respond to MAC-specific lookaround requests");
|
||||||
"Warning: Can't find our own MAC address. We won't be able to respond to MAC-specific lookaround requests"
|
}
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
if bind_addrs.is_empty() {
|
if bind_addrs.is_empty () {
|
||||||
println!("No bind addresses given, auto-detecting all local IPs");
|
println! ("No bind addresses given, auto-detecting all local IPs");
|
||||||
bind_addrs = get_ips()?;
|
bind_addrs = get_ips ()?;
|
||||||
}
|
}
|
||||||
|
|
||||||
Ok(Params {
|
Ok (Params {
|
||||||
common,
|
common,
|
||||||
bind_addrs,
|
bind_addrs,
|
||||||
nickname,
|
nickname,
|
||||||
our_mac,
|
our_mac,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn serve_interface(params: Params, socket: UdpSocket) -> Result<(), AppError> {
|
async fn serve_interface (
|
||||||
let mut recent_idem_ids = Vec::with_capacity(32);
|
params: Params,
|
||||||
|
socket: UdpSocket,
|
||||||
|
)
|
||||||
|
-> Result <(), AppError>
|
||||||
|
{
|
||||||
|
let mut recent_idem_ids = Vec::with_capacity (32);
|
||||||
|
|
||||||
loop {
|
loop {
|
||||||
println!("Listening...");
|
println! ("Listening...");
|
||||||
let (req_msgs, remote_addr) = match recv_msg_from(&socket).await {
|
let (req_msgs, remote_addr) = match recv_msg_from (&socket).await {
|
||||||
Ok(x) => x,
|
Ok (x) => x,
|
||||||
Err(e) => {
|
Err (e) => {
|
||||||
println!("Error while receiving message: {:?}", e);
|
println! ("Error while receiving message: {:?}", e);
|
||||||
continue;
|
continue;
|
||||||
}
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
let req = match req_msgs.into_iter().next() {
|
let req = match req_msgs.into_iter ().next () {
|
||||||
Some(x) => x,
|
Some (x) => x,
|
||||||
_ => {
|
_ => {
|
||||||
println!("Don't know how to handle this message, ignoring");
|
println! ("Don't know how to handle this message, ignoring");
|
||||||
continue;
|
continue;
|
||||||
}
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
let resp = match req {
|
let resp = match req {
|
||||||
Message::Request1 { mac: None, idem_id } => {
|
Message::Request1 {
|
||||||
if recent_idem_ids.contains(&idem_id) {
|
mac: None,
|
||||||
None
|
idem_id,
|
||||||
} else {
|
} => {
|
||||||
recent_idem_ids.insert(0, idem_id);
|
if recent_idem_ids.contains (&idem_id) {
|
||||||
recent_idem_ids.truncate(30);
|
None
|
||||||
Some(vec![
|
}
|
||||||
Message::Response1(params.our_mac),
|
else {
|
||||||
Message::Response2(message::Response2 {
|
recent_idem_ids.insert (0, idem_id);
|
||||||
idem_id,
|
recent_idem_ids.truncate (30);
|
||||||
nickname: params.nickname.clone(),
|
Some (vec! [
|
||||||
}),
|
Message::Response1 (params.our_mac),
|
||||||
])
|
Message::Response2 (message::Response2 {
|
||||||
}
|
idem_id,
|
||||||
}
|
nickname: params.nickname.clone (),
|
||||||
_ => continue,
|
}),
|
||||||
};
|
])
|
||||||
|
}
|
||||||
|
},
|
||||||
|
_ => continue,
|
||||||
|
};
|
||||||
|
|
||||||
if let Some(resp) = resp {
|
if let Some (resp) = resp {
|
||||||
socket
|
socket.send_to (&Message::many_to_vec (&resp)?, remote_addr).await?;
|
||||||
.send_to(&Message::many_to_vec(&resp)?, remote_addr)
|
}
|
||||||
.await?;
|
}
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
163
src/tlv.rs
163
src/tlv.rs
|
|
@ -1,117 +1,122 @@
|
||||||
use thiserror::Error;
|
use thiserror::Error;
|
||||||
|
|
||||||
type Result<T> = std::result::Result<T, TlvError>;
|
type Result <T> = std::result::Result <T, TlvError>;
|
||||||
|
|
||||||
#[derive(Debug, Error)]
|
#[derive (Debug, Error)]
|
||||||
pub enum TlvError {
|
pub enum TlvError {
|
||||||
#[error("Buffer too big")]
|
#[error ("Buffer too big")]
|
||||||
BufferTooBig,
|
BufferTooBig,
|
||||||
|
|
||||||
// Violets are purple,
|
// Violets are purple,
|
||||||
// To live is to suffer,
|
// To live is to suffer,
|
||||||
// The data is too big,
|
// The data is too big,
|
||||||
// For the gosh-darn buffer.
|
// For the gosh-darn buffer.
|
||||||
#[error("Data too big")]
|
|
||||||
DataTooBig,
|
#[error ("Data too big")]
|
||||||
#[error(transparent)]
|
DataTooBig,
|
||||||
Io(#[from] std::io::Error),
|
#[error (transparent)]
|
||||||
#[error("Actual bytes didn't match expected bytes")]
|
Io (#[from] std::io::Error),
|
||||||
NotExpected,
|
#[error ("Actual bytes didn't match expected bytes")]
|
||||||
#[error(transparent)]
|
NotExpected,
|
||||||
TryFromInt(#[from] std::num::TryFromIntError),
|
#[error (transparent)]
|
||||||
|
TryFromInt (#[from] std::num::TryFromIntError),
|
||||||
}
|
}
|
||||||
|
|
||||||
pub struct Writer<W> {
|
pub struct Writer <W> {
|
||||||
_x: std::marker::PhantomData<W>,
|
_x: std::marker::PhantomData <W>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<W: std::io::Write> Writer<W> {
|
impl <W: std::io::Write> Writer <W> {
|
||||||
fn length(w: &mut W, x: u32) -> Result<()> {
|
fn length (w: &mut W, x: u32) -> Result <()> {
|
||||||
w.write_all(&x.to_le_bytes())?;
|
w.write_all (&x.to_le_bytes ())?;
|
||||||
Ok(())
|
Ok (())
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn lv_bytes(w: &mut W, b: &[u8]) -> Result<()> {
|
pub fn lv_bytes (w: &mut W, b: &[u8]) -> Result <()> {
|
||||||
if b.len() > 2_000_000_000 {
|
if b.len () > 2_000_000_000 {
|
||||||
return Err(TlvError::BufferTooBig);
|
return Err (TlvError::BufferTooBig);
|
||||||
}
|
}
|
||||||
|
|
||||||
let l = u32::try_from(b.len())?;
|
let l = u32::try_from (b.len ())?;
|
||||||
|
|
||||||
Self::length(w, l)?;
|
Self::length (w, l)?;
|
||||||
w.write_all(b)?;
|
w.write_all (b)?;
|
||||||
|
|
||||||
Ok(())
|
Ok (())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub struct Reader<R> {
|
pub struct Reader <R> {
|
||||||
_x: std::marker::PhantomData<R>,
|
_x: std::marker::PhantomData <R>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<R: std::io::Read> Reader<R> {
|
impl <R: std::io::Read> Reader <R> {
|
||||||
pub fn expect(r: &mut R, expected: &[u8]) -> Result<()> {
|
pub fn expect (r: &mut R, expected: &[u8]) -> Result <()> {
|
||||||
let mut actual = vec![0u8; expected.len()];
|
let mut actual = vec! [0u8; expected.len ()];
|
||||||
r.read_exact(&mut actual)?;
|
r.read_exact (&mut actual)?;
|
||||||
if actual != expected {
|
if actual != expected {
|
||||||
return Err(TlvError::NotExpected);
|
return Err (TlvError::NotExpected);
|
||||||
}
|
}
|
||||||
Ok(())
|
Ok (())
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn length(r: &mut R) -> Result<u32> {
|
pub fn length (r: &mut R) -> Result <u32> {
|
||||||
let mut buf = [0; 4];
|
let mut buf = [0; 4];
|
||||||
r.read_exact(&mut buf)?;
|
r.read_exact (&mut buf)?;
|
||||||
|
|
||||||
Ok(u32::from_le_bytes(buf))
|
Ok (u32::from_le_bytes (buf))
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn lv_bytes_to_vec(r: &mut R, limit: usize) -> Result<Vec<u8>> {
|
pub fn lv_bytes_to_vec (r: &mut R, limit: usize) -> Result <Vec <u8>> {
|
||||||
let l = Self::length(r)?;
|
let l = Self::length (r)?;
|
||||||
let l = usize::try_from(l)?;
|
let l = usize::try_from (l)?;
|
||||||
if l > limit {
|
if l > limit {
|
||||||
return Err(TlvError::DataTooBig);
|
return Err (TlvError::DataTooBig);
|
||||||
}
|
}
|
||||||
|
|
||||||
let mut v = vec![0u8; l];
|
let mut v = vec! [0u8; l];
|
||||||
r.read_exact(&mut v)?;
|
r.read_exact (&mut v)?;
|
||||||
|
|
||||||
Ok(v)
|
Ok (v)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn u8(r: &mut R) -> std::io::Result<u8> {
|
pub fn u8 (r: &mut R) -> std::io::Result <u8> {
|
||||||
let mut buf = [0];
|
let mut buf = [0];
|
||||||
r.read_exact(&mut buf)?;
|
r.read_exact (&mut buf)?;
|
||||||
|
|
||||||
Ok(buf[0])
|
Ok (buf [0])
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg (test)]
|
||||||
mod test {
|
mod test {
|
||||||
use super::*;
|
use super::*;
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_1() -> Result<()> {
|
fn test_1 () -> Result <()> {
|
||||||
use std::io::Cursor;
|
use std::io::Cursor;
|
||||||
|
|
||||||
let b = "hi there".as_bytes();
|
let b = "hi there".as_bytes ();
|
||||||
|
|
||||||
let mut w = Cursor::new(Vec::default());
|
let mut w = Cursor::new (Vec::default ());
|
||||||
|
|
||||||
super::Writer::lv_bytes(&mut w, b)?;
|
super::Writer::lv_bytes (&mut w, b)?;
|
||||||
|
|
||||||
let v = w.into_inner();
|
let v = w.into_inner ();
|
||||||
|
|
||||||
assert_eq!(v, vec![8, 0, 0, 0, 104, 105, 32, 116, 104, 101, 114, 101,]);
|
assert_eq! (v, vec! [
|
||||||
|
8, 0, 0, 0,
|
||||||
|
104, 105, 32,
|
||||||
|
116, 104, 101, 114, 101,
|
||||||
|
]);
|
||||||
|
|
||||||
let mut r = Cursor::new(v);
|
let mut r = Cursor::new (v);
|
||||||
|
|
||||||
let buf = Reader::lv_bytes_to_vec(&mut r, 1024)?;
|
let buf = Reader::lv_bytes_to_vec (&mut r, 1024)?;
|
||||||
|
|
||||||
assert_eq!(buf.len(), b.len());
|
assert_eq! (buf.len (), b.len ());
|
||||||
assert_eq!(b, &buf);
|
assert_eq! (b, &buf);
|
||||||
|
|
||||||
Ok(())
|
Ok (())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue