Remove --camd-pkt-delay (-y) option.

This workaround is no longer needed because camd socket is now set
TCP_NODELAY and this fixes OSCAM communication.

ChangeLog

@@ -1,4 +1,5 @@
 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.

README

@@ -58,8 +58,6 @@ CAMD server options:
  -s --camd-server <addr>    | Set CAMD server ip address and 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
- -y --camd-pkt-delay <us>   | Sleep <us> usec between sending ECM/EMM
-                            .   packets to CAMD. Default: 0
 
 EMM options:
  -e --emm                   | Enable sending EMM's to CAMD. Default: disabled

camd.c

@@ -250,12 +250,6 @@ static int camd35_send_ecm(struct ts *ts, uint16_t ca_id, uint16_t service_id, u
 	c->buf[18] = 0xff;
 	c->buf[19] = 0xff;
 
-	// OSCAM do not like it if ECM's are comming too fast
-	// It thinks they are part of a single packet and ignores
-	// the data at the end. The usleep() is a hack but works
-	if (ts->packet_delay)
-		usleep(ts->packet_delay);
-
 	int ret = camd35_send_buf(ts, to_send);
 	if (ret <= 0) {
 		ts_LOGf("ERR | Error sending ecm packet, reconnecting to camd.\n");
@@ -290,12 +284,6 @@ static int camd35_send_emm(struct ts *ts, uint16_t ca_id, uint8_t *data, uint8_t
 	init_2b(ca_id  , c->buf + 10);
 	init_4b(prov_id, c->buf + 12);
 
-	// OSCAM do not like it if EMM's are comming too fast
-	// It thinks they are part of a single packet and ignores
-	// the data at the end. The usleep() is a hack but works
-	if (ts->packet_delay)
-		usleep(ts->packet_delay);
-
 	int ret = camd35_send_buf(ts, to_send);
 	if (ret < 0) {
 		c->emm_recv_errors++;

data.c

@@ -74,8 +74,6 @@ void data_init(struct ts *ts) {
 	ts->emm_send    = 0;
 	ts->pid_filter  = 1;
 
-	ts->packet_delay = 0;
-
 	ts->emm_report_interval = 60;
 	ts->emm_last_report     = time(NULL);
 

data.h

@@ -175,8 +175,6 @@ struct ts {
 
 	int					threaded;
 
-	int					packet_delay;
-
 	int					decode_stop;
 	pthread_t			decode_thread;
 	CBUF				*decode_buf;

tsdecrypt.1

@@ -120,11 +120,6 @@ Set CAMD user name. The default is \fBuser\fR.
 \fB\-P\fR, \fB\-\-camd\-pass\fR <password>
 Set CAMD user password. The default is \fBpass\fR.
 .TP
-\fB\-y\fR, \fB\-\-camd\-pkt\-delay\fR <usec>
-Sleep <usec> microseconds between sending ECM/EMM packets to CAMD. This
-is workaround for camd35 OSCAM protocol processing. The default sleep time
-is \fB0\fR (workaround is disabled).
-.TP
 .SH EMM OPTIONS
 .PP
 .TP

tsdecrypt.c

@@ -77,7 +77,6 @@ static const struct option long_options[] = {
 	{ "camd-server",		required_argument, NULL, 's' },
 	{ "camd-user",			required_argument, NULL, 'U' },
 	{ "camd-pass",			required_argument, NULL, 'P' },
-	{ "camd-pkt-delay",		required_argument, NULL, 'y' },
 
 	{ "emm",				no_argument,       NULL, 'e' },
 	{ "emm-pid",			required_argument, NULL, 'Z' },
@@ -141,8 +140,6 @@ static void show_help(struct ts *ts) {
 	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);
-	printf(" -y --camd-pkt-delay <us>   | Sleep <us> usec between sending ECM/EMM\n");
-	printf("                            .   packets to CAMD. Default: %d\n", ts->packet_delay);
 	printf("\n");
 	printf("EMM options:\n");
 	printf(" -e --emm                   | Enable sending EMM's to CAMD. Default: %s\n", ts->emm_send ? "enabled" : "disabled");
@@ -304,11 +301,6 @@ static void parse_options(struct ts *ts, int argc, char **argv) {
 				strncpy(ts->camd35.pass, optarg, sizeof(ts->camd35.pass) - 1);
 				ts->camd35.pass[sizeof(ts->camd35.pass) - 1] = 0;
 				break;
-			case 'y':
-				ts->packet_delay = atoi(optarg);
-				if (ts->packet_delay < 0 || ts->packet_delay > 1000000)
-					ts->packet_delay = 0;
-				break;
 
 			case 'e':
 				ts->emm_send = !ts->emm_send;
@@ -429,8 +421,7 @@ static void parse_options(struct ts *ts, int argc, char **argv) {
 	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);
 	ts_LOGf("Server pass: %s\n", ts->camd35.pass);
-	if (ts->packet_delay)
-		ts_LOGf("Pkt sleep  : %d us (%d ms)\n", ts->packet_delay, ts->packet_delay / 1000);
+
 	ts_LOGf("TS discont : %s\n", ts->ts_discont ? "report" : "ignore");
 	ts->threaded = !(ts->input.type == FILE_IO && ts->input.fd != 0);
 	if (ts->emm_send && ts->emm_report_interval)