Add --ecm-only (-v) and --ecm-and-emm-only (-q) options.

ChangeLog

@@ -1,3 +1,9 @@
+now : current
+ * Add --ecm-only (-v) option. This allows processing of ECMs but without
+   decoding the input stream.
+ * Add --ecm-and-emm-only (-q) option. This allows processing of ECMs
+   and EMMs but without decoding the input stream.
+
 2012-09-10 : Version 9.0
  * Add --no-output-on-error (-u) option. By using this option output can be
    disabled if there is no currently received code word.

README

@@ -174,6 +174,8 @@ EMM options:
 
 ECM options:
  -X --ecm-pid <pid>         | Force ECM pid. Default: none
+ -v --ecm-only              | Send only ECMs to CAMD, skipping EMMs and without
+                            .   decoding the input stream.
  -H --ecm-report-time <sec> | Report each <sec> how much ECMs and CWs have been
                             .   processed/skipped. Set <sec> to 0 to disable
                             .   the reports. Default: 60 sec
@@ -182,6 +184,9 @@ ECM options:
  -J --cw-warn-time <sec>    | Warn if no valid code word has been received.
                             .   Set <sec> to 0 to disable. Default: 60 sec
 
+ -q --ecm-and-emm-only      | Send ECMs and EMMs to CAMD but do not decode
+                            .   the input stream.
+
 Logging options:
  -S --syslog                | Log messages using syslog.
  -l --syslog-host <host>    | Syslog server address. Default: disabled

tsdecrypt.1

@@ -221,10 +221,11 @@ Set EMM pid manually. This option is useful for services that have
 couple of EMM streams from one CA system. Without this option tsdecrypt
 always chooses the first stream from the chosen CA system.
 .TP
-\fB\-E\fR, \fB\-\-emm\-only\fR <hierarchy>
+\fB\-E\fR, \fB\-\-emm\-only\fR
 Disable ECM processing and stream output. This option is useful if the EMM
 stream has very high rate and is interfering with ECM processing. Using
-\-\-emm\-only you can run special tsdecrypt dedicated only to card auto update.
+\-\-emm\-only you can run special tsdecrypt dedicated only to keeping
+card entitlements up to date.
 .TP
 \fB\-f\fR, \fB\-\-emm\-report\-time\fR <seconds>
 Set interval for EMM reports. The default is \fB60\fR seconds. Set to \fB0\fR
@@ -251,6 +252,11 @@ always chooses the first stream from the chosen CA system. Run tsdecrypt
 with \-\-debug 2 and look at CA descriptors in PMT to see what CA streams
 are available.
 .TP
+\fB\-v\fR, \fB\-\-ecm\-only\fR
+Process ECMs but do not decode the input stream. This option is useful if
+you just want to populate you OSCAM DCW cache but do not want to waste CPU
+time on stream decoding.
+.TP
 \fB\-H\fR, \fB\-\-ecm\-report\-time\fR <seconds>
 Set interval for ECM reports. The default is \fB60\fR seconds. Set to \fB0\fR
 to disable ECM reports.
@@ -269,6 +275,12 @@ reports are not affected by this option.
 After how much seconds to warn if valid code word was not received.
 The default is \fB60\fR seconds. Set to \fB0\fR to disable the warning.
 .TP
+\fB\-q\fR, \fB\-\-ecm\-and-emm-only\fR
+Process ECMs and EMMs but do not decode the input stream. This option combines
+\-\-ecm\-only and \-\-emm\-only options. Use it if you want to populate your
+OSCAM DCW cache and keep your card entitlements updated but do not want to
+waste CPU time on stream decoding.
+.TP
 .SH DEBUG OPTIONS
 .PP
 .TP

tsdecrypt.c

@@ -79,9 +79,9 @@ static void LOG_func(const char *msg) {
 		LOG(msg);
 }
 
-static const char short_options[] = "i:d:N:Sl:L:F:I:RzM:T:W:O:o:t:rk:g:upwxyc:C:Y:Q:A:s:U:P:B:46eZ:Ef:a:X:H:G:KJ:D:jbhVn:m:";
+static const char short_options[] = "i:d:N:Sl:L:F:I:RzM:T:W:O:o:t:rk:g:upwxyc:C:Y:Q:A:s:U:P:B:46eZ:Ef:a:X:vqH:G:KJ:D:jbhVn:m:";
 
-// Unused short options: aqv01235789
+// Unused short options: a01235789
 static const struct option long_options[] = {
 	{ "ident",				required_argument, NULL, 'i' },
 	{ "daemon",				required_argument, NULL, 'd' },
@@ -130,11 +130,14 @@ static const struct option long_options[] = {
 	{ "emm-filter",			required_argument, NULL, 'a' },
 
 	{ "ecm-pid",			required_argument, NULL, 'X' },
+	{ "ecm-only",			no_argument,       NULL, 'v' },
 	{ "ecm-report-time",	required_argument, NULL, 'H' },
 	{ "ecm-irdeto-type",	required_argument, NULL, 'G' },
 	{ "ecm-no-log",			no_argument      , NULL, 'K' },
 	{ "cw-warn-time",		required_argument, NULL, 'J' },
 
+	{ "ecm-and-emm-only",	no_argument,       NULL, 'q' },
+
 	{ "debug",				required_argument, NULL, 'D' },
 	{ "pid-report",			no_argument,       NULL, 'j' },
 	{ "bench",				no_argument,       NULL, 'b' },
@@ -231,6 +234,8 @@ static void show_help(struct ts *ts) {
 	printf("\n");
 	printf("ECM options:\n");
 	printf(" -X --ecm-pid <pid>         | Force ECM pid. Default: none\n");
+	printf(" -v --ecm-only              | Send only ECMs to CAMD, skipping EMMs and without\n");
+	printf("                            .   decoding the input stream.\n");
 	printf(" -H --ecm-report-time <sec> | Report each <sec> how much ECMs and CWs have been\n");
 	printf("                            .   processed/skipped. Set <sec> to 0 to disable\n");
 	printf("                            .   the reports. Default: %d sec\n", ts->ecm_report_interval);
@@ -239,6 +244,9 @@ static void show_help(struct ts *ts) {
 	printf(" -J --cw-warn-time <sec>    | Warn if no valid code word has been received.\n");
 	printf("                            .   Set <sec> to 0 to disable. Default: %d sec\n", ts->cw_warn_sec);
 	printf("\n");
+	printf(" -q --ecm-and-emm-only      | Send ECMs and EMMs to CAMD but do not decode\n");
+	printf("                            .   the input stream.\n");
+	printf("\n");
 	printf("Logging options:\n");
 	printf(" -S --syslog                | Log messages using syslog.\n");
 	printf(" -l --syslog-host <host>    | Syslog server address. Default: disabled\n");
@@ -525,6 +533,11 @@ static void parse_options(struct ts *ts, int argc, char **argv) {
 			case 'X': // --ecm-pid
 				ts->forced_ecm_pid = strtoul(optarg, NULL, 0) & 0x1fff;
 				break;
+			case 'v': // --ecm-only
+				ts->process_emm = 0;
+				ts->process_ecm = 1;
+				ts->output_stream = 0;
+				break;
 			case 'H': // --ecm-report-time
 				ts->ecm_report_interval = strtoul(optarg, NULL, 10);
 				if (ts->ecm_report_interval > 86400)
@@ -542,6 +555,11 @@ static void parse_options(struct ts *ts, int argc, char **argv) {
 					ts->cw_warn_sec = 86400;
 				ts->cw_last_warn= ts->cw_last_warn + ts->cw_warn_sec;
 				break;
+			case 'q': // --ecm-and-emm-only
+				ts->process_emm = 1;
+				ts->process_ecm = 1;
+				ts->output_stream = 0;
+				break;
 
 			case 'D': // --debug
 				ts->debug_level = atoi(optarg);