Merge branch 'sammauldin/felinet-not-required' into 'master'

Remove requirement for felinet

See merge request !2

src/config.rs

@@ -31,7 +31,7 @@ pub struct Config {
     pub ssid: u8,
     #[serde(default)]
     pub icon: u16,
-    pub felinet: FelinetConfig,
+    pub felinet: Option<FelinetConfig>,
     pub beacon: BeaconConfig,
 }
 

src/main.rs

@@ -129,12 +129,21 @@ async fn gate_forever(
         temperature_mutex,
     )?;
 
-    let endpoint = Endpoint::from_str(&config.felinet.address)?
-        .keep_alive_while_idle(true)
-        .keep_alive_timeout(Duration::from_secs(5))
-        .http2_keep_alive_interval(Duration::from_secs(5))
-        .tcp_keepalive(Some(Duration::from_secs(5)));
-    let client = HandlerClient::connect(endpoint).await?;
+    let client = if let Some(felinet_config) = &config.felinet {
+        let endpoint = Endpoint::from_str(&felinet_config.address)?
+            .keep_alive_while_idle(true)
+            .keep_alive_timeout(Duration::from_secs(5))
+            .http2_keep_alive_interval(Duration::from_secs(5))
+            .tcp_keepalive(Some(Duration::from_secs(5)));
+
+        Some(HandlerClient::connect(endpoint).await?)
+    } else {
+        eprintln!(
+            "No FELINET section specified in configuration. Received packets will not be uploaded!"
+        );
+        None
+    };
+
     let callsign = config.callsign.clone();
 
     {
@@ -159,28 +168,30 @@ async fn gate_forever(
         });
     }
 
-    {
-        let client = client.clone();
-        tokio::task::spawn(async {
-            felinet_send_forever(client, tx).await;
-        });
-    }
+    if let Some(client) = client {
+        {
+            let client = client.clone();
+            tokio::task::spawn(async {
+                felinet_send_forever(client, tx).await;
+            });
+        }
 
-    {
-        let mut client = client.clone();
-        tokio::task::spawn(async move {
-            loop {
-                client
-                    .ping(Request::new(PingRequest { uuid: uuid.into() }))
-                    .await
-                    .ok();
+        {
+            let mut client = client.clone();
+            tokio::task::spawn(async move {
+                loop {
+                    client
+                        .ping(Request::new(PingRequest { uuid: uuid.into() }))
+                        .await
+                        .ok();
+
+                    tokio::time::sleep(Duration::from_secs(600)).await;
+                }
+            });
+        }
 
-                tokio::time::sleep(Duration::from_secs(600)).await;
-            }
-        });
+        felinet_receive_forever(client, packet_send, &callsign, config.ssid, uuid).await;
     }
 
-    felinet_receive_forever(client, packet_send, &callsign, config.ssid, uuid).await;
-
     Ok(())
 }