From 76bd144a8bbedfceceeb9ad2975a3d3f9436e311 Mon Sep 17 00:00:00 2001
From: "Matthias P. Braendli" <matthias.braendli@mpb.li>
Date: Thu, 16 Aug 2018 09:50:00 +0200
Subject: FIG0/6: use service ECC if defined

---
 src/fig/FIG0_6.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/fig')

diff --git a/src/fig/FIG0_6.cpp b/src/fig/FIG0_6.cpp
index e540ebc..b7776f4 100644
--- a/src/fig/FIG0_6.cpp
+++ b/src/fig/FIG0_6.cpp
@@ -3,7 +3,7 @@
    2011, 2012 Her Majesty the Queen in Right of Canada (Communications
    Research Center Canada)
 
-   Copyright (C) 2016
+   Copyright (C) 2018
    Matthias P. Braendli, matthias.braendli@mpb.li
    */
 /*
@@ -185,7 +185,8 @@ FillStatus FIG0_6::fill(uint8_t *buf, size_t max_size)
                 }
             }
             else if (not PD and ILS) {
-                buf[0] = ensemble->ecc;
+                buf[0] = ((*keyservice)->ecc == 0) ?
+                    ensemble->ecc : (*keyservice)->ecc;
                 buf[1] = (*keyservice)->id >> 8;
                 buf[2] = (*keyservice)->id & 0xFF;
                 fig0->Length += 3;
-- 
cgit v1.2.3