Add --output-tos option.

ChangeLog

@@ -1,3 +1,6 @@
+next : Version next
+ * Add --output-tos (-g) option used to set output TOS value.
+
 2011-12-23 : Version 5.0
  * Add --bench (-b) option that benchmarks libdvbcsa decryption.
  * Remove --camd-pkt-delay (-y) option. This workaround is no longer needed.

README

@@ -45,6 +45,7 @@ Output options:
                             .    -O -              (write to stdout) (default)
  -o --output-intf <addr>    | Set multicast output interface. Default: 0.0.0.0
  -t --output-ttl <ttl>      | Set multicast ttl. Default: 1
+ -g --output-tos <tos>      | Set TOS value of output packets. Default: none
  -p --no-output-filter      | Disable output filtering. Default: enabled
  -y --output-nit-pass       | Pass through NIT.
  -w --output-eit-pass       | Pass through EIT (EPG).

data.c

@@ -97,6 +97,7 @@ void data_init(struct ts *ts) {
 	ts->output.fd   = 1; // STDOUT
 	ts->output.type = FILE_IO;
 	ts->output.ttl  = 1;
+	ts->output.tos  = -1;
 
 	ts->decode_buf  = cbuf_init((7 * dvbcsa_bs_batch_size() * 188) * 16, "decode"); // ~658Kb
 	ts->write_buf   = cbuf_init((7 * dvbcsa_bs_batch_size() * 188) *  8, "write");  // ~324Kb

data.h

@@ -169,6 +169,7 @@ struct io {
 	unsigned int		port;
 	// Used only for output
 	int					ttl;
+	int					tos;
 	struct in_addr		intf;
 };
 

tsdecrypt.1

@@ -92,6 +92,9 @@ Set multicast output interface.
 \fB\-t\fR, \fB\-\-output\-ttl\fR
 Set multicast ttl. The default value is \fB1\fR.
 .TP
+\fB\-g\fR, \fB\-\-output\-tos\fR
+Set TOS value of output packets. The default is not to set any specific TOS.
+.TP
 \fB\-p\fR, \fB\-\-no\-output\-filter\fR
 Disable output filtering. By default the output filter is enabled and only
 PAT/PMT/SDT and data packets are left in the output. Everything else not

tsdecrypt.c

@@ -103,7 +103,7 @@ void run_benchmark(void) {
 	puts("* Done *");
 }
 
-// Unused short options: FQTWYagjkmnqruv0123456789
+// Unused short options: FQTWYajkmnqruv0123456789
 static const struct option long_options[] = {
 	{ "ident",				required_argument, NULL, 'i' },
 	{ "daemon",				required_argument, NULL, 'd' },
@@ -120,6 +120,7 @@ static const struct option long_options[] = {
 	{ "output",				required_argument, NULL, 'O' },
 	{ "output-intf",		required_argument, NULL, 'o' },
 	{ "output-ttl",			required_argument, NULL, 't' },
+	{ "output-tos",			required_argument, NULL, 'g' },
 	{ "output-filter",		no_argument,       NULL, 'p' },
 	{ "no-output-filter",	no_argument,       NULL, 'p' },
 	{ "output-nit-pass",	no_argument,       NULL, 'y' },
@@ -185,6 +186,7 @@ static void show_help(struct ts *ts) {
 	printf("                            .    -O -              (write to stdout) (default)\n");
 	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(" -g --output-tos <tos>      | Set TOS value of output packets. Default: none\n");
 	printf(" -p --no-output-filter      | Disable output filtering. 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");
@@ -264,7 +266,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, port_set = 0;
-	while ( (j = getopt_long(argc, argv, "i:d:N:Sl:L:I:RzM:O:o:t:pwxyc:C:A:s:U:P:B: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:g:pwxyc:C:A:s:U:P:B:eZ:Ef:X:H:G:KJ:D:bhV", long_options, NULL)) != -1 ) {
 		char *p = NULL;
 		switch (j) {
 			case 'i':
@@ -320,6 +322,9 @@ static void parse_options(struct ts *ts, int argc, char **argv) {
 			case 't':
 				ts->output.ttl = atoi(optarg);
 				break;
+			case 'g':
+				ts->output.tos = (uint8_t)strtol(optarg, NULL, 0);
+				break;
 			case 'p':
 				ts->pid_filter = 0;
 				break;
@@ -519,6 +524,8 @@ static void parse_options(struct ts *ts, int argc, char **argv) {
 			ts_LOGf("Output addr: udp://%s:%u/\n", inet_ntoa(ts->output.addr), ts->output.port);
 			ts_LOGf("Output intf: %s\n", inet_ntoa(ts->output.intf));
 			ts_LOGf("Output ttl : %d\n", ts->output.ttl);
+			if (ts->output.tos > -1)
+				ts_LOGf("Output TOS : %u (0x%02x)\n", ts->output.tos, ts->output.tos);
 		} else if (ts->output.type == FILE_IO) {
 			ts_LOGf("Output file: %s\n", ts->output.fd == 1 ? "STDOUT" : ts->output.fname);
 		}

udp.c

@@ -104,6 +104,12 @@ int udp_connect_output(struct io *io) {
 		}
 	}
 
+	if (io->tos > -1) {
+		if (setsockopt(sock, IPPROTO_IP, IP_TOS, &io->tos, sizeof(io->tos)) < 0) {
+			ts_LOGf("setsockopt(IP_TOS 0x%02x): %s\n", io->tos, strerror(errno));
+		}
+	}
+
 	struct sockaddr_in sockaddr;
 	memset(&sockaddr, 0, sizeof(sockaddr));
 	sockaddr.sin_family			= AF_INET;