Merge branch 'servicelinking' into next

1 files changed, 86 insertions, 0 deletions

diff --git a/src/ConfigParser.cpp b/src/ConfigParser.cpp
index 0f05076..7219663 100644
--- a/src/ConfigParser.cpp
+++ b/src/ConfigParser.cpp
@@ -116,6 +116,90 @@ static uint16_t get_announcement_flag_from_ptree(
     return flags;
 }
 
+// Parse the linkage section
+static void parse_linkage(boost::property_tree::ptree& pt,
+        std::shared_ptr<dabEnsemble> ensemble)
+{
+    using boost::property_tree::ptree;
+    using boost::property_tree::ptree_error;
+
+    auto pt_linking = pt.get_child_optional("linking");
+    if (pt_linking)
+    {
+        for (const auto& it : *pt_linking) {
+            const string setuid = it.first;
+            const ptree pt_set = it.second;
+
+            uint16_t lsn = hexparse(pt_set.get("lsn", "0"));
+            if (lsn == 0) {
+                etiLog.level(error) << "LSN for linking set " <<
+                    setuid << " invalid or missing";
+                throw runtime_error("Invalid service linking definition");
+            }
+
+            bool hard = pt_set.get("hard", true);
+            bool international = pt_set.get("international", false);
+
+            string service_uid = pt_set.get("keyservice", "");
+            if (service_uid.empty()) {
+                etiLog.level(error) << "Key Service for linking set " <<
+                    setuid << " invalid or missing";
+                throw runtime_error("Invalid service linking definition");
+            }
+
+            auto linkageset = make_shared<LinkageSet>(setuid, lsn, hard, international);
+            linkageset->keyservice = service_uid; // TODO check if it exists
+
+            auto pt_list = pt_set.get_child_optional("list");
+            if (not pt_list) {
+                etiLog.level(error) << "list missing in linking set " <<
+                    setuid;
+                throw runtime_error("Invalid service linking definition");
+            }
+
+            for (const auto& it : *pt_list) {
+                const string linkuid = it.first;
+                const ptree pt_link = it.second;
+
+                ServiceLink link;
+
+                string link_type = pt_link.get("type", "");
+                if (link_type == "dab") link.type = ServiceLinkType::DAB;
+                else if (link_type == "fm") link.type = ServiceLinkType::FM;
+                else if (link_type == "drm") link.type = ServiceLinkType::DRM;
+                else if (link_type == "amss") link.type = ServiceLinkType::AMSS;
+                else {
+                    etiLog.level(error) << "Invalid type " << link_type <<
+                        " for link " << linkuid;
+                    throw runtime_error("Invalid service linking definition");
+                }
+
+                link.id = hexparse(pt_link.get("id", "0"));
+                if (link.id == 0) {
+                    etiLog.level(error) << "id for link " <<
+                        linkuid << " invalid or missing";
+                    throw runtime_error("Invalid service linking definition");
+                }
+
+                if (international) {
+                    link.ecc = hexparse(pt_link.get("ecc", "0"));
+                    if (link.ecc == 0) {
+                        etiLog.level(error) << "ecc for link " <<
+                            linkuid << " invalid or missing";
+                        throw runtime_error("Invalid service linking definition");
+                    }
+                }
+                else {
+                    link.ecc = 0;
+                }
+
+                linkageset->id_list.push_back(link);
+            }
+            ensemble->linkagesets.push_back(linkageset);
+        }
+    }
+}
+
 void parse_ptree(
         boost::property_tree::ptree& pt,
         std::shared_ptr<dabEnsemble> ensemble)
@@ -528,6 +612,8 @@ void parse_ptree(
         ensemble->components.push_back(component);
 
     }
+
+    parse_linkage(pt, ensemble);
 }
 
 static Inputs::dab_input_zmq_config_t setup_zmq_input(