Use TOML config

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "zika"
-version = "3.2.2"
+version = "3.2.3"
 license = "MIT"
 description = "IP Tunneling over MQTT"
 repository = "https://github.com/akiroz/zika"
@@ -24,12 +24,13 @@ ipnetwork = "0.20.0"
 log = "0.4.20"
 lru = "0.12.0"
 rand = "0.8.5"
-rumqttc = { version = "0.23.0", features = ["use-rustls"] }
-rustls = "0.21.8"
+rustls = "0.21.10"
 rustls-pemfile = "2.0.0"
+rumqttc = { version = "0.23.0", features = ["use-rustls"] }
+toml = "0.8.8"
 serde = { version = "1.0.193", features = ["derive"] }
-serde_json = "1.0.108"
-tokio = { version = "1.34.0", features = ["full"] }
+serde_default_utils = "0.2.1"
 tokio-rustls = "0.25.0"
 tokio-util = "0.7.10"
+tokio = { version = "1.34.0", features = ["full"] }
 tun = { version = "0.6.1", features = ["async"] }

README.md

@@ -18,14 +18,10 @@ it's possible capture/inject arbitrary IP packets to/from the target device if t
 
 ### Configuration
 
-See [zika_config.sample.json](zika_config.sample.json)
+See [zika_config.example.toml](zika_config.example.toml)
 
 ### Building
 
-Dependencies:
-- cargo
-- ...
-
 ```
 $ cargo build
 ```

src/client.rs

@@ -39,7 +39,7 @@ struct Tunnel {
 
 impl Client {
     pub async fn from_config(config: config::Config) -> Self {
-        let mqtt_options = config.broker_mqtt_options();
+        let mqtt_options = config.mqtt.to_mqtt_options().expect("valid mqtt config");
         let client_config = config.client.expect("non-null client config");
         Self::new(mqtt_options, client_config).await
     }