Merge pull request #7 from b-m-f/fix-persistent-keepalive

Fix persistent keepalive

README.md

@@ -27,6 +27,23 @@ All configs will be inside an output directory called `CONFIG_FILE`.
 In order to keep the Keys and IPs the same over consecutive executions make sure that the `CONFIG_FILE.toml` and output directory stay together.
 
 # Config file
+```
+[global]
+cidr = "10.0.0.0/24"
+
+[servers]
+[servers.gateway]
+endpoint = "mydomain.tld"
+ip = "10.0.0.1"
+port = 22222
+persistent_keepalive = 25
+
+[clients]
+[clients.laptop]
+dns = "10.0.0.1"
+[clients.phone]
+dns = "10.0.0.1"
+```
 
 ## [global]
 |What|Type|Description|Required|

src/main.rs

@@ -1,10 +1,7 @@
 mod wired;
 
-use std::fs::create_dir_all;
-
 use clap::Parser;
 
-
 #[derive(Parser, Debug)]
 #[command(name = "wired")]
 #[command(author = "b-m-f <[email protected]>")]

src/wired/clients.rs

@@ -54,7 +54,7 @@ impl ClientConfig {
                 Some(ka) => {
                     peers = format!(
                         "{}\n\
-             PersistentKeepalive= {}",
+             PersistentKeepalive = {}",
                         peers, ka,
                     )
                 }

tests/basic.bats

@@ -19,6 +19,29 @@ client_configs=( "desktop.conf" "laptop.conf" "phone.conf" "server2.conf" "serve
       # Expect the configs not to change between runs
       [ "$result_first_run" = "$result_second_run" ]
   done
+  run cat configs/test-basic/gateway.conf
+
+  assert_line --regexp 'Address = 10.0.0.1'
+  assert_line --regexp 'PrivateKey =.*'
+  assert_line --regexp 'DNS = 1.1.1.1'
+  assert_line --regexp 'ListenPort = 10101'
+
+  run cat configs/test-basic/laptop.conf
+
+  assert_line --regexp 'DNS = 10.0.0.1'
+
+  for file in "${client_configs[@]}"
+  do
+      run cat configs/test-basic/$file
+
+      assert_line --regexp 'Address = .*'
+      assert_line --regexp 'PrivateKey =.*'
+      assert_line --regexp 'PersistentKeepalive = 25'
+      assert_line --regexp 'PublicKey = .*'
+      assert_line --regexp 'AllowedIPs = 10.0.0.1'
+      assert_line --regexp 'Endpoint = test.test:10101'
+
+  done
 }
 
 @test "IPs are changed correctly" {

tests/configs/test-basic.toml

@@ -6,14 +6,14 @@ cidr = "10.0.0.0/24"
 endpoint = "test.test"
 ip = "10.0.0.1"
 port = 10101
+dns = "1.1.1.1"
+persistent_keepalive = 25
 
 [clients]
 [clients.laptop]
 dns = "10.0.0.1"
 [clients.desktop]
-dns = "10.0.0.1"
 [clients.phone]
 qr = true
-dns = "10.0.0.1"
 [clients.server2]
 [clients.server]

tests/configs/test-rotate-ips-reorder.toml

@@ -10,10 +10,8 @@ port = 10101
 [clients]
 [clients.server]
 [clients.desktop]
-dns = "10.0.0.1"
 [clients.server2]
 [clients.laptop]
 dns = "10.0.0.1"
 [clients.phone]
 qr = true
-dns = "10.0.0.1"

tests/configs/test-rotate-ips.toml

@@ -11,9 +11,7 @@ port = 10101
 [clients.laptop]
 dns = "10.0.0.1"
 [clients.desktop]
-dns = "10.0.0.1"
 [clients.phone]
 qr = true
-dns = "10.0.0.1"
 [clients.server2]
 [clients.server]

tests/configs/test-rotate-keys-and-ips-reorder.toml

@@ -10,10 +10,8 @@ port = 10101
 [clients]
 [clients.server]
 [clients.desktop]
-dns = "10.0.0.1"
 [clients.server2]
 [clients.phone]
 qr = true
-dns = "10.0.0.1"
 [clients.laptop]
 dns = "10.0.0.1"

tests/configs/test-rotate-keys-and-ips.toml

@@ -11,9 +11,7 @@ port = 10101
 [clients.laptop]
 dns = "10.0.0.1"
 [clients.desktop]
-dns = "10.0.0.1"
 [clients.phone]
 qr = true
-dns = "10.0.0.1"
 [clients.server2]
 [clients.server]

tests/configs/test-rotate-keys.toml

@@ -11,9 +11,7 @@ port = 10101
 [clients.laptop]
 dns = "10.0.0.1"
 [clients.desktop]
-dns = "10.0.0.1"
 [clients.phone]
 qr = true
-dns = "10.0.0.1"
 [clients.server2]
 [clients.server]