Add --ecm-no-log option to disable ECM and code words logging.

camd.c

@@ -124,7 +124,7 @@ static int camd35_recv_cw(struct ts *ts) {
 READ:
 	ret = camd35_recv(c, data, &data_len);
 	if (ret < 0) {
-		ts_LOGf("CW   | No CW has been received (ret = %d)\n", ret);
+		ts_LOGf("CW  | No CW has been received (ret = %d)\n", ret);
 		camd35_reconnect(ts);
 		return ret;
 	}
@@ -176,10 +176,12 @@ READ:
 		dvbcsa_bs_key_set(c->key->cw + 8, c->key->bs_csakey[1]);
 	}
 
-	ts_LOGf("CW  | CAID: 0x%04x [ %5llu ms ] ( %6llu ms ) ------- IDX: 0x%04x Data: %s\n",
-		ca_id, timeval_diff_msec(&tv1, &tv2),
-		timeval_diff_msec(&last_ts_keyset, &tv2),
-		idx, cw_dump );
+	if (ts->ecm_cw_log) {
+		ts_LOGf("CW  | CAID: 0x%04x [ %5llu ms ] ( %6llu ms ) ------- IDX: 0x%04x Data: %s\n",
+			ca_id, timeval_diff_msec(&tv1, &tv2),
+			timeval_diff_msec(&last_ts_keyset, &tv2),
+			idx, cw_dump );
+	}
 
 	return ret;
 }

data.c

@@ -69,6 +69,7 @@ void data_init(struct ts *ts) {
 	ts->syslog_port = 514;
 
 	ts->ts_discont  = 1;
+	ts->ecm_cw_log  = 1;
 
 	ts->debug_level = 0;
 	ts->req_CA_sys  = CA_CONAX;

data.h

@@ -129,6 +129,7 @@ struct ts {
 	int					pid_filter;
 
 	uint8_t				irdeto_ecm;
+	int					ecm_cw_log;
 
 	int					rtp_input;
 

tables.c

@@ -168,14 +168,16 @@ static void __process_ecm(struct ts *ts, uint16_t pid, uint8_t *ts_packet) {
 	struct ts_section_header *sec = ts->ecm->section_header;
 	int duplicate = ts_privsec_is_same(ts->ecm, ts->last_ecm);
 	if (!duplicate || ts->is_cw_error) {
-		ts_hex_dump_buf(dump, dump_buf_sz, sec->section_data, min(dump_sz, sec->section_data_len), 0);
-		ts_LOGf("ECM | CAID: 0x%04x PID 0x%04x Table: 0x%02x Length: %3d IDX: 0x%04x Data: %s..\n",
-			ts->ecm_caid,
-			th->pid,
-			sec->table_id,
-			sec->section_data_len,
-			ts->ecm_counter,
-			dump);
+		if (ts->ecm_cw_log) {
+			ts_hex_dump_buf(dump, dump_buf_sz, sec->section_data, min(dump_sz, sec->section_data_len), 0);
+			ts_LOGf("ECM | CAID: 0x%04x PID 0x%04x Table: 0x%02x Length: %3d IDX: 0x%04x Data: %s..\n",
+				ts->ecm_caid,
+				th->pid,
+				sec->table_id,
+				sec->section_data_len,
+				ts->ecm_counter,
+				dump);
+		}
 		if (ts->is_cw_error)
 			ts->ecm_counter--;
 		ts->is_cw_error = 0;

tsdecrypt.1

@@ -133,6 +133,10 @@ Set ECM IRDETO type. IRDETO CA send ECMs with different id mixed
 into one stream. Only one of the IDs are valid in given time. This
 option lets you choose which stream to process. The default stream
 type is \fB0\fR.
+.TP
+\fB\-K\fR, \fB\-\-ecm\-no\-log\fR
+Disable logging of ECMs and code words. Code word errors and stats
+reports are not affected by this option.
 .SH SEE ALSO
 See the README file for more information. If you have questions, remarks,
 problems or you just want to contact the developer, write to:

tsdecrypt.c

@@ -74,6 +74,7 @@ static const struct option long_options[] = {
 
 	{ "ecm-pid",			required_argument, NULL, 'X' },
 	{ "ecm-irdeto-type",	required_argument, NULL, 'G' },
+	{ "ecm-no-log",			no_argument      , NULL, 'K' },
 
 	{ "debug",				required_argument, NULL, 'D' },
 	{ "help",				no_argument,       NULL, 'h' },
@@ -133,6 +134,7 @@ static void show_help(struct ts *ts) {
 	printf("ECM options:\n");
 	printf(" -X --ecm-pid <pid>         | Force ECM pid. Default: none\n");
 	printf(" -G --ecm-irdeto-type <int> | Process IRDETO ECMs with type X /0..3/. Default: %d\n", ts->irdeto_ecm);
+	printf(" -K --ecm-no-log            | Disable ECM and code words logging.\n");
 	printf("\n");
 	printf("Misc options:\n");
 	printf(" -D --debug <level>         | Message debug level.\n");
@@ -170,7 +172,7 @@ static int parse_io_param(struct io *io, char *opt, int open_flags, mode_t open_
 
 static void parse_options(struct ts *ts, int argc, char **argv) {
 	int j, i, ca_err = 0, server_err = 1, input_addr_err = 0, output_addr_err = 0, output_intf_err = 0, ident_err = 0;
-	while ( (j = getopt_long(argc, argv, "i:d:l:L:I:RzO:o:t:pc:s:U:P:y:eZ:Ef:X:G:D:h", long_options, NULL)) != -1 ) {
+	while ( (j = getopt_long(argc, argv, "i:d:l:L:I:RzO:o:t:pc:s:U:P:y:eZ:Ef:X:G:KD:h", long_options, NULL)) != -1 ) {
 		char *p = NULL;
 		switch (j) {
 			case 'i':
@@ -287,6 +289,9 @@ static void parse_options(struct ts *ts, int argc, char **argv) {
 			case 'G':
 				ts->irdeto_ecm = atoi(optarg);
 				break;
+			case 'K':
+				ts->ecm_cw_log = 0;
+				break;
 
 			case 'D':
 				ts->debug_level = atoi(optarg);
@@ -373,6 +378,9 @@ static void parse_options(struct ts *ts, int argc, char **argv) {
 		ts_LOGf("Decoding   : %s\n", ts->threaded ? "threaded" : "single thread");
 	}
 
+	if (!ts->ecm_cw_log)
+		ts_LOGf("ECM/CW log : disabled\n");
+
 	for (i=0; i<(int)sizeof(ts->ident); i++) {
 		if (!ts->ident[i])
 			break;