Increase code word error notification time.

README

@@ -87,7 +87,7 @@ ECM options:
  -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
+                            .   Set <sec> to 0 to disable. Default: 60 sec
 
 Misc options:
  -D --debug <level>         | Message debug level.

camd.c

@@ -139,11 +139,20 @@ static int camd_send_ecm(struct ts *ts, struct camd_msg *msg) {
 
 	ret = camd_recv_cw(ts);
 	if (ret < 1) {
+		time_t now = time(NULL);
 		ts->is_cw_error = 1;
-		if (ts->key.ts && time(NULL) - ts->key.ts > KEY_VALID_TIME) {
-			if (c->key->is_valid_cw)
+		if (ts->key.ts && now - ts->key.ts > KEY_VALID_TIME) {
+			if (c->key->is_valid_cw) {
 				notify(ts, "NO_CODE_WORD", "No code word was set in %ld sec. Decryption is disabled.",
-					time(NULL) - ts->key.ts);
+					now - ts->key.ts);
+				ts_LOGf("CW  | *ERR* No valid code word was received in %ld seconds. Decryption is disabled.\n",
+					now - ts->key.ts);
+				ts->cw_last_warn = time(NULL);
+				ts->cw_next_warn = ts->cw_last_warn + ts->cw_warn_sec;
+				ts->cw_next_warn -= now - ts->key.ts;
+				if (ts->cw_next_warn <= ts->cw_last_warn)
+					ts->cw_next_warn = ts->cw_last_warn + ts->cw_warn_sec;
+			}
 			c->key->is_valid_cw = 0;
 		}
 		return 0;

data.c

@@ -88,8 +88,10 @@ void data_init(struct ts *ts) {
 	ts->ecm_report_interval = 60;
 	ts->ecm_last_report     = time(NULL);
 
-	ts->cw_warn_sec = 20;
+	ts->cw_warn_sec = 60;
 	ts->cw_last_warn= time(NULL);
+	ts->cw_last_warn= ts->cw_last_warn + ts->cw_warn_sec;
+	ts->key.ts      = time(NULL);
 
 	ts->input.fd    = 0; // STDIN
 	ts->input.type  = FILE_IO;

data.h

@@ -213,6 +213,7 @@ struct ts {
 
 	unsigned int		cw_warn_sec;
 	time_t				cw_last_warn;
+	time_t				cw_next_warn;
 
 	unsigned int		pid_report;
 	unsigned int		pid_stats[MAX_PIDS];

tsdecrypt.1

@@ -211,7 +211,7 @@ reports are not affected by this option.
 .TP
 \fB\-J\fR, \fB\-\-cw\-warn\-time\fR <seconds>
 After how much seconds to warn if valid code word was not received.
-The default is \fB20\fR seconds. Set to \fB0\fR to disable the warning.
+The default is \fB60\fR seconds. Set to \fB0\fR to disable the warning.
 .SH EVENTS
 Notification events are sent when \fB\-\-notify\-program\fR and \fB\-\-ident\fR
 options are used. The event parameters are set as environmental variables

tsdecrypt.c

@@ -454,6 +454,7 @@ static void parse_options(struct ts *ts, int argc, char **argv) {
 				ts->cw_warn_sec = strtoul(optarg, NULL, 10);
 				if (ts->cw_warn_sec > 86400)
 					ts->cw_warn_sec = 86400;
+				ts->cw_last_warn= ts->cw_last_warn + ts->cw_warn_sec;
 				break;
 
 			case 'D':
@@ -647,11 +648,14 @@ static void report_ecms(struct ts *ts, time_t now) {
 }
 
 static void report_cw_warn(struct ts *ts, time_t now) {
-	notify(ts, "NO_CODE_WORD", "No valid code word was received for %ld sec.",
-		now - ts->cw_last_warn);
-	ts_LOGf("CW  | *ERR* No valid code word was received for %ld seconds!\n",
-		now - ts->cw_last_warn);
+	if (now - ts->key.ts > 1) {
+		notify(ts, "NO_CODE_WORD", "No valid code word was received in %ld sec.",
+			now - ts->key.ts);
+		ts_LOGf("CW  | *ERR* No valid code word was received for %ld seconds!\n",
+			now - ts->key.ts);
+	}
 	ts->cw_last_warn = now;
+	ts->cw_next_warn = now + ts->cw_warn_sec;
 }
 
 static void do_reports(struct ts *ts) {
@@ -678,7 +682,7 @@ static void do_reports(struct ts *ts) {
 	}
 
 	if (!ts->emm_only && !ts->key.is_valid_cw) {
-		if ((time_t)(ts->cw_last_warn + ts->cw_warn_sec) <= now) {
+		if (ts->cw_warn_sec && now >= ts->cw_next_warn) {
 			report_cw_warn(ts, now);
 		}
 	}