Make camd->do_ecm() and camd->do_emm() ops to take struct camd_msg.

camd-cs378x.c

@@ -98,34 +98,32 @@ 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, 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);
+static int cs378x_do_ecm(struct camd *c, struct camd_msg *msg) {
+	int to_send = boundary(4, CAMD35_HDR_LEN + msg->data_len);
 
-	cs378x_buf_init(c, data, (int)data_len);
+	cs378x_buf_init(c, msg->data, (int)msg->data_len);
+
+	c->cs378x.msg_id++;
 
 	c->cs378x.buf[0] = 0x00; // CMD ECM request
-	init_2b(service_id , c->cs378x.buf + 8);
-	init_2b(ca_id      , c->cs378x.buf + 10);
-	init_4b(provider_id, c->cs378x.buf + 12);
-	init_2b(idx        , c->cs378x.buf + 16);
+	init_2b(msg->service_id , c->cs378x.buf + 8);
+	init_2b(msg->ca_id      , c->cs378x.buf + 10);
+	init_4b(0               , c->cs378x.buf + 12); // Provider ID
+	init_2b(c->cs378x.msg_id, c->cs378x.buf + 16);
 	c->cs378x.buf[18] = 0xff;
 	c->cs378x.buf[19] = 0xff;
 
 	return cs378x_send_buf(c, to_send);
 }
 
-static int cs378x_do_emm(struct camd *c, uint16_t ca_id, uint16_t service_id, uint8_t *data, uint8_t data_len) {
-	(void)service_id;
-	uint32_t prov_id = 0;
-	int to_send = boundary(4, CAMD35_HDR_LEN + data_len);
+static int cs378x_do_emm(struct camd *c, struct camd_msg *msg) {
+	int to_send = boundary(4, CAMD35_HDR_LEN + msg->data_len);
 
-	cs378x_buf_init(c, data, (int)data_len);
+	cs378x_buf_init(c, msg->data, (int)msg->data_len);
 
 	c->cs378x.buf[0] = 0x06; // CMD incomming EMM
-	init_2b(ca_id  , c->cs378x.buf + 10);
-	init_4b(prov_id, c->cs378x.buf + 12);
+	init_2b(msg->ca_id  , c->cs378x.buf + 10);
+	init_4b(0           , c->cs378x.buf + 12); // Provider ID
 
 	return cs378x_send_buf(c, to_send);
 }

camd.c

@@ -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, uint8_t *data, uint8_t data_len) {
+static int camd_send_ecm(struct ts *ts, struct camd_msg *msg) {
 	struct camd *c = &ts->camd;
-	int ret = c->ops.do_ecm(c, ca_id, service_id, data, data_len);
+	int ret = c->ops.do_ecm(c, msg);
 	if (ret <= 0) {
 		ts_LOGf("ERR | Error sending ecm packet, reconnecting to camd.\n");
 		ts->is_cw_error = 1;
@@ -140,9 +140,9 @@ static int camd_send_ecm(struct ts *ts, uint16_t ca_id, uint16_t service_id, uin
 	return ret;
 }
 
-static int camd_send_emm(struct ts *ts, uint16_t ca_id, uint16_t service_id, uint8_t *data, uint8_t data_len) {
+static int camd_send_emm(struct ts *ts, struct camd_msg *msg) {
 	struct camd *c = &ts->camd;
-	int ret = c->ops.do_emm(c, ca_id, service_id, data, data_len);
+	int ret = c->ops.do_emm(c, msg);
 	if (ret < 0) {
 		c->emm_recv_errors++;
 		if (c->emm_recv_errors >= EMM_RECV_ERRORS_LIMIT) {
@@ -159,30 +159,21 @@ static int camd_send_emm(struct ts *ts, uint16_t ca_id, uint16_t service_id, uin
 static void camd_do_msg(struct camd_msg *msg) {
 	if (msg->type == EMM_MSG) {
 		msg->ts->emm_seen_count++;
-		if (camd_send_emm(msg->ts, msg->ca_id, msg->service_id, msg->data, msg->data_len) > 0)
+		if (camd_send_emm(msg->ts, msg) > 0)
 			msg->ts->emm_processed_count++;
 	}
 	if (msg->type == ECM_MSG) {
 		msg->ts->ecm_seen_count++;
-		if (camd_send_ecm(msg->ts, msg->ca_id, msg->service_id, msg->data, msg->data_len) > 0)
+		if (camd_send_ecm(msg->ts, msg) > 0)
 			msg->ts->ecm_processed_count++;
 	}
 
 	camd_msg_free(&msg);
 }
 
-struct camd_msg *camd_msg_alloc_emm(uint16_t ca_id, uint8_t *data, uint8_t data_len) {
+struct camd_msg *camd_msg_alloc(enum msg_type msg_type, 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       = EMM_MSG;
-	c->ca_id      = ca_id;
-	c->data_len   = data_len;
-	memcpy(c->data, data, data_len);
-	return c;
-}
-
-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->type       = msg_type;
 	c->ca_id      = ca_id;
 	c->service_id = service_id;
 	c->data_len   = data_len;
@@ -217,7 +208,7 @@ static void *camd_thread(void *in_ts) {
 	pthread_exit(EXIT_SUCCESS);
 }
 
-void camd_msg_process(struct ts *ts, struct camd_msg *msg) {
+void camd_process_packet(struct ts *ts, struct camd_msg *msg) {
 	msg->ts = ts;
 	if (ts->camd.thread) {
 		if (msg->type == EMM_MSG)

camd.h

@@ -22,13 +22,13 @@
 
 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, uint8_t *ecm_data, uint8_t ecm_data_len);
+struct camd_msg *		camd_msg_alloc		(enum msg_type msg_type, uint16_t ca_id, uint16_t service_id, uint8_t *data, uint8_t data_len);
 void					camd_msg_free   	(struct camd_msg **pmsg);
 
 void					camd_start			(struct ts *ts);
 void					camd_stop			(struct ts *ts);
-void					camd_msg_process	(struct ts *ts, struct camd_msg *msg);
+
+void					camd_process_packet	(struct ts *ts, struct camd_msg *msg);
 
 void					camd_proto_cs378x	(struct camd_ops *ops);
 

data.h

@@ -85,8 +85,8 @@ struct camd_ops {
 	int (*connect)(struct camd *c);
 	void (*disconnect)(struct camd *c);
 	int (*reconnect)(struct camd *c);
-	int (*do_emm)(struct camd *c, uint16_t ca_id, uint16_t service_id, 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 (*do_emm)(struct camd *c, struct camd_msg *msg);
+	int (*do_ecm)(struct camd *c, struct camd_msg *msg);
 	int (*get_cw)(struct camd *c, uint16_t *ca_id, uint16_t *idx, uint8_t *cw);
 };
 

tables.c

@@ -266,7 +266,7 @@ static void __process_emm(struct ts *ts, uint16_t pid, uint8_t *ts_packet) {
 			sec->section_data_len,
 			dump);
 	}
-	camd_msg_process(ts, camd_msg_alloc_emm(ts->emm_caid, sec->section_data, sec->section_data_len));
+	camd_process_packet(ts, camd_msg_alloc(EMM_MSG, ts->emm_caid, ts->service_id, sec->section_data, sec->section_data_len));
 	ts_privsec_copy(ts->emm, ts->last_emm);
 	ts_privsec_clear(ts->emm);
 }
@@ -310,7 +310,7 @@ static void __process_ecm(struct ts *ts, uint16_t pid, uint8_t *ts_packet) {
 				dump);
 		}
 		ts->is_cw_error = 0;
-		camd_msg_process(ts, camd_msg_alloc_ecm(ts->ecm_caid, ts->service_id, sec->section_data, sec->section_data_len));
+		camd_process_packet(ts, camd_msg_alloc(ECM_MSG, 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 Data: -dup-\n",
 			ts->ecm_caid,