Merge branch 'ediInput' into next

1 files changed, 0 insertions, 182 deletions

diff --git a/src/dabOutput/edi/Transport.cpp b/src/dabOutput/edi/Transport.cpp
deleted file mode 100644
index d99e987..0000000
--- a/src/dabOutput/edi/Transport.cpp
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
-   Copyright (C) 2019
-   Matthias P. Braendli, matthias.braendli@mpb.li
-
-    http://www.opendigitalradio.org
-
-   EDI output,
-   UDP and TCP transports and their configuration
-
-   */
-/*
-   This file is part of ODR-DabMux.
-
-   ODR-DabMux is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as
-   published by the Free Software Foundation, either version 3 of the
-   License, or (at your option) any later version.
-
-   ODR-DabMux is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with ODR-DabMux.  If not, see <http://www.gnu.org/licenses/>.
-   */
-
-#include "Transport.h"
-#include <iterator>
-
-using namespace std;
-
-namespace edi {
-
-void configuration_t::print() const
-{
-    etiLog.level(info) << "EDI";
-    etiLog.level(info) << " verbose     " << verbose;
-    for (auto edi_dest : destinations) {
-        if (auto udp_dest = dynamic_pointer_cast<edi::udp_destination_t>(edi_dest)) {
-            etiLog.level(info) << " UDP to " << udp_dest->dest_addr << ":" << dest_port;
-            if (not udp_dest->source_addr.empty()) {
-                etiLog.level(info) << "  source      " << udp_dest->source_addr;
-                etiLog.level(info) << "  ttl         " << udp_dest->ttl;
-            }
-            etiLog.level(info) << "  source port " << udp_dest->source_port;
-        }
-        else if (auto tcp_dest = dynamic_pointer_cast<edi::tcp_destination_t>(edi_dest)) {
-            etiLog.level(info) << " TCP listening on port " << tcp_dest->listen_port;
-            etiLog.level(info) << "  max frames queued    " << tcp_dest->max_frames_queued;
-        }
-        else {
-            throw std::logic_error("EDI destination not implemented");
-        }
-    }
-    if (interleaver_enabled()) {
-        etiLog.level(info) << " interleave     " << latency_frames * 24 << " ms";
-    }
-}
-
-
-Sender::Sender(const configuration_t& conf) :
-    m_conf(conf),
-    edi_pft(m_conf)
-{
-    if (m_conf.verbose) {
-        etiLog.log(info, "Setup EDI");
-    }
-
-    for (const auto& edi_dest : m_conf.destinations) {
-        if (const auto udp_dest = dynamic_pointer_cast<edi::udp_destination_t>(edi_dest)) {
-            auto udp_socket = std::make_shared<UdpSocket>(udp_dest->source_port);
-
-            if (not udp_dest->source_addr.empty()) {
-                int err = udp_socket->setMulticastSource(udp_dest->source_addr.c_str());
-                if (err) {
-                    throw runtime_error("EDI socket set source failed!");
-                }
-                err = udp_socket->setMulticastTTL(udp_dest->ttl);
-                if (err) {
-                    throw runtime_error("EDI socket set TTL failed!");
-                }
-            }
-
-            udp_sockets.emplace(udp_dest.get(), udp_socket);
-        }
-        else if (auto tcp_dest = dynamic_pointer_cast<edi::tcp_destination_t>(edi_dest)) {
-            auto dispatcher = make_shared<TCPDataDispatcher>(tcp_dest->max_frames_queued);
-            dispatcher->start(tcp_dest->listen_port, "0.0.0.0");
-            tcp_dispatchers.emplace(tcp_dest.get(), dispatcher);
-        }
-        else {
-            throw std::logic_error("EDI destination not implemented");
-        }
-    }
-
-    if (m_conf.interleaver_enabled()) {
-        edi_interleaver.SetLatency(m_conf.latency_frames);
-    }
-
-    if (m_conf.dump) {
-        edi_debug_file.open("./edi.debug");
-    }
-
-    if (m_conf.verbose) {
-        etiLog.log(info, "EDI set up");
-    }
-}
-
-void Sender::write(const TagPacket& tagpacket)
-{
-    // Assemble into one AF Packet
-    edi::AFPacket af_packet = edi_afPacketiser.Assemble(tagpacket);
-
-    if (m_conf.enable_pft) {
-        // Apply PFT layer to AF Packet (Reed Solomon FEC and Fragmentation)
-        vector<edi::PFTFragment> edi_fragments = edi_pft.Assemble(af_packet);
-
-        if (m_conf.verbose) {
-            fprintf(stderr, "EDI number of PFT fragment before interleaver %zu",
-                    edi_fragments.size());
-        }
-
-        if (m_conf.interleaver_enabled()) {
-            edi_fragments = edi_interleaver.Interleave(edi_fragments);
-        }
-
-        // Send over ethernet
-        for (const auto& edi_frag : edi_fragments) {
-            for (auto& dest : m_conf.destinations) {
-                if (const auto& udp_dest = dynamic_pointer_cast<edi::udp_destination_t>(dest)) {
-                    InetAddress addr;
-                    addr.setAddress(udp_dest->dest_addr.c_str());
-                    addr.setPort(m_conf.dest_port);
-
-                    udp_sockets.at(udp_dest.get())->send(edi_frag, addr);
-                }
-                else if (auto tcp_dest = dynamic_pointer_cast<edi::tcp_destination_t>(dest)) {
-                    tcp_dispatchers.at(tcp_dest.get())->write(edi_frag);
-                }
-                else {
-                    throw std::logic_error("EDI destination not implemented");
-                }
-            }
-
-            if (m_conf.dump) {
-                std::ostream_iterator<uint8_t> debug_iterator(edi_debug_file);
-                std::copy(edi_frag.begin(), edi_frag.end(), debug_iterator);
-            }
-        }
-
-        if (m_conf.verbose) {
-            fprintf(stderr, "EDI number of PFT fragments %zu",
-                    edi_fragments.size());
-        }
-    }
-    else {
-        // Send over ethernet
-        for (auto& dest : m_conf.destinations) {
-            if (const auto& udp_dest = dynamic_pointer_cast<edi::udp_destination_t>(dest)) {
-                InetAddress addr;
-                addr.setAddress(udp_dest->dest_addr.c_str());
-                addr.setPort(m_conf.dest_port);
-
-                udp_sockets.at(udp_dest.get())->send(af_packet, addr);
-            }
-            else if (auto tcp_dest = dynamic_pointer_cast<edi::tcp_destination_t>(dest)) {
-                tcp_dispatchers.at(tcp_dest.get())->write(af_packet);
-            }
-            else {
-                throw std::logic_error("EDI destination not implemented");
-            }
-        }
-
-        if (m_conf.dump) {
-            std::ostream_iterator<uint8_t> debug_iterator(edi_debug_file);
-            std::copy(af_packet.begin(), af_packet.end(), debug_iterator);
-        }
-    }
-}
-
-}