Fix detection of non-encrypted streams

camd.c

@@ -170,10 +170,6 @@ static int camd_recv_cw(struct ts *ts) {
 #undef ERR
 
 static int camd_send_ecm(struct ts *ts, struct camd_msg *msg) {
-	if (!ts->stream_is_encrypted) {
-		return 0;
-	}
-
 	struct camd *c = &ts->camd;
 	int ret = c->ops.do_ecm(c, msg);
 	if (ret <= 0) {
@@ -189,10 +185,12 @@ static int camd_send_ecm(struct ts *ts, struct camd_msg *msg) {
 		ts->is_cw_error = 1;
 		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.",
-					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);
+				if (!ts->stream_is_not_scrambled) {
+					notify(ts, "NO_CODE_WORD", "No code word was set in %ld sec. Decryption is disabled.",
+						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;

data.c

@@ -85,6 +85,9 @@ void data_init(struct ts *ts) {
 	ts->ecm_report_interval = 60;
 	ts->ecm_last_report     = time(NULL);
 
+	ts->last_scrambled_packet_ts     = time(NULL);
+	ts->last_not_scrambled_packet_ts = time(NULL);
+
 	ts->irdeto_ecm_idx         = 0;
 	ts->irdeto_ecm_filter_type = IRDETO_FILTER_IDX;
 

data.h

@@ -276,8 +276,10 @@ struct ts {
 	time_t				cw_next_warn;
 	struct timeval		ecm_change_time;
 
-	unsigned int		stream_is_encrypted;
+	unsigned int		stream_is_not_scrambled;
 	time_t				last_scrambled_packet_ts;
+	time_t				last_not_scrambled_packet_ts;
+	time_t				last_not_scrambled_report_ts;
 
 	unsigned int		pid_report;
 	unsigned int		pid_stats[MAX_PIDS];

process.c

@@ -130,11 +130,25 @@ static void decode_buffer(struct ts *ts, uint8_t *data, int data_len) {
 		uint8_t *ts_packet = data + (i * 188);
 
 		uint16_t pid = ts_packet_get_pid(ts_packet);
-		if (pidmap_get(&ts->pidmap, pid) && ts_packet_is_scrambled(ts_packet)) {
-			if (ts_packet_is_scrambled(ts_packet) && ts->last_scrambled_packet_ts != now) {
-				ts->stream_is_encrypted = 1;
-				ts->last_scrambled_packet_ts = now;
+		bool in_pidmap = pidmap_get(&ts->pidmap, pid);
+		bool is_scrambled = ts_packet_is_scrambled(ts_packet);
+		if (in_pidmap) {
+			if (is_scrambled) {
+				if (ts->last_scrambled_packet_ts < now) {
+					ts->stream_is_not_scrambled = 0;
+					ts->last_scrambled_packet_ts = now;
+				}
+			} else {
+				if (now - 5 >= ts->last_scrambled_packet_ts) {
+					if (ts->last_not_scrambled_packet_ts < now) {
+						ts->camd.key->is_valid_cw = 0;
+						ts->stream_is_not_scrambled = 1;
+						ts->last_not_scrambled_packet_ts = now;
+					}
+				}
 			}
+		}
+		if (in_pidmap && is_scrambled) {
 			if (ts->key.is_valid_cw) {
 				int scramble_idx = ts_packet_get_scrambled(ts_packet);
 				if (!scramble_idx_old)
@@ -181,13 +195,6 @@ static void decode_buffer(struct ts *ts, uint8_t *data, int data_len) {
 		}
 	}
 
-	if (ts->last_scrambled_packet_ts && ts->last_scrambled_packet_ts < now - 5) {
-		ts_LOGf("N/E | No encrypted packet came during the last 5 seconds, disabling NO_CODE_WORD notifcation\n");
-		notify(ts, "STREAM_NOT_ENCRYPTED", "No encrypted packets were seen in the last 5 seconds.");
-		ts->stream_is_encrypted = 0;
-		ts->last_scrambled_packet_ts = 0;
-	}
-
 	// Decode packets
 	if (even_packets) {
 		if (use_dvbcsa) {

tsdecrypt.1

@@ -344,8 +344,8 @@ currently defined events are:
                   the stream is encrypted and there are no new code words
                   from the CAMD server.
 
-  \fBSTREAM_NOT_ENCRYPTED\fR    No encrypted packets arrived in the input stream
-                  for the last 5 seconds. The stream is probably not encrypted.
+  \fBSTREAM_CLEAR\fR    No encrypted packets arrived in the input stream.
+                  The stream is not encrypted and clear to view.
 
   \fBNO_EMM_RECEIVED\fR    No EMM packet have been received for X seconds.
 

tsdecrypt.c

@@ -861,6 +861,8 @@ static void report_emms(struct ts *ts, time_t now) {
 }
 
 static void report_ecms(struct ts *ts, time_t now) {
+	if (ts->stream_is_not_scrambled && ts->ecm_seen_count == 0)
+		return;
 	ts_LOGf("ECM | Received %u (%u dup) and processed %u in %lu seconds.\n",
 		ts->ecm_seen_count,
 		ts->ecm_duplicate_count,
@@ -873,6 +875,8 @@ static void report_ecms(struct ts *ts, time_t now) {
 }
 
 static void report_cw_warn(struct ts *ts, time_t now) {
+	if (ts->stream_is_not_scrambled)
+		return;
 	if (now - ts->key.ts > 1) {
 		notify(ts, "NO_CODE_WORD", "No valid code word was received in %ld sec.",
 			now - ts->key.ts);
@@ -905,7 +909,11 @@ static void do_reports(struct ts *ts) {
 			report_ecms(ts, now);
 		}
 	}
-
+	if (ts->stream_is_not_scrambled && ts->last_not_scrambled_report_ts <= now - 60) {
+		ts_LOGf("CLR | No encrypted packets in the last %ld seconds. Stream is clear.\n", now - ts->last_scrambled_packet_ts);
+		notify(ts, "STREAM_CLEAR", "No encrypted packets in the last %ld seconds. Stream is clear.", now - ts->last_scrambled_packet_ts);
+		ts->last_not_scrambled_report_ts = now;
+	}
 	if (ts->process_ecm && !ts->key.is_valid_cw) {
 		if (ts->cw_warn_sec && now >= ts->cw_next_warn) {
 			report_cw_warn(ts, now);