Move msg_id processing to be internal to cs378x protocol.

camd-cs378x.c

@@ -98,8 +98,9 @@ static void cs378x_buf_init(struct camd *c, uint8_t *data, int data_len) {
 	memcpy(c->cs378x.buf + CAMD35_HDR_LEN, data, data_len); // Copy data to buf
 }
 
-static int cs378x_do_ecm(struct camd *c, uint16_t ca_id, uint16_t service_id, uint16_t idx, uint8_t *data, uint8_t data_len) {
+static int cs378x_do_ecm(struct camd *c, uint16_t ca_id, uint16_t service_id, uint8_t *data, uint8_t data_len) {
 	uint32_t provider_id = 0;
+	uint16_t idx = c->cs378x.msg_id++;
 	int to_send = boundary(4, CAMD35_HDR_LEN + data_len);
 
 	cs378x_buf_init(c, data, (int)data_len);

camd.c

@@ -104,7 +104,7 @@ static int camd_recv_cw(struct ts *ts) {
 	}
 
 	if (ts->ecm_cw_log) {
-		ts_LOGf("CW  | CAID: 0x%04x [ %5llu ms ] ( %6llu ms ) ------- IDX: 0x%04x Data: %s\n",
+		ts_LOGf("CW  | CAID: 0x%04x [ %5llu ms ] ( %6llu ms ) ------ IDX: 0x%04x Data: %s\n",
 			ca_id, timeval_diff_msec(&tv1, &tv2),
 			timeval_diff_msec(&last_ts_keyset, &tv2),
 			idx, cw_dump );
@@ -115,9 +115,9 @@ static int camd_recv_cw(struct ts *ts) {
 
 #undef ERR
 
-static int camd_send_ecm(struct ts *ts, uint16_t ca_id, uint16_t service_id, uint16_t idx, uint8_t *data, uint8_t data_len) {
+static int camd_send_ecm(struct ts *ts, uint16_t ca_id, uint16_t service_id, uint8_t *data, uint8_t data_len) {
 	struct camd *c = &ts->camd;
-	int ret = c->ops.do_ecm(c, ca_id, service_id, idx, data, data_len);
+	int ret = c->ops.do_ecm(c, ca_id, service_id, data, data_len);
 	if (ret <= 0) {
 		ts_LOGf("ERR | Error sending ecm packet, reconnecting to camd.\n");
 		ts->is_cw_error = 1;
@@ -164,7 +164,7 @@ static void camd_do_msg(struct camd_msg *msg) {
 	}
 	if (msg->type == ECM_MSG) {
 		msg->ts->ecm_seen_count++;
-		if (camd_send_ecm(msg->ts, msg->ca_id, msg->service_id, msg->idx, msg->data, msg->data_len) > 0)
+		if (camd_send_ecm(msg->ts, msg->ca_id, msg->service_id, msg->data, msg->data_len) > 0)
 			msg->ts->ecm_processed_count++;
 	}
 
@@ -180,10 +180,9 @@ struct camd_msg *camd_msg_alloc_emm(uint16_t ca_id, uint8_t *data, uint8_t data_
 	return c;
 }
 
-struct camd_msg *camd_msg_alloc_ecm(uint16_t ca_id, uint16_t service_id, uint16_t idx, uint8_t *data, uint8_t data_len) {
+struct camd_msg *camd_msg_alloc_ecm(uint16_t ca_id, uint16_t service_id, uint8_t *data, uint8_t data_len) {
 	struct camd_msg *c = calloc(1, sizeof(struct camd_msg));
 	c->type       = ECM_MSG;
-	c->idx        = idx;
 	c->ca_id      = ca_id;
 	c->service_id = service_id;
 	c->data_len   = data_len;

camd.h

@@ -23,7 +23,7 @@
 int						camd_tcp_connect	(struct in_addr ip, int port);
 
 struct camd_msg *		camd_msg_alloc_emm	(uint16_t ca_id, uint8_t *emm_data, uint8_t emm_data_len);
-struct camd_msg *		camd_msg_alloc_ecm	(uint16_t ca_id, uint16_t service_id, uint16_t idx, uint8_t *ecm_data, uint8_t ecm_data_len);
+struct camd_msg *		camd_msg_alloc_ecm	(uint16_t ca_id, uint16_t service_id, uint8_t *ecm_data, uint8_t ecm_data_len);
 void					camd_msg_free   	(struct camd_msg **pmsg);
 
 void					camd_start			(struct ts *ts);

data.h

@@ -68,7 +68,7 @@ struct camd_ops {
 	void (*disconnect)(struct camd *c);
 	int (*reconnect)(struct camd *c);
 	int (*do_emm)(struct camd *c, uint16_t ca_id, uint8_t *data, uint8_t data_len);
-	int (*do_ecm)(struct camd *c, uint16_t ca_id, uint16_t service_id, uint16_t idx, uint8_t *data, uint8_t data_len);
+	int (*do_ecm)(struct camd *c, uint16_t ca_id, uint16_t service_id, uint8_t *data, uint8_t data_len);
 	int (*get_cw)(struct camd *c, uint16_t *ca_id, uint16_t *idx, uint8_t *cw);
 };
 
@@ -78,6 +78,7 @@ struct cs378x {
 	AES_KEY			aes_encrypt_key;
 	AES_KEY			aes_decrypt_key;
 	uint32_t		auth_token;
+	uint16_t		msg_id;
 };
 
 struct camd {
@@ -138,7 +139,6 @@ struct ts {
 	uint16_t			forced_caid;
 	uint16_t			forced_emm_pid;
 	uint16_t			forced_ecm_pid;
-	uint16_t			ecm_counter;
 	pidmap_t			pidmap;
 	pidmap_t			cc; // Continuity counters
 	pidmap_t			pid_seen;
@@ -213,7 +213,6 @@ enum msg_type { EMM_MSG, ECM_MSG };
 
 struct camd_msg {
 	enum msg_type	type;
-	uint16_t		idx;
 	uint16_t		ca_id;
 	uint16_t		service_id;
 	uint8_t			data_len;

tables.c

@@ -258,9 +258,10 @@ static void __process_emm(struct ts *ts, uint16_t pid, uint8_t *ts_packet) {
 	struct ts_section_header *sec = ts->emm->section_header;
 	if (ts->debug_level >= 2) {
 		ts_hex_dump_buf(dump, dump_buf_sz, sec->section_data, min(dump_sz, sec->section_data_len), 0);
-		ts_LOGf("EMM | CAID: 0x%04x PID 0x%04x Table: 0x%02x Length: %3d ----------- Data: %s..\n",
+		ts_LOGf("EMM | CAID: 0x%04x PID 0x%04x SID 0x%04x Table: 0x%02x Length: %3d Data: %s..\n",
 			ts->emm_caid,
 			th->pid,
+			ts->service_id,
 			sec->table_id,
 			sec->section_data_len,
 			dump);
@@ -300,25 +301,22 @@ static void __process_ecm(struct ts *ts, uint16_t pid, uint8_t *ts_packet) {
 	if (!duplicate || ts->is_cw_error) {
 		if (ts->ecm_cw_log) {
 			ts_hex_dump_buf(dump, dump_buf_sz, sec->section_data, min(dump_sz, sec->section_data_len), 0);
-			ts_LOGf("ECM | CAID: 0x%04x PID 0x%04x Table: 0x%02x Length: %3d IDX: 0x%04x Data: %s..\n",
+			ts_LOGf("ECM | CAID: 0x%04x PID 0x%04x SID 0x%04x Table: 0x%02x Length: %3d Data: %s..\n",
 				ts->ecm_caid,
 				th->pid,
+				ts->service_id,
 				sec->table_id,
 				sec->section_data_len,
-				ts->ecm_counter,
 				dump);
 		}
-		if (ts->is_cw_error)
-			ts->ecm_counter--;
 		ts->is_cw_error = 0;
-		camd_msg_process(ts, camd_msg_alloc_ecm(ts->ecm_caid, ts->service_id, ts->ecm_counter++, sec->section_data, sec->section_data_len));
+		camd_msg_process(ts, camd_msg_alloc_ecm(ts->ecm_caid, ts->service_id, sec->section_data, sec->section_data_len));
 	} else if (ts->debug_level >= 3) {
-		ts_LOGf("ECM | CAID: 0x%04x PID 0x%04x Table: 0x%02x Length: %3d IDX: 0x%04x Data: -dup-\n",
+		ts_LOGf("ECM | CAID: 0x%04x PID 0x%04x Table: 0x%02x Length: %3d Data: -dup-\n",
 			ts->ecm_caid,
 			th->pid,
 			sec->table_id,
-			sec->section_data_len,
-			ts->ecm_counter - 1);
+			sec->section_data_len);
 	}
 	ts_privsec_copy(ts->ecm, ts->last_ecm);
 	ts_privsec_clear(ts->ecm);