43 changed files with 800 additions and 1142 deletions
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@ -3,11 +3,8 @@
 	"build": {
 		"dockerfile": "Dockerfile"
 	},
-	"runArgs": [
-		"--cap-add=SYS_PTRACE",
-		"--security-opt",
-		"seccomp=unconfined"
-	],
+	"runArgs": [ "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined" ],
+
 	// Set *default* container specific settings.json values on container create.
 	"settings": { 
 		"terminal.integrated.shell.linux": "/bin/bash",
@ -17,20 +14,22 @@
 			"**/target/**": true
 		}
 	},
+
 	// Add the IDs of extensions you want installed when the container is created.
 	"extensions": [
+		"rust-lang.rust",
 		"bungcip.better-toml",
 		"vadimcn.vscode-lldb",
-		"serayuzgur.crates",
-		"editorconfig.editorconfig",
-		"swellaby.vscode-rust-test-adapter",
-		"matklad.rust-analyzer",
+		"mutantdino.resourcemonitor",
 		"asciidoctor.asciidoctor-vscode"
 	],
+
 	// Use 'forwardPorts' to make a list of ports inside the container available locally.
 	// "forwardPorts": [],
+
 	// Use 'postCreateCommand' to run commands after the container is created.
 	// "postCreateCommand": "rustc --version",
+
 	// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
 	"remoteUser": "vscode"
 }
--- a/.github/actions/build-deb/Dockerfile
+++ b/.github/actions/build-deb/Dockerfile
@ -11,7 +11,9 @@ RUN apt-get update \
    libc6-dev-i386 \
    gcc-5-multilib \
    asciidoctor \
- && apt-get clean && rm -rf /var/lib/apt/lists/*
+ && rm -rf /var/cache/dpkg
+
+RUN ln -s asm-generic/ /usr/include/asm

 ADD entrypoint.sh /entrypoint.sh

--- a/.github/actions/build-deb/action.yml
+++ b/.github/actions/build-deb/action.yml
@ -1,5 +1,11 @@
 name: 'build-deb'
 description: 'Create deb packages'
+inputs:
+  rust:
+    description: Rust version
+    default: 'stable'
 runs:
  using: 'docker'
  image: 'Dockerfile'
+  env:
+    RUST: ${{ inputs.rust }}
--- a/.github/actions/build-deb/entrypoint.sh
+++ b/.github/actions/build-deb/entrypoint.sh
@ -2,14 +2,7 @@

 set -e

-TOOLCHAIN=$(grep -e '^toolchain =' Cargo.toml | sed -e 's/toolchain = "\(.*\)"/\1/')
-
-VERSION=$(grep -e '^version =' Cargo.toml | sed -e 's/version = "\(.*\)"/\1/')
-DEB_VERSION=$(echo "$VERSION" | sed -e 's/-/~/g')
-
-ln -s asm-generic/ /usr/include/asm
-
-curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain ${TOOLCHAIN}
+curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain ${RUST}
 source $HOME/.cargo/env

 rustup target add i686-unknown-linux-gnu
@ -18,18 +11,22 @@ rustup target add aarch64-unknown-linux-gnu

 cargo install cargo-deb

-mkdir dist
+VERSION=$(grep -e '^version =' Cargo.toml | sed -e 's/version = "\(.*\)"/\1/')
+DEB_VERSION=$(echo "$VERSION" | sed -e 's/-/~/g')

-build_deb() {
-  ARCH=$1
-  TARGET=$2
-  cargo deb --target ${TARGET}
-  cp target/${TARGET}/debian/vpncloud_${DEB_VERSION}_${ARCH}.deb dist/vpncloud_${DEB_VERSION}_${ARCH}.deb
-}
+mkdir dist

 cargo deb
 cp target/debian/vpncloud_${DEB_VERSION}_amd64.deb dist/vpncloud_${DEB_VERSION}_amd64.deb

-build_deb i386 i686-unknown-linux-gnu
-build_deb armhf armv7-unknown-linux-gnueabihf
-build_deb arm64 aarch64-unknown-linux-gnu
+# i386 deb
+cargo deb --target i686-unknown-linux-gnu
+cp target/i686-unknown-linux-gnu/debian/vpncloud_${DEB_VERSION}_i386.deb dist/vpncloud_${DEB_VERSION}_i386.deb
+
+# arm7hf deb
+cargo deb --target armv7-unknown-linux-gnueabihf
+cp target/armv7-unknown-linux-gnueabihf/debian/vpncloud_${DEB_VERSION}_armhf.deb dist/vpncloud_${DEB_VERSION}_armhf.deb
+
+# aarch64 deb
+cargo deb --target aarch64-unknown-linux-gnu
+cp target/aarch64-unknown-linux-gnu/debian/vpncloud_${DEB_VERSION}_arm64.deb dist/vpncloud_${DEB_VERSION}_arm64.deb
--- a/.github/actions/build-rpm/Dockerfile
+++ b/.github/actions/build-rpm/Dockerfile
@ -2,9 +2,6 @@ FROM centos:7

 RUN yum groupinstall -y 'Development Tools'
 RUN yum install -y ruby && gem install asciidoctor -v 2.0.10
-RUN yum install -y libstdc++-*.i686 \
- && yum install -y glibc-*.i686 \
- && yum install -y libgcc.i686

 ADD entrypoint.sh /entrypoint.sh

--- a/.github/actions/build-rpm/action.yml
+++ b/.github/actions/build-rpm/action.yml
@ -1,5 +1,11 @@
 name: 'build-deb'
 description: 'Create deb packages'
+inputs:
+  rust:
+    description: Rust version
+    default: 'stable'
 runs:
  using: 'docker'
  image: 'Dockerfile'
+  env:
+    RUST: ${{ inputs.rust }}
--- a/.github/actions/build-rpm/entrypoint.sh
+++ b/.github/actions/build-rpm/entrypoint.sh
@ -2,7 +2,13 @@

 set -e

-TOOLCHAIN=$(grep -e '^toolchain =' Cargo.toml | sed -e 's/toolchain = "\(.*\)"/\1/')
+curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain ${RUST}
+source $HOME/.cargo/env
+
+rustup target add i686-unknown-linux-gnu
+rustup target add armv7-unknown-linux-gnueabihf
+
+cargo install cargo-rpm

 VERSION=$(grep -e '^version =' Cargo.toml | sed -e 's/version = "\(.*\)"/\1/')
 if echo "$VERSION" | fgrep -q "-"; then
@ -11,31 +17,8 @@ else
  RPM_VERSION="$VERSION-1"
 fi

-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 armv7-unknown-linux-gnueabihf
-
-cargo install cargo-rpm
-
 mkdir dist

 cargo build --release
 cargo rpm build
 cp target/release/rpmbuild/RPMS/x86_64/vpncloud-${RPM_VERSION}.x86_64.rpm dist/vpncloud_${RPM_VERSION}.x86_64.rpm
-
-
-build_rpm() {
-  ARCH=$1
-  TARGET=$2
-  if ! [ -f dist/vpncloud_${RPM_VERSION}.${ARCH}.rpm ]; then
-    mkdir -p target
-    [ -L target/assets ] || ln -s ../assets target/assets
-    [ -L target/target ] || ln -s ../target target/target
-    cargo rpm build --target ${TARGET}
-    cp target/${TARGET}/release/rpmbuild/RPMS/${ARCH}/vpncloud-${RPM_VERSION}.${ARCH}.rpm dist/vpncloud_${RPM_VERSION}.${ARCH}.rpm
-  fi
-}
-
-build_rpm i686 i686-unknown-linux-gnu
--- a/.github/actions/build-static/Dockerfile
+++ b/.github/actions/build-static/Dockerfile
@ -1,19 +0,0 @@
-FROM ubuntu:16.04
-
-RUN apt-get update \
- && apt-get install -y --no-install-recommends \
-    build-essential \
-    curl \
-    gcc-aarch64-linux-gnu \
-    gcc-arm-linux-gnueabihf \
-    libc6-dev-arm64-cross \
-    libc6-dev-armhf-cross \
-    libc6-dev-i386 \
-    gcc-5-multilib \
-    asciidoctor \
-    musl musl-dev musl-tools \
- && apt-get clean && rm -rf /var/lib/apt/lists/*
-
-ADD entrypoint.sh /entrypoint.sh
-
-ENTRYPOINT /entrypoint.sh
--- a/.github/actions/build-static/action.yml
+++ b/.github/actions/build-static/action.yml
@ -1,5 +0,0 @@
-name: 'build-static'
-description: 'Create static binaries'
-runs:
-  using: 'docker'
-  image: 'Dockerfile'
--- a/.github/actions/build-static/entrypoint.sh
+++ b/.github/actions/build-static/entrypoint.sh
@ -1,37 +0,0 @@
-#!/bin/bash
-
-set -e
-
-TOOLCHAIN=$(grep -e '^toolchain =' Cargo.toml | sed -e 's/toolchain = "\(.*\)"/\1/')
-UPX_VERSION=$(grep -e '^upx_version =' Cargo.toml | sed -e 's/upx_version = "\(.*\)"/\1/')
-
-VERSION=$(grep -e '^version =' Cargo.toml | sed -e 's/version = "\(.*\)"/\1/')
-DEB_VERSION=$(echo "$VERSION" | sed -e 's/-/~/g')
-
-ln -s asm-generic/ /usr/include/asm
-ln -s /usr/bin/aarch64-linux-gnu-gcc /usr/bin/aarch64-linux-musl-gcc
-ln -s /usr/bin/arm-linux-gnueabihf-gcc /usr/bin/arm-linux-musleabihf-gcc
-
-curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain ${TOOLCHAIN}
-source $HOME/.cargo/env
-
-rustup target add x86_64-unknown-linux-musl
-rustup target add i686-unknown-linux-musl
-rustup target add armv7-unknown-linux-musleabihf
-rustup target add aarch64-unknown-linux-musl
-
-curl https://github.com/upx/upx/releases/download/v${UPX_VERSION}/upx-${UPX_VERSION}-amd64_linux.tar.xz -Lf | tar -xJ --strip-components=1 -C /opt/rust/cargo/bin
-
-mkdir dist
-
-build_static() {
-  ARCH=$1
-  TARGET=$2
-  cargo build --release --features installer --target ${TARGET} && upx --lzma target/${TARGET}/release/vpncloud
-  cp target/${TARGET}/release/vpncloud ../dist/vpncloud_${VERSION}_static_${ARCH}
-}
-
-build_static amd64 x86_64-unknown-linux-musl
-#build_static i386 i686-unknown-linux-musl
-build_static armhf armv7-unknown-linux-musleabihf
-build_static arm64 aarch64-unknown-linux-musl
--- a/.github/workflows/package.yml
+++ b/.github/workflows/package.yml
@ -10,6 +10,8 @@ jobs:
      - uses: actions/checkout@v2
      - name: Run builder
        uses: ./.github/actions/build-deb
+        with:
+          rust: '1.50.0'
      - name: Archive artifacts
        uses: actions/upload-artifact@v1
        with:
@ -28,6 +30,8 @@ jobs:
      - uses: actions/checkout@v2
      - name: Run builder
        uses: ./.github/actions/build-rpm
+        with:
+          rust: '1.50.0'
      - name: Archive artifacts
        uses: actions/upload-artifact@v1
        with:
@ -39,21 +43,3 @@ jobs:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        with:
          args: 'dist/*.rpm'
-  static:
-    name: "Build static binaries"
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Run builder
-        uses: ./.github/actions/build-static
-      - name: Archive artifacts
-        uses: actions/upload-artifact@v1
-        with:
-          name: packages
-          path: dist
-      - name: Upload artifacts
-        uses: skx/github-action-publish-binaries@master
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          args: 'dist/*'
--- a/.rpm/vpncloud.spec
+++ b/.rpm/vpncloud.spec
@ -23,7 +23,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 rm -rf %{buildroot}
 mkdir -p %{buildroot}
 mkdir -p %{buildroot}/etc/vpncloud
-chmod 700 %{buildroot}/etc/vpncloud
 mkdir -p %{buildroot}/lib/systemd/system
 mkdir -p %{buildroot}/usr/share/man/man1
 cp %{buildroot}/../../../../../assets/example.net.disabled %{buildroot}/etc/vpncloud/example.net.disabled
--- a/.whitesource
+++ b/.whitesource
@ -1,12 +0,0 @@
-{
-  "scanSettings": {
-    "baseBranches": []
-  },
-  "checkRunSettings": {
-    "vulnerableCheckRunConclusionLevel": "failure",
-    "displayMode": "diff"
-  },
-  "issueSettings": {
-    "minSeverityLevel": "LOW"
-  }
-}
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -7,11 +7,9 @@ This project follows [semantic versioning](http://semver.org).
 - [added] Added interactive configuration wizard
 - [added] Support for (un-)installation
 - [added] Building static binaries
- [added] Building i686 rpm
 - [changed] Restructured example config
 - [changed] Changed Rust version to 1.50.0
 - [changed] Updated dependencies
- [changed] Change permissions of /etc/vpncloud

 ### v2.1.0 (2021-02-06)

--- a/Cargo.lock
+++ b/Cargo.lock
@ -9,22 +9,11 @@ dependencies = [
 "winapi",
 ]

-[[package]]
-name = "async-trait"
-version = "0.1.42"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d3a45e77e34375a7923b1e8febb049bb011f064714a8e17a1a616fef01da13d"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "attohttpc"
-version = "0.16.3"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdb8867f378f33f78a811a8eb9bf108ad99430d7aad43315dd9319c827ef6247"
+checksum = "ba5b30bf3a0aead269fd5dd69b385a3e90c2b55f4f215d1bdf52c3883f5fa7fa"
 dependencies = [
 "http",
 "log",
@ -96,9 +85,9 @@ dependencies = [

 [[package]]
 name = "bumpalo"
-version = "3.6.1"
+version = "3.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63396b8a4b9de3f4fdfb320ab6080762242f66a8ef174c49d8e19b674db4cdbe"
+checksum = "099e596ef14349721d9016f6b80dd3419ea1bf289ab9b44df8e4dfd3a005d5d9"

 [[package]]
 name = "byteorder"
@ -123,9 +112,9 @@ dependencies = [

 [[package]]
 name = "cc"
-version = "1.0.67"
+version = "1.0.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3c69b077ad434294d3ce9f1f6143a2a4b89a8a2d54ef813d85003a4fd1137fd"
+checksum = "4c0496836a84f8d0495758516b8621a622beb77c0fed418570e50764093ced48"

 [[package]]
 name = "cfg-if"
@ -241,28 +230,27 @@ dependencies = [

 [[package]]
 name = "crossbeam-epoch"
-version = "0.9.2"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d60ab4a8dba064f2fbb5aa270c28da5cf4bbd0e72dae1140a6b0353a779dbe00"
+checksum = "a1aaa739f95311c2c7887a76863f500026092fb1dce0161dab577e559ef3569d"
 dependencies = [
 "cfg-if 1.0.0",
+ "const_fn",
 "crossbeam-utils",
 "lazy_static",
- "loom",
 "memoffset",
 "scopeguard",
 ]

 [[package]]
 name = "crossbeam-utils"
-version = "0.8.2"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bae8f328835f8f5a6ceb6a7842a7f2d0c03692adb5c889347235d59194731fe3"
+checksum = "02d96d1e189ef58269ebe5b97953da3274d83a93af647c2ddd6f9dab28cedb8d"
 dependencies = [
 "autocfg",
 "cfg-if 1.0.0",
 "lazy_static",
- "loom",
 ]

 [[package]]
@ -350,27 +338,14 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"

 [[package]]
 name = "form_urlencoded"
-version = "1.0.1"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191"
+checksum = "ece68d15c92e84fa4f19d3780f1294e5ca82a78a6d515f1efaabcc144688be00"
 dependencies = [
 "matches",
 "percent-encoding",
 ]

-[[package]]
-name = "generator"
-version = "0.6.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9fed24fd1e18827652b4d55652899a1e9da8e54d91624dc3437a5bc3a9f9a9c"
-dependencies = [
- "cc",
- "libc",
- "log",
- "rustversion",
- "winapi",
-]
-
 [[package]]
 name = "generic-array"
 version = "0.14.4"
@ -441,9 +416,9 @@ checksum = "71a816c97c42258aa5834d07590b718b4c9a598944cd39a52dc25b351185d678"

 [[package]]
 name = "idna"
-version = "0.2.2"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89829a5d69c23d348314a7ac337fe39173b61149a9864deabd260983aed48c21"
+checksum = "de910d521f7cc3135c4de8db1cb910e0b5ed1dc6f57c381cd07e8e661ce10094"
 dependencies = [
 "matches",
 "unicode-bidi",
@ -550,17 +525,6 @@ dependencies = [
 "cfg-if 1.0.0",
 ]

-[[package]]
-name = "loom"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d44c73b4636e497b4917eb21c33539efa3816741a2d3ff26c6316f1b529481a4"
-dependencies = [
- "cfg-if 1.0.0",
- "generator",
- "scoped-tls",
-]
-
 [[package]]
 name = "matches"
 version = "0.1.8"
@ -582,29 +546,6 @@ dependencies = [
 "autocfg",
 ]

-[[package]]
-name = "mio"
-version = "0.7.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5dede4e2065b3842b8b0af444119f3aa331cc7cc2dd20388bfb0f5d5a38823a"
-dependencies = [
- "libc",
- "log",
- "miow",
- "ntapi",
- "winapi",
-]
-
-[[package]]
-name = "miow"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a33c1b55807fbed163481b5ba66db4b2fa6cde694a5027be10fb724206c5897"
-dependencies = [
- "socket2",
- "winapi",
-]
-
 [[package]]
 name = "nix"
 version = "0.14.1"
@ -630,15 +571,6 @@ dependencies = [
 "libc",
 ]

-[[package]]
-name = "ntapi"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44"
-dependencies = [
- "winapi",
-]
-
 [[package]]
 name = "num-traits"
 version = "0.2.14"
@ -660,9 +592,9 @@ dependencies = [

 [[package]]
 name = "once_cell"
-version = "1.6.0"
+version = "1.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ad167a2f54e832b82dbe003a046280dceffe5227b5f79e08e363a29638cfddd"
+checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0"

 [[package]]
 name = "oorandom"
@ -707,12 +639,6 @@ version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"

-[[package]]
-name = "pin-project-lite"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "439697af366c49a6d0a010c56a0d97685bc140ce0d377b13a2ea2aa42d64a827"
-
 [[package]]
 name = "plotters"
 version = "0.3.0"
@ -936,12 +862,6 @@ dependencies = [
 "semver",
 ]

-[[package]]
-name = "rustversion"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb5d2a036dc6d2d8fd16fde3498b04306e29bd193bf306a57427019b823d5acd"
-
 [[package]]
 name = "ryu"
 version = "1.0.5"
@ -957,12 +877,6 @@ dependencies = [
 "winapi-util",
 ]

-[[package]]
-name = "scoped-tls"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2"
-
 [[package]]
 name = "scopeguard"
 version = "1.1.0"
@ -1066,32 +980,12 @@ dependencies = [
 "nix 0.14.1",
 ]

-[[package]]
-name = "signal-hook-registry"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16f1d0fef1604ba8f7a073c7e701f213e056707210e9020af4528e0101ce11a6"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "smallvec"
 version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e"

-[[package]]
-name = "socket2"
-version = "0.3.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e"
-dependencies = [
- "cfg-if 1.0.0",
- "libc",
- "winapi",
-]
-
 [[package]]
 name = "spin"
 version = "0.5.2"
@ -1232,18 +1126,18 @@ dependencies = [

 [[package]]
 name = "thiserror"
-version = "1.0.24"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0f4a65597094d4483ddaed134f409b2cb7c1beccf25201a9f73c719254fa98e"
+checksum = "76cc616c6abf8c8928e2fdcc0dbfab37175edd8fb49a4641066ad1364fdab146"
 dependencies = [
 "thiserror-impl",
 ]

 [[package]]
 name = "thiserror-impl"
-version = "1.0.24"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7765189610d8241a44529806d6fd1f2e0a08734313a35d5b3a556f92b381f3c0"
+checksum = "9be73a2caec27583d0046ef3796c3794f868a5bc813db689eed00c7631275cd1"
 dependencies = [
 "proc-macro2",
 "quote",
@ -1313,37 +1207,6 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"

-[[package]]
-name = "tokio"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8190d04c665ea9e6b6a0dc45523ade572c088d2e6566244c1122671dbf4ae3a"
-dependencies = [
- "autocfg",
- "bytes",
- "libc",
- "memchr",
- "mio",
- "num_cpus",
- "once_cell",
- "parking_lot",
- "pin-project-lite",
- "signal-hook-registry",
- "tokio-macros",
- "winapi",
-]
-
-[[package]]
-name = "tokio-macros"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "caf7b11a536f46a809a8a9f0bb4237020f70ecbf115b842360afb127ea2fda57"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "tungstenite"
 version = "0.13.0"
@ -1414,9 +1277,9 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"

 [[package]]
 name = "url"
-version = "2.2.1"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ccd964113622c8e9322cfac19eb1004a07e636c545f325da085d5cdde6f1f8b"
+checksum = "5909f2b0817350449ed73e8bcd81c8c3c8d9a7a5d8acba4b27db277f1868976e"
 dependencies = [
 "form_urlencoded",
 "idna",
@ -1452,7 +1315,6 @@ checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
 name = "vpncloud"
 version = "2.1.0"
 dependencies = [
- "async-trait",
 "byteorder",
 "criterion",
 "daemonize",
@ -1474,7 +1336,6 @@ dependencies = [
 "tempfile",
 "thiserror",
 "time",
- "tokio",
 "tungstenite",
 "url",
 "yaml-rust",
--- a/Cargo.toml
+++ b/Cargo.toml
@ -11,10 +11,6 @@ keywords = ["vpn", "p2p", "tun", "tap", "network"]
 readme = "README.md"
 edition = "2018"

-[package.metadata]
-toolchain = "1.50.0"
-upx_version = "3.96"
-
 [dependencies]
 time = "=0.2.22"
 structopt = "0.3"
@ -37,8 +33,6 @@ dialoguer = { version = "0.7", optional = true }
 tungstenite = { version = "0.13", optional = true, default-features = false }
 url = { version = "2.2", optional = true }
 igd = { version = "0.12", optional = true }
-tokio = { version = "1", features = ["full"] }
-async-trait = "0.1"

 [dev-dependencies]
 tempfile = "3"
--- a/assets/deb-scripts/postint
+++ b/assets/deb-scripts/postint
@ -1,4 +1,3 @@
 #!/bin/bash

 systemctl daemon-reload
-chmod 700 /etc/vpncloud
--- a/builder/Dockerfile-deb
+++ b/builder/Dockerfile-deb
@ -1,8 +1,5 @@
 FROM ubuntu:16.04

-ARG TOOLCHAIN=stable
-ARG UPX_VERSION=3.96
-
 RUN apt-get update \
 && apt-get install -y --no-install-recommends \
    build-essential \
@ -14,19 +11,8 @@ RUN apt-get update \
    libc6-dev-i386 \
    gcc-5-multilib \
    asciidoctor \
- && apt-get clean && rm -rf /var/lib/apt/lists/*
-
-ENV RUSTUP_HOME=/opt/rust/rustup \
-    PATH=/opt/rust/cargo/bin:/home/user/.cargo/bin:/usr/local/musl/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-
-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 armv7-unknown-linux-gnueabihf \
- && env CARGO_HOME=/opt/rust/cargo rustup target add aarch64-unknown-linux-gnu
-
-RUN env CARGO_HOME=/opt/rust/cargo cargo install cargo-deb \
- && rm -rf /opt/rust/cargo/{git,tmp,registry}
+    musl musl-dev musl-tools \
+ && rm -rf /var/cache/dpkg

 RUN ln -s asm-generic/ /usr/include/asm

@ -34,8 +20,25 @@ RUN useradd -ms /bin/bash user
 USER user
 WORKDIR /home/user

-RUN mkdir -p /home/user/.cargo \
- && ln -s /opt/rust/cargo/config /home/user/.cargo/config
+ENV RUST=1.50.0
+
+RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain ${RUST}
+
+ENV PATH=/home/user/.cargo/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+
+RUN rustup target add i686-unknown-linux-gnu \
+ && rustup target add armv7-unknown-linux-gnueabihf \
+ && rustup target add aarch64-unknown-linux-gnu \
+ && rustup target add x86_64-unknown-linux-musl \
+ && rustup target add i686-unknown-linux-musl \
+ && rustup target add armv7-unknown-linux-musleabihf \
+ && rustup target add aarch64-unknown-linux-musl
+
+RUN cargo install cargo-deb \
+ && rm -rf /home/user/.cargo/{git,tmp,registry}
+
+ENV UPX_VER=3.96
+RUN curl https://github.com/upx/upx/releases/download/v${UPX_VER}/upx-${UPX_VER}-amd64_linux.tar.xz -Lf | tar -xJ --strip-components=1 -C /home/user/.cargo/bin

 VOLUME /home/user/.cargo/tmp
 VOLUME /home/user/.cargo/git
--- a/builder/Dockerfile-musl
+++ b/builder/Dockerfile-musl
@ -1,46 +0,0 @@
-FROM ubuntu:16.04
-
-ARG TOOLCHAIN=stable
-ARG UPX_VERSION=3.96
-
-RUN apt-get update \
- && apt-get install -y --no-install-recommends --no-install-suggests \
-    build-essential \
-    curl \
-    gcc-aarch64-linux-gnu \
-    gcc-arm-linux-gnueabihf \
-    libc6-dev-arm64-cross \
-    libc6-dev-armhf-cross \
-    libc6-dev-i386 \
-    gcc-5-multilib \
-    asciidoctor \
-    musl musl-dev musl-tools \
- && apt-get clean && rm -rf /var/lib/apt/lists/*
-
-ENV RUSTUP_HOME=/opt/rust/rustup \
-    PATH=/opt/rust/cargo/bin:/home/user/.cargo/bin:/usr/local/musl/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-
-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 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 armv7-unknown-linux-musleabihf \
- && env CARGO_HOME=/opt/rust/cargo rustup target add aarch64-unknown-linux-musl
-
-RUN curl https://github.com/upx/upx/releases/download/v${UPX_VERSION}/upx-${UPX_VERSION}-amd64_linux.tar.xz -Lf | tar -xJ --strip-components=1 -C /opt/rust/cargo/bin
-
-RUN ln -s asm-generic/ /usr/include/asm \
- && ln -s /usr/bin/g++ /usr/bin/musl-g++ \
- && ln -s /usr/bin/aarch64-linux-gnu-gcc /usr/bin/aarch64-linux-musl-gcc \
- && ln -s /usr/bin/arm-linux-gnueabihf-gcc /usr/bin/arm-linux-musleabihf-gcc
-
-RUN useradd -ms /bin/bash user
-USER user
-WORKDIR /home/user
-
-RUN mkdir -p /home/user/.cargo \
- && ln -s /opt/rust/cargo/config /home/user/.cargo/config
-
-VOLUME /home/user/.cargo/tmp
-VOLUME /home/user/.cargo/git
-VOLUME /home/user/.cargo/registry
--- a/builder/Dockerfile-rpm
+++ b/builder/Dockerfile-rpm
@ -1,32 +1,25 @@
 FROM centos:7

-ARG TOOLCHAIN=stable
-
 RUN yum groupinstall -y 'Development Tools'
 RUN yum install -y ruby && gem install asciidoctor -v 2.0.10

-ENV RUSTUP_HOME=/opt/rust/rustup \
-    PATH=/opt/rust/cargo/bin:/home/user/.cargo/bin:/usr/local/musl/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-
-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 armv7-unknown-linux-gnueabihf
-
-RUN env CARGO_HOME=/opt/rust/cargo cargo install cargo-rpm \
- && rm -rf /opt/rust/cargo/{git,tmp,registry}
-
-RUN yum install -y libstdc++-*.i686 \
- && yum install -y glibc-*.i686 \
- && yum install -y libgcc.i686
-
 RUN useradd -ms /bin/bash user
 USER user
 WORKDIR /home/user

-RUN mkdir -p /home/user/.cargo \
- && ln -s /opt/rust/cargo/config /home/user/.cargo/config
+ENV RUST=1.50.0
+
+RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain ${RUST}
+
+ENV PATH=/home/user/.cargo/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+
+RUN rustup target add i686-unknown-linux-gnu \
+ && rustup target add armv7-unknown-linux-gnueabihf
+
+RUN cargo install cargo-rpm \
+ && rm -rf /home/user/.cargo/{git,tmp,registry}

 VOLUME /home/user/.cargo/tmp
 VOLUME /home/user/.cargo/git
 VOLUME /home/user/.cargo/registry
+
--- a/builder/build.sh
+++ b/builder/build.sh
@ -12,15 +12,10 @@ function docker_cmd() {
    vpncloud-builder-$DIST bash -c "$CMD"
 }

-# docker run -it --rm -v $(pwd)/..:/home/user/code -v $(pwd)/cache/rpm/target:/home/user/code/target -v $(pwd)/cache/rpm/registry:/home/user/code/registry -v $(pwd)/cache/rpm/git:/home/user/code/git -v $(pwd)/cache/rpm/tmp:/home/user/code/tmp vpncloud-builder-rpm
-
 set -e

 cd $(dirname $0)

-TOOLCHAIN=$(grep -e '^toolchain =' ../Cargo.toml | sed -e 's/toolchain = "\(.*\)"/\1/')
-UPX_VERSION=$(grep -e '^upx_version =' ../Cargo.toml | sed -e 's/upx_version = "\(.*\)"/\1/')
-
 VERSION=$(grep -e '^version =' ../Cargo.toml | sed -e 's/version = "\(.*\)"/\1/')
 DEB_VERSION=$(echo "$VERSION" | sed -e 's/-/~/g')
 if echo "$VERSION" | fgrep -q "-"; then
@ -29,12 +24,12 @@ else
  RPM_VERSION="$VERSION-1"
 fi

-mkdir -p cache/{rpm,deb,musl}
+mkdir -p cache/{rpm,deb}
 CACHE=$(pwd)/cache

 mkdir -p ../dist

-docker build --rm -f=Dockerfile-deb --build-arg TOOLCHAIN=$TOOLCHAIN --build-arg UPX_VERSION=$UPX_VERSION -t vpncloud-builder-deb .
+docker build --rm -f=Dockerfile-deb -t vpncloud-builder-deb .

 # x86_64 deb
 if ! [ -f ../dist/vpncloud_${DEB_VERSION}_amd64.deb ]; then
@ -56,21 +51,19 @@ build_deb armhf armv7-unknown-linux-gnueabihf
 build_deb arm64 aarch64-unknown-linux-gnu


-docker build --rm -f=Dockerfile-musl -t vpncloud-builder-musl .
-
 build_static() {
  ARCH=$1
  TARGET=$2
  if ! [ -f ../dist/vpncloud_${VERSION}_static_${ARCH} ]; then
-    docker_cmd musl "cd code && cargo build --release --features installer --target ${TARGET} && upx --lzma target/${TARGET}/release/vpncloud"
-    cp $CACHE/musl/target/${TARGET}/release/vpncloud ../dist/vpncloud_${VERSION}_static_${ARCH}
+    docker_cmd deb "cd code && cargo build --release --features installer --target ${TARGET} && upx --lzma target/${TARGET}/release/vpncloud"
+    cp $CACHE/deb/target/${TARGET}/release/vpncloud ../dist/vpncloud_${VERSION}_static_${ARCH}
  fi
 }

 build_static amd64 x86_64-unknown-linux-musl
-#build_static i386 i686-unknown-linux-musl
+build_static i386 i686-unknown-linux-gnu
 build_static armhf armv7-unknown-linux-musleabihf
-build_static arm64 aarch64-unknown-linux-musl
+#build_static arm64 aarch64-unknown-linux-musl # fails for unknown reason


 docker build --rm -f=Dockerfile-rpm -t vpncloud-builder-rpm .
@ -80,17 +73,3 @@ if ! [ -f ../dist/vpncloud_${RPM_VERSION}.x86_64.rpm ]; then
  docker_cmd rpm 'cd code && cargo rpm build'
  cp $CACHE/rpm/target/release/rpmbuild/RPMS/x86_64/vpncloud-${RPM_VERSION}.x86_64.rpm ../dist/vpncloud_${RPM_VERSION}.x86_64.rpm
 fi
-
-build_rpm() {
-  ARCH=$1
-  TARGET=$2
-  if ! [ -f ../dist/vpncloud_${RPM_VERSION}.${ARCH}.rpm ]; then
-    mkdir -p $CACHE/rpm/target
-    [ -L $CACHE/rpm/target/assets ] || ln -s ../assets $CACHE/rpm/target/assets
-    [ -L $CACHE/rpm/target/target ] || ln -s ../target $CACHE/rpm/target/target
-    docker_cmd rpm "cd code && cargo rpm build --target ${TARGET}"
-    cp $CACHE/rpm/target/${TARGET}/release/rpmbuild/RPMS/${ARCH}/vpncloud-${RPM_VERSION}.${ARCH}.rpm ../dist/vpncloud_${RPM_VERSION}.${ARCH}.rpm
-  fi
-}
-
-build_rpm i686 i686-unknown-linux-gnu
--- a/src/beacon.rs
+++ b/src/beacon.rs
@ -322,7 +322,7 @@ impl<TS: TimeSource> BeaconSerializer<TS> {
 #[cfg(test)] use std::time::Duration;

 #[test]
-async fn encode() {
+fn encode() {
    MockTimeSource::set_time(2000 * 3600);
    let ser = BeaconSerializer::<MockTimeSource>::new(b"mysecretkey");
    let mut peers = vec![
@ -340,7 +340,7 @@ async fn encode() {
 }

 #[test]
-async fn decode() {
+fn decode() {
    MockTimeSource::set_time(2000 * 3600);
    let ser = BeaconSerializer::<MockTimeSource>::new(b"mysecretkey");
    let mut peers = vec![
@ -356,7 +356,7 @@ async fn decode() {
 }

 #[test]
-async fn decode_split() {
+fn decode_split() {
    MockTimeSource::set_time(2000 * 3600);
    let ser = BeaconSerializer::<MockTimeSource>::new(b"mysecretkey");
    let peers = vec![
@ -374,7 +374,7 @@ async fn decode_split() {
 }

 #[test]
-async fn decode_offset() {
+fn decode_offset() {
    MockTimeSource::set_time(2000 * 3600);
    let ser = BeaconSerializer::<MockTimeSource>::new(b"mysecretkey");
    let peers = vec![
@ -388,7 +388,7 @@ async fn decode_offset() {
 }

 #[test]
-async fn decode_multiple() {
+fn decode_multiple() {
    MockTimeSource::set_time(2000 * 3600);
    let ser = BeaconSerializer::<MockTimeSource>::new(b"mysecretkey");
    let peers = vec![
@ -402,7 +402,7 @@ async fn decode_multiple() {
 }

 #[test]
-async fn decode_ttl() {
+fn decode_ttl() {
    MockTimeSource::set_time(2000 * 3600);
    let ser = BeaconSerializer::<MockTimeSource>::new(b"mysecretkey");
    MockTimeSource::set_time(2000 * 3600);
@ -426,7 +426,7 @@ async fn decode_ttl() {
 }

 #[test]
-async fn decode_invalid() {
+fn decode_invalid() {
    MockTimeSource::set_time(2000 * 3600);
    let ser = BeaconSerializer::<MockTimeSource>::new(b"mysecretkey");
    assert_eq!(0, ser.decode("", None).len());
@ -440,7 +440,7 @@ async fn decode_invalid() {


 #[test]
-async fn encode_decode() {
+fn encode_decode() {
    MockTimeSource::set_time(2000 * 3600);
    let ser = BeaconSerializer::<MockTimeSource>::new(b"mysecretkey");
    let peers = vec![
@ -453,7 +453,7 @@ async fn encode_decode() {
 }

 #[test]
-async fn encode_decode_file() {
+fn encode_decode_file() {
    MockTimeSource::set_time(2000 * 3600);
    let ser = BeaconSerializer::<MockTimeSource>::new(b"mysecretkey");
    let peers = vec![
@ -468,7 +468,7 @@ async fn encode_decode_file() {
 }

 #[test]
-async fn encode_decode_cmd() {
+fn encode_decode_cmd() {
    MockTimeSource::set_time(2000 * 3600);
    let ser = BeaconSerializer::<MockTimeSource>::new(b"mysecretkey");
    let peers = vec![
--- a/src/config.rs
+++ b/src/config.rs
@ -669,7 +669,7 @@ pub struct ConfigFile {
 }

 #[test]
-async fn config_file() {
+fn config_file() {
    let config_file = "
 device:
  type: tun
@ -744,12 +744,12 @@ statsd:
 }

 #[test]
-async fn parse_example_config() {
+fn parse_example_config() {
    serde_yaml::from_str::<ConfigFile>(include_str!("../assets/example.net.disabled")).unwrap();
 }

 #[test]
-async fn config_merge() {
+fn config_merge() {
    let mut config = Config::default();
    config.merge_file(ConfigFile {
        device: Some(ConfigFileDevice {
--- a/src/crypto/common.rs
+++ b/src/crypto/common.rs
@ -242,13 +242,6 @@ impl PeerCrypto {
        }
    }

-    pub fn get_core(&self) -> Option<Arc<CryptoCore>> {
-        match self {
-            PeerCrypto::Encrypted { core, .. } => Some(core.clone()),
-            PeerCrypto::Unencrypted { .. } => None
-        }
-    }
-
    fn handle_init_message(&mut self, buffer: &mut MsgBuffer) -> Result<MessageResult, Error> {
        // TODO: parse message stage
        // TODO: depending on stage resend last message
@ -346,7 +339,7 @@ mod tests {
    }

    #[test]
-    async fn normal() {
+    fn normal() {
        let config = Config { password: Some("test".to_string()), ..Default::default() };
        let mut node1 = create_node(&config);
        let mut node2 = create_node(&config);
--- a/src/crypto/core.rs
+++ b/src/crypto/core.rs
@ -280,7 +280,7 @@ mod tests {
    use ring::aead::{self, LessSafeKey, UnboundKey};

    #[test]
-    async fn test_nonce() {
+    fn test_nonce() {
        let mut nonce = Nonce::zero();
        assert_eq!(nonce.as_bytes(), &[0; 12]);
        nonce.increment();
@ -302,17 +302,17 @@ mod tests {
    }

    #[test]
-    async fn test_encrypt_decrypt_aes128() {
+    fn test_encrypt_decrypt_aes128() {
        test_encrypt_decrypt(&aead::AES_128_GCM)
    }

    #[test]
-    async fn test_encrypt_decrypt_aes256() {
+    fn test_encrypt_decrypt_aes256() {
        test_encrypt_decrypt(&aead::AES_256_GCM)
    }

    #[test]
-    async fn test_encrypt_decrypt_chacha() {
+    fn test_encrypt_decrypt_chacha() {
        test_encrypt_decrypt(&aead::CHACHA20_POLY1305)
    }

@ -343,17 +343,17 @@ mod tests {
    }

    #[test]
-    async fn test_tampering_aes128() {
+    fn test_tampering_aes128() {
        test_tampering(&aead::AES_128_GCM)
    }

    #[test]
-    async fn test_tampering_aes256() {
+    fn test_tampering_aes256() {
        test_tampering(&aead::AES_256_GCM)
    }

    #[test]
-    async fn test_tampering_chacha() {
+    fn test_tampering_chacha() {
        test_tampering(&aead::CHACHA20_POLY1305)
    }

@ -384,17 +384,17 @@ mod tests {
    }

    #[test]
-    async fn test_nonce_pinning_aes128() {
+    fn test_nonce_pinning_aes128() {
        test_nonce_pinning(&aead::AES_128_GCM)
    }

    #[test]
-    async fn test_nonce_pinning_aes256() {
+    fn test_nonce_pinning_aes256() {
        test_nonce_pinning(&aead::AES_256_GCM)
    }

    #[test]
-    async fn test_nonce_pinning_chacha() {
+    fn test_nonce_pinning_chacha() {
        test_nonce_pinning(&aead::CHACHA20_POLY1305)
    }

@ -433,40 +433,40 @@ mod tests {
    }

    #[test]
-    async fn test_key_rotation_aes128() {
+    fn test_key_rotation_aes128() {
        test_key_rotation(&aead::AES_128_GCM);
    }

    #[test]
-    async fn test_key_rotation_aes256() {
+    fn test_key_rotation_aes256() {
        test_key_rotation(&aead::AES_256_GCM);
    }

    #[test]
-    async fn test_key_rotation_chacha() {
+    fn test_key_rotation_chacha() {
        test_key_rotation(&aead::CHACHA20_POLY1305);
    }


    #[test]
-    async fn test_core_size() {
-        assert_eq!(2400, mem::size_of::<CryptoCore>());
+    fn test_core_size() {
+        assert_eq!(2384, mem::size_of::<CryptoCore>());
    }

    #[test]
-    async fn test_speed_aes128() {
+    fn test_speed_aes128() {
        let speed = test_speed(&aead::AES_128_GCM, &Duration::from_secs_f32(0.2));
        assert!(speed > 10.0);
    }

    #[test]
-    async fn test_speed_aes256() {
+    fn test_speed_aes256() {
        let speed = test_speed(&aead::AES_256_GCM, &Duration::from_secs_f32(0.2));
        assert!(speed > 10.0);
    }

    #[test]
-    async fn test_speed_chacha() {
+    fn test_speed_chacha() {
        let speed = test_speed(&aead::CHACHA20_POLY1305, &Duration::from_secs_f32(0.2));
        assert!(speed > 10.0);
    }
--- a/src/crypto/init.rs
+++ b/src/crypto/init.rs
@ -739,7 +739,7 @@ mod tests {
    }

    #[test]
-    async fn normal_init() {
+    fn normal_init() {
        let (mut sender, mut receiver) = create_pair();
        let mut out = MsgBuffer::new(8);
        sender.send_ping(&mut out);
@ -761,7 +761,7 @@ mod tests {
    }

    #[test]
-    async fn lost_init_sender_recovers() {
+    fn lost_init_sender_recovers() {
        let (mut sender, mut receiver) = create_pair();
        let mut out = MsgBuffer::new(8);
        sender.send_ping(&mut out);
@ -794,7 +794,7 @@ mod tests {
    }

    #[test]
-    async fn lost_init_receiver_recovers() {
+    fn lost_init_receiver_recovers() {
        let (mut sender, mut receiver) = create_pair();
        let mut out = MsgBuffer::new(8);
        sender.send_ping(&mut out);
@ -826,7 +826,7 @@ mod tests {
    }

    #[test]
-    async fn timeout() {
+    fn timeout() {
        let (mut sender, _receiver) = create_pair();
        let mut out = MsgBuffer::new(8);
        sender.send_ping(&mut out);
@ -841,7 +841,7 @@ mod tests {
    }

    #[test]
-    async fn untrusted_peer() {
+    fn untrusted_peer() {
        let (mut sender, _) = create_pair();
        let (_, mut receiver) = create_pair();
        let mut out = MsgBuffer::new(8);
@ -851,7 +851,7 @@ mod tests {
    }

    #[test]
-    async fn manipulated_message() {
+    fn manipulated_message() {
        let (mut sender, mut receiver) = create_pair();
        let mut out = MsgBuffer::new(8);
        sender.send_ping(&mut out);
@ -861,7 +861,7 @@ mod tests {
    }

    #[test]
-    async fn connect_to_self() {
+    fn connect_to_self() {
        let (mut sender, _) = create_pair();
        let mut out = MsgBuffer::new(8);
        sender.send_ping(&mut out);
@ -889,7 +889,7 @@ mod tests {
    }

    #[test]
-    async fn algorithm_negotiation() {
+    fn algorithm_negotiation() {
        // Equal algorithms
        test_algorithm_negotiation(
            Algorithms {
--- a/src/crypto/rotate.rs
+++ b/src/crypto/rotate.rs
@ -230,7 +230,7 @@ mod tests {
    }

    #[test]
-    async fn test_encode_decode_message() {
+    fn test_encode_decode_message() {
        let mut data = Vec::with_capacity(100);
        let (_, key) = RotationState::create_key();
        let msg = RotationMessage { message_id: 1, propose: key, confirm: None };
@ -251,7 +251,7 @@ mod tests {
    }

    #[test]
-    async fn test_normal_rotation() {
+    fn test_normal_rotation() {
        let mut out1 = MsgBuffer::new(8);
        let mut out2 = MsgBuffer::new(8);

@ -325,7 +325,7 @@ mod tests {
    }

    #[test]
-    async fn test_duplication() {
+    fn test_duplication() {
        let mut out1 = MsgBuffer::new(8);
        let mut out2 = MsgBuffer::new(8);

@ -361,7 +361,7 @@ mod tests {
    }

    #[test]
-    async fn test_lost_message() {
+    fn test_lost_message() {
        let mut out1 = MsgBuffer::new(8);
        let mut out2 = MsgBuffer::new(8);

@ -387,7 +387,7 @@ mod tests {
    }

    #[test]
-    async fn test_reflect_back() {
+    fn test_reflect_back() {
        let mut out1 = MsgBuffer::new(8);
        let mut out2 = MsgBuffer::new(8);

--- a/src/device.rs
+++ b/src/device.rs
@ -2,22 +2,20 @@
 // Copyright (C) 2015-2021  Dennis Schwerdel
 // This software is licensed under GPL-3 or newer (see LICENSE.md)

-use async_trait::async_trait;
 use parking_lot::Mutex;
 use std::{
    cmp,
    collections::VecDeque,
    convert::TryInto,
    fmt,
-    io::{self, Cursor, Error as IoError},
+    fs::{self, File},
+    io::{self, BufRead, BufReader, Cursor, Error as IoError, Read, Write},
    net::{Ipv4Addr, UdpSocket},
-    os::unix::io::AsRawFd,
+    os::unix::io::{AsRawFd, RawFd},
    str,
    str::FromStr,
-    sync::Arc,
+    sync::Arc
 };
-use tokio::fs::{self, File};
-use tokio::io::{AsyncBufReadExt, AsyncReadExt, AsyncWriteExt, BufReader};

 use crate::{crypto, error::Error, util::MsgBuffer};

@ -28,13 +26,13 @@ union IfReqData {
    flags: libc::c_short,
    value: libc::c_int,
    addr: (libc::c_short, Ipv4Addr),
-    _dummy: [u8; 24],
+    _dummy: [u8; 24]
 }

 #[repr(C)]
 struct IfReq {
    ifr_name: [u8; libc::IF_NAMESIZE],
-    data: IfReqData,
+    data: IfReqData
 }

 impl IfReq {
@ -46,6 +44,7 @@ impl IfReq {
    }
 }

+
 /// The type of a tun/tap device
 #[derive(Serialize, Deserialize, Debug, Clone, Copy, PartialEq)]
 pub enum Type {
@ -54,14 +53,14 @@ pub enum Type {
    Tun,
    /// Tap interface: This interface transports Ethernet frames.
    #[serde(rename = "tap")]
-    Tap,
+    Tap
 }

 impl fmt::Display for Type {
    fn fmt(&self, formatter: &mut fmt::Formatter) -> Result<(), fmt::Error> {
        match *self {
            Type::Tun => write!(formatter, "tun"),
-            Type::Tap => write!(formatter, "tap"),
+            Type::Tap => write!(formatter, "tap")
        }
    }
 }
@ -73,13 +72,12 @@ impl FromStr for Type {
        Ok(match &text.to_lowercase() as &str {
            "tun" => Self::Tun,
            "tap" => Self::Tap,
-            _ => return Err("Unknown device type"),
+            _ => return Err("Unknown device type")
        })
    }
 }

-#[async_trait]
-pub trait Device: Send + 'static + Sized {
+pub trait Device: AsRawFd + Clone + Send + 'static {
    /// Returns the type of this device
    fn get_type(&self) -> Type;

@ -97,7 +95,7 @@ pub trait Device: Send + 'static + Sized {
    ///
    /// # Errors
    /// This method will return an error if the underlying read call fails.
-    async fn read(&mut self, buffer: &mut MsgBuffer) -> Result<(), Error>;
+    fn read(&mut self, buffer: &mut MsgBuffer) -> Result<(), Error>;

    /// Writes a packet/frame to the device
    ///
@ -108,18 +106,28 @@ pub trait Device: Send + 'static + Sized {
    ///
    /// # Errors
    /// This method will return an error if the underlying read call fails.
-    async fn write(&mut self, buffer: &mut MsgBuffer) -> Result<(), Error>;
-
-    async fn duplicate(&self) -> Result<Self, Error>;
+    fn write(&mut self, buffer: &mut MsgBuffer) -> Result<(), Error>;

    fn get_ip(&self) -> Result<Ipv4Addr, Error>;
 }

+
 /// Represents a tun/tap device
 pub struct TunTapDevice {
    fd: File,
    ifname: String,
-    type_: Type,
+    type_: Type
+}
+
+
+impl Clone for TunTapDevice {
+    fn clone(&self) -> Self {
+        Self {
+            fd: try_fail!(self.fd.try_clone(), "Failed to clone device: {}"),
+            ifname: self.ifname.clone(),
+            type_: self.type_
+        }
+    }
 }

 impl TunTapDevice {
@ -141,12 +149,12 @@ impl TunTapDevice {
    /// # Panics
    /// This method panics if the interface name is longer than 31 bytes.
    #[allow(clippy::useless_conversion)]
-    pub async fn new(ifname: &str, type_: Type, path: Option<&str>) -> io::Result<Self> {
+    pub fn new(ifname: &str, type_: Type, path: Option<&str>) -> io::Result<Self> {
        let path = path.unwrap_or_else(|| Self::default_path(type_));
-        let fd = fs::OpenOptions::new().read(true).write(true).open(path).await?;
+        let fd = fs::OpenOptions::new().read(true).write(true).open(path)?;
        let flags = match type_ {
            Type::Tun => libc::IFF_TUN | libc::IFF_NO_PI,
-            Type::Tap => libc::IFF_TAP | libc::IFF_NO_PI,
+            Type::Tap => libc::IFF_TAP | libc::IFF_NO_PI
        };
        let mut ifreq = IfReq::new(ifname);
        ifreq.data.flags = flags as libc::c_short;
@ -155,11 +163,11 @@ impl TunTapDevice {
            0 => {
                let mut ifname = String::with_capacity(32);
                let mut cursor = Cursor::new(ifreq.ifr_name);
-                cursor.read_to_string(&mut ifname).await?;
+                cursor.read_to_string(&mut ifname)?;
                ifname = ifname.trim_end_matches('\0').to_owned();
                Ok(Self { fd, ifname, type_ })
            }
-            _ => Err(IoError::last_os_error()),
+            _ => Err(IoError::last_os_error())
        }
    }

@ -167,7 +175,7 @@ impl TunTapDevice {
    #[inline]
    pub fn default_path(type_: Type) -> &'static str {
        match type_ {
-            Type::Tun | Type::Tap => "/dev/net/tun",
+            Type::Tun | Type::Tap => "/dev/net/tun"
        }
    }

@ -215,7 +223,7 @@ impl TunTapDevice {
                // IP version
                4 => buffer.message_mut()[0..4].copy_from_slice(&[0x00, 0x00, 0x08, 0x00]),
                6 => buffer.message_mut()[0..4].copy_from_slice(&[0x00, 0x00, 0x86, 0xdd]),
-                _ => unreachable!(),
+                _ => unreachable!()
            }
        }
    }
@ -231,11 +239,11 @@ impl TunTapDevice {
        }
    }

-    pub async fn set_mtu(&self, value: Option<usize>) -> io::Result<()> {
+    pub fn set_mtu(&self, value: Option<usize>) -> io::Result<()> {
        let value = match value {
            Some(value) => value,
            None => {
-                let default_device = get_default_device().await?;
+                let default_device = get_default_device()?;
                get_device_mtu(&default_device)? - self.get_overhead()
            }
        };
@ -249,24 +257,23 @@ impl TunTapDevice {
        set_device_enabled(&self.ifname, true)
    }

-    pub async fn get_rp_filter(&self) -> io::Result<u8> {
-        Ok(cmp::max(get_rp_filter("all").await?, get_rp_filter(&self.ifname).await?))
+    pub fn get_rp_filter(&self) -> io::Result<u8> {
+        Ok(cmp::max(get_rp_filter("all")?, get_rp_filter(&self.ifname)?))
    }

-    pub async fn fix_rp_filter(&self) -> io::Result<()> {
-        if get_rp_filter("all").await? > 1 {
+    pub fn fix_rp_filter(&self) -> io::Result<()> {
+        if get_rp_filter("all")? > 1 {
            info!("Setting net.ipv4.conf.all.rp_filter=1");
-            set_rp_filter("all", 1).await?
+            set_rp_filter("all", 1)?
        }
-        if get_rp_filter(&self.ifname).await? != 1 {
+        if get_rp_filter(&self.ifname)? != 1 {
            info!("Setting net.ipv4.conf.{}.rp_filter=1", self.ifname);
-            set_rp_filter(&self.ifname, 1).await?
+            set_rp_filter(&self.ifname, 1)?
        }
        Ok(())
    }
 }

-#[async_trait]
 impl Device for TunTapDevice {
    fn get_type(&self) -> Type {
        self.type_
@ -276,27 +283,19 @@ impl Device for TunTapDevice {
        &self.ifname
    }

-    async fn duplicate(&self) -> Result<Self, Error> {
-        Ok(Self {
-            fd: self.fd.try_clone().await.map_err(|e| Error::DeviceIo("Failed to clone device", e))?,
-            ifname: self.ifname.clone(),
-            type_: self.type_,
-        })
-    }
-
-    async fn read(&mut self, buffer: &mut MsgBuffer) -> Result<(), Error> {
+    fn read(&mut self, buffer: &mut MsgBuffer) -> Result<(), Error> {
        buffer.clear();
-        let read = self.fd.read(buffer.buffer()).await.map_err(|e| Error::DeviceIo("Read error", e))?;
+        let read = self.fd.read(buffer.buffer()).map_err(|e| Error::DeviceIo("Read error", e))?;
        buffer.set_length(read);
        self.correct_data_after_read(buffer);
        Ok(())
    }

-    async fn write(&mut self, buffer: &mut MsgBuffer) -> Result<(), Error> {
+    fn write(&mut self, buffer: &mut MsgBuffer) -> Result<(), Error> {
        self.correct_data_before_write(buffer);
-        match self.fd.write_all(buffer.message()).await {
-            Ok(_) => self.fd.flush().await.map_err(|e| Error::DeviceIo("Flush error", e)),
-            Err(e) => Err(Error::DeviceIo("Write error", e)),
+        match self.fd.write_all(buffer.message()) {
+            Ok(_) => self.fd.flush().map_err(|e| Error::DeviceIo("Flush error", e)),
+            Err(e) => Err(Error::DeviceIo("Write error", e))
        }
    }

@ -305,10 +304,18 @@ impl Device for TunTapDevice {
    }
 }

+impl AsRawFd for TunTapDevice {
+    #[inline]
+    fn as_raw_fd(&self) -> RawFd {
+        self.fd.as_raw_fd()
+    }
+}
+
+
 #[derive(Clone)]
 pub struct MockDevice {
    inbound: Arc<Mutex<VecDeque<Vec<u8>>>>,
-    outbound: Arc<Mutex<VecDeque<Vec<u8>>>>,
+    outbound: Arc<Mutex<VecDeque<Vec<u8>>>>
 }

 impl MockDevice {
@ -329,12 +336,7 @@ impl MockDevice {
    }
 }

-#[async_trait]
 impl Device for MockDevice {
-    async fn duplicate(&self) -> Result<Self, Error> {
-        Ok(self.clone())
-    }
-
    fn get_type(&self) -> Type {
        Type::Tun
    }
@ -343,7 +345,7 @@ impl Device for MockDevice {
        "mock0"
    }

-    async fn read(&mut self, buffer: &mut MsgBuffer) -> Result<(), Error> {
+    fn read(&mut self, buffer: &mut MsgBuffer) -> Result<(), Error> {
        if let Some(data) = self.inbound.lock().pop_front() {
            buffer.clear();
            buffer.set_length(data.len());
@ -354,7 +356,7 @@ impl Device for MockDevice {
        }
    }

-    async fn write(&mut self, buffer: &mut MsgBuffer) -> Result<(), Error> {
+    fn write(&mut self, buffer: &mut MsgBuffer) -> Result<(), Error> {
        self.outbound.lock().push_back(buffer.message().into());
        Ok(())
    }
@ -368,11 +370,19 @@ impl Default for MockDevice {
    fn default() -> Self {
        Self {
            outbound: Arc::new(Mutex::new(VecDeque::with_capacity(10))),
-            inbound: Arc::new(Mutex::new(VecDeque::with_capacity(10))),
+            inbound: Arc::new(Mutex::new(VecDeque::with_capacity(10)))
        }
    }
 }

+impl AsRawFd for MockDevice {
+    #[inline]
+    fn as_raw_fd(&self) -> RawFd {
+        unimplemented!()
+    }
+}
+
+
 #[allow(clippy::useless_conversion)]
 fn set_device_mtu(ifname: &str, mtu: usize) -> io::Result<()> {
    let sock = UdpSocket::bind("0.0.0.0:0")?;
@ -381,7 +391,7 @@ fn set_device_mtu(ifname: &str, mtu: usize) -> io::Result<()> {
    let res = unsafe { libc::ioctl(sock.as_raw_fd(), libc::SIOCSIFMTU.try_into().unwrap(), &mut ifreq) };
    match res {
        0 => Ok(()),
-        _ => Err(IoError::last_os_error()),
+        _ => Err(IoError::last_os_error())
    }
 }

@ -392,7 +402,7 @@ fn get_device_mtu(ifname: &str) -> io::Result<usize> {
    let res = unsafe { libc::ioctl(sock.as_raw_fd(), libc::SIOCGIFMTU.try_into().unwrap(), &mut ifreq) };
    match res {
        0 => Ok(unsafe { ifreq.data.value as usize }),
-        _ => Err(IoError::last_os_error()),
+        _ => Err(IoError::last_os_error())
    }
 }

@ -405,12 +415,12 @@ fn get_device_addr(ifname: &str) -> io::Result<Ipv4Addr> {
        0 => {
            let af = unsafe { ifreq.data.addr.0 };
            if af as libc::c_int != libc::AF_INET {
-                return Err(io::Error::new(io::ErrorKind::AddrNotAvailable, "Invalid address family".to_owned()));
+                return Err(io::Error::new(io::ErrorKind::AddrNotAvailable, "Invalid address family".to_owned()))
            }
            let ip = unsafe { ifreq.data.addr.1 };
            Ok(ip)
        }
-        _ => Err(IoError::last_os_error()),
+        _ => Err(IoError::last_os_error())
    }
 }

@ -422,7 +432,7 @@ fn set_device_addr(ifname: &str, addr: Ipv4Addr) -> io::Result<()> {
    let res = unsafe { libc::ioctl(sock.as_raw_fd(), libc::SIOCSIFADDR.try_into().unwrap(), &mut ifreq) };
    match res {
        0 => Ok(()),
-        _ => Err(IoError::last_os_error()),
+        _ => Err(IoError::last_os_error())
    }
 }

@ -436,12 +446,12 @@ fn get_device_netmask(ifname: &str) -> io::Result<Ipv4Addr> {
        0 => {
            let af = unsafe { ifreq.data.addr.0 };
            if af as libc::c_int != libc::AF_INET {
-                return Err(io::Error::new(io::ErrorKind::AddrNotAvailable, "Invalid address family".to_owned()));
+                return Err(io::Error::new(io::ErrorKind::AddrNotAvailable, "Invalid address family".to_owned()))
            }
            let ip = unsafe { ifreq.data.addr.1 };
            Ok(ip)
        }
-        _ => Err(IoError::last_os_error()),
+        _ => Err(IoError::last_os_error())
    }
 }

@ -453,7 +463,7 @@ fn set_device_netmask(ifname: &str, addr: Ipv4Addr) -> io::Result<()> {
    let res = unsafe { libc::ioctl(sock.as_raw_fd(), libc::SIOCSIFNETMASK.try_into().unwrap(), &mut ifreq) };
    match res {
        0 => Ok(()),
-        _ => Err(IoError::last_os_error()),
+        _ => Err(IoError::last_os_error())
    }
 }

@ -462,7 +472,7 @@ fn set_device_enabled(ifname: &str, up: bool) -> io::Result<()> {
    let sock = UdpSocket::bind("0.0.0.0:0")?;
    let mut ifreq = IfReq::new(ifname);
    if unsafe { libc::ioctl(sock.as_raw_fd(), libc::SIOCGIFFLAGS.try_into().unwrap(), &mut ifreq) } != 0 {
-        return Err(IoError::last_os_error());
+        return Err(IoError::last_os_error())
    }
    if up {
        unsafe { ifreq.data.value |= libc::IFF_UP | libc::IFF_RUNNING }
@ -472,22 +482,20 @@ fn set_device_enabled(ifname: &str, up: bool) -> io::Result<()> {
    let res = unsafe { libc::ioctl(sock.as_raw_fd(), libc::SIOCSIFFLAGS.try_into().unwrap(), &mut ifreq) };
    match res {
        0 => Ok(()),
-        _ => Err(IoError::last_os_error()),
+        _ => Err(IoError::last_os_error())
    }
 }

-async fn get_default_device() -> io::Result<String> {
-    let mut fd = BufReader::new(File::open("/proc/net/route").await?);
+
+fn get_default_device() -> io::Result<String> {
+    let fd = BufReader::new(File::open("/proc/net/route")?);
    let mut best = None;
-    let mut line = String::with_capacity(80);
-    while let Ok(read) = fd.read_line(&mut line).await {
-        if read == 0 {
-            break;
-        }
+    for line in fd.lines() {
+        let line = line?;
        let parts = line.split('\t').collect::<Vec<_>>();
        if parts[1] == "00000000" {
            best = Some(parts[0].to_string());
-            break;
+            break
        }
        if parts[2] != "00000000" {
            best = Some(parts[0].to_string())
@ -500,14 +508,14 @@ async fn get_default_device() -> io::Result<String> {
    }
 }

-async fn get_rp_filter(device: &str) -> io::Result<u8> {
-    let mut fd = File::open(format!("/proc/sys/net/ipv4/conf/{}/rp_filter", device)).await?;
+fn get_rp_filter(device: &str) -> io::Result<u8> {
+    let mut fd = File::open(format!("/proc/sys/net/ipv4/conf/{}/rp_filter", device))?;
    let mut contents = String::with_capacity(10);
-    fd.read_to_string(&mut contents).await?;
+    fd.read_to_string(&mut contents)?;
    u8::from_str(contents.trim()).map_err(|_| io::Error::new(io::ErrorKind::InvalidData, "Invalid rp_filter value"))
 }

-async fn set_rp_filter(device: &str, val: u8) -> io::Result<()> {
-    let mut fd = File::create(format!("/proc/sys/net/ipv4/conf/{}/rp_filter", device)).await?;
-    fd.write_all(format!("{}", val).as_bytes()).await
+fn set_rp_filter(device: &str, val: u8) -> io::Result<()> {
+    let mut fd = File::create(format!("/proc/sys/net/ipv4/conf/{}/rp_filter", device))?;
+    writeln!(fd, "{}", val)
 }
--- a/src/engine/device_thread.rs
+++ b/src/engine/device_thread.rs
@ -1,18 +1,17 @@
 use super::{
    shared::{SharedPeerCrypto, SharedTable, SharedTraffic},
-    SPACE_BEFORE,
+    SPACE_BEFORE
 };
 use crate::{
-    config::Config,
    device::Device,
    error::Error,
    messages::MESSAGE_TYPE_DATA,
    net::Socket,
    util::{MsgBuffer, Time, TimeSource},
    Protocol,
+    config::Config
 };
 use std::{marker::PhantomData, net::SocketAddr};
-use tokio::time::timeout;

 pub struct DeviceThread<S: Socket, D: Device, P: Protocol, TS: TimeSource> {
    // Read-only fields
@ -21,21 +20,16 @@ pub struct DeviceThread<S: Socket, D: Device, P: Protocol, TS: TimeSource> {
    broadcast: bool,
    // Device-only fields
    socket: S,
-    pub device: D,
+    device: D,
    next_housekeep: Time,
-    buffer: MsgBuffer,
-    broadcast_buffer: MsgBuffer,
    // Shared fields
    traffic: SharedTraffic,
    peer_crypto: SharedPeerCrypto,
-    table: SharedTable<TS>,
+    table: SharedTable<TS>
 }

 impl<S: Socket, D: Device, P: Protocol, TS: TimeSource> DeviceThread<S, D, P, TS> {
-    pub fn new(
-        config: Config, device: D, socket: S, traffic: SharedTraffic, peer_crypto: SharedPeerCrypto,
-        table: SharedTable<TS>,
-    ) -> Self {
+    pub fn new(config: Config, device: D, socket: S, traffic: SharedTraffic, peer_crypto: SharedPeerCrypto, table: SharedTable<TS>) -> Self {
        Self {
            _dummy_ts: PhantomData,
            _dummy_p: PhantomData,
@ -45,106 +39,97 @@ impl<S: Socket, D: Device, P: Protocol, TS: TimeSource> DeviceThread<S, D, P, TS
            next_housekeep: TS::now(),
            traffic,
            peer_crypto,
-            table,
-            buffer: MsgBuffer::new(SPACE_BEFORE),
-            broadcast_buffer: MsgBuffer::new(SPACE_BEFORE)
+            table
        }
    }

    #[inline]
-    async fn send_to(&mut self, addr: SocketAddr) -> Result<(), Error> {
-        let size = self.buffer.len();
-        debug!("Sending msg with {} bytes to {}", size, addr);
-        self.traffic.count_out_traffic(addr, size);
-        match self.socket.send(self.buffer.message(), addr).await {
-            Ok(written) if written == size => Ok(()),
+    fn send_to(&mut self, addr: SocketAddr, msg: &mut MsgBuffer) -> Result<(), Error> {
+        debug!("Sending msg with {} bytes to {}", msg.len(), addr);
+        self.traffic.count_out_traffic(addr, msg.len());
+        match self.socket.send(msg.message(), addr) {
+            Ok(written) if written == msg.len() => Ok(()),
            Ok(_) => Err(Error::Socket("Sent out truncated packet")),
-            Err(e) => Err(Error::SocketIo("IOError when sending", e)),
+            Err(e) => Err(Error::SocketIo("IOError when sending", e))
        }
    }

    #[inline]
-    async fn send_msg(&mut self, addr: SocketAddr, type_: u8) -> Result<(), Error> {
-        debug!("Sending msg with {} bytes to {}", self.buffer.len(), addr);
-        self.buffer.prepend_byte(type_);
-        self.peer_crypto.encrypt_for(addr, &mut self.buffer)?;
-        self.send_to(addr).await
+    fn send_msg(&mut self, addr: SocketAddr, type_: u8, msg: &mut MsgBuffer) -> Result<(), Error> {
+        debug!("Sending msg with {} bytes to {}", msg.len(), addr);
+        msg.prepend_byte(type_);
+        self.peer_crypto.encrypt_for(addr, msg)?;
+        self.send_to(addr, msg)
    }

    #[inline]
-    async fn broadcast_msg(&mut self, type_: u8) -> Result<(), Error> {
-        let size = self.buffer.len();
-        debug!("Broadcasting message type {}, {:?} bytes to {} peers", type_, size, self.peer_crypto.count());
+    fn broadcast_msg(&mut self, type_: u8, msg: &mut MsgBuffer) -> Result<(), Error> {
+        debug!("Broadcasting message type {}, {:?} bytes to {} peers", type_, msg.len(), self.peer_crypto.count());
+        let mut msg_data = MsgBuffer::new(100);
        let traffic = &mut self.traffic;
        let socket = &mut self.socket;
-        let peers = self.peer_crypto.get_snapshot();
-        for (addr, crypto) in peers {
-            self.broadcast_buffer.set_start(self.buffer.get_start());
-            self.broadcast_buffer.set_length(self.buffer.len());
-            self.broadcast_buffer.message_mut().clone_from_slice(self.buffer.message());
-            self.broadcast_buffer.prepend_byte(type_);
+        self.peer_crypto.for_each(|addr, crypto| {
+            msg_data.set_start(msg.get_start());
+            msg_data.set_length(msg.len());
+            msg_data.message_mut().clone_from_slice(msg.message());
+            msg_data.prepend_byte(type_);
            if let Some(crypto) = crypto {
-                crypto.encrypt(&mut self.broadcast_buffer);
+                crypto.encrypt(&mut msg_data);
            }
-            traffic.count_out_traffic(addr, self.broadcast_buffer.len());
-            match socket.send(self.broadcast_buffer.message(), addr).await {
-                Ok(written) if written == self.broadcast_buffer.len() => Ok(()),
+            traffic.count_out_traffic(addr, msg_data.len());
+            match socket.send(msg_data.message(), addr) {
+                Ok(written) if written == msg_data.len() => Ok(()),
                Ok(_) => Err(Error::Socket("Sent out truncated packet")),
-                Err(e) => Err(Error::SocketIo("IOError when sending", e)),
-            }?
-        }
-        Ok(())
+                Err(e) => Err(Error::SocketIo("IOError when sending", e))
+            }
+        })
    }

-    async fn forward_packet(&mut self) -> Result<(), Error> {
-        let (src, dst) = P::parse(self.buffer.message())?;
-        debug!("Read data from interface: src: {}, dst: {}, {} bytes", src, dst, self.buffer.len());
-        self.traffic.count_out_payload(dst, src, self.buffer.len());
+    fn forward_packet(&mut self, data: &mut MsgBuffer) -> Result<(), Error> {
+        let (src, dst) = P::parse(data.message())?;
+        debug!("Read data from interface: src: {}, dst: {}, {} bytes", src, dst, data.len());
+        self.traffic.count_out_payload(dst, src, data.len());
        match self.table.lookup(dst) {
            Some(addr) => {
                // Peer found for destination
                debug!("Found destination for {} => {}", dst, addr);
-                self.send_msg(addr, MESSAGE_TYPE_DATA).await?;
+                self.send_msg(addr, MESSAGE_TYPE_DATA, data)?;
            }
            None => {
                if self.broadcast {
                    debug!("No destination for {} found, broadcasting", dst);
-                    self.broadcast_msg(MESSAGE_TYPE_DATA).await?;
+                    self.broadcast_msg(MESSAGE_TYPE_DATA, data)?;
                } else {
                    debug!("No destination for {} found, dropping", dst);
-                    self.traffic.count_dropped_payload(self.buffer.len());
+                    self.traffic.count_dropped_payload(data.len());
                }
            }
        }
        Ok(())
    }

-    pub async fn housekeep(&mut self) -> Result<(), Error> {
-        self.peer_crypto.load();
+    fn housekeep(&mut self) -> Result<(), Error> {
+        self.peer_crypto.sync();
        self.table.sync();
        self.traffic.sync();
-        Ok(())
+        unimplemented!();
    }

-    pub async fn iteration(&mut self) {
-        if let Ok(result) = timeout(std::time::Duration::from_millis(1000), self.device.read(&mut self.buffer)).await {
-            try_fail!(result, "Failed to read from device: {}");
-            if let Err(e) = self.forward_packet().await {
+    pub fn run(mut self) {
+        let mut buffer = MsgBuffer::new(SPACE_BEFORE);
+        loop {
+            try_fail!(self.device.read(&mut buffer), "Failed to read from device: {}");
+            //TODO: set and handle timeout
+            if let Err(e) = self.forward_packet(&mut buffer) {
                error!("{}", e);
            }
-        }
-        let now = TS::now();
-        if self.next_housekeep < now {
-            if let Err(e) = self.housekeep().await {
-                error!("{}", e)
+            let now = TS::now();
+            if self.next_housekeep < now {
+                if let Err(e) = self.housekeep() {
+                    error!("{}", e)
+                }
+                self.next_housekeep = now + 1
            }
-            self.next_housekeep = now + 1
-        }
-    }
-
-    pub async fn run(mut self) {
-        loop {
-            self.iteration().await
        }
    }
 }
--- a/src/engine/mod.rs
+++ b/src/engine/mod.rs
@ -6,8 +6,7 @@ mod device_thread;
 mod shared;
 mod socket_thread;

-use std::{fs::File, hash::BuildHasherDefault};
-use tokio;
+use std::{fs::File, hash::BuildHasherDefault, thread};

 use fnv::FnvHasher;

@ -18,7 +17,7 @@ use crate::{
    engine::{
        device_thread::DeviceThread,
        shared::{SharedPeerCrypto, SharedTable, SharedTraffic},
-        socket_thread::SocketThread,
+        socket_thread::SocketThread
    },
    error::Error,
    messages::AddrList,
@ -26,7 +25,7 @@ use crate::{
    payload::Protocol,
    port_forwarding::PortForwarding,
    types::NodeId,
-    util::{addr_nice, resolve, CtrlC, Time, TimeSource},
+    util::{addr_nice, resolve, CtrlC, Time, TimeSource}
 };

 pub type Hash = BuildHasherDefault<FnvHasher>;
@ -34,14 +33,14 @@ pub type Hash = BuildHasherDefault<FnvHasher>;
 pub const STATS_INTERVAL: Time = 60;
 const SPACE_BEFORE: usize = 100;

-pub struct PeerData {
+struct PeerData {
    addrs: AddrList,
    #[allow(dead_code)] // TODO: export in status
    last_seen: Time,
    timeout: Time,
    peer_timeout: u16,
    node_id: NodeId,
-    crypto: PeerCrypto,
+    crypto: PeerCrypto
 }

 #[derive(Clone)]
@ -51,29 +50,30 @@ pub struct ReconnectEntry {
    tries: u16,
    timeout: u16,
    next: Time,
-    final_timeout: Option<Time>,
+    final_timeout: Option<Time>
 }

+
 pub struct GenericCloud<D: Device, P: Protocol, S: Socket, TS: TimeSource> {
    socket_thread: SocketThread<S, D, P, TS>,
-    device_thread: DeviceThread<S, D, P, TS>,
+    device_thread: DeviceThread<S, D, P, TS>
 }

 impl<D: Device, P: Protocol, S: Socket, TS: TimeSource> GenericCloud<D, P, S, TS> {
    #[allow(clippy::too_many_arguments)]
-    pub async fn new(
-        config: &Config, socket: S, device: D, port_forwarding: Option<PortForwarding>, stats_file: Option<File>,
-    ) -> Result<Self, Error> {
+    pub fn new(
+        config: &Config, socket: S, device: D, port_forwarding: Option<PortForwarding>, stats_file: Option<File>
+    ) -> Self {
        let table = SharedTable::<TS>::new(&config);
        let traffic = SharedTraffic::new();
        let peer_crypto = SharedPeerCrypto::new();
        let device_thread = DeviceThread::<S, D, P, TS>::new(
            config.clone(),
-            device.duplicate().await?,
+            device.clone(),
            socket.clone(),
            traffic.clone(),
            peer_crypto.clone(),
-            table.clone(),
+            table.clone()
        );
        let socket_thread = SocketThread::<S, D, P, TS>::new(
            config.clone(),
@ -83,71 +83,72 @@ impl<D: Device, P: Protocol, S: Socket, TS: TimeSource> GenericCloud<D, P, S, TS
            peer_crypto,
            table,
            port_forwarding,
-            stats_file,
+            stats_file
        );
-        Ok(Self { socket_thread, device_thread })
+        Self { socket_thread, device_thread }
    }

    pub fn add_peer(&mut self, addr: String) -> Result<(), Error> {
        unimplemented!()
    }

-    pub async fn run(self) {
+    pub fn run(self) {
+        // TODO: spawn threads
        let ctrlc = CtrlC::new();
-        let device_thread_handle = tokio::spawn(self.device_thread.run());
-        let socket_thread_handle = tokio::spawn(self.socket_thread.run());
+        let device_thread = self.device_thread;
+        let device_thread_handle = thread::spawn(move || device_thread.run());
+        let socket_thread = self.socket_thread;
+        let socket_thread_handle = thread::spawn(move || socket_thread.run());
        // TODO: wait for ctrl-c
-        let (dev_ret, sock_ret) = join!(device_thread_handle, socket_thread_handle);
-        dev_ret.unwrap();
-        sock_ret.unwrap();
+        device_thread_handle.join().unwrap();
+        socket_thread_handle.join().unwrap();
    }
 }

-#[cfg(test)]
-use super::device::MockDevice;
-#[cfg(test)]
-use super::net::MockSocket;
-#[cfg(test)]
-use super::util::MockTimeSource;
-#[cfg(test)]
-use std::net::SocketAddr;
+
+#[cfg(test)] use super::device::MockDevice;
+#[cfg(test)] use super::net::MockSocket;
+#[cfg(test)] use super::util::{MockTimeSource, MsgBuffer};
+#[cfg(test)] use std::net::SocketAddr;

 #[cfg(test)]
 impl<P: Protocol> GenericCloud<MockDevice, P, MockSocket, MockTimeSource> {
    pub fn socket(&mut self) -> &mut MockSocket {
-        &mut self.socket_thread.socket
+        unimplemented!()
+        //&mut self.socket
    }

    pub fn device(&mut self) -> &mut MockDevice {
-        &mut self.device_thread.device
+        unimplemented!()
+        //&mut self.device
    }

-    pub async fn connect(&mut self, addr: SocketAddr) -> Result<(), Error> {
-        self.socket_thread.connect(addr).await
+    pub fn trigger_socket_event(&mut self) {
+        let mut buffer = MsgBuffer::new(SPACE_BEFORE);
+        unimplemented!()
    }

-    pub async fn trigger_socket_event(&mut self) {
-        self.socket_thread.iteration().await
+    pub fn trigger_device_event(&mut self) {
+        let mut buffer = MsgBuffer::new(SPACE_BEFORE);
+        unimplemented!()
    }

-    pub async fn trigger_device_event(&mut self) {
-        self.device_thread.iteration().await
-    }
-
-    pub async fn trigger_housekeep(&mut self) {
-        try_fail!(self.socket_thread.housekeep().await, "Housekeep failed: {}");
-        try_fail!(self.device_thread.housekeep().await, "Housekeep failed: {}");
+    pub fn trigger_housekeep(&mut self) {
+        unimplemented!()
    }

    pub fn is_connected(&self, addr: &SocketAddr) -> bool {
-        self.socket_thread.peers.contains_key(addr)
+        unimplemented!()
+        // self.peers.contains_key(addr)
    }

    pub fn own_addresses(&self) -> &[SocketAddr] {
-        &self.socket_thread.own_addresses
+        unimplemented!()
+        //&self.own_addresses
    }

-    pub async fn get_num(&self) -> usize {
-        self.socket_thread.socket.address().await.unwrap().port() as usize
+    pub fn get_num(&self) -> usize {
+        unimplemented!()
+        // self.socket.address().unwrap().port() as usize
    }
 }
--- a/src/engine/shared.rs
+++ b/src/engine/shared.rs
@ -16,8 +16,6 @@ use std::{
    sync::Arc
 };

-use super::PeerData;
-
 #[derive(Clone)]
 pub struct SharedPeerCrypto {
    peers: Arc<Mutex<HashMap<SocketAddr, Option<Arc<CryptoCore>>, Hash>>>
@ -28,7 +26,11 @@ impl SharedPeerCrypto {
        SharedPeerCrypto { peers: Arc::new(Mutex::new(HashMap::default())) }
    }

-    pub fn encrypt_for(&self, peer: SocketAddr, data: &mut MsgBuffer) -> Result<(), Error> {
+    pub fn sync(&mut self) {
+        // TODO sync if needed
+    }
+
+    pub fn encrypt_for(&mut self, peer: SocketAddr, data: &mut MsgBuffer) -> Result<(), Error> {
        let mut peers = self.peers.lock();
        match peers.get_mut(&peer) {
            None => Err(Error::InvalidCryptoState("No crypto found for peer")),
@ -40,18 +42,14 @@ impl SharedPeerCrypto {
        }
    }

-    pub fn store(&self, data: &HashMap<SocketAddr, PeerData, Hash>) {
+    pub fn for_each(
+        &mut self, mut callback: impl FnMut(SocketAddr, Option<Arc<CryptoCore>>) -> Result<(), Error>
+    ) -> Result<(), Error> {
        let mut peers = self.peers.lock();
-        peers.clear();
-        peers.extend(data.iter().map(|(k, v)| (*k, v.crypto.get_core())));
-    }
-
-    pub fn load(&mut self) {
-        // TODO sync if needed
-    }
-    
-    pub fn get_snapshot(&self) -> HashMap<SocketAddr, Option<Arc<CryptoCore>>, Hash> {
-        self.peers.lock().clone()
+        for (k, v) in peers.iter_mut() {
+            callback(*k, v.clone())?
+        }
+        Ok(())
    }

    pub fn count(&self) -> usize {
--- a/src/engine/socket_thread.rs
+++ b/src/engine/socket_thread.rs
@ -1,6 +1,6 @@
 use super::{
    shared::{SharedPeerCrypto, SharedTable, SharedTraffic},
-    SPACE_BEFORE,
+    SPACE_BEFORE
 };

 use crate::{
@ -12,13 +12,13 @@ use crate::{
    error::Error,
    messages::{
        AddrList, NodeInfo, PeerInfo, MESSAGE_TYPE_CLOSE, MESSAGE_TYPE_DATA, MESSAGE_TYPE_KEEPALIVE,
-        MESSAGE_TYPE_NODE_INFO,
+        MESSAGE_TYPE_NODE_INFO
    },
    net::{mapped_addr, Socket},
    port_forwarding::PortForwarding,
    types::{Address, NodeId, Range, RangeList},
    util::{MsgBuffer, StatsdMsg, Time, TimeSource},
-    Config, Crypto, Device, Protocol,
+    Config, Crypto, Device, Protocol
 };
 use rand::{random, seq::SliceRandom, thread_rng};
 use smallvec::{smallvec, SmallVec};
@ -31,15 +31,16 @@ use std::{
    io::{Cursor, Seek, SeekFrom, Write},
    marker::PhantomData,
    net::{SocketAddr, ToSocketAddrs},
-    str::FromStr,
+    str::FromStr
 };
-use tokio::time::timeout;
+

 const MAX_RECONNECT_INTERVAL: u16 = 3600;
 const RESOLVE_INTERVAL: Time = 300;
 const OWN_ADDRESS_RESET_INTERVAL: Time = 300;
 pub const STATS_INTERVAL: Time = 60;

+
 #[derive(Clone)]
 pub struct ReconnectEntry {
    address: Option<(String, Time)>,
@ -47,7 +48,7 @@ pub struct ReconnectEntry {
    tries: u16,
    timeout: u16,
    next: Time,
-    final_timeout: Option<Time>,
+    final_timeout: Option<Time>
 }

 pub struct SocketThread<S: Socket, D: Device, P: Protocol, TS: TimeSource> {
@ -61,14 +62,14 @@ pub struct SocketThread<S: Socket, D: Device, P: Protocol, TS: TimeSource> {
    _dummy_ts: PhantomData<TS>,
    _dummy_p: PhantomData<P>,
    // Socket-only fields
-    pub socket: S,
+    socket: S,
    device: D,
    next_housekeep: Time,
-    pub own_addresses: AddrList,
+    own_addresses: AddrList,
    next_own_address_reset: Time,
    pending_inits: HashMap<SocketAddr, InitState<NodeInfo>, Hash>,
    crypto: Crypto,
-    pub peers: HashMap<SocketAddr, PeerData, Hash>,
+    peers: HashMap<SocketAddr, PeerData, Hash>,
    next_peers: Time,
    next_stats_out: Time,
    next_beacon: Time,
@ -76,20 +77,18 @@ pub struct SocketThread<S: Socket, D: Device, P: Protocol, TS: TimeSource> {
    stats_file: Option<File>,
    statsd_server: Option<String>,
    reconnect_peers: SmallVec<[ReconnectEntry; 3]>,
-    buffer: MsgBuffer,
-    broadcast_buffer: MsgBuffer,
    // Shared fields
    peer_crypto: SharedPeerCrypto,
    traffic: SharedTraffic,
    table: SharedTable<TS>,
    // Should not be here
-    port_forwarding: Option<PortForwarding>, // TODO: 3rd thread
+    port_forwarding: Option<PortForwarding> // TODO: 3rd thread
 }

 impl<S: Socket, D: Device, P: Protocol, TS: TimeSource> SocketThread<S, D, P, TS> {
    pub fn new(
        config: Config, device: D, socket: S, traffic: SharedTraffic, peer_crypto: SharedPeerCrypto,
-        table: SharedTable<TS>, port_forwarding: Option<PortForwarding>, stats_file: Option<File>,
+        table: SharedTable<TS>, port_forwarding: Option<PortForwarding>, stats_file: Option<File>
    ) -> Self {
        let mut claims = SmallVec::with_capacity(config.claims.len());
        for s in &config.claims {
@ -105,12 +104,13 @@ impl<S: Socket, D: Device, P: Protocol, TS: TimeSource> SocketThread<S, D, P, TS
                Err(Error::DeviceIo(_, e)) if e.kind() == io::ErrorKind::AddrNotAvailable => {
                    info!("No address set on interface.")
                }
-                Err(e) => error!("{}", e),
+                Err(e) => error!("{}", e)
            }
        }
        let now = TS::now();
        let update_freq = config.get_keepalive() as u16;
        let node_id = random();
+        let crypto = Crypto::new(node_id, &config.crypto).unwrap();
        let beacon_key = config.beacon_password.as_ref().map(|s| s.as_bytes()).unwrap_or(&[]);
        Self {
            _dummy_p: PhantomData,
@ -139,77 +139,72 @@ impl<S: Socket, D: Device, P: Protocol, TS: TimeSource> SocketThread<S, D, P, TS
            update_freq,
            statsd_server: config.statsd_server.clone(),
            crypto: Crypto::new(node_id, &config.crypto).unwrap(),
-            config,
-            buffer: MsgBuffer::new(SPACE_BEFORE),
-            broadcast_buffer: MsgBuffer::new(SPACE_BEFORE),
+            config
        }
    }

    #[inline]
-    async fn send_to(&mut self, addr: SocketAddr) -> Result<(), Error> {
-        let size = self.buffer.len();
-        debug!("Sending msg with {} bytes to {}", size, addr);
-        self.traffic.count_out_traffic(addr, size);
-        match self.socket.send(self.buffer.message(), addr).await {
-            Ok(written) if written == size => {
-                self.buffer.clear();
-                Ok(())
-            }
+    fn send_to(&mut self, addr: SocketAddr, msg: &MsgBuffer) -> Result<(), Error> {
+        debug!("Sending msg with {} bytes to {}", msg.len(), addr);
+        self.traffic.count_out_traffic(addr, msg.len());
+        match self.socket.send(msg.message(), addr) {
+            Ok(written) if written == msg.len() => Ok(()),
            Ok(_) => Err(Error::Socket("Sent out truncated packet")),
-            Err(e) => Err(Error::SocketIo("IOError when sending", e)),
+            Err(e) => Err(Error::SocketIo("IOError when sending", e))
        }
    }

    #[inline]
-    async fn broadcast_msg(&mut self, type_: u8) -> Result<(), Error> {
-        debug!("Broadcasting message type {}, {:?} bytes to {} peers", type_, self.buffer.len(), self.peers.len());
+    fn broadcast_msg(&mut self, type_: u8, msg: &mut MsgBuffer) -> Result<(), Error> {
+        debug!("Broadcasting message type {}, {:?} bytes to {} peers", type_, msg.len(), self.peers.len());
+        let mut msg_data = MsgBuffer::new(100);
        for (addr, peer) in &mut self.peers {
-            self.broadcast_buffer.set_start(self.buffer.get_start());
-            self.broadcast_buffer.set_length(self.buffer.len());
-            self.broadcast_buffer.message_mut().clone_from_slice(self.buffer.message());
-            self.broadcast_buffer.prepend_byte(type_);
-            peer.crypto.encrypt_message(&mut self.broadcast_buffer);
-            self.traffic.count_out_traffic(*addr, self.broadcast_buffer.len());
-            match self.socket.send(self.broadcast_buffer.message(), *addr).await {
-                Ok(written) if written == self.broadcast_buffer.len() => Ok(()),
+            msg_data.set_start(msg.get_start());
+            msg_data.set_length(msg.len());
+            msg_data.message_mut().clone_from_slice(msg.message());
+            msg_data.prepend_byte(type_);
+            peer.crypto.encrypt_message(&mut msg_data);
+            self.traffic.count_out_traffic(*addr, msg_data.len());
+            match self.socket.send(msg_data.message(), *addr) {
+                Ok(written) if written == msg_data.len() => Ok(()),
                Ok(_) => Err(Error::Socket("Sent out truncated packet")),
-                Err(e) => Err(Error::SocketIo("IOError when sending", e)),
+                Err(e) => Err(Error::SocketIo("IOError when sending", e))
            }?
        }
-        self.buffer.clear();
        Ok(())
    }

-    async fn connect_sock(&mut self, addr: SocketAddr) -> Result<(), Error> {
+    fn connect_sock(&mut self, addr: SocketAddr) -> Result<(), Error> {
        let addr = mapped_addr(addr);
        if self.peers.contains_key(&addr)
            || self.own_addresses.contains(&addr)
            || self.pending_inits.contains_key(&addr)
        {
-            return Ok(());
+            return Ok(())
        }
        debug!("Connecting to {:?}", addr);
        let payload = self.create_node_info();
        let mut init = self.crypto.peer_instance(payload);
-        init.send_ping(&mut self.buffer);
+        let mut msg = MsgBuffer::new(SPACE_BEFORE);
+        init.send_ping(&mut msg);
        self.pending_inits.insert(addr, init);
-        self.send_to(addr).await
+        self.send_to(addr, &msg)
    }

-    pub async fn connect<Addr: ToSocketAddrs + fmt::Debug + Clone>(&mut self, addr: Addr) -> Result<(), Error> {
+    pub fn connect<Addr: ToSocketAddrs + fmt::Debug + Clone>(&mut self, addr: Addr) -> Result<(), Error> {
        let addrs = resolve(&addr)?.into_iter().map(mapped_addr).collect::<SmallVec<[SocketAddr; 3]>>();
        for addr in &addrs {
            if self.own_addresses.contains(addr)
                || self.peers.contains_key(addr)
                || self.pending_inits.contains_key(addr)
            {
-                return Ok(());
+                return Ok(())
            }
        }
        // Send a message to each resolved address
        for a in addrs {
            // Ignore error this time
-            self.connect_sock(a).await.ok();
+            self.connect_sock(a).ok();
        }
        Ok(())
    }
@ -229,72 +224,68 @@ impl<S: Socket, D: Device, P: Protocol, TS: TimeSource> SocketThread<S, D, P, TS
            peers,
            claims: self.claims.clone(),
            peer_timeout: Some(self.peer_timeout_publish),
-            addrs: self.own_addresses.clone(),
+            addrs: self.own_addresses.clone()
        }
    }

-    async fn update_peer_info(&mut self, addr: SocketAddr, info: Option<NodeInfo>) -> Result<(), Error> {
+    fn update_peer_info(&mut self, addr: SocketAddr, info: Option<NodeInfo>) -> Result<(), Error> {
        if let Some(peer) = self.peers.get_mut(&addr) {
            peer.last_seen = TS::now();
            peer.timeout = TS::now() + self.config.peer_timeout as Time
        } else {
            error!("Received peer update from non peer {}", addr_nice(addr));
-            return Ok(());
+            return Ok(())
        }
        if let Some(info) = info {
            debug!("Adding claims of peer {}: {:?}", addr_nice(addr), info.claims);
            self.table.set_claims(addr, info.claims);
            debug!("Received {} peers from {}: {:?}", info.peers.len(), addr_nice(addr), info.peers);
-            self.connect_to_peers(&info.peers).await?;
+            self.connect_to_peers(&info.peers)?;
        }
        Ok(())
    }

-    async fn add_new_peer(&mut self, addr: SocketAddr, info: NodeInfo) -> Result<(), Error> {
+    fn add_new_peer(&mut self, addr: SocketAddr, info: NodeInfo, msg: &mut MsgBuffer) -> Result<(), Error> {
        info!("Added peer {}", addr_nice(addr));
        if let Some(init) = self.pending_inits.remove(&addr) {
-            self.buffer.clear();
-            let crypto = init.finish(&mut self.buffer);
-            self.peers.insert(
-                addr,
-                PeerData {
-                    addrs: info.addrs.clone(),
-                    crypto,
-                    node_id: info.node_id,
-                    peer_timeout: info.peer_timeout.unwrap_or(DEFAULT_PEER_TIMEOUT),
-                    last_seen: TS::now(),
-                    timeout: TS::now() + self.config.peer_timeout as Time,
-                },
-            );
-            self.update_peer_info(addr, Some(info)).await?;
-            if !self.buffer.is_empty() {
-                self.send_to(addr).await?;
+            msg.clear();
+            let crypto = init.finish(msg);
+            self.peers.insert(addr, PeerData {
+                addrs: info.addrs.clone(),
+                crypto,
+                node_id: info.node_id,
+                peer_timeout: info.peer_timeout.unwrap_or(DEFAULT_PEER_TIMEOUT),
+                last_seen: TS::now(),
+                timeout: TS::now() + self.config.peer_timeout as Time
+            });
+            self.update_peer_info(addr, Some(info))?;
+            if !msg.is_empty() {
+                self.send_to(addr, msg)?;
            }
-            self.peer_crypto.store(&self.peers);
        } else {
            error!("No init for new peer {}", addr_nice(addr));
        }
        Ok(())
    }

-    async fn connect_to_peers(&mut self, peers: &[PeerInfo]) -> Result<(), Error> {
+    fn connect_to_peers(&mut self, peers: &[PeerInfo]) -> Result<(), Error> {
        'outer: for peer in peers {
            for addr in &peer.addrs {
                if self.peers.contains_key(addr) {
-                    continue 'outer;
+                    continue 'outer
                }
            }
            if let Some(node_id) = peer.node_id {
                if self.node_id == node_id {
-                    continue 'outer;
+                    continue 'outer
                }
                for p in self.peers.values() {
                    if p.node_id == node_id {
-                        continue 'outer;
+                        continue 'outer
                    }
                }
            }
-            self.connect(&peer.addrs as &[SocketAddr]).await?;
+            self.connect(&peer.addrs as &[SocketAddr])?;
        }
        Ok(())
    }
@ -303,20 +294,18 @@ impl<S: Socket, D: Device, P: Protocol, TS: TimeSource> SocketThread<S, D, P, TS
        if let Some(_peer) = self.peers.remove(&addr) {
            info!("Closing connection to {}", addr_nice(addr));
            self.table.remove_claims(addr);
-            self.peer_crypto.store(&self.peers);
        }
    }

-    async fn handle_payload_from(&mut self, peer: SocketAddr) -> Result<(), Error> {
-        let (src, dst) = P::parse(self.buffer.message())?;
-        let len = self.buffer.len();
+    fn handle_payload_from(&mut self, peer: SocketAddr, data: &mut MsgBuffer) -> Result<(), Error> {
+        let (src, dst) = P::parse(data.message())?;
+        let len = data.len();
        debug!("Writing data to device: {} bytes", len);
        self.traffic.count_in_payload(src, dst, len);
-        if let Err(e) = self.device.write(&mut self.buffer).await {
+        if let Err(e) = self.device.write(data) {
            error!("Failed to send via device: {}", e);
-            return Err(e);
+            return Err(e)
        }
-        self.buffer.clear();
        if self.learning {
            // Learn single address
            self.table.cache(src, peer);
@ -324,90 +313,85 @@ impl<S: Socket, D: Device, P: Protocol, TS: TimeSource> SocketThread<S, D, P, TS
        Ok(())
    }

-    async fn process_message(&mut self, src: SocketAddr, msg_result: MessageResult) -> Result<(), Error> {
+    fn process_message(
+        &mut self, src: SocketAddr, msg_result: MessageResult, data: &mut MsgBuffer
+    ) -> Result<(), Error> {
        match msg_result {
-            MessageResult::Message(type_) => match type_ {
-                MESSAGE_TYPE_DATA => self.handle_payload_from(src).await?,
-                MESSAGE_TYPE_NODE_INFO => {
-                    let info = match NodeInfo::decode(Cursor::new(self.buffer.message())) {
-                        Ok(val) => val,
-                        Err(err) => {
-                            self.traffic.count_invalid_protocol(self.buffer.len());
-                            return Err(err);
-                        }
-                    };
-                    self.update_peer_info(src, Some(info)).await?;
-                    self.buffer.clear();
+            MessageResult::Message(type_) => {
+                match type_ {
+                    MESSAGE_TYPE_DATA => self.handle_payload_from(src, data)?,
+                    MESSAGE_TYPE_NODE_INFO => {
+                        let info = match NodeInfo::decode(Cursor::new(data.message())) {
+                            Ok(val) => val,
+                            Err(err) => {
+                                self.traffic.count_invalid_protocol(data.len());
+                                return Err(err)
+                            }
+                        };
+                        self.update_peer_info(src, Some(info))?
+                    }
+                    MESSAGE_TYPE_KEEPALIVE => self.update_peer_info(src, None)?,
+                    MESSAGE_TYPE_CLOSE => self.remove_peer(src),
+                    _ => {
+                        self.traffic.count_invalid_protocol(data.len());
+                        return Err(Error::Message("Unknown message type"))
+                    }
                }
-                MESSAGE_TYPE_KEEPALIVE => {
-                    self.update_peer_info(src, None).await?;
-                    self.buffer.clear();
-                }
-                MESSAGE_TYPE_CLOSE => {
-                    self.remove_peer(src);
-                    self.buffer.clear();
-                }
-                _ => {
-                    self.traffic.count_invalid_protocol(self.buffer.len());
-                    self.buffer.clear();
-                    return Err(Error::Message("Unknown message type"));
-                }
-            },
-            MessageResult::Reply => self.send_to(src).await?,
-            MessageResult::None => {
-                self.buffer.clear();
            }
+            MessageResult::Reply => self.send_to(src, data)?,
+            MessageResult::None => ()
        }
        Ok(())
    }

-    async fn handle_message(&mut self, src: SocketAddr) -> Result<(), Error> {
+    fn handle_message(&mut self, src: SocketAddr, data: &mut MsgBuffer) -> Result<(), Error> {
        let src = mapped_addr(src);
-        debug!("Received {} bytes from {}", self.buffer.len(), src);
-        let buffer = &mut self.buffer;
-        if let Some(result) = self.peers.get_mut(&src).map(|peer| peer.crypto.handle_message(buffer)) {
-            return self.process_message(src, result?).await;
+        debug!("Received {} bytes from {}", data.len(), src);
+        if let Some(result) = self.peers.get_mut(&src).map(|peer| peer.crypto.handle_message(data)) {
+            return self.process_message(src, result?, data)
        }
-        let is_init = is_init_message(buffer.message());
+        let is_init = is_init_message(data.message());
        if let Some(result) = self.pending_inits.get_mut(&src).map(|init| {
            if is_init {
-                init.handle_init(buffer)
+                init.handle_init(data)
            } else {
-                buffer.clear();
-                init.repeat_last_message(buffer);
+                data.clear();
+                init.repeat_last_message(data);
                Ok(InitResult::Continue)
            }
        }) {
-            if !buffer.is_empty() {
-                self.send_to(src).await?
+            match result? {
+                InitResult::Continue => {
+                    if !data.is_empty() {
+                        self.send_to(src, data)?
+                    }
+                }
+                InitResult::Success { peer_payload, .. } => self.add_new_peer(src, peer_payload, data)?
            }
-            if let InitResult::Success { peer_payload, .. } = result? {
-                self.add_new_peer(src, peer_payload).await?
-            }
-            return Ok(());
+            return Ok(())
        }
-        if !is_init_message(self.buffer.message()) {
+        if !is_init_message(data.message()) {
            info!("Ignoring non-init message from unknown peer {}", addr_nice(src));
-            self.traffic.count_invalid_protocol(self.buffer.len());
-            self.buffer.clear();
-            return Ok(());
+            self.traffic.count_invalid_protocol(data.len());
+            return Ok(())
        }
        let mut init = self.crypto.peer_instance(self.create_node_info());
-        let msg_result = init.handle_init(&mut self.buffer);
+        let msg_result = init.handle_init(data);
        match msg_result {
            Ok(_) => {
                self.pending_inits.insert(src, init);
-                self.send_to(src).await
+                self.send_to(src, data)
            }
            Err(err) => {
-                self.traffic.count_invalid_protocol(self.buffer.len());
+                self.traffic.count_invalid_protocol(data.len());
                Err(err)
            }
        }
    }

-    pub async fn housekeep(&mut self) -> Result<(), Error> {
+    fn housekeep(&mut self) -> Result<(), Error> {
        let now = TS::now();
+        let mut buffer = MsgBuffer::new(SPACE_BEFORE);
        let mut del: SmallVec<[SocketAddr; 3]> = SmallVec::new();
        for (&addr, ref data) in &self.peers {
            if data.timeout < now {
@ -418,10 +402,10 @@ impl<S: Socket, D: Device, P: Protocol, TS: TimeSource> SocketThread<S, D, P, TS
            info!("Forgot peer {} due to timeout", addr_nice(addr));
            self.peers.remove(&addr);
            self.table.remove_claims(addr);
-            self.connect_sock(addr).await?; // Try to reconnect
+            self.connect_sock(addr)?; // Try to reconnect
        }
        self.table.housekeep();
-        self.crypto_housekeep().await?;
+        self.crypto_housekeep()?;
        // Periodically extend the port-forwarding
        if let Some(ref mut pfw) = self.port_forwarding {
            pfw.check_extend();
@ -429,75 +413,75 @@ impl<S: Socket, D: Device, P: Protocol, TS: TimeSource> SocketThread<S, D, P, TS
        let now = TS::now();
        // Periodically reset own peers
        if self.next_own_address_reset <= now {
-            self.reset_own_addresses().await.map_err(|err| Error::SocketIo("Failed to get own addresses", err))?;
+            self.reset_own_addresses().map_err(|err| Error::SocketIo("Failed to get own addresses", err))?;
            self.next_own_address_reset = now + OWN_ADDRESS_RESET_INTERVAL;
        }
        // Periodically send peer list to peers
        if self.next_peers <= now {
            debug!("Send peer list to all peers");
            let info = self.create_node_info();
-            info.encode(&mut self.buffer);
-            self.broadcast_msg(MESSAGE_TYPE_NODE_INFO).await?;
+            info.encode(&mut buffer);
+            self.broadcast_msg(MESSAGE_TYPE_NODE_INFO, &mut buffer)?;
            // Reschedule for next update
            let min_peer_timeout = self.peers.iter().map(|p| p.1.peer_timeout).min().unwrap_or(DEFAULT_PEER_TIMEOUT);
            let interval = min(self.update_freq as u16, max(min_peer_timeout / 2 - 60, 1));
            self.next_peers = now + Time::from(interval);
        }
-        self.reconnect_to_peers().await?;
+        self.reconnect_to_peers()?;
        if self.next_stats_out < now {
            // Write out the statistics
            self.write_out_stats().map_err(|err| Error::FileIo("Failed to write stats file", err))?;
-            self.send_stats_to_statsd().await?;
+            self.send_stats_to_statsd()?;
            self.next_stats_out = now + STATS_INTERVAL;
            self.traffic.period(Some(5));
        }
        if let Some(peers) = self.beacon_serializer.get_cmd_results() {
            debug!("Loaded beacon with peers: {:?}", peers);
            for peer in peers {
-                self.connect_sock(peer).await?;
+                self.connect_sock(peer)?;
            }
        }
        if self.next_beacon < now {
            self.store_beacon()?;
-            self.load_beacon().await?;
+            self.load_beacon()?;
            self.next_beacon = now + Time::from(self.config.beacon_interval);
        }
+        // TODO: sync peer_crypto
        self.table.sync();
        self.traffic.sync();
-        self.peer_crypto.store(&self.peers);
-        assert!(self.buffer.is_empty());
-        Ok(())
+        unimplemented!();
    }

-    async fn crypto_housekeep(&mut self) -> Result<(), Error> {
+    fn crypto_housekeep(&mut self) -> Result<(), Error> {
+        let mut msg = MsgBuffer::new(SPACE_BEFORE);
        let mut del: SmallVec<[SocketAddr; 4]> = smallvec![];
        for addr in self.pending_inits.keys().copied().collect::<SmallVec<[SocketAddr; 4]>>() {
-            self.buffer.clear();
-            if self.pending_inits.get_mut(&addr).unwrap().every_second(&mut self.buffer).is_err() {
+            msg.clear();
+            if self.pending_inits.get_mut(&addr).unwrap().every_second(&mut msg).is_err() {
                del.push(addr)
-            } else if !self.buffer.is_empty() {
-                self.send_to(addr).await?
+            } else if !msg.is_empty() {
+                self.send_to(addr, &msg)?
            }
        }
        for addr in self.peers.keys().copied().collect::<SmallVec<[SocketAddr; 16]>>() {
-            self.buffer.clear();
-            self.peers.get_mut(&addr).unwrap().crypto.every_second(&mut self.buffer);
-            if !self.buffer.is_empty() {
-                self.send_to(addr).await?
+            msg.clear();
+            self.peers.get_mut(&addr).unwrap().crypto.every_second(&mut msg);
+            if !msg.is_empty() {
+                self.send_to(addr, &msg)?
            }
        }
        for addr in del {
            self.pending_inits.remove(&addr);
            if self.peers.remove(&addr).is_some() {
-                self.connect_sock(addr).await?;
+                self.connect_sock(addr)?;
            }
        }
        Ok(())
    }

-    async fn reset_own_addresses(&mut self) -> io::Result<()> {
+    fn reset_own_addresses(&mut self) -> io::Result<()> {
        self.own_addresses.clear();
-        self.own_addresses.push(self.socket.address().await.map(mapped_addr)?);
+        self.own_addresses.push(self.socket.address().map(mapped_addr)?);
        if let Some(ref pfw) = self.port_forwarding {
            self.own_addresses.push(pfw.get_internal_ip().into());
            self.own_addresses.push(pfw.get_external_ip().into());
@ -526,14 +510,14 @@ impl<S: Socket, D: Device, P: Protocol, TS: TimeSource> SocketThread<S, D, P, TS
    }

    /// Loads the beacon
-    async fn load_beacon(&mut self) -> Result<(), Error> {
+    fn load_beacon(&mut self) -> Result<(), Error> {
        let peers;
        if let Some(ref path) = self.config.beacon_load {
            if let Some(path) = path.strip_prefix('|') {
                self.beacon_serializer
                    .read_from_cmd(path, Some(50))
                    .map_err(|e| Error::BeaconIo("Failed to call beacon command", e))?;
-                return Ok(());
+                return Ok(())
            } else {
                peers = self
                    .beacon_serializer
@ -541,11 +525,11 @@ impl<S: Socket, D: Device, P: Protocol, TS: TimeSource> SocketThread<S, D, P, TS
                    .map_err(|e| Error::BeaconIo("Failed to read beacon from file", e))?;
            }
        } else {
-            return Ok(());
+            return Ok(())
        }
        debug!("Loaded beacon with peers: {:?}", peers);
        for peer in peers {
-            self.connect_sock(peer).await?;
+            self.connect_sock(peer)?;
        }
        Ok(())
    }
@ -577,7 +561,7 @@ impl<S: Socket, D: Device, P: Protocol, TS: TimeSource> SocketThread<S, D, P, TS
    }

    /// Sends the statistics to a statsd endpoint
-    async fn send_stats_to_statsd(&mut self) -> Result<(), Error> {
+    fn send_stats_to_statsd(&mut self) -> Result<(), Error> {
        if let Some(ref endpoint) = self.statsd_server {
            let peer_traffic = self.traffic.total_peer_traffic();
            let payload_traffic = self.traffic.total_payload_traffic();
@ -623,10 +607,10 @@ impl<S: Socket, D: Device, P: Protocol, TS: TimeSource> SocketThread<S, D, P, TS
            let msg_data = msg.as_bytes();
            let addrs = resolve(endpoint)?;
            if let Some(addr) = addrs.first() {
-                match self.socket.send(msg_data, *addr).await {
+                match self.socket.send(msg_data, *addr) {
                    Ok(written) if written == msg_data.len() => Ok(()),
                    Ok(_) => Err(Error::Socket("Sent out truncated packet")),
-                    Err(e) => Err(Error::SocketIo("IOError when sending", e)),
+                    Err(e) => Err(Error::SocketIo("IOError when sending", e))
                }?
            } else {
                error!("Failed to resolve statsd server {}", endpoint);
@ -635,14 +619,14 @@ impl<S: Socket, D: Device, P: Protocol, TS: TimeSource> SocketThread<S, D, P, TS
        Ok(())
    }

-    async fn reconnect_to_peers(&mut self) -> Result<(), Error> {
+    fn reconnect_to_peers(&mut self) -> Result<(), Error> {
        let now = TS::now();
        // Connect to those reconnect_peers that are due
        for entry in self.reconnect_peers.clone() {
            if entry.next > now {
-                continue;
+                continue
            }
-            self.connect(&entry.resolved as &[SocketAddr]).await?;
+            self.connect(&entry.resolved as &[SocketAddr])?;
        }
        for entry in &mut self.reconnect_peers {
            // Schedule for next second if node is connected
@ -651,7 +635,7 @@ impl<S: Socket, D: Device, P: Protocol, TS: TimeSource> SocketThread<S, D, P, TS
                    entry.tries = 0;
                    entry.timeout = 1;
                    entry.next = now + 1;
-                    continue;
+                    continue
                }
            }
            // Resolve entries anew
@ -659,17 +643,19 @@ impl<S: Socket, D: Device, P: Protocol, TS: TimeSource> SocketThread<S, D, P, TS
                if *next_resolve <= now {
                    match resolve(address as &str) {
                        Ok(addrs) => entry.resolved = addrs,
-                        Err(_) => match resolve(&format!("{}:{}", address, DEFAULT_PORT)) {
-                            Ok(addrs) => entry.resolved = addrs,
-                            Err(err) => warn!("Failed to resolve {}: {}", address, err),
-                        },
+                        Err(_) => {
+                            match resolve(&format!("{}:{}", address, DEFAULT_PORT)) {
+                                Ok(addrs) => entry.resolved = addrs,
+                                Err(err) => warn!("Failed to resolve {}: {}", address, err)
+                            }
+                        }
                    }
                    *next_resolve = now + RESOLVE_INTERVAL;
                }
            }
            // Ignore if next attempt is already in the future
            if entry.next > now {
-                continue;
+                continue
            }
            // Exponential back-off: every 10 tries, the interval doubles
            entry.tries += 1;
@ -688,43 +674,42 @@ impl<S: Socket, D: Device, P: Protocol, TS: TimeSource> SocketThread<S, D, P, TS
        Ok(())
    }

-    pub async fn iteration(&mut self) {
-        if let Ok(result) = timeout(std::time::Duration::from_millis(1000), self.socket.receive(&mut self.buffer)).await
-        {
-            let src = try_fail!(result, "Failed to read from network socket: {}");
-            match self.handle_message(src).await {
-                Err(e @ Error::CryptoInitFatal(_)) => {
-                    debug!("Fatal crypto init error from {}: {}", src, e);
-                    info!("Closing pending connection to {} due to error in crypto init", addr_nice(src));
-                    self.pending_inits.remove(&src);
-                    self.buffer.clear();
-                }
-                Err(e @ Error::CryptoInit(_)) => {
-                    debug!("Recoverable init error from {}: {}", src, e);
-                    info!("Ignoring invalid init message from peer {}", addr_nice(src));
-                    self.buffer.clear();
-                }
-                Err(e) => {
-                    error!("{}", e);
-                    self.buffer.clear();
-                }
-                Ok(_) => {}
-            }
-            debug_assert!(self.buffer.is_empty());
-        }
-        let now = TS::now();
-        if self.next_housekeep < now {
-            if let Err(e) = self.housekeep().await {
-                error!("{}", e)
-            }
-            self.next_housekeep = now + 1
-        }
-        debug_assert!(self.buffer.is_empty());
-    }
-
-    pub async fn run(mut self) {
+    pub fn run(mut self) {
+        let mut buffer = MsgBuffer::new(SPACE_BEFORE);
        loop {
-            self.iteration().await
+            match self.socket.receive(&mut buffer) {
+                Err(err) => {
+                    if err.kind() == io::ErrorKind::TimedOut || err.kind() == io::ErrorKind::WouldBlock {
+                        // ok, this is a normal timeout
+                    } else {
+                        fail!("Failed to read from network socket: {}", err);
+                    }
+                }
+                Ok(src) => {
+                    match self.handle_message(src, &mut buffer) {
+                        Err(e @ Error::CryptoInitFatal(_)) => {
+                            debug!("Fatal crypto init error from {}: {}", src, e);
+                            info!("Closing pending connection to {} due to error in crypto init", addr_nice(src));
+                            self.pending_inits.remove(&src);
+                        }
+                        Err(e @ Error::CryptoInit(_)) => {
+                            debug!("Recoverable init error from {}: {}", src, e);
+                            info!("Ignoring invalid init message from peer {}", addr_nice(src));
+                        }
+                        Err(e) => {
+                            error!("{}", e);
+                        }
+                        Ok(_) => {}
+                    }
+                }
+            }
+            let now = TS::now();
+            if self.next_housekeep < now {
+                if let Err(e) = self.housekeep() {
+                    error!("{}", e)
+                }
+                self.next_housekeep = now + 1
+            }
        }
    }
 }
--- a/src/installer.rs
+++ b/src/installer.rs
@ -1,10 +1,9 @@
-use crate::{error::Error, util::run_cmd};
+use crate::error::Error;
 use std::{
    env,
    fs::{self, File},
    io::Write,
-    os::unix::fs::PermissionsExt,
-    process::Command
+    os::unix::fs::PermissionsExt
 };

 const MANPAGE: &[u8] = include_bytes!("../target/vpncloud.1.gz");
@ -12,12 +11,6 @@ const SERVICE_FILE: &[u8] = include_bytes!("../assets/vpncloud@.service");
 const WS_PROXY_SERVICE_FILE: &[u8] = include_bytes!("../assets/vpncloud-wsproxy.service");
 const EXAMPLE_CONFIG: &[u8] = include_bytes!("../assets/example.net.disabled");

-fn systemctl_daemon_reload() {
-    let mut cmd = Command::new("systemctl");
-    cmd.arg("daemon-reload");
-    run_cmd(cmd);
-}
-
 pub fn install() -> Result<(), Error> {
    env::current_exe()
        .and_then(|p| fs::copy(p, "/usr/bin/vpncloud"))
@ -25,7 +18,7 @@ pub fn install() -> Result<(), Error> {
    fs::set_permissions("/usr/bin/vpncloud", fs::Permissions::from_mode(755))
        .map_err(|e| Error::FileIo("Failed to set permissions for binary", e))?;
    fs::create_dir_all("/etc/vpncloud").map_err(|e| Error::FileIo("Failed to create config folder", e))?;
-    fs::set_permissions("/etc/vpncloud", fs::Permissions::from_mode(700))
+    fs::set_permissions("/etc/vpncloud", fs::Permissions::from_mode(600))
        .map_err(|e| Error::FileIo("Failed to set permissions for config folder", e))?;
    File::create("/etc/vpncloud/example.net.disabled")
        .and_then(|mut f| f.write_all(EXAMPLE_CONFIG))
@ -39,7 +32,6 @@ pub fn install() -> Result<(), Error> {
    File::create("/lib/systemd/system/vpncloud-wsproxy.service")
        .and_then(|mut f| f.write_all(WS_PROXY_SERVICE_FILE))
        .map_err(|e| Error::FileIo("Failed to create wsporxy service file", e))?;
-    systemctl_daemon_reload();
    info!("Install successful");
    Ok(())
 }
@ -52,7 +44,6 @@ pub fn uninstall() -> Result<(), Error> {
    fs::remove_file("/lib/systemd/system/vpncloud-wsproxy.service")
        .map_err(|e| Error::FileIo("Failed to remove wsproxy service file", e))?;
    fs::remove_file("/usr/bin/vpncloud").map_err(|e| Error::FileIo("Failed to remove binary", e))?;
-    systemctl_daemon_reload();
    info!("Uninstall successful");
    Ok(())
 }
--- a/src/main.rs
+++ b/src/main.rs
@ -4,7 +4,6 @@

 #[macro_use] extern crate log;
 #[macro_use] extern crate serde;
-#[macro_use] extern crate tokio;

 #[cfg(test)] extern crate tempfile;

@ -135,16 +134,16 @@ fn parse_ip_netmask(addr: &str) -> Result<(Ipv4Addr, Ipv4Addr), String> {
    Ok((ip, netmask))
 }

-async fn setup_device(config: &Config) -> TunTapDevice {
+fn setup_device(config: &Config) -> TunTapDevice {
    let device = try_fail!(
-        TunTapDevice::new(&config.device_name, config.device_type, config.device_path.as_ref().map(|s| s as &str)).await,
+        TunTapDevice::new(&config.device_name, config.device_type, config.device_path.as_ref().map(|s| s as &str)),
        "Failed to open virtual {} interface {}: {}",
        config.device_type,
        config.device_name
    );
    info!("Opened device {}", device.ifname());
    config.call_hook("device_setup", vec![("IFNAME", device.ifname())], true);
-    if let Err(err) = device.set_mtu(None).await {
+    if let Err(err) = device.set_mtu(None) {
        error!("Error setting optimal MTU on {}: {}", device.ifname(), err);
    }
    if let Some(ip) = &config.ip {
@ -156,9 +155,9 @@ async fn setup_device(config: &Config) -> TunTapDevice {
        run_script(script, device.ifname());
    }
    if config.fix_rp_filter {
-        try_fail!(device.fix_rp_filter().await, "Failed to change rp_filter settings: {}");
+        try_fail!(device.fix_rp_filter(), "Failed to change rp_filter settings: {}");
    }
-    if let Ok(val) = device.get_rp_filter().await {
+    if let Ok(val) = device.get_rp_filter() {
        if val != 1 {
            warn!("Your networking configuration might be affected by a vulnerability (https://vpncloud.ddswd.de/docs/security/cve-2019-14899/), please change your rp_filter setting to 1 (currently {}).", val);
        }
@ -168,9 +167,9 @@ async fn setup_device(config: &Config) -> TunTapDevice {
 }

 #[allow(clippy::cognitive_complexity)]
-async fn run<P: Protocol, S: Socket>(config: Config, socket: S) {
-    let device = setup_device(&config).await;
-    let port_forwarding = if config.port_forwarding { socket.create_port_forwarding().await } else { None };
+fn run<P: Protocol, S: Socket>(config: Config, socket: S) {
+    let device = setup_device(&config);
+    let port_forwarding = if config.port_forwarding { socket.create_port_forwarding() } else { None };
    let stats_file = match config.stats_file {
        None => None,
        Some(ref name) => {
@ -188,7 +187,7 @@ async fn run<P: Protocol, S: Socket>(config: Config, socket: S) {
    };
    let ifname = device.ifname().to_string();
    let mut cloud =
-        try_fail!(GenericCloud::<TunTapDevice, P, S, SystemTimeSource>::new(&config, socket, device, port_forwarding, stats_file).await, "Failed to create engine: {}");
+        GenericCloud::<TunTapDevice, P, S, SystemTimeSource>::new(&config, socket, device, port_forwarding, stats_file);
    for mut addr in config.peers {
        if addr.find(':').unwrap_or(0) <= addr.find(']').unwrap_or(0) {
            // : not present or only in IPv6 address
@ -222,14 +221,13 @@ async fn run<P: Protocol, S: Socket>(config: Config, socket: S) {
        }
        try_fail!(pd.apply(), "Failed to drop privileges: {}");
    }
-    cloud.run().await;
+    cloud.run();
    if let Some(script) = config.ifdown {
        run_script(&script, &ifname);
    }
 }

-#[tokio::main]
-async fn main() {
+fn main() {
    let args: Args = Args::from_args();
    if args.version {
        println!("VpnCloud v{}", env!("CARGO_PKG_VERSION"));
@ -323,16 +321,16 @@ async fn main() {
    }
    #[cfg(feature = "websocket")]
    if config.listen.starts_with("ws://") {
-        let socket = try_fail!(ProxyConnection::listen(&config.listen).await, "Failed to open socket {}: {}", config.listen);
+        let socket = try_fail!(ProxyConnection::listen(&config.listen), "Failed to open socket {}: {}", config.listen);
        match config.device_type {
-            Type::Tap => run::<payload::Frame, _>(config, socket).await,
-            Type::Tun => run::<payload::Packet, _>(config, socket).await
+            Type::Tap => run::<payload::Frame, _>(config, socket),
+            Type::Tun => run::<payload::Packet, _>(config, socket)
        }
        return        
    }
-    let socket = try_fail!(NetSocket::listen(&config.listen).await, "Failed to open socket {}: {}", config.listen);
+    let socket = try_fail!(NetSocket::listen(&config.listen), "Failed to open socket {}: {}", config.listen);
    match config.device_type {
-        Type::Tap => run::<payload::Frame, _>(config, socket).await,
-        Type::Tun => run::<payload::Packet, _>(config, socket).await
+        Type::Tap => run::<payload::Frame, _>(config, socket),
+        Type::Tun => run::<payload::Packet, _>(config, socket)
    }
 }
--- a/src/net.rs
+++ b/src/net.rs
@ -4,24 +4,24 @@

 use super::util::{MockTimeSource, MsgBuffer, Time, TimeSource};
 use crate::port_forwarding::PortForwarding;
-use async_trait::async_trait;
 use parking_lot::Mutex;
 use std::{
    collections::{HashMap, VecDeque},
    io::{self, ErrorKind},
    net::{IpAddr, Ipv6Addr, SocketAddr, UdpSocket},
-    os::unix::io::AsRawFd,
+    os::unix::io::{AsRawFd, RawFd},
    sync::{
        atomic::{AtomicBool, Ordering},
-        Arc,
+        Arc
    },
+    time::Duration
 };

 pub fn mapped_addr(addr: SocketAddr) -> SocketAddr {
    // HOT PATH
    match addr {
        SocketAddr::V4(addr4) => SocketAddr::new(IpAddr::V6(addr4.ip().to_ipv6_mapped()), addr4.port()),
-        _ => addr,
+        _ => addr
    }
 }

@ -31,13 +31,12 @@ pub fn get_ip() -> IpAddr {
    s.local_addr().unwrap().ip()
 }

-#[async_trait]
-pub trait Socket: Sized + Clone + Send + Sync + 'static {
-    async fn listen(addr: &str) -> Result<Self, io::Error>;
-    async fn receive(&mut self, buffer: &mut MsgBuffer) -> Result<SocketAddr, io::Error>;
-    async fn send(&mut self, data: &[u8], addr: SocketAddr) -> Result<usize, io::Error>;
-    async fn address(&self) -> Result<SocketAddr, io::Error>;
-    async fn create_port_forwarding(&self) -> Option<PortForwarding>;
+pub trait Socket: AsRawFd + Sized + Clone + Send + 'static {
+    fn listen(addr: &str) -> Result<Self, io::Error>;
+    fn receive(&mut self, buffer: &mut MsgBuffer) -> Result<SocketAddr, io::Error>;
+    fn send(&mut self, data: &[u8], addr: SocketAddr) -> Result<usize, io::Error>;
+    fn address(&self) -> Result<SocketAddr, io::Error>;
+    fn create_port_forwarding(&self) -> Option<PortForwarding>;
 }

 pub fn parse_listen(addr: &str) -> SocketAddr {
@ -60,33 +59,40 @@ impl Clone for NetSocket {
    }
 }

+impl AsRawFd for NetSocket {
+    fn as_raw_fd(&self) -> RawFd {
+        self.0.as_raw_fd()
+    }
+}

-#[async_trait]
 impl Socket for NetSocket {
-    async fn listen(addr: &str) -> Result<Self, io::Error> {
+    fn listen(addr: &str) -> Result<Self, io::Error> {
        let addr = parse_listen(addr);
-        Ok(NetSocket(UdpSocket::bind(addr)?))
+        Ok(NetSocket(UdpSocket::bind(addr).and_then(|s| {
+            s.set_read_timeout(Some(Duration::from_secs(1)))?;
+            Ok(s)
+        })?))
    }

-    async fn receive(&mut self, buffer: &mut MsgBuffer) -> Result<SocketAddr, io::Error> {
+    fn receive(&mut self, buffer: &mut MsgBuffer) -> Result<SocketAddr, io::Error> {
        buffer.clear();
        let (size, addr) = self.0.recv_from(buffer.buffer())?;
        buffer.set_length(size);
        Ok(addr)
    }

-    async fn send(&mut self, data: &[u8], addr: SocketAddr) -> Result<usize, io::Error> {
+    fn send(&mut self, data: &[u8], addr: SocketAddr) -> Result<usize, io::Error> {
        self.0.send_to(data, addr)
    }

-    async fn address(&self) -> Result<SocketAddr, io::Error> {
+    fn address(&self) -> Result<SocketAddr, io::Error> {
        let mut addr = self.0.local_addr()?;
        addr.set_ip(get_ip());
        Ok(addr)
    }

-    async fn create_port_forwarding(&self) -> Option<PortForwarding> {
-        PortForwarding::new(self.address().await.unwrap().port())
+    fn create_port_forwarding(&self) -> Option<PortForwarding> {
+        PortForwarding::new(self.address().unwrap().port())
    }
 }

@ -94,13 +100,14 @@ thread_local! {
    static MOCK_SOCKET_NAT: AtomicBool = AtomicBool::new(false);
 }

+
 #[derive(Clone)]
 pub struct MockSocket {
    nat: bool,
    nat_peers: Arc<Mutex<HashMap<SocketAddr, Time>>>,
    address: SocketAddr,
    outbound: Arc<Mutex<VecDeque<(SocketAddr, Vec<u8>)>>>,
-    inbound: Arc<Mutex<VecDeque<(SocketAddr, Vec<u8>)>>>,
+    inbound: Arc<Mutex<VecDeque<(SocketAddr, Vec<u8>)>>>
 }

 impl MockSocket {
@ -110,7 +117,7 @@ impl MockSocket {
            nat_peers: Default::default(),
            address,
            outbound: Arc::new(Mutex::new(VecDeque::with_capacity(10))),
-            inbound: Arc::new(Mutex::new(VecDeque::with_capacity(10))),
+            inbound: Arc::new(Mutex::new(VecDeque::with_capacity(10)))
        }
    }

@ -125,12 +132,12 @@ impl MockSocket {
    pub fn put_inbound(&mut self, from: SocketAddr, data: Vec<u8>) -> bool {
        if !self.nat {
            self.inbound.lock().push_back((from, data));
-            return true;
+            return true
        }
        if let Some(timeout) = self.nat_peers.lock().get(&from) {
            if *timeout >= MockTimeSource::now() {
                self.inbound.lock().push_back((from, data));
-                return true;
+                return true
            }
        }
        warn!("Sender {:?} is filtered out by NAT", from);
@ -142,14 +149,18 @@ impl MockSocket {
    }
 }

+impl AsRawFd for MockSocket {
+    fn as_raw_fd(&self) -> RawFd {
+        unimplemented!()
+    }
+}

-#[async_trait]
 impl Socket for MockSocket {
-    async fn listen(addr: &str) -> Result<Self, io::Error> {
+    fn listen(addr: &str) -> Result<Self, io::Error> {
        Ok(Self::new(parse_listen(addr)))
    }

-    async fn receive(&mut self, buffer: &mut MsgBuffer) -> Result<SocketAddr, io::Error> {
+    fn receive(&mut self, buffer: &mut MsgBuffer) -> Result<SocketAddr, io::Error> {
        if let Some((addr, data)) = self.inbound.lock().pop_front() {
            buffer.clear();
            buffer.set_length(data.len());
@ -160,7 +171,7 @@ impl Socket for MockSocket {
        }
    }

-    async fn send(&mut self, data: &[u8], addr: SocketAddr) -> Result<usize, io::Error> {
+    fn send(&mut self, data: &[u8], addr: SocketAddr) -> Result<usize, io::Error> {
        self.outbound.lock().push_back((addr, data.into()));
        if self.nat {
            self.nat_peers.lock().insert(addr, MockTimeSource::now() + 300);
@ -168,11 +179,11 @@ impl Socket for MockSocket {
        Ok(data.len())
    }

-    async fn address(&self) -> Result<SocketAddr, io::Error> {
+    fn address(&self) -> Result<SocketAddr, io::Error> {
        Ok(self.address)
    }

-    async fn create_port_forwarding(&self) -> Option<PortForwarding> {
+    fn create_port_forwarding(&self) -> Option<PortForwarding> {
        None
    }
 }
--- a/src/payload.rs
+++ b/src/payload.rs
@ -54,7 +54,7 @@ impl Protocol for Frame {


 #[test]
-async fn decode_frame_without_vlan() {
+fn decode_frame_without_vlan() {
    let data = [6, 5, 4, 3, 2, 1, 1, 2, 3, 4, 5, 6, 1, 2, 3, 4, 5, 6, 7, 8];
    let (src, dst) = Frame::parse(&data).unwrap();
    assert_eq!(src, Address { data: [1, 2, 3, 4, 5, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], len: 6 });
@ -62,7 +62,7 @@ async fn decode_frame_without_vlan() {
 }

 #[test]
-async fn decode_frame_with_vlan() {
+fn decode_frame_with_vlan() {
    let data = [6, 5, 4, 3, 2, 1, 1, 2, 3, 4, 5, 6, 0x81, 0, 4, 210, 1, 2, 3, 4, 5, 6, 7, 8];
    let (src, dst) = Frame::parse(&data).unwrap();
    assert_eq!(src, Address { data: [4, 210, 1, 2, 3, 4, 5, 6, 0, 0, 0, 0, 0, 0, 0, 0], len: 8 });
@ -70,7 +70,7 @@ async fn decode_frame_with_vlan() {
 }

 #[test]
-async fn decode_invalid_frame() {
+fn decode_invalid_frame() {
    assert!(Frame::parse(&[6, 5, 4, 3, 2, 1, 1, 2, 3, 4, 5, 6, 1, 2, 3, 4, 5, 6, 7, 8]).is_ok());
    // truncated frame
    assert!(Frame::parse(&[]).is_err());
@ -120,7 +120,7 @@ impl Protocol for Packet {


 #[test]
-async fn decode_ipv4_packet() {
+fn decode_ipv4_packet() {
    let data = [0x40, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 192, 168, 1, 1, 192, 168, 1, 2];
    let (src, dst) = Packet::parse(&data).unwrap();
    assert_eq!(src, Address { data: [192, 168, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], len: 4 });
@ -128,7 +128,7 @@ async fn decode_ipv4_packet() {
 }

 #[test]
-async fn decode_ipv6_packet() {
+fn decode_ipv6_packet() {
    let data = [
        0x60, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 0, 9, 8, 7, 6, 5, 4, 3, 2, 1, 6, 5,
        4, 3, 2, 1
@ -139,7 +139,7 @@ async fn decode_ipv6_packet() {
 }

 #[test]
-async fn decode_invalid_packet() {
+fn decode_invalid_packet() {
    assert!(Packet::parse(&[0x40, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 192, 168, 1, 1, 192, 168, 1, 2]).is_ok());
    assert!(Packet::parse(&[
        0x60, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 0, 9, 8, 7, 6, 5, 4, 3, 2, 1, 6, 5,
--- a/src/tests/common.rs
+++ b/src/tests/common.rs
@ -82,7 +82,7 @@ impl<P: Protocol> Simulator<P> {
        Self { next_port: 1, nodes: HashMap::default(), messages: VecDeque::default() }
    }

-    pub async fn add_node(&mut self, nat: bool, config: &Config) -> SocketAddr {
+    pub fn add_node(&mut self, nat: bool, config: &Config) -> SocketAddr {
        let mut config = config.clone();
        MockSocket::set_nat(nat);
        config.listen = format!("[::]:{}", self.next_port);
@ -92,25 +92,25 @@ impl<P: Protocol> Simulator<P> {
        }
        DebugLogger::set_node(self.next_port as usize);
        self.next_port += 1;
-        let node = TestNode::new(&config, MockSocket::new(addr), MockDevice::new(), None, None).await.unwrap();
+        let node = TestNode::new(&config, MockSocket::new(addr), MockDevice::new(), None, None);
        DebugLogger::set_node(0);
        self.nodes.insert(addr, node);
        addr
    }

    #[allow(dead_code)]
-    pub async fn get_node(&mut self, addr: SocketAddr) -> &mut TestNode<P> {
+    pub fn get_node(&mut self, addr: SocketAddr) -> &mut TestNode<P> {
        let node = self.nodes.get_mut(&addr).unwrap();
-        DebugLogger::set_node(node.get_num().await);
+        DebugLogger::set_node(node.get_num());
        node
    }

-    pub async fn simulate_next_message(&mut self) {
+    pub fn simulate_next_message(&mut self) {
        if let Some((src, dst, data)) = self.messages.pop_front() {
            if let Some(node) = self.nodes.get_mut(&dst) {
                if node.socket().put_inbound(src, data) {
-                    DebugLogger::set_node(node.get_num().await);
-                    node.trigger_socket_event().await;
+                    DebugLogger::set_node(node.get_num());
+                    node.trigger_socket_event();
                    DebugLogger::set_node(0);
                    let sock = node.socket();
                    let src = dst;
@ -124,16 +124,16 @@ impl<P: Protocol> Simulator<P> {
        }
    }

-    pub async fn simulate_all_messages(&mut self) {
+    pub fn simulate_all_messages(&mut self) {
        while !self.messages.is_empty() {
-            self.simulate_next_message().await
+            self.simulate_next_message()
        }
    }

-    pub async fn trigger_node_housekeep(&mut self, addr: SocketAddr) {
+    pub fn trigger_node_housekeep(&mut self, addr: SocketAddr) {
        let node = self.nodes.get_mut(&addr).unwrap();
-        DebugLogger::set_node(node.get_num().await);
-        node.trigger_housekeep().await;
+        DebugLogger::set_node(node.get_num());
+        node.trigger_housekeep();
        DebugLogger::set_node(0);
        let sock = node.socket();
        while let Some((dst, data)) = sock.pop_outbound() {
@ -141,10 +141,10 @@ impl<P: Protocol> Simulator<P> {
        }
    }

-    pub async fn trigger_housekeep(&mut self) {
+    pub fn trigger_housekeep(&mut self) {
        for (src, node) in &mut self.nodes {
-            DebugLogger::set_node(node.get_num().await);
-            node.trigger_housekeep().await;
+            DebugLogger::set_node(node.get_num());
+            node.trigger_housekeep();
            DebugLogger::set_node(0);
            let sock = node.socket();
            while let Some((dst, data)) = sock.pop_outbound() {
@ -157,20 +157,20 @@ impl<P: Protocol> Simulator<P> {
        MockTimeSource::set_time(time);
    }

-    pub async fn simulate_time(&mut self, time: Time) {
+    pub fn simulate_time(&mut self, time: Time) {
        let mut t = MockTimeSource::now();
        while t < time {
            t += 1;
            self.set_time(t);
-            self.trigger_housekeep().await;
-            self.simulate_all_messages().await;
+            self.trigger_housekeep();
+            self.simulate_all_messages();
        }
    }

-    pub async fn connect(&mut self, src: SocketAddr, dst: SocketAddr) {
+    pub fn connect(&mut self, src: SocketAddr, dst: SocketAddr) {
        let node = self.nodes.get_mut(&src).unwrap();
-        DebugLogger::set_node(node.get_num().await);
-        node.connect(dst).await.unwrap();
+        DebugLogger::set_node(node.get_num());
+        node.connect(dst).unwrap();
        DebugLogger::set_node(0);
        let sock = node.socket();
        while let Some((dst, data)) = sock.pop_outbound() {
@ -192,11 +192,11 @@ impl<P: Protocol> Simulator<P> {
        self.messages.len()
    }

-    pub async fn put_payload(&mut self, addr: SocketAddr, data: Vec<u8>) {
+    pub fn put_payload(&mut self, addr: SocketAddr, data: Vec<u8>) {
        let node = self.nodes.get_mut(&addr).unwrap();
        node.device().put_inbound(data);
-        DebugLogger::set_node(node.get_num().await);
-        node.trigger_device_event().await;
+        DebugLogger::set_node(node.get_num());
+        node.trigger_device_event();
        DebugLogger::set_node(0);
        let sock = node.socket();
        while let Some((dst, data)) = sock.pop_outbound() {
--- a/src/tests/nat.rs
+++ b/src/tests/nat.rs
@ -5,35 +5,35 @@
 use super::common::*;

 #[test]
-async fn connect_nat_2_peers() {
+fn connect_nat_2_peers() {
    let config = Config { port_forwarding: false, ..Default::default() };
    let mut sim = TapSimulator::new();
-    let node1 = sim.add_node(true, &config).await;
-    let node2 = sim.add_node(true, &config).await;
+    let node1 = sim.add_node(true, &config);
+    let node2 = sim.add_node(true, &config);

-    sim.connect(node1, node2).await;
-    sim.connect(node2, node1).await;
+    sim.connect(node1, node2);
+    sim.connect(node2, node1);

-    sim.simulate_time(60).await;
+    sim.simulate_time(60);

    assert!(sim.is_connected(node1, node2));
    assert!(sim.is_connected(node2, node1));
 }

 #[test]
-async fn connect_nat_3_peers() {
+fn connect_nat_3_peers() {
    let config = Config::default();
    let mut sim = TapSimulator::new();
-    let node1 = sim.add_node(true, &config).await;
-    let node2 = sim.add_node(true, &config).await;
-    let node3 = sim.add_node(true, &config).await;
+    let node1 = sim.add_node(true, &config);
+    let node2 = sim.add_node(true, &config);
+    let node3 = sim.add_node(true, &config);

-    sim.connect(node1, node2).await;
-    sim.connect(node2, node1).await;
-    sim.connect(node1, node3).await;
-    sim.connect(node3, node1).await;
+    sim.connect(node1, node2);
+    sim.connect(node2, node1);
+    sim.connect(node1, node3);
+    sim.connect(node3, node1);

-    sim.simulate_time(300).await;
+    sim.simulate_time(300);
    assert!(sim.is_connected(node1, node2));
    assert!(sim.is_connected(node2, node1));
    assert!(sim.is_connected(node1, node3));
@ -43,19 +43,19 @@ async fn connect_nat_3_peers() {
 }

 #[test]
-async fn nat_keepalive() {
+fn nat_keepalive() {
    let config = Config::default();
    let mut sim = TapSimulator::new();
-    let node1 = sim.add_node(true, &config).await;
-    let node2 = sim.add_node(true, &config).await;
-    let node3 = sim.add_node(true, &config).await;
+    let node1 = sim.add_node(true, &config);
+    let node2 = sim.add_node(true, &config);
+    let node3 = sim.add_node(true, &config);

-    sim.connect(node1, node2).await;
-    sim.connect(node2, node1).await;
-    sim.connect(node1, node3).await;
-    sim.connect(node3, node1).await;
+    sim.connect(node1, node2);
+    sim.connect(node2, node1);
+    sim.connect(node1, node3);
+    sim.connect(node3, node1);

-    sim.simulate_time(1000).await;
+    sim.simulate_time(1000);
    assert!(sim.is_connected(node1, node2));
    assert!(sim.is_connected(node2, node1));
    assert!(sim.is_connected(node1, node3));
@ -63,7 +63,7 @@ async fn nat_keepalive() {
    assert!(sim.is_connected(node2, node3));
    assert!(sim.is_connected(node3, node2));

-    sim.simulate_time(10000).await;
+    sim.simulate_time(10000);
    assert!(sim.is_connected(node1, node2));
    assert!(sim.is_connected(node2, node1));
    assert!(sim.is_connected(node1, node3));
--- a/src/tests/payload.rs
+++ b/src/tests/payload.rs
@ -5,37 +5,37 @@
 use super::common::*;

 #[test]
-async fn switch_delivers() {
+fn switch_delivers() {
    let config = Config { device_type: Type::Tap, ..Config::default() };
    let mut sim = TapSimulator::new();
-    let node1 = sim.add_node(false, &config).await;
-    let node2 = sim.add_node(false, &config).await;
+    let node1 = sim.add_node(false, &config);
+    let node2 = sim.add_node(false, &config);

-    sim.connect(node1, node2).await;
-    sim.simulate_all_messages().await;
+    sim.connect(node1, node2);
+    sim.simulate_all_messages();
    assert!(sim.is_connected(node1, node2));
    assert!(sim.is_connected(node2, node1));

    let payload = vec![2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 1, 2, 3, 4, 5];

-    sim.put_payload(node1, payload.clone()).await;
-    sim.simulate_all_messages().await;
+    sim.put_payload(node1, payload.clone());
+    sim.simulate_all_messages();

    assert_eq!(Some(payload), sim.pop_payload(node2));
 }

 #[test]
-async fn switch_learns() {
+fn switch_learns() {
    let config = Config { device_type: Type::Tap, ..Config::default() };
    let mut sim = TapSimulator::new();
-    let node1 = sim.add_node(false, &config).await;
-    let node2 = sim.add_node(false, &config).await;
-    let node3 = sim.add_node(false, &config).await;
+    let node1 = sim.add_node(false, &config);
+    let node2 = sim.add_node(false, &config);
+    let node3 = sim.add_node(false, &config);

-    sim.connect(node1, node2).await;
-    sim.connect(node1, node3).await;
-    sim.connect(node2, node3).await;
-    sim.simulate_all_messages().await;
+    sim.connect(node1, node2);
+    sim.connect(node1, node3);
+    sim.connect(node2, node3);
+    sim.simulate_all_messages();
    assert!(sim.is_connected(node1, node2));
    assert!(sim.is_connected(node2, node1));
    assert!(sim.is_connected(node1, node3));
@ -47,8 +47,8 @@ async fn switch_learns() {

    // Nothing learnt so far, node1 broadcasts

-    sim.put_payload(node1, payload.clone()).await;
-    sim.simulate_all_messages().await;
+    sim.put_payload(node1, payload.clone());
+    sim.simulate_all_messages();

    assert_eq!(Some(payload.clone()), sim.pop_payload(node2));
    assert_eq!(Some(payload), sim.pop_payload(node3));
@ -57,25 +57,25 @@ async fn switch_learns() {

    // Node 2 learned the address by receiving it, does not broadcast

-    sim.put_payload(node2, payload.clone()).await;
-    sim.simulate_all_messages().await;
+    sim.put_payload(node2, payload.clone());
+    sim.simulate_all_messages();

    assert_eq!(Some(payload), sim.pop_payload(node1));
    assert_eq!(None, sim.pop_payload(node3));
 }

 #[test]
-async fn switch_honours_vlans() {
+fn switch_honours_vlans() {
    let config = Config { device_type: Type::Tap, ..Config::default() };
    let mut sim = TapSimulator::new();
-    let node1 = sim.add_node(false, &config).await;
-    let node2 = sim.add_node(false, &config).await;
-    let node3 = sim.add_node(false, &config).await;
+    let node1 = sim.add_node(false, &config);
+    let node2 = sim.add_node(false, &config);
+    let node3 = sim.add_node(false, &config);

-    sim.connect(node1, node2).await;
-    sim.connect(node1, node3).await;
-    sim.connect(node2, node3).await;
-    sim.simulate_all_messages().await;
+    sim.connect(node1, node2);
+    sim.connect(node1, node3);
+    sim.connect(node2, node3);
+    sim.simulate_all_messages();
    assert!(sim.is_connected(node1, node2));
    assert!(sim.is_connected(node2, node1));
    assert!(sim.is_connected(node1, node3));
@ -87,8 +87,8 @@ async fn switch_honours_vlans() {

    // Nothing learnt so far, node1 broadcasts

-    sim.put_payload(node1, payload.clone()).await;
-    sim.simulate_all_messages().await;
+    sim.put_payload(node1, payload.clone());
+    sim.simulate_all_messages();

    assert_eq!(Some(payload.clone()), sim.pop_payload(node2));
    assert_eq!(Some(payload), sim.pop_payload(node3));
@ -97,8 +97,8 @@ async fn switch_honours_vlans() {

    // Node 2 learned the address by receiving it, does not broadcast

-    sim.put_payload(node2, payload.clone()).await;
-    sim.simulate_all_messages().await;
+    sim.put_payload(node2, payload.clone());
+    sim.simulate_all_messages();

    assert_eq!(Some(payload), sim.pop_payload(node1));
    assert_eq!(None, sim.pop_payload(node3));
@ -107,8 +107,8 @@ async fn switch_honours_vlans() {

    // Different VLANs, node 2 does not learn, still broadcasts

-    sim.put_payload(node2, payload.clone()).await;
-    sim.simulate_all_messages().await;
+    sim.put_payload(node2, payload.clone());
+    sim.simulate_all_messages();

    assert_eq!(Some(payload.clone()), sim.pop_payload(node1));
    assert_eq!(Some(payload), sim.pop_payload(node3));
@ -116,13 +116,13 @@ async fn switch_honours_vlans() {

 #[test]
 #[ignore]
-async fn switch_forgets() {
+fn switch_forgets() {
    // TODO Test
    unimplemented!()
 }

 #[test]
-async fn router_delivers() {
+fn router_delivers() {
    let config1 = Config {
        device_type: Type::Tun,
        auto_claim: false,
@ -136,24 +136,24 @@ async fn router_delivers() {
        ..Config::default()
    };
    let mut sim = TunSimulator::new();
-    let node1 = sim.add_node(false, &config1).await;
-    let node2 = sim.add_node(false, &config2).await;
+    let node1 = sim.add_node(false, &config1);
+    let node2 = sim.add_node(false, &config2);

-    sim.connect(node1, node2).await;
-    sim.simulate_all_messages().await;
+    sim.connect(node1, node2);
+    sim.simulate_all_messages();
    assert!(sim.is_connected(node1, node2));
    assert!(sim.is_connected(node2, node1));

    let payload = vec![0x40, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2];

-    sim.put_payload(node1, payload.clone()).await;
-    sim.simulate_all_messages().await;
+    sim.put_payload(node1, payload.clone());
+    sim.simulate_all_messages();

    assert_eq!(Some(payload), sim.pop_payload(node2));
 }

 #[test]
-async fn router_drops_unknown_dest() {
+fn router_drops_unknown_dest() {
    let config1 = Config {
        device_type: Type::Tun,
        auto_claim: false,
@ -167,18 +167,18 @@ async fn router_drops_unknown_dest() {
        ..Config::default()
    };
    let mut sim = TunSimulator::new();
-    let node1 = sim.add_node(false, &config1).await;
-    let node2 = sim.add_node(false, &config2).await;
+    let node1 = sim.add_node(false, &config1);
+    let node2 = sim.add_node(false, &config2);

-    sim.connect(node1, node2).await;
-    sim.simulate_all_messages().await;
+    sim.connect(node1, node2);
+    sim.simulate_all_messages();
    assert!(sim.is_connected(node1, node2));
    assert!(sim.is_connected(node2, node1));

    let payload = vec![0x40, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 3, 3, 3, 3];

-    sim.put_payload(node1, payload).await;
-    sim.simulate_all_messages().await;
+    sim.put_payload(node1, payload);
+    sim.simulate_all_messages();

    assert_eq!(None, sim.pop_payload(node2));
 }
--- a/src/tests/peers.rs
+++ b/src/tests/peers.rs
@ -5,47 +5,47 @@
 use super::common::*;

 #[test]
-async fn direct_connect() {
+fn direct_connect() {
    let config = Config::default();
    let mut sim = TapSimulator::new();
-    let node1 = sim.add_node(false, &config).await;
-    let node2 = sim.add_node(false, &config).await;
+    let node1 = sim.add_node(false, &config);
+    let node2 = sim.add_node(false, &config);

-    sim.connect(node1, node2).await;
-    sim.simulate_all_messages().await;
+    sim.connect(node1, node2);
+    sim.simulate_all_messages();
    assert!(sim.is_connected(node1, node2));
    assert!(sim.is_connected(node2, node1));
 }

 #[test]
-async fn direct_connect_unencrypted() {
+fn direct_connect_unencrypted() {
    let config = Config {
        crypto: CryptoConfig { algorithms: vec!["plain".to_string()], ..CryptoConfig::default() },
        ..Config::default()
    };
    let mut sim = TapSimulator::new();
-    let node1 = sim.add_node(false, &config).await;
-    let node2 = sim.add_node(false, &config).await;
+    let node1 = sim.add_node(false, &config);
+    let node2 = sim.add_node(false, &config);

-    sim.connect(node1, node2).await;
-    sim.simulate_all_messages().await;
+    sim.connect(node1, node2);
+    sim.simulate_all_messages();
    assert!(sim.is_connected(node1, node2));
    assert!(sim.is_connected(node2, node1));
 }

 #[test]
-async fn cross_connect() {
+fn cross_connect() {
    let config = Config::default();
    let mut sim = TapSimulator::new();
-    let node1 = sim.add_node(false, &config).await;
-    let node2 = sim.add_node(false, &config).await;
-    let node3 = sim.add_node(false, &config).await;
+    let node1 = sim.add_node(false, &config);
+    let node2 = sim.add_node(false, &config);
+    let node3 = sim.add_node(false, &config);

-    sim.connect(node1, node2).await;
-    sim.connect(node1, node3).await;
-    sim.simulate_all_messages().await;
+    sim.connect(node1, node2);
+    sim.connect(node1, node3);
+    sim.simulate_all_messages();

-    sim.simulate_time(120).await;
+    sim.simulate_time(120);

    assert!(sim.is_connected(node1, node2));
    assert!(sim.is_connected(node2, node1));
@ -56,124 +56,124 @@ async fn cross_connect() {
 }

 #[test]
-async fn connect_via_beacons() {
+fn connect_via_beacons() {
    let mut sim = TapSimulator::new();
    let beacon_path = "target/.vpncloud_test";
    let config1 = Config { beacon_store: Some(beacon_path.to_string()), ..Default::default() };
-    let node1 = sim.add_node(false, &config1).await;
+    let node1 = sim.add_node(false, &config1);
    let config2 = Config { beacon_load: Some(beacon_path.to_string()), ..Default::default() };
-    let node2 = sim.add_node(false, &config2).await;
+    let node2 = sim.add_node(false, &config2);

    sim.set_time(100);
-    sim.trigger_node_housekeep(node1).await;
-    sim.trigger_node_housekeep(node2).await;
-    sim.simulate_all_messages().await;
+    sim.trigger_node_housekeep(node1);
+    sim.trigger_node_housekeep(node2);
+    sim.simulate_all_messages();

    assert!(sim.is_connected(node1, node2));
    assert!(sim.is_connected(node2, node1));
 }

 #[test]
-async fn reconnect_after_timeout() {
+fn reconnect_after_timeout() {
    let config = Config::default();
    let mut sim = TapSimulator::new();
-    let node1 = sim.add_node(false, &config).await;
-    let node2 = sim.add_node(false, &config).await;
+    let node1 = sim.add_node(false, &config);
+    let node2 = sim.add_node(false, &config);

-    sim.connect(node1, node2).await;
-    sim.simulate_all_messages().await;
+    sim.connect(node1, node2);
+    sim.simulate_all_messages();
    assert!(sim.is_connected(node1, node2));
    assert!(sim.is_connected(node2, node1));

    sim.set_time(5000);
-    sim.trigger_housekeep().await;
+    sim.trigger_housekeep();
    assert!(!sim.is_connected(node1, node2));
    assert!(!sim.is_connected(node2, node1));

-    sim.simulate_all_messages().await;
+    sim.simulate_all_messages();
    assert!(sim.is_connected(node1, node2));
    assert!(sim.is_connected(node2, node1));
 }

 #[test]
-async fn lost_init_ping() {
+fn lost_init_ping() {
    let config = Config::default();
    let mut sim = TapSimulator::new();
-    let node1 = sim.add_node(false, &config).await;
-    let node2 = sim.add_node(false, &config).await;
+    let node1 = sim.add_node(false, &config);
+    let node2 = sim.add_node(false, &config);

-    sim.connect(node1, node2).await;
+    sim.connect(node1, node2);
    sim.drop_message(); // drop init ping

-    sim.simulate_time(120).await;
+    sim.simulate_time(120);
    assert!(sim.is_connected(node1, node2));
    assert!(sim.is_connected(node2, node1));
 }

 #[test]
-async fn lost_init_pong() {
+fn lost_init_pong() {
    let config = Config::default();
    let mut sim = TapSimulator::new();
-    let node1 = sim.add_node(false, &config).await;
-    let node2 = sim.add_node(false, &config).await;
+    let node1 = sim.add_node(false, &config);
+    let node2 = sim.add_node(false, &config);

-    sim.connect(node1, node2).await;
-    sim.simulate_next_message().await; // init ping
+    sim.connect(node1, node2);
+    sim.simulate_next_message(); // init ping
    sim.drop_message(); // drop init pong

-    sim.simulate_time(120).await;
+    sim.simulate_time(120);
    assert!(sim.is_connected(node1, node2));
    assert!(sim.is_connected(node2, node1));
 }

 #[test]
-async fn lost_init_peng() {
+fn lost_init_peng() {
    let config = Config::default();
    let mut sim = TapSimulator::new();
-    let node1 = sim.add_node(false, &config).await;
-    let node2 = sim.add_node(false, &config).await;
+    let node1 = sim.add_node(false, &config);
+    let node2 = sim.add_node(false, &config);

-    sim.connect(node1, node2).await;
-    sim.simulate_next_message().await; // init ping
-    sim.simulate_next_message().await; // init pong
+    sim.connect(node1, node2);
+    sim.simulate_next_message(); // init ping
+    sim.simulate_next_message(); // init pong
    sim.drop_message(); // drop init peng

-    sim.simulate_time(120).await;
+    sim.simulate_time(120);
    assert!(sim.is_connected(node1, node2));
    assert!(sim.is_connected(node2, node1));
 }

 #[test]
 #[ignore]
-async fn peer_exchange() {
+fn peer_exchange() {
    // TODO Test
    unimplemented!()
 }

 #[test]
 #[ignore]
-async fn lost_peer_exchange() {
+fn lost_peer_exchange() {
    // TODO Test
    unimplemented!()
 }

 #[test]
 #[ignore]
-async fn remove_dead_peers() {
+fn remove_dead_peers() {
    // TODO Test
    unimplemented!()
 }

 #[test]
 #[ignore]
-async fn update_primary_address() {
+fn update_primary_address() {
    // TODO Test
    unimplemented!()
 }

 #[test]
 #[ignore]
-async fn automatic_peer_timeout() {
+fn automatic_peer_timeout() {
    // TODO Test
    unimplemented!()
 }
--- a/src/types.rs
+++ b/src/types.rs
@ -240,7 +240,7 @@ mod tests {
    use std::io::Cursor;

    #[test]
-    async fn address_parse_fmt() {
+    fn address_parse_fmt() {
        assert_eq!(format!("{}", Address::from_str("120.45.22.5").unwrap()), "120.45.22.5");
        assert_eq!(format!("{}", Address::from_str("78:2d:16:05:01:02").unwrap()), "78:2d:16:05:01:02");
        assert_eq!(
@ -256,7 +256,7 @@ mod tests {
    }

    #[test]
-    async fn address_decode_encode() {
+    fn address_decode_encode() {
        let mut buf = vec![];
        let addr = Address::from_str("120.45.22.5").unwrap();
        addr.write_to(Cursor::new(&mut buf));
@ -277,7 +277,7 @@ mod tests {
    }

    #[test]
-    async fn address_eq() {
+    fn address_eq() {
        assert_eq!(
            Address::read_from_fixed(Cursor::new(&[1, 2, 3, 4]), 4).unwrap(),
            Address::read_from_fixed(Cursor::new(&[1, 2, 3, 4]), 4).unwrap()
@ -297,7 +297,7 @@ mod tests {
    }

    #[test]
-    async fn address_range_decode_encode() {
+    fn address_range_decode_encode() {
        let mut buf = vec![];
        let range =
            Range { base: Address { data: [0, 1, 2, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], len: 4 }, prefix_len: 24 };
--- a/src/util.rs
+++ b/src/util.rs
@ -24,14 +24,14 @@ pub type Time = i64;
 #[derive(Clone)]
 pub struct MsgBuffer {
    space_before: usize,
-    buffer: Box<[u8; 65535]>,
+    buffer: [u8; 65535],
    start: usize,
    end: usize,
 }

 impl MsgBuffer {
    pub fn new(space_before: usize) -> Self {
-        Self { buffer: Box::new([0; 65535]), space_before, start: space_before, end: space_before }
+        Self { buffer: [0; 65535], space_before, start: space_before, end: space_before }
    }

    pub fn get_start(&self) -> usize {
@ -427,7 +427,7 @@ pub fn run_cmd(mut cmd: Command) {
 }

 #[test]
-async fn base62() {
+fn base62() {
    assert_eq!("", to_base62(&[0]));
    assert_eq!("z", to_base62(&[61]));
    assert_eq!("10", to_base62(&[62]));
--- a/src/wsproxy.rs
+++ b/src/wsproxy.rs
@ -6,20 +6,20 @@ use super::{
    net::{get_ip, mapped_addr, parse_listen, Socket},
    poll::{WaitImpl, WaitResult},
    port_forwarding::PortForwarding,
-    util::MsgBuffer,
+    util::MsgBuffer
 };
-use async_trait::async_trait;
 use byteorder::{NetworkEndian, ReadBytesExt, WriteBytesExt};
 use std::{
    io::{self, Cursor, Read, Write},
    net::{Ipv6Addr, SocketAddr, SocketAddrV6, TcpListener, TcpStream, UdpSocket},
-    os::unix::io::AsRawFd,
+    os::unix::io::{AsRawFd, RawFd},
    sync::Arc,
-    thread::spawn,
+    thread::spawn
 };
 use tungstenite::{client::AutoStream, connect, protocol::WebSocket, server::accept, Message};
 use url::Url;

+
 macro_rules! io_error {
    ($val:expr, $format:expr) => ( {
        $val.map_err(|err| io::Error::new(io::ErrorKind::Other, format!($format, err)))
@ -36,7 +36,7 @@ fn write_addr<W: Write>(addr: SocketAddr, mut out: W) -> Result<(), io::Error> {
            out.write_all(&addr.ip().octets())?;
            out.write_u16::<NetworkEndian>(addr.port())?;
        }
-        _ => unreachable!(),
+        _ => unreachable!()
    }
    Ok(())
 }
@ -87,7 +87,7 @@ fn serve_proxy_connection(stream: TcpStream) -> Result<(), io::Error> {
            WaitResult::Timeout => {
                io_error!(websocket.write_message(Message::Ping(vec![])), "Failed to send ping: {}")?;
            }
-            WaitResult::Error(err) => return Err(err),
+            WaitResult::Error(err) => return Err(err)
        }
    }
    Ok(())
@ -112,7 +112,7 @@ pub fn run_proxy(listen: &str) -> Result<(), io::Error> {
 #[derive(Clone)]
 pub struct ProxyConnection {
    addr: SocketAddr,
-    socket: Arc<WebSocket<AutoStream>>,
+    socket: Arc<WebSocket<AutoStream>>
 }

 impl ProxyConnection {
@ -128,9 +128,14 @@ impl ProxyConnection {
    }
 }

-#[async_trait]
+impl AsRawFd for ProxyConnection {
+    fn as_raw_fd(&self) -> RawFd {
+        self.socket.get_ref().as_raw_fd()
+    }
+}
+ 
 impl Socket for ProxyConnection {
-    async fn listen(url: &str) -> Result<Self, io::Error> {
+    fn listen(url: &str) -> Result<Self, io::Error> {
        let parsed_url = io_error!(Url::parse(url), "Invalid URL {}: {}", url)?;
        let (mut socket, _) = io_error!(connect(parsed_url), "Failed to connect to URL {}: {}", url)?;
        socket.get_mut().set_nodelay(true)?;
@ -141,7 +146,7 @@ impl Socket for ProxyConnection {
        Ok(con)
    }

-    async fn receive(&mut self, buffer: &mut MsgBuffer) -> Result<SocketAddr, io::Error> {
+    fn receive(&mut self, buffer: &mut MsgBuffer) -> Result<SocketAddr, io::Error> {
        buffer.clear();
        let data = self.read_message()?;
        let addr = read_addr(Cursor::new(&data))?;
@ -149,7 +154,7 @@ impl Socket for ProxyConnection {
        Ok(addr)
    }

-    async fn send(&mut self, data: &[u8], addr: SocketAddr) -> Result<usize, io::Error> {
+    fn send(&mut self, data: &[u8], addr: SocketAddr) -> Result<usize, io::Error> {
        let mut msg = Vec::with_capacity(data.len() + 18);
        write_addr(addr, &mut msg)?;
        msg.write_all(data)?;
@ -160,11 +165,11 @@ impl Socket for ProxyConnection {
        */
    }

-    async fn address(&self) -> Result<SocketAddr, io::Error> {
+    fn address(&self) -> Result<SocketAddr, io::Error> {
        Ok(self.addr)
    }

-    async fn create_port_forwarding(&self) -> Option<PortForwarding> {
+    fn create_port_forwarding(&self) -> Option<PortForwarding> {
        None
    }
 }