From: Jaroslav Kysela <perex@perex.cz>
Date: Tue, 26 Dec 2017 10:04:15 +0000 (+0100)
Subject: cwc, cccam: call caid2name() with full caid
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf5d768871f38ea9a7213cb5447038a24b2515a1;p=thirdparty%2Ftvheadend.git

cwc, cccam: call caid2name() with full caid
---

diff --git a/src/descrambler/cccam.c b/src/descrambler/cccam.c
index e6523733f..c13079a03 100644
--- a/src/descrambler/cccam.c
+++ b/src/descrambler/cccam.c
@@ -422,7 +422,7 @@ cccam_new_card(cccam_t *cccam, uint8_t *buf, uint8_t *ua,
       memcpy(ep->sa, psa[i], 8);
   }
 
-  n = caid2name(caid & 0xff00) ?: "Unknown";
+  n = caid2name(caid) ?: "Unknown";
 
   if (ua) {
     tvhinfo(LS_CCCAM, "%s:%i: Connected as user %s "
diff --git a/src/descrambler/cwc.c b/src/descrambler/cwc.c
index 63634aedf..5b780e3e2 100644
--- a/src/descrambler/cwc.c
+++ b/src/descrambler/cwc.c
@@ -529,7 +529,7 @@ cwc_new_card(cwc_t *cwc, uint16_t caid, uint8_t *ua,
       memcpy(ep->sa, psa[i], 8);
   }
 
-  n = caid2name(caid & 0xff00) ?: "Unknown";
+  n = caid2name(caid) ?: "Unknown";
 
   if (ua) {
     tvhinfo(LS_CWC, "%s:%i: Connected as user %s "