From 7e59a191cd2545a4b024c6cf78a4c7c6c1d4956e Mon Sep 17 00:00:00 2001
From: "Matthias P. Braendli" <matthias.braendli@mpb.li>
Date: Fri, 11 Jul 2025 10:42:09 +0200
Subject: common: EDI per-output PFT config; allow setting TTL without UDP
 source

---
 lib/edioutput/EDIConfig.h | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

(limited to 'lib/edioutput/EDIConfig.h')

diff --git a/lib/edioutput/EDIConfig.h b/lib/edioutput/EDIConfig.h
index 1997210..de4217f 100644
--- a/lib/edioutput/EDIConfig.h
+++ b/lib/edioutput/EDIConfig.h
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2019
+   Copyright (C) 2025
    Matthias P. Braendli, matthias.braendli@mpb.li
 
     http://www.opendigitalradio.org
@@ -27,6 +27,7 @@
 
 #pragma once
 
+#include <optional>
 #include <vector>
 #include <string>
 #include <memory>
@@ -36,17 +37,31 @@ namespace edi {
 
 /** Configuration for EDI output */
 
+struct pft_settings_t {
+    // protection and fragmentation settings
+    bool verbose       = false;
+    bool enable_pft    = false;
+    unsigned chunk_len = 207;        // RSk, data length of each chunk
+    unsigned fec       = 0;          // number of fragments that can be recovered
+    double fragment_spreading_factor = 0.95;
+    // Spread transmission of fragments in time. 1.0 = 100% means spreading over the whole duration of a frame (24ms)
+    // Above 100% means that the fragments are spread over several 24ms periods, interleaving the AF packets.
+};
+
 struct destination_t {
     virtual ~destination_t() {};
+
+    pft_settings_t pft_settings = {};
 };
 
+
 // Can represent both unicast and multicast destinations
 struct udp_destination_t : public destination_t {
     std::string dest_addr;
-    unsigned int dest_port = 0;
+    uint16_t dest_port = 0;
     std::string source_addr;
-    unsigned int source_port = 0;
-    unsigned int ttl = 10;
+    uint16_t source_port = 0;
+    std::optional<uint8_t> ttl = std::nullopt;
 };
 
 // TCP server that can accept multiple connections
@@ -66,16 +81,9 @@ struct tcp_client_t : public destination_t {
 };
 
 struct configuration_t {
-    unsigned chunk_len = 207;        // RSk, data length of each chunk
-    unsigned fec       = 0;          // number of fragments that can be recovered
-    bool dump          = false;      // dump a file with the EDI packets
-    bool verbose       = false;
-    bool enable_pft    = false;      // Enable protection and fragmentation
+    bool verbose = false;
     unsigned int tagpacket_alignment = 0;
     std::vector<std::shared_ptr<destination_t> > destinations;
-    double fragment_spreading_factor = 0.95;
-    // Spread transmission of fragments in time. 1.0 = 100% means spreading over the whole duration of a frame (24ms)
-    // Above 100% means that the fragments are spread over several 24ms periods, interleaving the AF packets.
 
     bool enabled() const { return destinations.size() > 0; }
 
-- 
cgit v1.2.3