Add support for Irdeto CHID filtering (tested with Raduga).

ChangeLog

@@ -10,6 +10,7 @@ now : current
  * Add support for setting multicast source address /SSM/ (--input-source).
  * Add support for EMM filters similar to DVBAPI filters (match + mask).
  * Add support for EMM filters based on section length.
+ * Add support for Irdeto CHID filtering (tested with Raduga).
 
 2012-09-10 : Version 9.0
  * Add --no-output-on-error (-u) option. By using this option output can be

README

@@ -181,7 +181,9 @@ ECM options:
  -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
- -G --ecm-irdeto-type <int> | Process IRDETO ECMs with type X /0-3/. Default: 0
+ -G --ecm-irdeto-type <int> | Process IRDETO ECMs with index X /0-255/
+                            .   It is better to use --ecm-irdeto-chid option!
+ -2 --ecm-irdeto-chid <int> | Set CHID to filter Irdeto ECMs (Default: 0x0000).
  -K --ecm-no-log            | Disable ECM and code words logging.
  -J --cw-warn-time <sec>    | Warn if no valid code word has been received.
                             .   Set <sec> to 0 to disable. Default: 60 sec
@@ -266,6 +268,11 @@ Examples:
    tsdecrypt --ecm-file ecm.txt --caid 0x5581 --input-service 12345 \
        --camd-server example.com
 
+   # Decrypt IRDETO stream from Raduga (CHID == 0x0015)
+   tsdecrypt --input 239.0.50.11:5000 --output 239.78.78.78:5000 \
+             --camd-server example.com \
+             --ca-system IRDETO --caid 0x0652 --ecm-irdeto-chid 0x0015
+
 OSCAM cs378x configuration
 ==========================
 In order for tsdecrypt to communicate with OSCAM using cs378x (camd35

data.c

@@ -85,6 +85,9 @@ void data_init(struct ts *ts) {
 	ts->ecm_report_interval = 60;
 	ts->ecm_last_report     = time(NULL);
 
+	ts->irdeto_ecm_idx         = 0;
+	ts->irdeto_ecm_filter_type = IRDETO_FILTER_IDX;
+
 	ts->cw_warn_sec = 60;
 	ts->cw_last_warn= time(NULL);
 	ts->cw_last_warn= ts->cw_last_warn + ts->cw_warn_sec;

data.h

@@ -290,7 +290,14 @@ struct ts {
 	int					tdt_passthrough;
 	int					nit_passthrough;
 
-	uint8_t				irdeto_ecm;
+	uint8_t				irdeto_ecm_idx;
+	uint16_t			irdeto_ecm_chid;
+
+	enum {
+		IRDETO_FILTER_IDX,
+		IRDETO_FILTER_CHID,
+	} irdeto_ecm_filter_type;
+
 	int					ecm_cw_log;
 
 	int					rtp_input;

tables.c

@@ -314,8 +314,16 @@ static void __process_ecm(struct ts *ts, uint16_t pid, uint8_t *ts_packet) {
 		return;
 
 	if (ts->req_CA_sys == CA_IRDETO) {
-		int type = ts->ecm->section_header->section_data[4];
-		if (type != ts->irdeto_ecm) {
+		uint8_t idx     = ts->ecm->section_header->section_data[4];
+		uint16_t chid   = (ts->ecm->section_header->section_data[6] << 8) | ts->ecm->section_header->section_data[7];
+
+		bool ecm_ok = false;
+		switch (ts->irdeto_ecm_filter_type) {
+		case IRDETO_FILTER_IDX : ecm_ok = (idx == ts->irdeto_ecm_idx); break;
+		case IRDETO_FILTER_CHID: ecm_ok = (chid == ts->irdeto_ecm_chid); break;
+		}
+
+		if (!ecm_ok) {
 			ts_privsec_clear(ts->ecm);
 			return;
 		}

tsdecrypt.1

@@ -267,11 +267,16 @@ time on stream decoding.
 Set interval for ECM reports. The default is \fB60\fR seconds. Set to \fB0\fR
 to disable ECM reports.
 .TP
-\fB\-G\fR, \fB\-\-ecm\-irdeto\-type\fR <type>
-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.
+\fB\-G\fR, \fB\-\-ecm\-irdeto\-type\fR <int>
+Set the index of the IRDETO ECM stream. \fBNOTE: This option is deprecated,
+better use \-\-ecm\-irdeto\-chid\fR.
+.TP
+\fB\-2\fR, \fB\-\-ecm\-irdeto\-chid\fR <int>
+IRDETO CA sends ECMs mixed in single stream on single PID. In order to select
+the correct ECM stream the so called CHID number is used. Oscam reports what
+CHIDs are activated in your card and tsdecrypt allows you to set the correct
+CHID number using this option. tsderypt reports what CHIDs are available
+in the incoming ECM stream. The CHID is 16-bit number (0x0000 - 0xffff).
 .TP
 \fB\-K\fR, \fB\-\-ecm\-no\-log\fR
 Disable logging of ECMs and code words. Code word errors and stats
@@ -396,6 +401,11 @@ CA system is set to CONAX, you can change it using \fB\-\-ca-system\fR parameter
    # Send ECM from file
    tsdecrypt --ecm-file ecm.txt --caid 0x5581 --input-service 12345 \\
        --camd-server example.com
+
+   # Decrypt IRDETO stream from Raduga (CHID == 0x0015)
+   tsdecrypt --input 239.0.50.11:5000 --output 239.78.78.78:5000 \\
+             --camd-server example.com \\
+             --ca-system IRDETO --caid 0x0652 --ecm-irdeto-chid 0x0015
 .fi
 .SH SEE ALSO
 See the README file for more information. If you have questions, remarks,

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:1: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:";
+static const char short_options[] = "i:d:N:Sl:L:F:I:1:RzM:T:W:O:o:t:rk:g:upwxyc:C:Y:Q:A:s:U:P:B:46eZ:Ef:a:X:vqH:G:2:KJ:D:jbhVn:m:";
 
-// Unused short options: 0235789
+// Unused short options: 035789
 static const struct option long_options[] = {
 	{ "ident",				required_argument, NULL, 'i' },
 	{ "daemon",				required_argument, NULL, 'd' },
@@ -134,6 +134,7 @@ static const struct option long_options[] = {
 	{ "ecm-only",			no_argument,       NULL, 'v' },
 	{ "ecm-report-time",	required_argument, NULL, 'H' },
 	{ "ecm-irdeto-type",	required_argument, NULL, 'G' },
+	{ "ecm-irdeto-chid",	required_argument, NULL, '2' },
 	{ "ecm-no-log",			no_argument      , NULL, 'K' },
 	{ "cw-warn-time",		required_argument, NULL, 'J' },
 
@@ -242,7 +243,9 @@ static void show_help(struct ts *ts) {
 	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);
-	printf(" -G --ecm-irdeto-type <int> | Process IRDETO ECMs with type X /0-3/. Default: %d\n", ts->irdeto_ecm);
+	printf(" -G --ecm-irdeto-type <int> | Process IRDETO ECMs with index X /0-255/\n");
+	printf("                            .   It is better to use --ecm-irdeto-chid option!\n");
+	printf(" -2 --ecm-irdeto-chid <int> | Set CHID to filter Irdeto ECMs (Default: 0x0000).\n");
 	printf(" -K --ecm-no-log            | Disable ECM and code words logging.\n");
 	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);
@@ -557,7 +560,12 @@ static void parse_options(struct ts *ts, int argc, char **argv) {
 					ts->ecm_report_interval = 86400;
 				break;
 			case 'G': // --ecm-irdeto-type
-				ts->irdeto_ecm = atoi(optarg);
+				ts->irdeto_ecm_idx = strtoul(optarg, NULL, 0);
+				ts->irdeto_ecm_filter_type = IRDETO_FILTER_IDX;
+				break;
+			case '2': // --ecm-irdeto-chid
+				ts->irdeto_ecm_chid = strtoul(optarg, NULL, 0);
+				ts->irdeto_ecm_filter_type = IRDETO_FILTER_CHID;
 				break;
 			case 'K': // --ecm-no-log
 				ts->ecm_cw_log = !ts->ecm_cw_log;
@@ -734,8 +742,12 @@ static void parse_options(struct ts *ts, int argc, char **argv) {
 	if (ts->forced_service_id)
 		ts_LOGf("Service id : 0x%04x (%d)\n",
 			ts->forced_service_id, ts->forced_service_id);
-	if (ts->req_CA_sys == CA_IRDETO)
-		ts_LOGf("Irdeto ECM : %d\n", ts->irdeto_ecm);
+	if (ts->req_CA_sys == CA_IRDETO) {
+		switch (ts->irdeto_ecm_filter_type) {
+		case IRDETO_FILTER_IDX : ts_LOGf("Irdeto ECM : Index: 0x%02x (%d)\n", ts->irdeto_ecm_idx, ts->irdeto_ecm_idx); break;
+		case IRDETO_FILTER_CHID: ts_LOGf("Irdeto ECM : CHID: 0x%04x (%d)\n", ts->irdeto_ecm_chid, ts->irdeto_ecm_chid); break;
+		}
+	}
 
 	if (ts->output_stream) {
 		if (ts->output.type == NET_IO) {