Add support for multiple IRDETO types.

With this patch Bulsatcom irdeto ECM stream can be used
for decoding.

data.c

@@ -18,9 +18,11 @@ void data_init(struct ts *ts) {
 
 	ts->emm      = ts_privsec_alloc();
 	ts->last_emm = ts_privsec_alloc();
+	ts->tmp_emm  = ts_privsec_alloc();
 
 	ts->ecm      = ts_privsec_alloc();
 	ts->last_ecm = ts_privsec_alloc();
+	ts->tmp_ecm  = ts_privsec_alloc();
 
 	pidmap_clear(&ts->pidmap);
 	pidmap_clear(&ts->cc);
@@ -76,8 +78,10 @@ void data_free(struct ts *ts) {
 	ts_pmt_free(&ts->curpmt);
 	ts_privsec_free(&ts->emm);
 	ts_privsec_free(&ts->last_emm);
+	ts_privsec_free(&ts->tmp_emm);
 	ts_privsec_free(&ts->ecm);
 	ts_privsec_free(&ts->last_ecm);
+	ts_privsec_free(&ts->tmp_ecm);
 
 	dvbcsa_key_free(ts->key.csakey[0]);
 	dvbcsa_key_free(ts->key.csakey[1]);

data.h

@@ -79,6 +79,8 @@ struct ts {
 	struct ts_pmt		*pmt, *curpmt;
 	struct ts_privsec	*emm, *last_emm;
 	struct ts_privsec	*ecm, *last_ecm;
+	struct ts_privsec	*tmp_emm;
+	struct ts_privsec	*tmp_ecm;
 	uint16_t			pmt_pid;
 	uint16_t			service_id;
 	uint16_t			emm_caid, emm_pid;
@@ -107,6 +109,8 @@ struct ts {
 	int					emm_only;
 	int					pid_filter;
 
+	uint8_t				irdeto_ecm;
+
 	int					rtp_input;
 
 	struct io			input;

tables.c

@@ -81,10 +81,8 @@ void process_pmt(struct ts *ts, uint16_t pid, uint8_t *ts_packet) {
 #define dump_sz      (16)
 #define dump_buf_sz  (dump_sz * 6)
 
-void process_emm(struct ts *ts, uint16_t pid, uint8_t *ts_packet) {
+static void __process_emm(struct ts *ts, uint16_t pid, uint8_t *ts_packet) {
 	char dump[dump_buf_sz];
-	if (!ts->emm_pid || ts->emm_pid != pid)
-		return;
 
 	show_ts_pack(ts, pid, "emm", NULL, ts_packet);
 
@@ -111,19 +109,21 @@ void process_emm(struct ts *ts, uint16_t pid, uint8_t *ts_packet) {
 	ts_privsec_clear(ts->emm);
 }
 
-void process_ecm(struct ts *ts, uint16_t pid, uint8_t *ts_packet) {
+static void __process_ecm(struct ts *ts, uint16_t pid, uint8_t *ts_packet) {
 	char dump[dump_buf_sz];
 
-	if (ts->emm_only)
-		return;
-
-	if (!ts->ecm_pid || ts->ecm_pid != pid)
-		return;
-
 	ts->ecm = ts_privsec_push_packet(ts->ecm, ts_packet);
 	if (!ts->ecm->initialized)
 		return;
 
+	if (ts->req_CA_sys == CA_IRDETO) {
+		int type = ts->ecm->section_header->section_data[4];
+		if (type != ts->irdeto_ecm) {
+			ts_privsec_clear(ts->ecm);
+			return;
+		}
+	}
+
 	struct ts_header *th = &ts->ecm->ts_header;
 	struct ts_section_header *sec = ts->ecm->section_header;
 	int duplicate = ts_privsec_is_same(ts->ecm, ts->last_ecm);
@@ -153,3 +153,65 @@ void process_ecm(struct ts *ts, uint16_t pid, uint8_t *ts_packet) {
 
 	show_ts_pack(ts, pid, !duplicate ? "ecm" : "ec+", NULL, ts_packet);
 }
+
+// There are cryptosystems that are puting more than one PSI table
+// in TS packet. IRDETO is such example. Because libtsfuncs assumes
+// that one ts packet can produce maximum 1 PSI table, the following
+// workaround is used for EMM/ECM private sections. Basically we detect
+// if after the section there is something else than 0xff (filler) and
+// if there is something change ts_packet pointer field to point to
+// start of the potential section and reparse section.
+void process_ecm(struct ts *ts, uint16_t pid, uint8_t *ts_packet) {
+	int section_end;
+
+	if (ts->emm_only)
+		return;
+
+	if (!ts->ecm_pid || ts->ecm_pid != pid)
+		return;
+
+process_psi:
+	ts->tmp_ecm = ts_privsec_push_packet(ts->tmp_ecm, ts_packet);
+	if (!ts->tmp_ecm->initialized) {
+		__process_ecm(ts, pid, ts_packet);
+		return;
+	}
+
+	section_end = ts->tmp_ecm->section_header->pointer_field + ts->tmp_ecm->section_header->section_length + 3 + 4 + 1;
+	if (section_end < 188 && ts_packet[section_end] != 0xff) {
+		__process_ecm(ts, pid, ts_packet);
+		ts_packet[4] = ts_packet[4] + ts->tmp_ecm->section_header->section_length + 3;
+		ts_privsec_clear(ts->tmp_ecm);
+		goto process_psi;
+	} else {
+		__process_ecm(ts, pid, ts_packet);
+	}
+
+	ts_privsec_clear(ts->tmp_ecm);
+}
+
+void process_emm(struct ts *ts, uint16_t pid, uint8_t *ts_packet) {
+	int section_end;
+
+	if (!ts->emm_pid || ts->emm_pid != pid)
+		return;
+
+process_psi:
+	ts->tmp_emm = ts_privsec_push_packet(ts->tmp_emm, ts_packet);
+	if (!ts->tmp_emm->initialized) {
+		__process_emm(ts, pid, ts_packet);
+		return;
+	}
+
+	section_end = ts->tmp_emm->section_header->pointer_field + ts->tmp_emm->section_header->section_length + 3 + 4 + 1;
+	if (section_end < 188 && ts_packet[section_end] != 0xff) {
+		__process_emm(ts, pid, ts_packet);
+		ts_packet[4] = ts_packet[4] + ts->tmp_emm->section_header->section_length + 3;
+		ts_privsec_clear(ts->tmp_emm);
+		goto process_psi;
+	} else {
+		__process_emm(ts, pid, ts_packet);
+	}
+
+	ts_privsec_clear(ts->tmp_emm);
+}

tsdecrypt.c

@@ -65,6 +65,9 @@ static void show_help(struct ts *ts) {
 	printf("    -P server_pass | default: %s\n", ts->camd35.pass);
 	printf("    -y usec_delay  | Sleep X usec between sending ECM/EMM packets to OSCAM. Default: %d\n", ts->packet_delay);
 	printf("\n");
+	printf("  ECM options:\n");
+	printf("    -G ecm_type    | IRDETO: Process only ECMs with selected type (0,1,2,3). Default: %d\n", ts->irdeto_ecm);
+	printf("\n");
 	printf("  EMM options:\n");
 	printf("    -E             | Process only EMMs without decoding input stream. Default: %s\n", ts->emm_only ? "true" : "false");
 	printf("    -f <seconds>   | Report how much EMMs has been send for processing each X seconds.\n");
@@ -112,7 +115,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(argc, argv, "i:d:l:L:c:s:I:O:o:t:U:P:y:f:eEzpD:hR")) != -1) {
+	while ((j = getopt(argc, argv, "i:d:l:L:c:s:I:O:o:t:U:P:y:f:eEzpD:hRG:")) != -1) {
 		char *p = NULL;
 		switch (j) {
 			case 'i':
@@ -176,6 +179,10 @@ static void parse_options(struct ts *ts, int argc, char **argv) {
 				ts->output.ttl = atoi(optarg);
 				break;
 
+			case 'G':
+				ts->irdeto_ecm = atoi(optarg);
+				break;
+
 			case 'U':
 				strncpy(ts->camd35.user, optarg, sizeof(ts->camd35.user) - 1);
 				ts->camd35.user[sizeof(ts->camd35.user) - 1] = 0;
@@ -258,6 +265,9 @@ static void parse_options(struct ts *ts, int argc, char **argv) {
 	} else if (ts->input.type == FILE_IO) {
 		ts_LOGf("Input file : %s\n", ts->input.fd == 0 ? "STDIN" : ts->input.fname);
 	}
+	if (ts->req_CA_sys == CA_IRDETO)
+		ts_LOGf("Irdeto ECM : %d\n", ts->irdeto_ecm);
+
 	if (!ts->emm_only)
 	{
 		if (ts->output.type == NET_IO) {