Merge branch 'master' into threading

Create armel build targets for cross compilation

.cargo/config

@@ -18,6 +18,16 @@ linker = "arm-linux-gnueabihf-gcc"
 objcopy = { path = "arm-linux-gnueabihf-objcopy" }
 strip = { path = "arm-linux-gnueabihf-strip" }
 
+[target.armv5te-unknown-linux-gnueabi]
+linker = "arm-linux-gnueabi-gcc"
+objcopy = { path = "arm-linux-gnueabi-objcopy" }
+strip = { path = "arm-linux-gnueabi-strip" }
+
+[target.armv5te-unknown-linux-musleabi]
+linker = "arm-linux-gnueabi-gcc"
+objcopy = { path = "arm-linux-gnueabi-objcopy" }
+strip = { path = "arm-linux-gnueabi-strip" }
+
 [target.aarch64-unknown-linux-gnu]
 linker = "aarch64-linux-gnu-gcc"
 objcopy = { path = "aarch64-linux-gnu-objcopy" }

.devcontainer/Dockerfile

@@ -11,8 +11,8 @@ RUN chown vscode: -R /usr/local/rustup /usr/local/cargo
 
 USER vscode
 
-RUN rustup default 1.51.0 \
+RUN rustup default 1.57.0 \
  && rustup component add clippy rust-src rustfmt
 
-RUN cargo install cargo-outdated cargo-cache \
+RUN cargo install cargo-outdated cargo-cache cargo-criterion \
  && cargo cache -a

.devcontainer/devcontainer.json

@@ -25,7 +25,8 @@
 		"editorconfig.editorconfig",
 		"swellaby.vscode-rust-test-adapter",
 		"matklad.rust-analyzer",
-		"asciidoctor.asciidoctor-vscode"
+		"asciidoctor.asciidoctor-vscode",
+		"ms-vscode.test-adapter-converter"
 	],
 	// Use 'forwardPorts' to make a list of ports inside the container available locally.
 	// "forwardPorts": [],

.github/actions/build-deb/Dockerfile

@@ -6,8 +6,10 @@ RUN apt-get update \
     curl \
     gcc-aarch64-linux-gnu \
     gcc-arm-linux-gnueabihf \
+    gcc-arm-linux-gnueabi \
     libc6-dev-arm64-cross \
     libc6-dev-armhf-cross \
+    libc6-dev-armel-cross \
     libc6-dev-i386 \
     gcc-5-multilib \
     asciidoctor \

.github/actions/build-deb/entrypoint.sh

@@ -13,6 +13,7 @@ curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain ${TOOLCHAIN}
 source $HOME/.cargo/env
 
 rustup target add i686-unknown-linux-gnu
+rustup target add armv5te-unknown-linux-gnueabi
 rustup target add armv7-unknown-linux-gnueabihf
 rustup target add aarch64-unknown-linux-gnu
 
@@ -32,4 +33,5 @@ cp target/debian/vpncloud_${DEB_VERSION}_amd64.deb dist/vpncloud_${DEB_VERSION}_
 
 build_deb i386 i686-unknown-linux-gnu
 build_deb armhf armv7-unknown-linux-gnueabihf
+build_deb armel armv5te-unknown-linux-gnueabi
 build_deb arm64 aarch64-unknown-linux-gnu

.github/actions/build-static/Dockerfile

@@ -6,8 +6,10 @@ RUN apt-get update \
     curl \
     gcc-aarch64-linux-gnu \
     gcc-arm-linux-gnueabihf \
+    gcc-arm-linux-gnueabi \
     libc6-dev-arm64-cross \
     libc6-dev-armhf-cross \
+    libc6-dev-armel-cross \
     libc6-dev-i386 \
     gcc-5-multilib \
     asciidoctor \

.github/actions/build-static/entrypoint.sh

@@ -17,6 +17,7 @@ source $HOME/.cargo/env
 
 rustup target add x86_64-unknown-linux-musl
 rustup target add i686-unknown-linux-musl
+rustup target add armv5te-unknown-linux-musleabi
 rustup target add armv7-unknown-linux-musleabihf
 rustup target add aarch64-unknown-linux-musl
 
@@ -34,4 +35,5 @@ build_static() {
 build_static amd64 x86_64-unknown-linux-musl
 #build_static i386 i686-unknown-linux-musl
 build_static armhf armv7-unknown-linux-musleabihf
+build_static armel armv5te-unknown-linux-musleabi
 build_static arm64 aarch64-unknown-linux-musl

CHANGELOG.md

@@ -4,8 +4,12 @@ This project follows [semantic versioning](http://semver.org).
 
 ### UNRELEASED
 
+- [added] Added build for armv5te (thanks to xek)
 - [added] Option to specify advertised addresses
 - [added] Peers now learn their own address from peers
+- [changed] Changed Rust version to 1.57.0
+- [changed] Updated dependencies
+- [fixed] Fixed problem with IPv4 addresses in listen option
 
 ### v2.2.0 (2021-04-06)
 

Cargo.toml

@@ -12,7 +12,7 @@ readme = "README.md"
 edition = "2018"
 
 [package.metadata]
-toolchain = "1.51.0"
+toolchain = "1.57.0"
 upx_version = "3.96"
 
 [dependencies]
@@ -30,10 +30,10 @@ ring = "0.16"
 privdrop = "0.5"
 byteorder = "1.4"
 thiserror = "1.0"
-parking_lot = "*"
+parking_lot = "^0.11.2"
-smallvec = "1.6"
+smallvec = "1.7"
-dialoguer = { version = "0.8", optional = true }
+dialoguer = { version = "0.9", optional = true }
-tungstenite = { version = "0.13", optional = true, default-features = false }
+tungstenite = { version = "0.16", optional = true, default-features = false }
 url = { version = "2.2", optional = true }
 igd = { version = "0.12", optional = true }
 timeout_io = "0.6"

benches/criterion.rs

@@ -3,8 +3,6 @@
 extern crate serde;
 #[macro_use]
 extern crate log;
-#[macro_use]
-extern crate tokio;
 
 use criterion::{criterion_group, criterion_main, Criterion, Throughput};
 

benches/valgrind.rs

@@ -3,8 +3,6 @@
 extern crate serde;
 #[macro_use]
 extern crate log;
-#[macro_use]
-extern crate tokio;
 
 use iai::{black_box, main};
 

builder/Dockerfile-deb

@@ -9,8 +9,10 @@ RUN apt-get update \
     curl \
     gcc-aarch64-linux-gnu \
     gcc-arm-linux-gnueabihf \
+    gcc-arm-linux-gnueabi \
     libc6-dev-arm64-cross \
     libc6-dev-armhf-cross \
+    libc6-dev-armel-cross \
     libc6-dev-i386 \
     gcc-5-multilib \
     asciidoctor \
@@ -22,6 +24,7 @@ ENV RUSTUP_HOME=/opt/rust/rustup \
 RUN curl https://sh.rustup.rs -sSf | env CARGO_HOME=/opt/rust/cargo sh -s -- -y --default-toolchain ${TOOLCHAIN} --profile minimal --no-modify-path
 
 RUN env CARGO_HOME=/opt/rust/cargo rustup target add i686-unknown-linux-gnu \
+ && env CARGO_HOME=/opt/rust/cargo rustup target add armv5te-unknown-linux-gnueabi \
  && env CARGO_HOME=/opt/rust/cargo rustup target add armv7-unknown-linux-gnueabihf \
  && env CARGO_HOME=/opt/rust/cargo rustup target add aarch64-unknown-linux-gnu
 

builder/Dockerfile-musl

@@ -9,8 +9,10 @@ RUN apt-get update \
     curl \
     gcc-aarch64-linux-gnu \
     gcc-arm-linux-gnueabihf \
+    gcc-arm-linux-gnueabi \
     libc6-dev-arm64-cross \
     libc6-dev-armhf-cross \
+    libc6-dev-armel-cross \
     libc6-dev-i386 \
     gcc-5-multilib \
     asciidoctor \
@@ -24,6 +26,7 @@ RUN curl https://sh.rustup.rs -sSf | env CARGO_HOME=/opt/rust/cargo sh -s -- -y
 
 RUN env CARGO_HOME=/opt/rust/cargo rustup target add x86_64-unknown-linux-musl \
  && env CARGO_HOME=/opt/rust/cargo rustup target add i686-unknown-linux-musl \
+ && env CARGO_HOME=/opt/rust/cargo rustup target add armv5te-unknown-linux-musleabi \
  && env CARGO_HOME=/opt/rust/cargo rustup target add armv7-unknown-linux-musleabihf \
  && env CARGO_HOME=/opt/rust/cargo rustup target add aarch64-unknown-linux-musl
 

builder/build.sh

@@ -53,6 +53,7 @@ build_deb() {
 
 build_deb i386 i686-unknown-linux-gnu
 build_deb armhf armv7-unknown-linux-gnueabihf
+build_deb armel armv5te-unknown-linux-gnueabi
 build_deb arm64 aarch64-unknown-linux-gnu
 
 
@@ -69,6 +70,7 @@ build_static() {
 
 build_static amd64 x86_64-unknown-linux-musl
 #build_static i386 i686-unknown-linux-musl
+build_static armel armv5te-unknown-linux-musleabi
 build_static armhf armv7-unknown-linux-musleabihf
 build_static arm64 aarch64-unknown-linux-musl
 

src/config.rs

@@ -387,7 +387,7 @@ impl Config {
         if let Some(ref s) = self.hook {
             script = Some(s);
         }
-        if let Some(ref s) = self.hooks.get(event) {
+        if let Some(s) = self.hooks.get(event) {
             script = Some(s);
         }
         if script.is_none() {

src/crypto/common.rs

@@ -247,7 +247,7 @@ impl PeerCrypto {
         match self {
             PeerCrypto::Encrypted { trusted_keys, last_init_message, .. }
             | PeerCrypto::Unencrypted { trusted_keys, last_init_message, .. } => {
-                let (msg, _) = InitMsg::read_from(buffer.buffer(), &trusted_keys)?;
+                let (msg, _) = InitMsg::read_from(buffer.buffer(), trusted_keys)?;
                 buffer.clear();
                 if msg.stage() == STAGE_PONG {
                     buffer.set_length(last_init_message.len());

src/crypto/core.rs

@@ -112,7 +112,7 @@ struct CryptoKey {
 
 impl CryptoKey {
     fn new(rand: &SystemRandom, key: LessSafeKey, nonce_half: bool) -> Self {
-        let mut send_nonce = Nonce::random(&rand);
+        let mut send_nonce = Nonce::random(rand);
         send_nonce.set_msb(if nonce_half { 0x80 } else { 0x00 });
         CryptoKey {
             key,

src/crypto/init.rs

@@ -246,7 +246,7 @@ impl InitMsg {
 
         let signed_data = &r.into_inner()[1..pos];
         let public_key = signature::UnparsedPublicKey::new(&ED25519, &public_key_data);
-        if public_key.verify(&signed_data, &signature).is_err() {
+        if public_key.verify(signed_data, &signature).is_err() {
             return Err(Error::Crypto("invalid signature"));
         }
 
@@ -331,7 +331,7 @@ impl InitMsg {
                 w.write_u8(Self::PART_ECDH_PUBLIC_KEY)?;
                 let key_bytes = ecdh_public_key.bytes();
                 w.write_u16::<NetworkEndian>(key_bytes.len() as u16)?;
-                w.write_all(&key_bytes)?;
+                w.write_all(key_bytes)?;
             }
             _ => (),
         }
@@ -536,8 +536,8 @@ impl<P: Payload> InitState<P> {
             },
             _ => unreachable!(),
         };
-        let mut bytes = out.buffer();
+        let bytes = out.buffer();
-        let len = msg.write_to(&mut bytes, &self.key_pair).expect("Buffer too small");
+        let len = msg.write_to(bytes, &self.key_pair).expect("Buffer too small");
         self.last_message = Some(bytes[0..len].to_vec());
         out.set_length(len);
     }
@@ -699,7 +699,7 @@ mod tests {
 
     impl Payload for Vec<u8> {
         fn write_to(&self, buffer: &mut MsgBuffer) {
-            buffer.buffer().write_all(&self).expect("Buffer too small");
+            buffer.buffer().write_all(self).expect("Buffer too small");
             buffer.set_length(self.len())
         }
 

src/crypto/rotate.rs

@@ -176,7 +176,7 @@ impl RotationState {
         if let Some(ref private_key) = self.proposed {
             // Still a proposed key that has not been confirmed, proposal must have been lost
             if self.timeout {
-                let proposed_key = Self::compute_public_key(&private_key);
+                let proposed_key = Self::compute_public_key(private_key);
                 if let Some((ref confirmed_key, message_id)) = self.confirmed {
                     // Reconfirm last confirmed key
                     Self::send(
@@ -271,7 +271,7 @@ mod tests {
         assert!(key2.is_some());
         let key2 = key2.unwrap();
         assert_eq!(key2.id, 2);
-        assert_eq!(key2.use_for_sending, false);
+        assert!(!key2.use_for_sending);
         assert!(!out2.is_empty());
         let msg2 = out2.msg().unwrap();
         assert_eq!(msg2.message_id, 2);
@@ -281,14 +281,14 @@ mod tests {
         assert!(key.is_some());
         let key = key.unwrap();
         assert_eq!(key.id, 2);
-        assert_eq!(key.use_for_sending, true);
+        assert!(key.use_for_sending);
         // Cycle 2
         let key1 = node1.cycle(&mut out1);
         let key2 = node2.cycle(&mut out2);
         assert!(key1.is_some());
         let key1 = key1.unwrap();
         assert_eq!(key1.id, 3);
-        assert_eq!(key1.use_for_sending, false);
+        assert!(!key1.use_for_sending);
         assert!(!out1.is_empty());
         let msg1 = out1.msg().unwrap();
         assert_eq!(msg1.message_id, 3);
@@ -300,7 +300,7 @@ mod tests {
         assert!(key.is_some());
         let key = key.unwrap();
         assert_eq!(key.id, 3);
-        assert_eq!(key.use_for_sending, true);
+        assert!(key.use_for_sending);
         // Cycle 3
         let key1 = node1.cycle(&mut out1);
         let key2 = node2.cycle(&mut out2);
@@ -309,7 +309,7 @@ mod tests {
         assert!(key2.is_some());
         let key2 = key2.unwrap();
         assert_eq!(key2.id, 4);
-        assert_eq!(key2.use_for_sending, false);
+        assert!(!key2.use_for_sending);
         assert!(!out2.is_empty());
         let msg2 = out2.msg().unwrap();
         assert_eq!(msg2.message_id, 4);
@@ -319,7 +319,7 @@ mod tests {
         assert!(key.is_some());
         let key = key.unwrap();
         assert_eq!(key.id, 4);
-        assert_eq!(key.use_for_sending, true);
+        assert!(key.use_for_sending);
     }
 
     #[test]

src/device.rs

@@ -270,7 +270,7 @@ impl Device for TunTapDevice {
     fn read(&mut self, buffer: &mut MsgBuffer) -> Result<(), Error> {
         buffer.clear();
         let mut read = 0;
-        self.fd.try_read(buffer.buffer(), &mut read, Duration::from_secs(1)).map_err(|e| Error::DeviceRead(e))?;
+        self.fd.try_read(buffer.buffer(), &mut read, Duration::from_secs(1)).map_err(Error::DeviceRead)?;
         buffer.set_length(read);
         self.correct_data_after_read(buffer);
         Ok(())

src/engine/common.rs

@@ -50,7 +50,7 @@ impl<D: Device, P: Protocol, S: Socket, TS: TimeSource> GenericCloud<D, P, S, TS
     pub fn new(
         config: &Config, socket: S, device: D, port_forwarding: Option<PortForwarding>, stats_file: Option<File>,
     ) -> Result<Self, Error> {
-        let table = SharedTable::<TS>::new(&config);
+        let table = SharedTable::<TS>::new(config);
         let traffic = SharedTraffic::new();
         let peer_crypto = SharedPeerCrypto::new();
         let running = Arc::new(AtomicBool::new(true));

src/engine/socket_thread.rs

@@ -430,7 +430,7 @@ impl<S: Socket, D: Device, P: Protocol, TS: TimeSource> SocketThread<S, D, P, TS
     pub fn housekeep(&mut self) -> Result<(), Error> {
         let now = TS::now();
         let mut del: SmallVec<[SocketAddr; 3]> = SmallVec::new();
-        for (&addr, ref data) in &self.peers {
+        for (&addr, data) in &self.peers {
             if data.timeout < now {
                 del.push(addr);
             }
@@ -675,7 +675,7 @@ impl<S: Socket, D: Device, P: Protocol, TS: TimeSource> SocketThread<S, D, P, TS
         for entry in &mut self.reconnect_peers {
             // Schedule for next second if node is connected
             for addr in &entry.resolved {
-                if self.peers.contains_key(&addr) {
+                if self.peers.contains_key(addr) {
                     entry.tries = 0;
                     entry.timeout = 1;
                     entry.next = now + 1;

src/net.rs

@@ -96,13 +96,15 @@ thread_local! {
     static MOCK_SOCKET_NAT: AtomicBool = AtomicBool::new(false);
 }
 
+type MsgQueue = Arc<Mutex<VecDeque<(SocketAddr, Vec<u8>)>>>;
+
 #[derive(Clone)]
 pub struct MockSocket {
     nat: bool,
     nat_peers: Arc<Mutex<HashMap<SocketAddr, Time>>>,
     address: SocketAddr,
-    outbound: Arc<Mutex<VecDeque<(SocketAddr, Vec<u8>)>>>,
+    outbound: MsgQueue,
-    inbound: Arc<Mutex<VecDeque<(SocketAddr, Vec<u8>)>>>,
+    inbound: MsgQueue,
 }
 
 impl MockSocket {

src/wizard.rs

@@ -501,8 +501,8 @@ pub fn configure(name: Option<String>) -> Result<(), io::Error> {
         println!("  start the VPN:   sudo service vpncloud@{0} start", name);
         println!("  stop the VPN:    sudo service vpncloud@{0} stop", name);
         println!("  get the status:  sudo service vpncloud@{0} status", name);
-        println!("  add VPN to autostart:       sudo sysctl enable vpncloud@{0}", name);
+        println!("  add VPN to autostart:       sudo systemctl enable vpncloud@{0}", name);
-        println!("  remove VPN from autostart:  sudo sysctl disable vpncloud@{0}", name);
+        println!("  remove VPN from autostart:  sudo systemctl disable vpncloud@{0}", name);
     }
 
     Ok(())

src/wsproxy.rs

@@ -9,8 +9,13 @@ use super::{
     util::MsgBuffer,
 };
 use byteorder::{NetworkEndian, ReadBytesExt, WriteBytesExt};
-use std::{io::{self, Cursor, Read, Write}, net::{Ipv6Addr, SocketAddr, SocketAddrV6, TcpListener, TcpStream, UdpSocket}, os::unix::io::AsRawFd, sync::Arc, thread};
+use std::{
-use tungstenite::{client::AutoStream, connect, protocol::WebSocket, server::accept, Message};
+    io::{self, Cursor, Read, Write},
+    net::{Ipv6Addr, SocketAddr, SocketAddrV6, TcpListener, TcpStream, UdpSocket},
+    os::unix::io::{AsRawFd, RawFd},
+    thread, sync::Arc,
+};
+use tungstenite::{connect, protocol::WebSocket, Message, accept, stream::{MaybeTlsStream, NoDelay}};
 use url::Url;
 
 macro_rules! io_error {
@@ -105,7 +110,7 @@ pub fn run_proxy(listen: &str) -> Result<(), io::Error> {
 #[derive(Clone)]
 pub struct ProxyConnection {
     addr: SocketAddr,
-    socket: Arc<WebSocket<AutoStream>>,
+    socket: Arc<WebSocket<MaybeTlsStream<TcpStream>>>,
 }
 
 impl ProxyConnection {
@@ -132,6 +137,15 @@ impl ProxyConnection {
     }
 }
 
+impl AsRawFd for ProxyConnection {
+    fn as_raw_fd(&self) -> RawFd {
+        match self.socket.get_ref() {
+            MaybeTlsStream::Plain(stream) => stream.as_raw_fd(),
+            _ => unimplemented!()
+        }
+    }
+}
+
 impl Socket for ProxyConnection {
     fn create_port_forwarding(&self) -> Option<PortForwarding> {
         None