Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
capmt: fix the regression from 1847713
  • Loading branch information
perexg committed Oct 6, 2015
1 parent 1aa7ddd commit 2039ca7
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 10 deletions.
9 changes: 0 additions & 9 deletions src/descrambler/capmt.c
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/descrambler/descrambler.c
Expand Up @@ -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);

Expand Down

0 comments on commit 2039ca7

Please sign in to comment.