Add --caid option to choose exact CAID.

data.h

@@ -97,6 +97,7 @@ struct ts {
 	uint16_t			service_id;
 	uint16_t			emm_caid, emm_pid;
 	uint16_t			ecm_caid, ecm_pid;
+	uint16_t			forced_caid;
 	uint16_t			forced_emm_pid;
 	uint16_t			forced_ecm_pid;
 	uint16_t			ecm_counter;

libtsfuncs

@@ -1 +1 @@
-Subproject commit d9734150a39af5019cb8cef21f3efea914222575
+Subproject commit e9ba8bcf8f26ad1b2242f434f293faa22fd290e5

tables.c

@@ -65,9 +65,16 @@ void process_cat(struct ts *ts, uint16_t pid, uint8_t *ts_packet) {
 
 	handle_table_changes(cat);
 
-	ts_get_emm_info(ts->cat, ts->req_CA_sys, &ts->emm_caid, &ts->emm_pid);
-	if (!ts->emm_caid && ts->forced_emm_pid)
-		ts->emm_caid = 0xffff;
+	if (ts->forced_caid) {
+		ts->emm_caid = ts->forced_caid;
+		ts_get_emm_info_by_caid(ts->cat, ts->emm_caid, &ts->emm_pid);
+	} else {
+		ts_get_emm_info(ts->cat, ts->req_CA_sys, &ts->emm_caid, &ts->emm_pid);
+	}
+
+	if (ts->forced_emm_pid)
+		ts_get_emm_info_by_pid(ts->cat, &ts->emm_caid, ts->forced_emm_pid);
+
 	if (ts->emm_caid) {
 		char *CA_sys = ts_get_CA_sys_txt(ts_get_CA_sys(ts->emm_caid));
 		ts_LOGf("--- | EMM CAID: 0x%04x (%s)\n", ts->emm_caid, CA_sys);
@@ -100,9 +107,16 @@ void process_pmt(struct ts *ts, uint16_t pid, uint8_t *ts_packet) {
 		pidmap_set(&ts->pidmap, stream->pid); // Data
 	}
 
-	ts_get_ecm_info(ts->pmt, ts->req_CA_sys, &ts->ecm_caid, &ts->ecm_pid);
-	if (!ts->ecm_caid && ts->forced_ecm_pid)
-		ts->ecm_caid = 0xffff;
+	if (ts->forced_caid) {
+		ts->ecm_caid = ts->forced_caid;
+		ts_get_ecm_info_by_caid(ts->pmt, ts->ecm_caid, &ts->ecm_pid);
+	} else {
+		ts_get_ecm_info(ts->pmt, ts->req_CA_sys, &ts->ecm_caid, &ts->ecm_pid);
+	}
+
+	if (ts->forced_ecm_pid)
+		ts_get_ecm_info_by_pid(ts->pmt, &ts->ecm_caid, ts->forced_ecm_pid);
+
 	if (ts->ecm_caid) {
 		char *CA_sys = ts_get_CA_sys_txt(ts_get_CA_sys(ts->ecm_caid));
 		ts_LOGf("--- | ECM CAID: 0x%04x (%s)\n", ts->ecm_caid, CA_sys);

tsdecrypt.1

@@ -70,7 +70,7 @@ Enable output filtering. When output filter is enabled only PAT/PMT/SDT
 and data packets are left in the output. Everything else not mentioned
 in PMT like NIT, EIT, TDT tables and unknown pids is removed.
 .TP
-.SH CAMD OPTIONS
+.SH CA OPTIONS
 .PP
 .TP
 \fB\-c\fR, \fB\-\-ca\-system\fR <ca_sys>
@@ -81,6 +81,13 @@ probably working) are \fBSECA\fR (\fBMEDIAGUARD\fR), \fBVIDEOGUARD\fR
 (\fBNDS\fR), \fBNAGRA\fR and \fBDRECRYPT\fR. The default <ca_sys>
 is \fBCONAX\fR.
 .TP
+\fB\-C\fR, \fB\-\-caid\fR <caid>
+Directly set CAID. This is useful if you have couple of CA streams from
+one CA but with different CAIDs.
+.TP
+.SH CAMD OPTIONS
+.PP
+.TP
 \fB\-s\fR, \fB\-\-camd\-server\fR <addr[:port]>
 Set CAMD server ip and port (10.0.1.1:2233). Is not set default port is
 \fB2233\fR. tsdecrypt is tested and working with OSCAM using cs378x protocol

tsdecrypt.c

@@ -64,6 +64,7 @@ static const struct option long_options[] = {
 	{ "output-filter",		no_argument,       NULL, 'p' },
 
 	{ "ca-system",			required_argument, NULL, 'c' },
+	{ "caid",				required_argument, NULL, 'C' },
 	{ "camd-server",		required_argument, NULL, 's' },
 	{ "camd-user",			required_argument, NULL, 'U' },
 	{ "camd-pass",			required_argument, NULL, 'P' },
@@ -115,11 +116,14 @@ static void show_help(struct ts *ts) {
 	printf(" -t --output-ttl <ttl>      | Set multicast ttl. Default: %d\n", ts->output.ttl);
 	printf(" -p --output-filter         | Enable or disable output filter. Default: %s\n", ts->pid_filter ? "enabled" : "disabled");
 	printf("\n");
-	printf("CAMD server options:\n");
+	printf("CA options:\n");
 	printf(" -c --ca-system <ca_sys>    | Process input EMM/ECM from <ca_sys>.\n");
 	printf("                            | Valid systems are: CONAX (default), CRYPTOWORKS,\n");
 	printf("                            .   IRDETO, SECA (MEDIAGUARD), VIACCESS,\n");
 	printf("                            .   VIDEOGUARD (NDS), NAGRA and DRECRYPT.\n");
+	printf(" -C --caid <caid>           | Set CAID. Default: Taken from --ca-system.\n");
+	printf("\n");
+	printf("CAMD server options:\n");
 	printf(" -s --camd-server <addr>    | Set CAMD server ip address and port (1.2.3.4:2233).\n");
 	printf(" -U --camd-user <user>      | Set CAMD server user. Default: %s\n", ts->camd35.user);
 	printf(" -P --camd-pass <pass>      | Set CAMD server password. Default: %s\n", ts->camd35.pass);
@@ -181,7 +185,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:KJ:D:h", long_options, NULL)) != -1 ) {
+	while ( (j = getopt_long(argc, argv, "i:d:l:L:I:RzO:o:t:pc:C:s:U:P:y:eZ:Ef:X:G:KJ:D:h", long_options, NULL)) != -1 ) {
 		char *p = NULL;
 		switch (j) {
 			case 'i':
@@ -249,6 +253,10 @@ static void parse_options(struct ts *ts, int argc, char **argv) {
 				else
 					ca_err = 1;
 				break;
+			case 'C':
+				ts->forced_caid = strtoul(optarg, NULL, 0) & 0xffff;
+				break;
+
 			case 's':
 				p = strrchr(optarg, ':');
 				if (p) {
@@ -349,7 +357,16 @@ static void parse_options(struct ts *ts, int argc, char **argv) {
 		ts_LOGf("Syslog     : %s:%d\n", ts->syslog_host, ts->syslog_port);
 	else
 		ts_LOGf("Syslog     : disabled\n");
-	ts_LOGf("CA System  : %s\n", ts_get_CA_sys_txt(ts->req_CA_sys));
+
+	if (ts->forced_caid)
+		ts->req_CA_sys = ts_get_CA_sys(ts->forced_caid);
+	if (!ts->forced_caid)
+		ts_LOGf("CA System  : %s\n", ts_get_CA_sys_txt(ts->req_CA_sys));
+	else
+		ts_LOGf("CA System  : %s | CAID: 0x%04x (%d)\n",
+			ts_get_CA_sys_txt(ts->req_CA_sys),
+			ts->forced_caid, ts->forced_caid);
+
 	if (ts->input.type == NET_IO) {
 		ts_LOGf("Input addr : %s://%s:%u/\n",
 			ts->rtp_input ? "rtp" : "udp",