Make separate log category for EMM messages

diff --git a/src/descrambler/descrambler.c b/src/descrambler/descrambler.c
index d58cbe984b82abec8e761c95e06a45edc05c2c9b..b0c9585e21edd3c7a31c8bf27bb6050c6576855a 100644 (file)
--- a/src/descrambler/descrambler.c
+++ b/src/descrambler/descrambler.c
@@ -923,15 +923,15 @@ descrambler_table_callback
                    ptr[0], des->number, len, mt->mt_pid);
       } else {
         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)",
+          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],
                    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)",
+          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);
         else if (len >= 4)
-          tvhtrace(LS_DESCRAMBLER, "EMM message %02x:{%02x:%02x}:%02x (len %d, pid %d)",
+          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);
       }
     }

diff --git a/src/tvhlog.c b/src/tvhlog.c
index a3fab4c845135e1066d065150e7cf8997a99341d..bc9b688319143513fd53cf11b50cbc6662cfde2b 100644 (file)
--- a/src/tvhlog.c
+++ b/src/tvhlog.c
@@ -132,6 +132,7 @@ tvhlog_subsys_t tvhlog_subsystems[] = {
   [LS_ESFILTER]      = { "esfilter",      N_("Elementary Stream Filter") },
   [LS_PROFILE]       = { "profile",       N_("Streaming Profile") },
   [LS_DESCRAMBLER]   = { "descrambler",   N_("Descrambler") },
+  [LS_DESCRAMBLER_EMM]={ "descrambler-emm",N_("Descrambler EMM") },
   [LS_CACLIENT]      = { "caclient",      N_("CA (descrambling) Client") },
   [LS_CSA]           = { "csa",           N_("CSA (descrambling)") },
   [LS_CAPMT]         = { "capmt",         N_("CAPMT CA Client") },

diff --git a/src/tvhlog.h b/src/tvhlog.h
index 67e0003cf93c3bc49c15a235c9e0ac8633f28e32..bf67ab3882a484645836b0818935b7dbd7444736 100644 (file)
--- a/src/tvhlog.h
+++ b/src/tvhlog.h
@@ -156,6 +156,7 @@ enum {
   LS_ESFILTER,
   LS_PROFILE,
   LS_DESCRAMBLER,
+  LS_DESCRAMBLER_EMM,
   LS_CACLIENT,
   LS_CSA,
   LS_CAPMT,