From: Jaroslav Kysela <perex@perex.cz>
Date: Sat, 7 Jan 2017 12:17:32 +0000 (+0100)
Subject: descrambler: log more EMM data
X-Git-Tag: v4.2.1~135
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ad9427469614fc773f719a88940c5dc5b3da019;p=thirdparty%2Ftvheadend.git

descrambler: log more EMM data
---

diff --git a/src/descrambler/descrambler.c b/src/descrambler/descrambler.c
index 4e0a88361..577cf198c 100644
--- a/src/descrambler/descrambler.c
+++ b/src/descrambler/descrambler.c
@@ -914,8 +914,17 @@ descrambler_table_callback
           tvhtrace(LS_DESCRAMBLER, "Unknown fast table message %02x (section %d, len %d, pid %d)",
                    ptr[0], des->number, len, mt->mt_pid);
       } else {
-        tvhtrace(LS_DESCRAMBLER, "EMM message %02x:%02x:%02x:%02x (len %d, pid %d)",
-                 ptr[0], ptr[1], ptr[2], ptr[3], len, mt->mt_pid);
+        if (len >= 18)
+          tvhtrace(LS_DESCRAMBLER, "EMM message %02x:{%02x:%02x}:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x (len %d, pid %d)",
+                   ptr[0], ptr[1], ptr[2], ptr[3], ptr[4], ptr[5], ptr[6], ptr[7],
+                   ptr[8], ptr[9], ptr[10], ptr[11], ptr[12], ptr[13], ptr[14], ptr[15],
+                   ptr[16], ptr[17], len, mt->mt_pid);
+        else if (len >= 6)
+          tvhtrace(LS_DESCRAMBLER, "EMM message %02x:{%02x:%02x}:%02x:%02x:%02x (len %d, pid %d)",
+                   ptr[0], ptr[1], ptr[2], ptr[3], ptr[4], ptr[5], len, mt->mt_pid);
+        else if (len >= 4)
+          tvhtrace(LS_DESCRAMBLER, "EMM message %02x:{%02x:%02x}:%02x (len %d, pid %d)",
+                   ptr[0], ptr[1], ptr[2], ptr[3], len, mt->mt_pid);
       }
     }
   }