Track if stream is encrypted or not

ChangeLog

@@ -1,3 +1,7 @@
+xxxx-xx-xx : Version -next
+ * Add new notification message STREAM_NOT_ENCRYPTED. When stream is not
+   encrypted no NO_CODE_WORD notifications are sent.
+
 2013-09-12 : Version 10.0
  * Add --ecm-only (-v) option. This allows processing of ECMs but without
    decoding the input stream.

camd.c

@@ -170,6 +170,10 @@ 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) {

data.h

@@ -276,6 +276,9 @@ struct ts {
 	time_t				cw_next_warn;
 	struct timeval		ecm_change_time;
 
+	unsigned int		stream_is_encrypted;
+	time_t				last_scrambled_packet_ts;
+
 	unsigned int		pid_report;
 	unsigned int		pid_stats[MAX_PIDS];
 

process.c

@@ -20,6 +20,7 @@
 #include "csa.h"
 #include "tables.h"
 #include "util.h"
+#include "notify.h"
 
 static unsigned long ts_pack;
 static int ts_pack_shown;
@@ -122,12 +123,18 @@ static void decode_buffer(struct ts *ts, uint8_t *data, int data_len) {
 
 	int scramble_idx_old = 0;
 
+	time_t now = time(NULL);
+
 	// Prepare batch structure
 	for (i = 0; i < batch_sz; i++) {
 		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;
+			}
 			if (ts->key.is_valid_cw) {
 				int scramble_idx = ts_packet_get_scrambled(ts_packet);
 				if (!scramble_idx_old)
@@ -174,6 +181,13 @@ 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

@@ -340,7 +340,12 @@ currently defined events are:
 
   \fBNO_CODE_WORD\fR    No valid code word was received for X seconds. The
                   decryption process have been suspended until valid
-                  code word is received.
+                  code word is received. This event is sent only if
+                  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.
 
   \fBNO_EMM_RECEIVED\fR    No EMM packet have been received for X seconds.