From f7d497b388daa780a98475b5824df050082b0aa0 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Thu, 25 May 2017 08:53:20 +0200 Subject: [PATCH] descrambler: fix EMM message traces (PAT/CAT) --- src/descrambler/descrambler.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/descrambler/descrambler.c b/src/descrambler/descrambler.c index 2e423dc52..be7c81f27 100644 --- a/src/descrambler/descrambler.c +++ b/src/descrambler/descrambler.c @@ -921,18 +921,22 @@ descrambler_table_callback } else tvhtrace(LS_DESCRAMBLER, "Unknown fast table message %02x (section %d, len %d, pid %d)", ptr[0], des->number, len, mt->mt_pid); - } else { + } else if (tvhtrace_enabled()) { + const char *s; + if (mt->mt_pid == DVB_PAT_PID) s = "PAT"; + else if (mt->mt_pid == DVB_CAT_PID) s = "CAT"; + else s = "EMM"; if (len >= 18) - tvhtrace(LS_DESCRAMBLER_EMM, "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], + tvhtrace(LS_DESCRAMBLER_EMM, "%s message %02x:{%02x:%02x}:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x (len %d, pid %d)", + s, 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, "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); + tvhtrace(LS_DESCRAMBLER_EMM, "%s message %02x:{%02x:%02x}:%02x:%02x:%02x (len %d, pid %d)", + s, ptr[0], ptr[1], ptr[2], ptr[3], ptr[4], ptr[5], len, mt->mt_pid); else if (len >= 4) - tvhtrace(LS_DESCRAMBLER_EMM, "EMM message %02x:{%02x:%02x}:%02x (len %d, pid %d)", - ptr[0], ptr[1], ptr[2], ptr[3], len, mt->mt_pid); + tvhtrace(LS_DESCRAMBLER_EMM, "%s message %02x:{%02x:%02x}:%02x (len %d, pid %d)", + s, ptr[0], ptr[1], ptr[2], ptr[3], len, mt->mt_pid); } } } -- 2.47.3