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.
|
||||
# It is not intended for manual editing.
|
||||
version = 4
|
||||
version = 3
|
||||
|
||||
[[package]]
|
||||
name = "autocfg"
|
||||
|
|
@ -15,10 +15,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||
checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
|
||||
|
||||
[[package]]
|
||||
name = "bitflags"
|
||||
version = "2.9.0"
|
||||
name = "cc"
|
||||
version = "1.0.72"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd"
|
||||
checksum = "22a9137b95ea06864e018375b72adfb7db6e6f68cfc8df5a04d00288050485ee"
|
||||
|
||||
[[package]]
|
||||
name = "cfg-if"
|
||||
|
|
@ -26,12 +26,6 @@ version = "1.0.0"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
|
||||
|
||||
[[package]]
|
||||
name = "cfg_aliases"
|
||||
version = "0.2.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
|
||||
|
||||
[[package]]
|
||||
name = "configparser"
|
||||
version = "3.0.0"
|
||||
|
|
@ -71,9 +65,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "libc"
|
||||
version = "0.2.170"
|
||||
version = "0.2.135"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "875b3680cb2f8f71bdcf9a30f38d48282f5d3c95cbf9b3fa57269bb5d5c06828"
|
||||
checksum = "68783febc7782c6c5cb401fbda4de5a9898be1762314da0bb2c10ced61f18b0c"
|
||||
|
||||
[[package]]
|
||||
name = "log"
|
||||
|
|
@ -91,7 +85,7 @@ dependencies = [
|
|||
"configparser",
|
||||
"directories",
|
||||
"mac_address",
|
||||
"nix",
|
||||
"nix 0.25.0",
|
||||
"rand",
|
||||
"thiserror",
|
||||
"tokio",
|
||||
|
|
@ -99,19 +93,19 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "mac_address"
|
||||
version = "1.1.8"
|
||||
version = "1.1.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c0aeb26bf5e836cc1c341c8106051b573f1766dfa05aa87f0b98be5e51b02303"
|
||||
checksum = "89544d9544366f6cda81244514a80809b137b5a179947b73bfa9f2797480de69"
|
||||
dependencies = [
|
||||
"nix",
|
||||
"nix 0.22.2",
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "memoffset"
|
||||
version = "0.9.1"
|
||||
version = "0.6.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
|
||||
checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
|
||||
dependencies = [
|
||||
"autocfg",
|
||||
]
|
||||
|
|
@ -140,17 +134,31 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "nix"
|
||||
version = "0.29.0"
|
||||
version = "0.22.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
|
||||
checksum = "d3bb9a13fa32bc5aeb64150cd3f32d6cf4c748f8f8a417cce5d2eb976a8370ba"
|
||||
dependencies = [
|
||||
"bitflags 2.9.0",
|
||||
"bitflags",
|
||||
"cc",
|
||||
"cfg-if",
|
||||
"cfg_aliases",
|
||||
"libc",
|
||||
"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]]
|
||||
name = "ntapi"
|
||||
version = "0.3.6"
|
||||
|
|
@ -166,6 +174,12 @@ version = "0.2.7"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443"
|
||||
|
||||
[[package]]
|
||||
name = "pin-utils"
|
||||
version = "0.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
|
||||
|
||||
[[package]]
|
||||
name = "ppv-lite86"
|
||||
version = "0.2.15"
|
||||
|
|
@ -236,7 +250,7 @@ version = "0.2.10"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff"
|
||||
dependencies = [
|
||||
"bitflags 1.2.1",
|
||||
"bitflags",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
authors = ["Trish"]
|
||||
categories = ["command-line-utilities"]
|
||||
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"
|
||||
keywords = ["address", "discovery", "ip", "network"]
|
||||
license = "AGPL-3.0"
|
||||
|
|
@ -14,8 +14,8 @@ version = "0.1.6"
|
|||
[dependencies]
|
||||
configparser = "3.0.0"
|
||||
directories = "5.0.0"
|
||||
mac_address = "1.1.8"
|
||||
nix = "0.29.0"
|
||||
mac_address = "1.1.2"
|
||||
nix = "0.25.0"
|
||||
rand = "0.8.4"
|
||||
thiserror = "1.0.30"
|
||||
tokio = { version = "1.14.0", features = ["fs", "net", "rt", "time"] }
|
||||
|
|
|
|||
|
|
@ -44,7 +44,8 @@ pub enum CliArgError {
|
|||
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?;
|
||||
buf.truncate (bytes_recved);
|
||||
|
|
|
|||
|
|
@ -18,9 +18,23 @@ pub fn debug() {
|
|||
// numbers differ.
|
||||
|
||||
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 {
|
||||
[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],
|
||||
]
|
||||
}
|
||||
|
|
|
|||
|
|
@ -32,12 +32,7 @@ pub async fn client<I: Iterator<Item = String>>(args: I) -> Result<(), AppError>
|
|||
|
||||
let mut peers = HashMap::with_capacity (10);
|
||||
|
||||
timeout(
|
||||
Duration::from_millis(params.timeout_ms),
|
||||
listen_for_responses(&socket, params.nicknames, &mut peers),
|
||||
)
|
||||
.await
|
||||
.ok();
|
||||
timeout (Duration::from_millis (params.timeout_ms), listen_for_responses (&*socket, params.nicknames, &mut peers)).await.ok ();
|
||||
|
||||
let mut peers: Vec <_> = peers.into_iter ().collect ();
|
||||
peers.sort_by_key (|(_, v)| v.mac);
|
||||
|
|
@ -48,7 +43,7 @@ pub async fn client<I: Iterator<Item = String>>(args: I) -> Result<(), AppError>
|
|||
None => {
|
||||
println! ("<Unknown> = {}", ip);
|
||||
continue;
|
||||
}
|
||||
},
|
||||
Some (x) => x,
|
||||
};
|
||||
|
||||
|
|
@ -56,7 +51,7 @@ pub async fn client<I: Iterator<Item = String>>(args: I) -> Result<(), AppError>
|
|||
None => {
|
||||
println! ("{} = {}", MacAddress::new (mac), ip.ip ());
|
||||
continue;
|
||||
}
|
||||
},
|
||||
Some (x) => x,
|
||||
};
|
||||
|
||||
|
|
@ -66,10 +61,13 @@ pub async fn client<I: Iterator<Item = String>>(args: I) -> Result<(), AppError>
|
|||
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 ConfigFile { nicknames } = load_config_file();
|
||||
let ConfigFile {
|
||||
nicknames,
|
||||
} = load_config_file ();
|
||||
|
||||
while let Some (arg) = args.next () {
|
||||
match arg.as_str () {
|
||||
|
|
@ -78,13 +76,12 @@ pub async fn find_nick<I: Iterator<Item = String>>(mut args: I) -> Result<(), Ap
|
|||
None => return Err (CliArgError::MissingArgumentValue (arg).into ()),
|
||||
Some (x) => u64::from_str (&x)?,
|
||||
};
|
||||
}
|
||||
},
|
||||
_ => nick = Some (arg),
|
||||
}
|
||||
}
|
||||
|
||||
let needle_nick =
|
||||
nick.ok_or_else(|| CliArgError::MissingRequiredArg("nickname".to_string()))?;
|
||||
let needle_nick = nick.ok_or_else (|| CliArgError::MissingRequiredArg ("nickname".to_string ()))?;
|
||||
let needle_nick = Some (needle_nick);
|
||||
|
||||
let common_params = Default::default ();
|
||||
|
|
@ -93,8 +90,7 @@ pub async fn find_nick<I: Iterator<Item = String>>(mut args: I) -> Result<(), Ap
|
|||
let msg = Message::new_request1 ().to_vec ()?;
|
||||
tokio::spawn (send_requests (Arc::clone (&socket), common_params, msg));
|
||||
|
||||
timeout(Duration::from_millis(timeout_ms), async move {
|
||||
loop {
|
||||
timeout (Duration::from_millis (timeout_ms), async move { loop {
|
||||
let (msgs, remote_addr) = match recv_msg_from (&socket).await {
|
||||
Err (_) => continue,
|
||||
Ok (x) => x,
|
||||
|
|
@ -119,18 +115,20 @@ pub async fn find_nick<I: Iterator<Item = String>>(mut args: I) -> Result<(), Ap
|
|||
println! ("{}", remote_addr.ip ());
|
||||
return;
|
||||
}
|
||||
}
|
||||
})
|
||||
.await?;
|
||||
}}).await?;
|
||||
|
||||
Ok (())
|
||||
}
|
||||
|
||||
fn configure_client<I: Iterator<Item = String>>(mut args: I) -> Result<ClientParams, AppError> {
|
||||
fn configure_client <I: Iterator <Item=String>> (mut args: I)
|
||||
-> Result <ClientParams, AppError>
|
||||
{
|
||||
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 () {
|
||||
match arg.as_str () {
|
||||
|
|
@ -139,13 +137,13 @@ fn configure_client<I: Iterator<Item = String>>(mut args: I) -> Result<ClientPar
|
|||
None => return Err (CliArgError::MissingArgumentValue (arg).into ()),
|
||||
Some (x) => Ipv4Addr::from_str (&x)?,
|
||||
});
|
||||
}
|
||||
},
|
||||
"--timeout-ms" => {
|
||||
timeout_ms = match args.next () {
|
||||
None => return Err (CliArgError::MissingArgumentValue (arg).into ()),
|
||||
Some (x) => u64::from_str (&x)?,
|
||||
};
|
||||
}
|
||||
},
|
||||
_ => return Err (CliArgError::UnrecognizedArgument (arg).into ()),
|
||||
}
|
||||
}
|
||||
|
|
@ -181,7 +179,9 @@ fn load_config_file() -> ConfigFile {
|
|||
}
|
||||
}
|
||||
|
||||
ConfigFile { nicknames }
|
||||
ConfigFile {
|
||||
nicknames,
|
||||
}
|
||||
}
|
||||
|
||||
async fn make_socket (
|
||||
|
|
@ -192,10 +192,7 @@ async fn make_socket(
|
|||
|
||||
for bind_addr in &bind_addrs {
|
||||
if let Err (e) = socket.join_multicast_v4 (common_params.multicast_addr, *bind_addr) {
|
||||
println!(
|
||||
"Error joining multicast group with iface {}: {:?}",
|
||||
bind_addr, e
|
||||
);
|
||||
println! ("Error joining multicast group with iface {}: {:?}", bind_addr, e);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -206,11 +203,11 @@ async fn send_requests(
|
|||
socket: Arc <UdpSocket>,
|
||||
params: app_common::Params,
|
||||
msg: Vec <u8>,
|
||||
) -> Result<(), AppError> {
|
||||
)
|
||||
-> Result <(), AppError>
|
||||
{
|
||||
for _ in 0..10 {
|
||||
socket
|
||||
.send_to(&msg, (params.multicast_addr, params.server_port))
|
||||
.await?;
|
||||
socket.send_to (&msg, (params.multicast_addr, params.server_port)).await?;
|
||||
sleep (Duration::from_millis (100)).await;
|
||||
}
|
||||
|
||||
|
|
@ -220,7 +217,7 @@ async fn send_requests(
|
|||
async fn listen_for_responses (
|
||||
socket: &UdpSocket,
|
||||
nicknames: HashMap <String, String>,
|
||||
peers: &mut HashMap<SocketAddr, ServerResponse>,
|
||||
peers: &mut HashMap <SocketAddr, ServerResponse>
|
||||
) {
|
||||
loop {
|
||||
let (msgs, remote_addr) = match recv_msg_from (socket).await {
|
||||
|
|
@ -250,8 +247,9 @@ async fn listen_for_responses(
|
|||
fn get_peer_nickname (
|
||||
nicknames: &HashMap <String, String>,
|
||||
mac: Option <[u8; 6]>,
|
||||
peer_nickname: Option<String>,
|
||||
) -> Option<String> {
|
||||
peer_nickname: Option <String>
|
||||
) -> Option <String>
|
||||
{
|
||||
match peer_nickname.as_deref () {
|
||||
None => (),
|
||||
Some ("") => (),
|
||||
|
|
@ -259,9 +257,7 @@ fn get_peer_nickname(
|
|||
}
|
||||
|
||||
if let Some (mac) = &mac {
|
||||
return nicknames
|
||||
.get(&format!("{}", MacAddress::new(*mac)))
|
||||
.cloned();
|
||||
return nicknames.get (&format! ("{}", MacAddress::new (*mac))).cloned ()
|
||||
}
|
||||
|
||||
None
|
||||
|
|
@ -275,7 +271,9 @@ mod test {
|
|||
fn test_nicknames () {
|
||||
let mut nicks = HashMap::new ();
|
||||
|
||||
for (k, v) in [("01:01:01:01:01:01", "phoenix")] {
|
||||
for (k, v) in [
|
||||
("01:01:01:01:01:01", "phoenix")
|
||||
] {
|
||||
nicks.insert (k.to_string (), v.to_string ());
|
||||
}
|
||||
|
||||
|
|
@ -288,16 +286,8 @@ mod test {
|
|||
( 3, (Some ([1, 1, 1, 1, 1, 2]), None), None),
|
||||
// If the server tells us its nickname, that always takes priority
|
||||
( 4, (None, Some ("snowflake")), Some ("snowflake")),
|
||||
(
|
||||
5,
|
||||
(Some([1, 1, 1, 1, 1, 1]), Some("snowflake")),
|
||||
Some("snowflake"),
|
||||
),
|
||||
(
|
||||
6,
|
||||
(Some([1, 1, 1, 1, 1, 2]), Some("snowflake")),
|
||||
Some("snowflake"),
|
||||
),
|
||||
( 5, (Some ([1, 1, 1, 1, 1, 1]), Some ("snowflake")), Some ("snowflake")),
|
||||
( 6, (Some ([1, 1, 1, 1, 1, 2]), Some ("snowflake")), Some ("snowflake")),
|
||||
// But blank nicknames are treated like None
|
||||
( 7, (None, Some ("")), None),
|
||||
( 8, (Some ([1, 1, 1, 1, 1, 1]), Some ("")), Some ("phoenix")),
|
||||
|
|
|
|||
26
src/ip.rs
26
src/ip.rs
|
|
@ -1,4 +1,8 @@
|
|||
use std::{net::Ipv4Addr, process::Command, str::FromStr};
|
||||
use std::{
|
||||
net::Ipv4Addr,
|
||||
process::Command,
|
||||
str::FromStr,
|
||||
};
|
||||
|
||||
#[derive (Debug, thiserror::Error)]
|
||||
pub enum IpError {
|
||||
|
|
@ -34,7 +38,9 @@ pub mod linux {
|
|||
use super::*;
|
||||
|
||||
pub fn get_ip_addr_output () -> Result <String, IpError> {
|
||||
let output = Command::new("ip").arg("addr").output()?;
|
||||
let output = Command::new ("ip")
|
||||
.arg ("addr")
|
||||
.output ()?;
|
||||
let output = output.stdout.as_slice ();
|
||||
let output = String::from_utf8 (output.to_vec ())?;
|
||||
Ok (output)
|
||||
|
|
@ -43,8 +49,7 @@ pub mod linux {
|
|||
pub fn parse_ip_addr_output (output: &str) -> Vec <Ipv4Addr> {
|
||||
// I wrote this in FP style because I was bored.
|
||||
|
||||
output
|
||||
.lines()
|
||||
output.lines ()
|
||||
.map (|l| l.trim_start ())
|
||||
.filter_map (|l| l.strip_prefix ("inet "))
|
||||
.filter_map (|l| l.find ('/').map (|x| &l [0..x]))
|
||||
|
|
@ -59,7 +64,8 @@ pub mod windows {
|
|||
use super::*;
|
||||
|
||||
pub fn get_ip_config_output () -> Result <String, IpError> {
|
||||
let output = Command::new("ipconfig").output()?;
|
||||
let output = Command::new ("ipconfig")
|
||||
.output ()?;
|
||||
let output = output.stdout.as_slice ();
|
||||
let output = String::from_utf8 (output.to_vec ())?;
|
||||
Ok (output)
|
||||
|
|
@ -98,12 +104,16 @@ pub mod windows {
|
|||
|
||||
#[test]
|
||||
fn test () {
|
||||
for (input, expected) in [(
|
||||
for (input, expected) in [
|
||||
(
|
||||
r"
|
||||
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);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -45,13 +45,15 @@ async fn async_main() -> Result<(), AppError> {
|
|||
fn config () {
|
||||
if let Some (proj_dirs) = ProjectDirs::from ("", "ReactorScram", "LookAround") {
|
||||
println! ("Using config dir {:?}", proj_dirs.config_local_dir ());
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
println! ("Can't detect config dir.");
|
||||
}
|
||||
}
|
||||
|
||||
fn my_ips () -> Result <(), AppError> {
|
||||
for addr in ip::get_ips()? {
|
||||
for addr in ip::get_ips ()?
|
||||
{
|
||||
println! ("{:?}", addr);
|
||||
}
|
||||
|
||||
|
|
|
|||
149
src/message.rs
149
src/message.rs
|
|
@ -8,7 +8,10 @@ type Mac = [u8; 6];
|
|||
#[derive (Debug, PartialEq)]
|
||||
pub enum Message {
|
||||
// 1
|
||||
Request1 { idem_id: [u8; 8], mac: Option<Mac> },
|
||||
Request1 {
|
||||
idem_id: [u8; 8],
|
||||
mac: Option <Mac>
|
||||
},
|
||||
// 2
|
||||
Response1 (Option <Mac>),
|
||||
// 3
|
||||
|
|
@ -20,7 +23,10 @@ impl Message {
|
|||
let mut idem_id = [0u8; 8];
|
||||
rand::thread_rng ().fill_bytes (&mut idem_id);
|
||||
|
||||
Message::Request1 { idem_id, mac: None }
|
||||
Message::Request1 {
|
||||
idem_id,
|
||||
mac: None,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -64,19 +70,21 @@ impl Write for DummyWriter {
|
|||
|
||||
impl Message {
|
||||
pub fn write <T> (&self, w: &mut Cursor <T>) -> Result <(), MessageError>
|
||||
where
|
||||
Cursor<T>: Write,
|
||||
where Cursor <T>: Write
|
||||
{
|
||||
match self {
|
||||
Self::Request1 { idem_id, mac } => {
|
||||
Self::Request1 {
|
||||
idem_id,
|
||||
mac,
|
||||
}=> {
|
||||
w.write_all (&[1])?;
|
||||
w.write_all (&idem_id[..])?;
|
||||
Self::write_mac_opt (w, *mac)?;
|
||||
}
|
||||
},
|
||||
Self::Response1 (mac) => {
|
||||
w.write_all (&[2])?;
|
||||
Self::write_mac_opt (w, *mac)?;
|
||||
}
|
||||
},
|
||||
Self::Response2 (x) => {
|
||||
w.write_all (&[3])?;
|
||||
// Measure length with dummy writes
|
||||
|
|
@ -90,25 +98,28 @@ impl Message {
|
|||
let len = u32::try_from (dummy_writer.position)?;
|
||||
w.write_all (&len.to_le_bytes ())?;
|
||||
Self::write_response_2 (w, x)?;
|
||||
}
|
||||
},
|
||||
}
|
||||
|
||||
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)
|
||||
-> Result <(), MessageError>
|
||||
{
|
||||
w.write_all (¶ms.idem_id)?;
|
||||
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) => {
|
||||
w.write_all (&[1])?;
|
||||
w.write_all (&mac[..])?;
|
||||
}
|
||||
},
|
||||
None => w.write_all (&[0])?,
|
||||
}
|
||||
Ok (())
|
||||
|
|
@ -139,12 +150,15 @@ impl Message {
|
|||
r.read_exact (&mut idem_id)?;
|
||||
|
||||
let mac = Self::read_mac_opt (r)?;
|
||||
Self::Request1 { idem_id, mac }
|
||||
Self::Request1 {
|
||||
idem_id,
|
||||
mac,
|
||||
}
|
||||
},
|
||||
2 => {
|
||||
let mac = Self::read_mac_opt (r)?;
|
||||
Self::Response1 (mac)
|
||||
}
|
||||
},
|
||||
3 => {
|
||||
tlv::Reader::<_>::length (r)?;
|
||||
|
||||
|
|
@ -154,18 +168,24 @@ impl Message {
|
|||
let nickname = tlv::Reader::<_>::lv_bytes_to_vec (r, 64)?;
|
||||
let nickname = String::from_utf8 (nickname)?;
|
||||
|
||||
Self::Response2(Response2 { idem_id, nickname })
|
||||
}
|
||||
Self::Response2 (Response2 {
|
||||
idem_id,
|
||||
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)
|
||||
-> Result <Option <[u8; 6]>, std::io::Error>
|
||||
{
|
||||
Ok (if tlv::Reader::u8 (r)? == 1 {
|
||||
let mut mac = [0u8; 6];
|
||||
r.read_exact (&mut mac)?;
|
||||
Some (mac)
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
None
|
||||
})
|
||||
}
|
||||
|
|
@ -192,14 +212,19 @@ mod test {
|
|||
fn test_write_2 () -> Result <(), MessageError> {
|
||||
for (input, expected) in [
|
||||
(
|
||||
vec![Message::Request1 {
|
||||
idem_id: [1, 2, 3, 4, 5, 6, 7, 8],
|
||||
mac: None,
|
||||
}],
|
||||
vec! [
|
||||
154, 74, 67, 129, // Request tag
|
||||
1, // Idem ID
|
||||
1, 2, 3, 4, 5, 6, 7, 8, // MAC is None
|
||||
Message::Request1 {
|
||||
idem_id: [1, 2, 3, 4, 5, 6, 7, 8,],
|
||||
mac: None,
|
||||
},
|
||||
],
|
||||
vec! [
|
||||
154, 74, 67, 129,
|
||||
// Request tag
|
||||
1,
|
||||
// Idem ID
|
||||
1, 2, 3, 4, 5, 6, 7, 8,
|
||||
// MAC is None
|
||||
0,
|
||||
],
|
||||
),
|
||||
|
|
@ -207,20 +232,28 @@ mod test {
|
|||
vec! [
|
||||
Message::Response1 (Some ([0x11, 0x22, 0x33, 0x44, 0x55, 0x66])),
|
||||
Message::Response2 (Response2 {
|
||||
idem_id: [1, 2, 3, 4, 5, 6, 7, 8],
|
||||
idem_id: [1, 2, 3, 4, 5, 6, 7, 8,],
|
||||
nickname: ":V".to_string (),
|
||||
}),
|
||||
],
|
||||
vec! [
|
||||
// Magic number for LookAround packets
|
||||
154, 74, 67, 129, // Response1 tag
|
||||
2, // MAC is Some
|
||||
1, // MAC
|
||||
17, 34, 51, 68, 85, 102, // 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,
|
||||
154, 74, 67, 129,
|
||||
// Response1 tag
|
||||
2,
|
||||
// MAC is Some
|
||||
1,
|
||||
// MAC
|
||||
17, 34, 51, 68, 85, 102,
|
||||
// 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,
|
||||
],
|
||||
),
|
||||
] {
|
||||
|
|
@ -240,9 +273,12 @@ mod test {
|
|||
mac: None,
|
||||
},
|
||||
vec! [
|
||||
154, 74, 67, 129, // Request tag
|
||||
1, // Idem ID
|
||||
1, 2, 3, 4, 5, 6, 7, 8, // MAC is None
|
||||
154, 74, 67, 129,
|
||||
// Request tag
|
||||
1,
|
||||
// Idem ID
|
||||
1, 2, 3, 4, 5, 6, 7, 8,
|
||||
// MAC is None
|
||||
0,
|
||||
],
|
||||
),
|
||||
|
|
@ -250,9 +286,12 @@ mod test {
|
|||
Message::Response1 (Some ([0x11, 0x22, 0x33, 0x44, 0x55, 0x66])),
|
||||
vec! [
|
||||
// Magic number for LookAround packets
|
||||
154, 74, 67, 129, // Response tag
|
||||
2, // MAC is Some
|
||||
1, // MAC
|
||||
154, 74, 67, 129,
|
||||
// Response tag
|
||||
2,
|
||||
// MAC is Some
|
||||
1,
|
||||
// MAC
|
||||
17, 34, 51, 68, 85, 102,
|
||||
],
|
||||
),
|
||||
|
|
@ -260,14 +299,14 @@ mod test {
|
|||
Message::Response1 (None),
|
||||
vec! [
|
||||
// Magic number for LookAround packets
|
||||
154, 74, 67, 129, // Response tag
|
||||
2, // MAC is None
|
||||
154, 74, 67, 129,
|
||||
// Response tag
|
||||
2,
|
||||
// MAC is None
|
||||
0,
|
||||
],
|
||||
),
|
||||
]
|
||||
.into_iter()
|
||||
{
|
||||
].into_iter () {
|
||||
let actual = input.to_vec ()?;
|
||||
assert_eq! (actual, expected, "{:?}", input);
|
||||
}
|
||||
|
|
@ -278,24 +317,26 @@ mod test {
|
|||
#[test]
|
||||
fn test_read_2 () -> Result <(), MessageError> {
|
||||
for input in [
|
||||
vec![Message::Request1 {
|
||||
vec! [
|
||||
Message::Request1 {
|
||||
idem_id: [0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08],
|
||||
mac: None,
|
||||
}],
|
||||
vec![Message::Response1(Some([
|
||||
0x11, 0x22, 0x33, 0x44, 0x55, 0x66,
|
||||
]))],
|
||||
vec![Message::Response1(None)],
|
||||
},
|
||||
],
|
||||
vec! [
|
||||
Message::Response1 (Some ([0x11, 0x22, 0x33, 0x44, 0x55, 0x66])),
|
||||
],
|
||||
vec! [
|
||||
Message::Response1 (None),
|
||||
],
|
||||
vec! [
|
||||
Message::Response1 (Some ([0x11, 0x22, 0x33, 0x44, 0x55, 0x66])),
|
||||
Message::Response2 (Response2 {
|
||||
idem_id: [1, 2, 3, 4, 5, 6, 7, 8],
|
||||
idem_id: [1, 2, 3, 4, 5, 6, 7, 8,],
|
||||
nickname: ":V".to_string (),
|
||||
}),
|
||||
],
|
||||
]
|
||||
.into_iter()
|
||||
{
|
||||
].into_iter () {
|
||||
let encoded = Message::many_to_vec (&input)?;
|
||||
let decoded = Message::from_slice2 (&encoded)?;
|
||||
assert_eq! (input, decoded);
|
||||
|
|
|
|||
|
|
@ -1,27 +1,52 @@
|
|||
pub use std::{
|
||||
collections::HashMap,
|
||||
env,
|
||||
io::{Cursor, Write},
|
||||
net::{Ipv4Addr, SocketAddr, SocketAddrV4},
|
||||
io::{
|
||||
Cursor,
|
||||
Write,
|
||||
},
|
||||
net::{
|
||||
Ipv4Addr,
|
||||
SocketAddr,
|
||||
SocketAddrV4,
|
||||
},
|
||||
str::FromStr,
|
||||
sync::Arc,
|
||||
time::Duration,
|
||||
time::{
|
||||
Duration,
|
||||
Instant,
|
||||
},
|
||||
};
|
||||
|
||||
pub use configparser::ini::Ini;
|
||||
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 tokio::{
|
||||
net::UdpSocket,
|
||||
time::{sleep, timeout},
|
||||
time::{
|
||||
sleep,
|
||||
timeout,
|
||||
},
|
||||
};
|
||||
|
||||
pub use crate::{
|
||||
app_common::{
|
||||
self, AppError, CliArgError, LOOKAROUND_VERSION, find_project_dirs, recv_msg_from,
|
||||
self,
|
||||
LOOKAROUND_VERSION,
|
||||
AppError,
|
||||
CliArgError,
|
||||
find_project_dirs,
|
||||
recv_msg_from,
|
||||
},
|
||||
ip::get_ips,
|
||||
message::{self, Message, PACKET_SIZE},
|
||||
message::{
|
||||
self,
|
||||
PACKET_SIZE,
|
||||
Message,
|
||||
},
|
||||
tlv,
|
||||
};
|
||||
|
|
|
|||
|
|
@ -8,7 +8,8 @@ struct Params {
|
|||
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)) => {
|
||||
println!("Our MAC addr = {}", ma);
|
||||
|
|
@ -19,18 +20,11 @@ pub async fn server<I: Iterator<Item = String>>(args: I) -> Result<(), AppError>
|
|||
|
||||
let params = configure (args)?;
|
||||
|
||||
let socket = UdpSocket::bind(SocketAddrV4::new(
|
||||
Ipv4Addr::UNSPECIFIED,
|
||||
params.common.server_port,
|
||||
))
|
||||
.await?;
|
||||
let socket = UdpSocket::bind (SocketAddrV4::new (Ipv4Addr::UNSPECIFIED, params.common.server_port)).await?;
|
||||
|
||||
for bind_addr in ¶ms.bind_addrs {
|
||||
if let Err (e) = socket.join_multicast_v4 (params.common.multicast_addr, *bind_addr) {
|
||||
println!(
|
||||
"Error joining multicast group with iface {}: {:?}",
|
||||
bind_addr, e
|
||||
);
|
||||
println! ("Error joining multicast group with iface {}: {:?}", bind_addr, e);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -39,7 +33,8 @@ pub async fn server<I: Iterator<Item = String>>(args: I) -> Result<(), AppError>
|
|||
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 mut nickname = String::new ();
|
||||
|
|
@ -52,13 +47,12 @@ fn configure<I: Iterator<Item = String>>(mut args: I) -> Result<Params, AppError
|
|||
nickname = x;
|
||||
eprintln! ("Loaded nickname {:?}", nickname);
|
||||
}
|
||||
} else {
|
||||
eprintln!(
|
||||
"Can't load ini from {:?}, didn't load default configs",
|
||||
path
|
||||
);
|
||||
}
|
||||
} else {
|
||||
else {
|
||||
eprintln! ("Can't load ini from {:?}, didn't load default configs", path);
|
||||
}
|
||||
}
|
||||
else {
|
||||
eprintln! ("Can't find config dir, didn't load default configs");
|
||||
}
|
||||
|
||||
|
|
@ -69,22 +63,20 @@ fn configure<I: Iterator<Item = String>>(mut args: I) -> Result<Params, AppError
|
|||
None => return Err (CliArgError::MissingArgumentValue (arg).into ()),
|
||||
Some (x) => Ipv4Addr::from_str (&x)?,
|
||||
});
|
||||
}
|
||||
},
|
||||
"--nickname" => {
|
||||
nickname = match args.next () {
|
||||
None => return Err (CliArgError::MissingArgumentValue (arg).into ()),
|
||||
Some(x) => x,
|
||||
Some (x) => x
|
||||
};
|
||||
}
|
||||
},
|
||||
_ => return Err (CliArgError::UnrecognizedArgument (arg).into ()),
|
||||
}
|
||||
}
|
||||
|
||||
let our_mac = get_mac_address ()?.map (|x| x.bytes ());
|
||||
if our_mac.is_none () {
|
||||
println!(
|
||||
"Warning: Can't find our own MAC address. We won't be able to respond to MAC-specific lookaround requests"
|
||||
);
|
||||
println! ("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 () {
|
||||
|
|
@ -100,7 +92,12 @@ fn configure<I: Iterator<Item = String>>(mut args: I) -> Result<Params, AppError
|
|||
})
|
||||
}
|
||||
|
||||
async fn serve_interface(params: Params, socket: UdpSocket) -> Result<(), AppError> {
|
||||
async fn serve_interface (
|
||||
params: Params,
|
||||
socket: UdpSocket,
|
||||
)
|
||||
-> Result <(), AppError>
|
||||
{
|
||||
let mut recent_idem_ids = Vec::with_capacity (32);
|
||||
|
||||
loop {
|
||||
|
|
@ -110,7 +107,7 @@ async fn serve_interface(params: Params, socket: UdpSocket) -> Result<(), AppErr
|
|||
Err (e) => {
|
||||
println! ("Error while receiving message: {:?}", e);
|
||||
continue;
|
||||
}
|
||||
},
|
||||
};
|
||||
|
||||
let req = match req_msgs.into_iter ().next () {
|
||||
|
|
@ -118,14 +115,18 @@ async fn serve_interface(params: Params, socket: UdpSocket) -> Result<(), AppErr
|
|||
_ => {
|
||||
println! ("Don't know how to handle this message, ignoring");
|
||||
continue;
|
||||
}
|
||||
},
|
||||
};
|
||||
|
||||
let resp = match req {
|
||||
Message::Request1 { mac: None, idem_id } => {
|
||||
Message::Request1 {
|
||||
mac: None,
|
||||
idem_id,
|
||||
} => {
|
||||
if recent_idem_ids.contains (&idem_id) {
|
||||
None
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
recent_idem_ids.insert (0, idem_id);
|
||||
recent_idem_ids.truncate (30);
|
||||
Some (vec! [
|
||||
|
|
@ -136,14 +137,12 @@ async fn serve_interface(params: Params, socket: UdpSocket) -> Result<(), AppErr
|
|||
}),
|
||||
])
|
||||
}
|
||||
}
|
||||
},
|
||||
_ => continue,
|
||||
};
|
||||
|
||||
if let Some (resp) = resp {
|
||||
socket
|
||||
.send_to(&Message::many_to_vec(&resp)?, remote_addr)
|
||||
.await?;
|
||||
socket.send_to (&Message::many_to_vec (&resp)?, remote_addr).await?;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@ pub enum TlvError {
|
|||
// To live is to suffer,
|
||||
// The data is too big,
|
||||
// For the gosh-darn buffer.
|
||||
|
||||
#[error ("Data too big")]
|
||||
DataTooBig,
|
||||
#[error (transparent)]
|
||||
|
|
@ -103,7 +104,11 @@ mod test {
|
|||
|
||||
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);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue