.

Author: ylxdzsw

Cargo.toml

@@ -1,15 +1,15 @@
 [package]
 name = "v2socks"
-version = "0.2.3"
+version = "0.2.4"
 authors = ["ylxdzsw <[email protected]>"]
-edition = "2018"
+edition = "2021"
 
 [profile.release]
 panic = "abort"
 lto = true
 
 [dependencies]
-oh-my-rust = { git = "https://github.com/ylxdzsw/oh-my-rust", default-features = false, features = ["std"]}
+absurd = { git = "https://github.com/ylxdzsw/absurd" }
 rust-crypto = "0.2"
 rand = "0.8"
 anyhow = "1.0"

PKGBUILD

@@ -3,7 +3,7 @@
 pkgname=v2socks
 pkgdesc="An opinioned lightweight socks5 server and vmess (v2ray) client."
 pkgrel=1
-pkgver=0.2.3
+pkgver=0.2.4
 arch=(any)
 url='https://github.com/ylxdzsw/v2socks'
 license=(GPL3)
@@ -16,4 +16,4 @@ package() {
     cargo build --release
     install -D "$srcdir"/v2socks-$pkgver/target/release/v2socks "$pkgdir"/usr/bin/v2socks
     install -Dm644 "$srcdir"/v2socks-$pkgver/v2socks.service "$pkgdir"/usr/lib/systemd/system/v2socks.service
-}
+}

src/main.rs

@@ -1,13 +1,11 @@
 use v2socks::*;
-use oh_my_rust::*;
+use absurd::*;
 use rand::prelude::*;
 use std::io::prelude::*;
 
-// basic logic:
 // 1. main thread listen for socks5 connections
 // 2. spawn a child thread for each connection, perform the sock5 and vmess handshake respectively
 // 3. after the handshake succeed, spawn a pair of threads to pipe the two connections forward and backward
-
 // todo: use thread pool or async io
 
 const USAGE: &str = "

src/socks.rs

@@ -1,5 +1,5 @@
 use super::*;
-use oh_my_rust::*;
+use absurd::*;
 use anyhow::{Context, Result, anyhow};
 use std::net::{TcpListener, TcpStream};
 use std::io::prelude::*;
@@ -58,7 +58,7 @@ fn initialize(stream: &mut (impl ReadExt + Write)) -> Result<()> {
         return Err(anyhow!("unsupported socks version {}. Hint: {}", header[0], hint))
     }
 
-    let list: Vec<u8> = stream.read_exact_alloc(header[1] as usize).context("read methods failed")?;
+    let list = stream.read_exact_alloc(header[1] as usize).context("read methods failed")?;
 
     if !list.contains(&0) {
         stream.write(&[5, 0xff]).context("write response failed")?;
@@ -85,7 +85,7 @@ fn read_request(stream: &mut (impl ReadExt + Write)) -> Result<(Addr, u16)> {
         0x04 => Addr::V6(read_exact!(stream, [0; 16]).context("read v6 address failed")?),
         0x03 => {
             let len = read_exact!(stream, [0]).context("read domain length failed")?[0];
-            Addr::Domain(stream.read_exact_alloc(len as usize).context("read domain failed")?.into_boxed_slice())
+            Addr::Domain(stream.read_exact_alloc(len as usize).context("read domain failed")?)
         },
         _ => return Err(anyhow!("unknown ATYP"))
     };
@@ -123,4 +123,3 @@ fn reply_request(stream: &mut (impl ReadExt + Write), addr: Addr, port: u16) ->
 
     Ok(())
 }
-

src/vmess.rs

@@ -1,5 +1,5 @@
 use super::*;
-use oh_my_rust::*;
+use absurd::*;
 use crypto::digest::Digest;
 use crypto::symmetriccipher::BlockEncryptor;
 use crypto::mac::Mac;