Update 'install.sh'

.cargo/config.toml

@@ -1,2 +1,3 @@
 [build]
-# rustflags = [ "--cfg", "tokio_unstable" ]
+rustflags = [ "--cfg", "tokio_unstable" ]
+

.gitea/workflows/checks.yaml

@@ -1,29 +0,0 @@
-name: "Code Checks"
-on:
-  pull_request:
-
-jobs:
-  # Check formatting with rustfmt
-  formatting:
-    name: cargo fmt
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      # Ensure rustfmt is installed and setup problem matcher
-      - uses: actions-rust-lang/setup-rust-toolchain
-        with:
-          components: rustfmt
-      - name: Rustfmt Check
-        uses: actions-rust-lang/rustfmt@v1
-
-  # Check code with clippy
-  clippy:
-    name: cargo clippy
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      # Ensure clippy is installed and setup problem matcher
-      - uses: actions-rust-lang/setup-rust-toolchain
-        with:
-          components: clippy
-      - run: cargo clippy -- -D warnings

.gitea/workflows/tests.yaml

@@ -1,13 +0,0 @@
-name: "Test Suite"
-on:
-  push:
-  pull_request:
-
-jobs:
-  test:
-    name: cargo test
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions-rust-lang/setup-rust-toolchain
-      - run: cargo test --all-features

Cargo.lock

@@ -190,7 +190,6 @@ dependencies = [
  "tracing",
  "tracing-error",
  "tracing-subscriber",
- "zerocopy",
 ]
 
 [[package]]
@@ -1339,24 +1338,3 @@ name = "windows_x86_64_msvc"
 version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
-
-[[package]]
-name = "zerocopy"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "332f188cc1bcf1fe1064b8c58d150f497e697f49774aa846f2dc949d9a25f236"
-dependencies = [
- "byteorder",
- "zerocopy-derive",
-]
-
-[[package]]
-name = "zerocopy-derive"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6505e6815af7de1746a08f69c69606bb45695a17149517680f3b2149713b19a3"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]

Cargo.toml

@@ -27,9 +27,8 @@ once_cell = "1.17.1"
 eyre = "0.6.8"
 color-eyre = "0.6.2"
 tracing-error = "0.2.0"
-zerocopy = "0.6.1"
 
 [features]
-default = ["debug_server"]
+default = ["debug_server", "tokio_console"]
 debug_server = ["dep:hyper"]
 tokio_console = ["dep:console-subscriber"]

install.sh

@@ -24,8 +24,8 @@ then
     exit 1
 fi
 
-user_name="itelex"
+user_name="centralex"
-install_dir="/home/itelex/"
+install_dir="/var/lib/centralex"
 service_file="/etc/systemd/system/centralex.service"
 
 if [ $# -lt 1 ]; then
@@ -52,7 +52,7 @@ case "$step" in
         rm rustup.sh
 
         echo "cloning source code..."
-        git clone https://gitea.h.glsys.de/soruh/centralex centralex
+        git clone https://github.com/soruh/centralex centralex
 
         echo "creating default config..."
         cp centralex/config-template.json centralex/config.json
@@ -63,8 +63,8 @@ case "$step" in
             exit 1
         fi
 
-        # echo "creating user $user_name..."
+        echo "creating user $user_name..."
-        # useradd -s /usr/sbin/nologin --create-home --home-dir "$install_dir" "$user_name" 
+        useradd -s /usr/sbin/nologin --create-home --home-dir "$install_dir" "$user_name" 
 
         echo "creating service file..."
         cat > "$service_file" << EOF
@@ -72,10 +72,10 @@ case "$step" in
 Description=Centralex
 
 [Service]
-Environment=RUST_BACKTRACE=1
+Enviroment=RUST_BACKTRACE=1
 ExecStart=$install_dir/.cargo/bin/cargo run --release
 Type=simple
-User=$user_name
+User=centralex
 WorkingDirectory=$install_dir/centralex
 
 [Install]
@@ -100,6 +100,4 @@ EOF
     ;;
 esac
 
-echo "success"
+echo "installation complete"
-
-exit 0

src/auth.rs

@@ -2,21 +2,9 @@ use std::net::SocketAddr;
 
 use eyre::eyre;
 use tracing::{debug, instrument};
-use zerocopy::{AsBytes, LittleEndian};
 
 use crate::packets::{Header, Packet, PacketKind};
 
-type U16 = zerocopy::U16<LittleEndian>;
-type U32 = zerocopy::U32<LittleEndian>;
-
-#[derive(AsBytes)]
-#[repr(C)]
-struct DynIpUpdate {
-    number: U32,
-    pin: U16,
-    port: U16,
-}
-
 /// # Errors
 /// - the dyn ip server returns a malformed response or is unreachable
 /// - the authentication fails
@@ -37,21 +25,18 @@ pub async fn dyn_ip_update(
         data: Vec::new(),
     };
 
-    packet.data.resize(packet.header.length as usize, 0);
+    packet.data.clear();
-
+    packet.data.reserve(packet.header.length as usize);
-    DynIpUpdate {
+    packet.data.extend_from_slice(&number.to_le_bytes());
-        number: number.into(),
+    packet.data.extend_from_slice(&pin.to_le_bytes());
-        pin: pin.into(),
+    packet.data.extend_from_slice(&port.to_le_bytes());
-        port: port.into(),
-    }
-    .write_to(packet.data.as_mut_slice())
-    .unwrap();
 
     let mut socket = tokio::net::TcpStream::connect(server).await?;
 
     let (mut reader, mut writer) = socket.split();
 
     packet.send(&mut writer).await?;
+
     packet.recv_into(&mut reader).await?;
 
     let result = match packet.kind() {

src/client.rs

@@ -15,7 +15,6 @@ use tracing::{info, instrument, trace};
 use crate::{
     auth::dyn_ip_update,
     constants::{AUTH_TIMEOUT, CALL_ACK_TIMEOUT, CALL_TIMEOUT, PING_TIMEOUT, SEND_PING_INTERVAL},
-    debug_server::peer_query,
     packets::{Header, Packet, PacketKind, RemConnect, REJECT_OOP, REJECT_TIMEOUT},
     ports::{PortHandler, PortStatus},
     Config, HandlerMetadata,
@@ -51,9 +50,9 @@ async fn authenticate(
             updated_server = true;
         }
 
-        let listener = if let Some((listener, _packet)) =
+        let mut port_handler = port_handler.lock().await;
-            port_handler.lock().await.stop_rejector(port).await
+
-        {
+        let listener = if let Some((listener, _packet)) = port_handler.stop_rejector(port).await {
             Ok(listener)
         } else {
             TcpListener::bind((config.listen_addr.ip(), port)).await
@@ -71,17 +70,6 @@ async fn authenticate(
                 let _ip = dyn_ip_update(&config.dyn_ip_server, number, pin, port).await?;
             }
 
-            #[cfg(feature = "debug_server")]
-            let name = peer_query(&config.dyn_ip_server, number).await?;
-
-            let mut port_handler = port_handler.lock().await;
-
-            #[cfg(feature = "debug_server")]
-            if let Some(name) = name {
-                info!(%name, "found client name");
-                port_handler.names.insert(number, name);
-            }
-
             port_handler.register_update();
             port_handler
                 .port_state
@@ -94,7 +82,7 @@ async fn authenticate(
             break Ok(Some(port));
         }
 
-        port_handler.lock().await.mark_port_error(number, port);
+        port_handler.mark_port_error(number, port);
     }
 }
 
@@ -277,7 +265,7 @@ async fn connect(
     client.set_nodelay(true)?;
     caller.set_nodelay(true)?;
 
-    _ = timeout(CALL_TIMEOUT, tokio::io::copy_bidirectional(client, caller)).await;
+    let _ = timeout(CALL_TIMEOUT, tokio::io::copy_bidirectional(client, caller)).await;
 
     {
         let mut port_handler = port_handler.lock().await;

src/debug_server.rs

@@ -7,11 +7,6 @@ use std::net::SocketAddr;
 use std::sync::Arc;
 use tokio::sync::Mutex;
 use tracing::error;
-use zerocopy::{AsBytes, FromBytes, LittleEndian, Unaligned};
-
-use tracing::{debug, instrument};
-
-use crate::packets::{Header, Packet};
 
 use crate::ports::PortHandler;
 use crate::spawn;
@@ -46,74 +41,3 @@ pub async fn debug_server(addr: SocketAddr, port_handler: Arc<Mutex<PortHandler>
         error!(%error, "debug server error");
     }
 }
-
-type U16 = zerocopy::U16<LittleEndian>;
-type U32 = zerocopy::U32<LittleEndian>;
-
-#[derive(AsBytes)]
-#[repr(transparent)]
-#[allow(dead_code)]
-struct PeerQuery {
-    number: U32,
-}
-
-#[derive(FromBytes, Unaligned, Debug)]
-#[repr(packed)]
-#[allow(dead_code)]
-struct PeerReply {
-    number: U32,
-    name: [u8; 40],
-    flags: U16,
-    kind: u8,
-    hostname: [u8; 40],
-    ipaddress: [u8; 4],
-    port: U16,
-    extension: u8,
-    pin: U16,
-    timestamp: U32,
-}
-
-#[instrument]
-pub async fn peer_query(server: &SocketAddr, number: u32) -> eyre::Result<Option<String>> {
-    debug!(%number, "looking up");
-
-    let mut packet = Packet {
-        header: Header {
-            kind: 3, // Peer Query
-            length: 4,
-        },
-        data: Vec::new(),
-    };
-
-    packet.data.clear();
-    packet.data.resize(packet.header.length as usize, 0);
-
-    PeerQuery {
-        number: number.into(),
-    }
-    .write_to(packet.data.as_mut_slice())
-    .unwrap();
-
-    let mut socket = tokio::net::TcpStream::connect(server).await?;
-
-    let (mut reader, mut writer) = socket.split();
-
-    packet.send(&mut writer).await?;
-    packet.recv_into(&mut reader).await?;
-
-    Ok(if packet.kind().raw() == 5 {
-        // PeerReply
-        PeerReply::read_from(packet.data.as_slice()).and_then(|x| {
-            let i = x
-                .name
-                .iter()
-                .enumerate()
-                .find_map(|(i, c)| (*c == 0).then_some(i))
-                .unwrap_or(x.name.len());
-
-            Some(std::str::from_utf8(&x.name[..i]).ok()?.to_owned())
-        })
-    } else {
-        None
-    })
-}

src/main.rs

@@ -185,7 +185,7 @@ fn setup_tracing(config: &Config) {
                 Level::ERROR => write!(writer, " {:>5} ", level.red())?,
             }
 
-            write!(writer, "{:23}{}", meta.target().dimmed(), ":".bold())?;
+            write!(writer, "{:17}{}", meta.target().dimmed(), ":".bold())?;
 
             /*
             if let Some(filename) = meta.file() {
@@ -266,7 +266,7 @@ async fn connection_handler(
         };
 
         let (_, mut writer) = stream.split();
-        _ = packet.send(&mut writer).await;
+        let _ = packet.send(&mut writer).await;
     }
 
     if let Some(port) = handler_metadata.port {
@@ -293,7 +293,7 @@ async fn connection_handler(
     }
 
     sleep(Duration::from_secs(3)).await;
-    _ = stream.shutdown().await;
+    let _ = stream.shutdown().await;
 }
 
 fn main() -> eyre::Result<()> {

src/ports.rs

@@ -45,10 +45,6 @@ pub struct PortHandler {
     allocated_ports: HashMap<Number, Port>,
 
     pub port_state: HashMap<Port, PortState>,
-
-    #[cfg(feature = "debug_server")]
-    #[serde(default)]
-    pub names: HashMap<Number, String>,
 }
 
 #[instrument(skip(port_handler, change_receiver))]
@@ -92,24 +88,22 @@ impl<T: Display> Debug for DisplayAsDebug<T> {
     }
 }
 
-fn duration_string(duration: Duration) -> String {
+fn duration_in_hours(duration: Duration) -> String {
     let seconds_elapsed = duration.as_secs();
 
-    let days = seconds_elapsed / (60 * 60 * 24);
+    let hours = seconds_elapsed / (60 * 60);
-    let hours = seconds_elapsed / (60 * 60) % 24;
     let minutes = (seconds_elapsed / 60) % 60;
     let seconds = seconds_elapsed % 60;
 
-    match (days > 0, hours > 0, minutes > 0) {
+    match (hours > 0, minutes > 0) {
-        (true, _, _) => format!("{days}d {hours}h {minutes}min {seconds}s"),
+        (true, _) => format!("{hours}h {minutes}min {seconds}s"),
-        (false, true, _) => format!("{hours}h {minutes}min {seconds}s"),
+        (false, true) => format!("{minutes}min {seconds}s"),
-        (false, false, true) => format!("{minutes}min {seconds}s"),
         _ => format!("{duration:.0?}"),
     }
 }
 
 fn format_instant(instant: Instant) -> String {
-    let when = duration_string(instant.elapsed()) + " ago";
+    let when = duration_in_hours(instant.elapsed()) + " ago";
 
     (|| -> eyre::Result<_> {
         let timestamp = SystemTime::now().duration_since(UNIX_EPOCH)? - instant.elapsed();
@@ -128,7 +122,6 @@ fn instant_from_timestamp(timestamp: UnixTimestamp) -> Instant {
     Instant::now() - UNIX_EPOCH.elapsed().unwrap() + Duration::from_secs(timestamp)
 }
 
-#[cfg(feature = "debug_server")]
 impl Debug for PortHandler {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         const SHOW_N_FREE_PORTS: usize = 10;
@@ -172,9 +165,8 @@ impl Debug for PortHandler {
             .map(|(&number, &port)| {
                 #[derive(Debug)]
                 #[allow(dead_code)]
-                struct State<'n> {
+                struct State {
                     state: PortStatus,
-                    name: &'n str,
                     number: u32,
                     port: u16,
                     last_change: DisplayAsDebug<String>,
@@ -186,7 +178,6 @@ impl Debug for PortHandler {
                     state: state.status,
                     number,
                     port,
-                    name: self.names.get(&number).map_or("?", |x| x.as_str()),
                     last_change: DisplayAsDebug(format_instant(instant_from_timestamp(
                         state.last_change,
                     ))),
@@ -427,7 +418,7 @@ impl Rejector {
                 loop {
                     if let Ok((mut socket, _)) = listener.accept().await {
                         let (_, mut writer) = socket.split();
-                        _ = packet.send(&mut writer).await;
+                        let _ = packet.send(&mut writer).await;
                     }
                 }
             })
@@ -438,7 +429,7 @@ impl Rejector {
     #[instrument(skip(self))]
     async fn stop(self) -> (TcpListener, Packet) {
         self.handle.abort();
-        _ = self.handle.await;
+        let _ = self.handle.await;
         let (listener, packet) = Arc::try_unwrap(self.state).unwrap();
         (listener.into_inner(), packet)
     }
@@ -474,7 +465,7 @@ impl PortHandler {
         };
 
         if let Some(port) = port {
-            info!(port, "allocated");
+            info!(port, "allocated port");
         }
 
         port
@@ -535,9 +526,6 @@ impl PortHandler {
             self.register_update();
             info!(port, old_number, "reused port");
             assert!(self.allocated_ports.remove(&old_number).is_some());
-            #[cfg(feature = "debug_server")]
-            self.names.remove(&old_number);
-
             return Some(port);
         }