Move EMM reports processing into main thread.

This move is in preparation for adding ecm reports.

camd.c

@@ -275,26 +275,19 @@ static int camd35_send_emm(struct ts *ts, uint16_t ca_id, uint8_t *data, uint8_t
 	if (ret <= 0) {
 		ts_LOGf("EMM | Error sending packet.\n");
 		camd35_reconnect(ts);
-	} else {
-		c->emm_count++;
 	}
 	return ret;
 }
 
 static void camd_do_msg(struct camd_msg *msg) {
-	struct camd35 *c = &msg->ts->camd35;
-	if (msg->type == EMM_MSG)
-		camd35_send_emm(msg->ts, msg->ca_id, msg->data, msg->data_len);
+	if (msg->type == EMM_MSG) {
+		msg->ts->emm_seen_count++;
+		if (camd35_send_emm(msg->ts, msg->ca_id, msg->data, msg->data_len) > 0)
+			msg->ts->emm_processed_count++;
+	}
 	if (msg->type == ECM_MSG)
 		camd35_send_ecm(msg->ts, msg->ca_id, msg->service_id, msg->idx, msg->data, msg->data_len);
 
-	if (msg->ts->emm_send && c->emm_count_report_interval && c->emm_count_last_report + c->emm_count_report_interval <= time(NULL))
-	{
-		ts_LOGf("EMM | Send %d messages in %d seconds.\n", c->emm_count, c->emm_count_report_interval);
-		c->emm_count = 0;
-		c->emm_count_last_report = time(NULL);
-	}
-
 	camd_msg_free(&msg);
 }
 

data.c

@@ -62,8 +62,6 @@ void data_init(struct ts *ts) {
 	ts->camd35.key          = &ts->key;
 	strcpy(ts->camd35.user, "user");
 	strcpy(ts->camd35.pass, "pass");
-	ts->camd35.emm_count_report_interval = 60;
-	ts->camd35.emm_count_last_report     = time(NULL);
 
 	// Config
 	ts->syslog_port = 514;
@@ -78,6 +76,9 @@ void data_init(struct ts *ts) {
 
 	ts->packet_delay = 0;
 
+	ts->emm_report_interval = 60;
+	ts->emm_last_report     = time(NULL);
+
 	ts->input.fd    = 0; // STDIN
 	ts->input.type  = FILE_IO;
 

data.h

@@ -56,11 +56,6 @@ struct camd35 {
 	unsigned int	server_port;
 	char			user[64];
 	char			pass[64];
-
-	int				emm_count;
-	int				emm_count_report_interval;
-	time_t			emm_count_last_report;
-
 	AES_KEY			aes_encrypt_key;
 	AES_KEY			aes_decrypt_key;
 
@@ -109,6 +104,12 @@ struct ts {
 	pidmap_t			cc; // Continuity counters
 	pidmap_t			pid_seen;
 
+	// Stats
+	unsigned int		emm_seen_count;
+	unsigned int		emm_processed_count;
+	unsigned int		emm_report_interval;
+	time_t				emm_last_report;
+
 	// CAMD handling
 	struct key			key;
 	struct camd35		camd35;

tsdecrypt.1

@@ -115,8 +115,8 @@ stream has very high rate and is interfering with ECM processing. Using
 --emm-only you can run special tsdecrypt dedicated only to card auto update.
 .TP
 \fB\-f\fR, \fB\-\-emm\-report\-time\fR <seconds>
-Set interval for EMM totals report message. The default is \fB60\fR seconds.
-Set to \fB0\fR to disable EMM reporting.
+Set interval for EMM reports. The default is \fB60\fR seconds. Set to \fB0\fR
+to disable EMM reports.
 .TP
 .SH ECM OPTIONS
 .PP

tsdecrypt.c

@@ -127,9 +127,9 @@ static void show_help(struct ts *ts) {
 	printf(" -E --emm-only              | Send only EMMs to CAMD, skipping ECMs and without\n");
 	printf("                            . decoding the input stream.\n");
 	printf(" -Z --emm-pid <pid>         | Force EMM pid. Default: none\n");
-	printf(" -f --emm-report-time <sec> | Report how much EMMs has been send for processing\n");
-	printf("                            . each <sec> seconds. Set <sec> to 0 to disable\n");
-	printf("                            . reporting. Default: %d sec\n", ts->camd35.emm_count_report_interval);
+	printf(" -f --emm-report-time <sec> | Report each <sec> seconds how much EMMs have been\n");
+	printf("                            . received/processed. Set <sec> to 0 to disable\n");
+	printf("                            . the reports. Default: %d sec\n", ts->emm_report_interval);
 	printf("\n");
 	printf("ECM options:\n");
 	printf(" -X --ecm-pid <pid>         | Force ECM pid. Default: none\n");
@@ -276,11 +276,9 @@ static void parse_options(struct ts *ts, int argc, char **argv) {
 				ts->emm_send = 1;
 				break;
 			case 'f':
-				ts->camd35.emm_count_report_interval = atoi(optarg);
-				if (ts->camd35.emm_count_report_interval < 0)
-					ts->camd35.emm_count_report_interval = 0;
-				if (ts->camd35.emm_count_report_interval > 86400)
-					ts->camd35.emm_count_report_interval = 86400;
+				ts->emm_report_interval = strtoul(optarg, NULL, 10);
+				if (ts->emm_report_interval > 86400)
+					ts->emm_report_interval = 86400;
 				break;
 
 			case 'X':
@@ -367,9 +365,9 @@ static void parse_options(struct ts *ts, int argc, char **argv) {
 		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->camd35.emm_count_report_interval)
-		ts_LOGf("EMM report : %d sec\n", ts->camd35.emm_count_report_interval);
-	if (ts->emm_send && ts->camd35.emm_count_report_interval == 0)
+	if (ts->emm_send && ts->emm_report_interval)
+		ts_LOGf("EMM report : %d sec\n", ts->emm_report_interval);
+	if (ts->emm_send && ts->emm_report_interval == 0)
 		ts_LOGf("EMM report : disabled\n");
 	if (ts->emm_only) {
 		ts_LOGf("EMM only   : %s\n", ts->emm_only ? "yes" : "no");
@@ -389,6 +387,21 @@ static void parse_options(struct ts *ts, int argc, char **argv) {
 	}
 }
 
+static void do_reports(struct ts *ts) {
+	time_t now = time(NULL);
+	if (ts->emm_send && ts->emm_report_interval) {
+		if ((time_t)(ts->emm_last_report + ts->emm_report_interval) <= now) {
+			ts->emm_last_report = now;
+			ts_LOGf("EMM | Received %u and processed %u in %u seconds.\n",
+				ts->emm_seen_count,
+				ts->emm_processed_count,
+				ts->emm_report_interval);
+			ts->emm_seen_count = 0;
+			ts->emm_processed_count = 0;
+		}
+	}
+}
+
 void signal_quit(int sig) {
 	if (!keep_running)
 		raise(sig);
@@ -444,6 +457,8 @@ int main(int argc, char **argv) {
 
 	camd_start(&ts);
 	do {
+		do_reports(&ts);
+
 		if (ts.input.type == NET_IO) {
 			set_log_io_errors(0);
 			if (!ts.rtp_input) {