Add --output-{nit,eit,tdt}-pass to enable pass through in output filtering mode.

ChangeLog

@@ -3,10 +3,13 @@ xxxx-xx-xx : Version next
  * Remove --camd-pkt-delay (-y) option. This workaround is no longer needed.
  * Fix payload offset detection, a bug which broke packets that have
    adaptation with whole packet size (libtsfuncs).
- * Add --input-service option, to choose service id (program) in MPTS input.
+ * Add --input-service (-M) option, to choose service id (program) in MPTS input.
  * When the input is MPTS and output filtering is enabled, rewrite output
    PAT to include only the single program that is decoded.
  * Parse SDT and display provider and service name.
+ * Add --output-nit-pass (-y) to enable NIT pass through.
+ * Add --output-eit-pass (-w) to enable EIT (EPG) pass through.
+ * Add --output-tdt-pass (-x) to enable TDT/TOT pass through.
 
 2011-11-18 : Version 4.0
  * Set CAMD sockets NODELAY to avoid OSCAM errors when many packets are sent.

README

@@ -46,6 +46,9 @@ Output options:
  -o --output-intf <addr>    | Set multicast output interface. Default: 0.0.0.0
  -t --output-ttl <ttl>      | Set multicast ttl. Default: 1
  -p --output-filter         | Enable or disable output filter. Default: enabled
+ -y --output-nit-pass       | Pass through NIT.
+ -w --output-eit-pass       | Pass through EIT (EPG).
+ -x --output-tdt-pass       | Pass through TDT/TOT.
 
 CA options:
  -c --ca-system <ca_sys>    | Process input EMM/ECM from <ca_sys>.
@@ -55,7 +58,7 @@ CA options:
  -C --caid <caid>           | Set CAID. Default: Taken from --ca-system.
 
 CAMD server options:
- -s --camd-server <addr>    | Set CAMD server ip address and port (1.2.3.4:2233).
+ -s --camd-server <addr>    | Set CAMD server ip_address:port (1.2.3.4:2233).
  -U --camd-user <user>      | Set CAMD server user. Default: user
  -P --camd-pass <pass>      | Set CAMD server password. Default: pass
 
@@ -73,7 +76,7 @@ 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 type X /0-3/. Default: 0
  -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: 20 sec

data.h

@@ -161,6 +161,9 @@ struct ts {
 	int					emm_send;
 	int					emm_only;
 	int					pid_filter;
+	int					eit_passthrough;
+	int					tdt_passthrough;
+	int					nit_passthrough;
 
 	uint8_t				irdeto_ecm;
 	int					ecm_cw_log;

tables.c

@@ -133,6 +133,12 @@ void process_pmt(struct ts *ts, uint16_t pid, uint8_t *ts_packet) {
 	pidmap_clear(&ts->pidmap);
 	pidmap_set(&ts->pidmap, 0x0000); // PAT
 	pidmap_set(&ts->pidmap, 0x0011); // SDT
+	if (ts->nit_passthrough)
+		pidmap_set(&ts->pidmap, 0x0010); // NIT
+	if (ts->eit_passthrough)
+		pidmap_set(&ts->pidmap, 0x0012); // EIT
+	if (ts->tdt_passthrough)
+		pidmap_set(&ts->pidmap, 0x0014); // TDT/TOT
 	pidmap_set(&ts->pidmap, ts->pmt->ts_header.pid); // PMT PID
 	pidmap_set(&ts->pidmap, ts->pmt->PCR_pid); // PCR
 	for (i=0;i<ts->pmt->streams_num;i++) {

tsdecrypt.1

@@ -96,6 +96,15 @@ 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
+\fB\-y\fR, \fB\-\-output\-nit\-pass\fR
+Pass throught NIT packets when output filtering is enabled.
+.TP
+\fB\-w\fR, \fB\-\-output\-eit\-pass\fR
+Pass throught EIT (EPG) packets when output filtering is enabled.
+.TP
+\fB\-x\fR, \fB\-\-output\-tdt\-pass\fR
+Pass throught TDT/TOT packets when output filtering is enabled.
+.TP
 .SH CA OPTIONS
 .PP
 .TP

tsdecrypt.c

@@ -103,7 +103,7 @@ void run_benchmark(void) {
 	puts("* Done *");
 }
 
-// Unused short options: ABFQTWYagjkmnqruvwxy0123456789
+// Unused short options: ABFQTWYagjkmnqruv0123456789
 static const struct option long_options[] = {
 	{ "ident",				required_argument, NULL, 'i' },
 	{ "daemon",				required_argument, NULL, 'd' },
@@ -121,6 +121,9 @@ static const struct option long_options[] = {
 	{ "output-intf",		required_argument, NULL, 'o' },
 	{ "output-ttl",			required_argument, NULL, 't' },
 	{ "output-filter",		no_argument,       NULL, 'p' },
+	{ "output-nit-pass",	no_argument,       NULL, 'y' },
+	{ "output-eit-pass",	no_argument,       NULL, 'w' },
+	{ "output-tdt-pass",	no_argument,       NULL, 'x' },
 
 	{ "ca-system",			required_argument, NULL, 'c' },
 	{ "caid",				required_argument, NULL, 'C' },
@@ -179,6 +182,9 @@ static void show_help(struct ts *ts) {
 	printf(" -o --output-intf <addr>    | Set multicast output interface. Default: %s\n", inet_ntoa(ts->output.intf));
 	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(" -y --output-nit-pass       | Pass through NIT.\n");
+	printf(" -w --output-eit-pass       | Pass through EIT (EPG).\n");
+	printf(" -x --output-tdt-pass       | Pass through TDT/TOT.\n");
 	printf("\n");
 	printf("CA options:\n");
 	printf(" -c --ca-system <ca_sys>    | Process input EMM/ECM from <ca_sys>.\n");
@@ -250,7 +256,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:N:Sl:L:I:RzM:O:o:t:pc:C:s:U:P:eZ:Ef:X:H:G:KJ:D:bhV", long_options, NULL)) != -1 ) {
+	while ( (j = getopt_long(argc, argv, "i:d:N:Sl:L:I:RzM:O:o:t:pwxyc:C:s:U:P:eZ:Ef:X:H:G:KJ:D:bhV", long_options, NULL)) != -1 ) {
 		char *p = NULL;
 		switch (j) {
 			case 'i':
@@ -309,7 +315,15 @@ static void parse_options(struct ts *ts, int argc, char **argv) {
 			case 'p':
 				ts->pid_filter = !ts->pid_filter;
 				break;
-
+			case 'y':
+				ts->nit_passthrough = !ts->nit_passthrough;
+				break;
+			case 'w':
+				ts->eit_passthrough = !ts->eit_passthrough;
+				break;
+			case 'x':
+				ts->tdt_passthrough = !ts->tdt_passthrough;
+				break;
 			case 'c':
 				if (strcasecmp("IRDETO", optarg) == 0)
 					ts->req_CA_sys = CA_IRDETO;
@@ -472,7 +486,18 @@ static void parse_options(struct ts *ts, int argc, char **argv) {
 		} else if (ts->output.type == FILE_IO) {
 			ts_LOGf("Output file: %s\n", ts->output.fd == 1 ? "STDOUT" : ts->output.fname);
 		}
-		ts_LOGf("PID filter : %s\n", ts->pid_filter ? "enabled" : "disabled");
+		ts_LOGf("Out filter : %s (%s)\n",
+			ts->pid_filter ? "enabled" : "disabled",
+			ts->pid_filter ? "output only service related PIDs" : "output everything"
+		);
+		if (ts->pid_filter) {
+			if (ts->nit_passthrough)
+				ts_LOGf("Out filter : Pass through NIT.\n");
+			if (ts->eit_passthrough)
+				ts_LOGf("Out filter : Pass through EIT (EPG).\n");
+			if (ts->tdt_passthrough)
+				ts_LOGf("Out filter : Pass through TDT/TOT.\n");
+		}
 	}
 	ts_LOGf("Server addr: tcp://%s:%u/\n", inet_ntoa(ts->camd35.server_addr), ts->camd35.server_port);
 	ts_LOGf("Server user: %s\n", ts->camd35.user);