]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
capmt: fix the regression from 18477131e644c0e27ecb4e7ef267109cf1e5bee2
authorJaroslav Kysela <perex@perex.cz>
Tue, 6 Oct 2015 19:45:30 +0000 (21:45 +0200)
committerJaroslav Kysela <perex@perex.cz>
Tue, 6 Oct 2015 19:45:48 +0000 (21:45 +0200)
src/descrambler/capmt.c
src/descrambler/descrambler.c

index 6cea5c712779946ede9cb0994ff1b5860bac9d29..cf3865e4824594875cf5f5c9aa0722b0fe32e3f5 100644 (file)
@@ -1248,15 +1248,6 @@ capmt_analyze_cmd(capmt_t *capmt, int adapter, sbuf_t *sb, int offset)
 
     capmt_stop_filter(capmt, adapter, sb, offset);
 
-
-    uint16_t protocol_version = sbuf_peek_u16(sb, offset + 4);
-    uint8_t len = sbuf_peek_u8(sb, offset + 4 + 2);
-    unsigned char oscam_info[len+1];
-    memcpy(&oscam_info, sbuf_peek(sb, offset + 4 + 2 + 1), len);
-    oscam_info[len] = 0; //null-terminating the string
-
-    tvhlog(LOG_INFO, "capmt", "%s: connected to %s, using network protocol_version = %d", capmt_name(capmt), oscam_info, protocol_version);
-
   } else if (cmd == DVBAPI_ECM_INFO) {
 
     uint16_t sid     = sbuf_peek_u16(sb, offset + 4);
index d2c72adbffeb5b9fdb87a7a805d4fdfec8cd8fce..660cf74e3b9e20e34f58e84cb5d32d6a26337537 100644 (file)
@@ -182,7 +182,7 @@ descrambler_notify( th_descrambler_t *td,
 
   tvhlog(LOG_DEBUG, "descrambler", "info - service='%s' caid=%04X(%s) "
                                    "provid=%06X ecmtime=%d hops=%d "
-                                   "reader=%s from=%s protocol=%s",
+                                   "reader='%s' from='%s' protocol='%s'",
          t->s_dvb_svcname, caid, cardsystem, provid,
          ecmtime, hops, reader, from, protocol);