descrambler: fix EMM message traces (PAT/CAT)

diff --git a/src/descrambler/descrambler.c b/src/descrambler/descrambler.c
index 486032c298886d332650916a045774fd36708b11..a42c56f2e55a2678ebe0548da3e0b57a49e970b3 100644 (file)
--- 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);
       }
     }
   }