Split cs378x protocol from generic camd code.

Makefile

@@ -30,7 +30,7 @@ FUNCS_LIB = $(FUNCS_DIR)/libfuncs.a
 TS_DIR = libtsfuncs
 TS_LIB = $(TS_DIR)/libtsfuncs.a
 
-tsdecrypt_SRC  = data.c udp.c util.c camd.c process.c tables.c notify.c tsdecrypt.c
+tsdecrypt_SRC  = data.c udp.c util.c camd.c camd-cs378x.c process.c tables.c notify.c tsdecrypt.c
 tsdecrypt_LIBS = -lcrypto -ldvbcsa -lpthread
 tsdecrypt_OBJS = $(FUNCS_LIB) $(TS_LIB) $(tsdecrypt_SRC:.c=.o)
 

TODO

@@ -1 +0,0 @@
-- Make camd comm code modular in order to add more protocols.

camd-cs378x.c

@@ -0,0 +1,186 @@
+/*
+ * cs378x protocol
+ * Copyright (C) 2011 Unix Solutions Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ */
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+
+#include <openssl/aes.h>
+#include <openssl/md5.h>
+
+#include "libfuncs/libfuncs.h"
+
+#include "data.h"
+#include "util.h"
+#include "camd.h"
+
+static int cs378x_connect(struct camd35 *c) {
+	if (c->server_fd < 0)
+		c->server_fd = camd_tcp_connect(c->server_addr, c->server_port);
+	return c->server_fd;
+}
+
+static void cs378x_disconnect(struct camd35 *c) {
+	shutdown_fd(&c->server_fd);
+}
+
+static int cs378x_reconnect(struct camd35 *c) {
+	cs378x_disconnect(c);
+	return cs378x_connect(c);
+}
+
+static int cs378x_recv(struct camd35 *c, uint8_t *data, int *data_len) {
+	int i;
+
+	// Read AUTH token
+	ssize_t r = fdread(c->server_fd, (char *)data, 4);
+	if (r < 4)
+		return -1;
+	uint32_t auth_token = (((data[0] << 24) | (data[1] << 16) | (data[2]<<8) | data[3]) & 0xffffffffL);
+	if (auth_token != c->auth_token)
+		ts_LOGf("WARN: recv auth 0x%08x != camd35_auth 0x%08x\n", auth_token, c->auth_token);
+
+	*data_len = 256;
+	for (i = 0; i < *data_len; i += 16) { // Read and decrypt payload
+		fdread(c->server_fd, (char *)data + i, 16);
+		AES_decrypt(data + i, data + i, &c->aes_decrypt_key);
+		if (i == 0)
+			*data_len = boundary(4, data[1] + 20); // Initialize real data length
+	}
+	return *data_len;
+}
+
+static int cs378x_send_buf(struct camd35 *c, int data_len) {
+	int i;
+	unsigned char dump[16];
+
+	cs378x_connect(c);
+
+	// Prepare auth token (only once)
+	if (!c->auth_token) {
+		c->auth_token = crc32(0L, MD5((unsigned char *)c->user, strlen(c->user), dump), 16);
+
+		MD5((unsigned char *)c->pass, strlen(c->pass), dump);
+
+		AES_set_encrypt_key(dump, 128, &c->aes_encrypt_key);
+		AES_set_decrypt_key(dump, 128, &c->aes_decrypt_key);
+	}
+
+	uint8_t *bdata = c->buf + 4; // Leave space for auth token
+	memmove(bdata, c->buf, data_len); // Move data
+	init_4b(c->auth_token, c->buf); // Put authentication token
+
+	for (i = 0; i < data_len; i += 16) // Encrypt payload
+		AES_encrypt(bdata + i, bdata + i, &c->aes_encrypt_key);
+
+	return fdwrite(c->server_fd, (char *)c->buf, data_len + 4);
+}
+
+static void cs378x_buf_init(struct camd35 *c, uint8_t *data, int data_len) {
+	memset(c->buf, 0, CAMD35_HDR_LEN); // Reset header
+	memset(c->buf + CAMD35_HDR_LEN, 0xff, CAMD35_BUF_LEN - CAMD35_HDR_LEN); // Reset data
+	c->buf[1] = data_len; // Data length
+	init_4b(crc32(0L, data, data_len), c->buf + 4); // Data CRC is at buf[4]
+	memcpy(c->buf + CAMD35_HDR_LEN, data, data_len); // Copy data to buf
+}
+
+static int cs378x_do_ecm(struct camd35 *c, uint16_t ca_id, uint16_t service_id, uint16_t idx, uint8_t *data, uint8_t data_len) {
+	uint32_t provider_id = 0;
+	int to_send = boundary(4, CAMD35_HDR_LEN + data_len);
+
+	cs378x_buf_init(c, data, (int)data_len);
+
+	c->buf[0] = 0x00; // CMD ECM request
+	init_2b(service_id , c->buf + 8);
+	init_2b(ca_id      , c->buf + 10);
+	init_4b(provider_id, c->buf + 12);
+	init_2b(idx        , c->buf + 16);
+	c->buf[18] = 0xff;
+	c->buf[19] = 0xff;
+
+	return cs378x_send_buf(c, to_send);
+}
+
+static int cs378x_do_emm(struct camd35 *c, uint16_t ca_id, uint8_t *data, uint8_t data_len) {
+	uint32_t prov_id = 0;
+	int to_send = boundary(4, CAMD35_HDR_LEN + data_len);
+
+	cs378x_buf_init(c, data, (int)data_len);
+
+	c->buf[0] = 0x06; // CMD incomming EMM
+	init_2b(ca_id  , c->buf + 10);
+	init_4b(prov_id, c->buf + 12);
+
+	return cs378x_send_buf(c, to_send);
+}
+
+static int cs378x_get_cw(struct camd35 *c, uint16_t *ca_id, uint16_t *idx, uint8_t *cw) {
+	uint8_t *data = c->buf;
+	int data_len = 0;
+	int ret = 0;
+
+READ:
+	ret = cs378x_recv(c, data, &data_len);
+	if (ret < 0) {
+		ts_LOGf("ERR | No code word has been received (ret = %d)\n", ret);
+		cs378x_reconnect(c);
+		return ret;
+	}
+
+	// EMM request, ignore it. Sometimes OSCAM sends two EMM requests after CW
+	if (data[0] == 0x05)
+		goto READ;
+
+	if (data[0] != 0x01) {
+		ts_LOGf("ERR | Unexpected server response on code word request (ret data[0] == 0x%02x /%s/)\n",
+			data[0],
+			data[0] == 0x08 ? "No card" :
+			data[0] == 0x44 ? "No code word found" : "Unknown err");
+		c->ecm_recv_errors++;
+		usleep(10000);
+		if (c->ecm_recv_errors >= ECM_RECV_ERRORS_LIMIT) {
+			c->key->is_valid_cw = 0;
+			memset(cw, 0, 16); // Invalid CW
+		}
+		return 0;
+	}
+
+	if (data_len < 48) {
+		ts_LOGf("ERR | Code word data_len (%d) mismatch != 48\n", data_len);
+		return 0;
+	}
+
+	if (data[1] < 0x10) {
+		ts_LOGf("ERR | Code word len (%d) mismatch != 16\n", data[1]);
+		return 0;
+	}
+
+	*ca_id = (data[10] << 8) | data[11];
+	*idx   = (data[16] << 8) | data[17];
+	memcpy(cw, data + 20, 16);
+
+	return ret;
+}
+
+void camd_proto_cs378x(struct camd_ops *ops) {
+	ops->connect	= cs378x_connect;
+	ops->disconnect	= cs378x_disconnect;
+	ops->reconnect	= cs378x_reconnect;
+	ops->do_emm		= cs378x_do_emm;
+	ops->do_ecm		= cs378x_do_ecm;
+	ops->get_cw		= cs378x_get_cw;
+}

camd.c

@@ -24,20 +24,16 @@
 #include <netinet/tcp.h>
 #include <arpa/inet.h>
 
-#include <openssl/aes.h>
-#include <openssl/md5.h>
-
 #include <dvbcsa/dvbcsa.h>
 
 #include "libfuncs/libfuncs.h"
-#include "libtsfuncs/tsfuncs.h"
 
 #include "data.h"
 #include "util.h"
 #include "camd.h"
 #include "notify.h"
 
-static int connect_to(struct in_addr ip, int port) {
+int camd_tcp_connect(struct in_addr ip, int port) {
 	ts_LOGf("CAM | Connecting to server %s:%d\n", inet_ntoa(ip), port);
 
 	int fd = socket(PF_INET, SOCK_STREAM, 0);
@@ -64,112 +60,22 @@ static int connect_to(struct in_addr ip, int port) {
 	return fd;
 }
 
-static void camd35_init_auth(struct ts *ts) {
-	struct camd35 *c = &ts->camd35;
-	unsigned char dump[16];
-
-	if (c->auth_token)
-		return;
-
-	c->auth_token = crc32(0L, MD5((unsigned char *)c->user, strlen(c->user), dump), 16);
-
-	MD5((unsigned char *)c->pass, strlen(c->pass), dump);
-
-	AES_set_encrypt_key(dump, 128, &c->aes_encrypt_key);
-	AES_set_decrypt_key(dump, 128, &c->aes_decrypt_key);
-}
-
-static int camd35_connect(struct ts *ts) {
-	struct camd35 *c = &ts->camd35;
-	if (c->server_fd < 0)
-		c->server_fd = connect_to(c->server_addr, c->server_port);
-	return c->server_fd;
-}
-
-static void camd35_disconnect(struct ts *ts) {
-	struct camd35 *c = &ts->camd35;
-	shutdown_fd(&c->server_fd);
-}
-
-static int camd35_reconnect(struct ts *ts) {
-	camd35_disconnect(ts);
-	return camd35_connect(ts);
-}
-
-static int camd35_recv(struct camd35 *c, uint8_t *data, int *data_len) {
-	int i;
-
-	// Read AUTH token
-	ssize_t r = fdread(c->server_fd, (char *)data, 4);
-	if (r < 4)
-		return -1;
-	uint32_t auth_token = (((data[0] << 24) | (data[1] << 16) | (data[2]<<8) | data[3]) & 0xffffffffL);
-	if (auth_token != c->auth_token)
-		ts_LOGf("WARN: recv auth 0x%08x != camd35_auth 0x%08x\n", auth_token, c->auth_token);
-
-	*data_len = 256;
-	for (i = 0; i < *data_len; i += 16) { // Read and decrypt payload
-		fdread(c->server_fd, (char *)data + i, 16);
-		AES_decrypt(data + i, data + i, &c->aes_decrypt_key);
-		if (i == 0)
-			*data_len = boundary(4, data[1] + 20); // Initialize real data length
-	}
-	return *data_len;
-}
-
 static int camd35_recv_cw(struct ts *ts) {
 	struct camd35 *c = &ts->camd35;
 	struct timeval tv1, tv2, last_ts_keyset;
 	static uint8_t invalid_cw[16] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
-	uint8_t *data = c->buf;
-	int data_len = 0;
-	int ret = 0;
+	uint16_t ca_id = 0;
+	uint16_t idx = 0;
+	int ret;
 
 	gettimeofday(&tv1, NULL);
-READ:
-	ret = camd35_recv(c, data, &data_len);
-	if (ret < 0) {
-		ts_LOGf("ERR | No code word has been received (ret = %d)\n", ret);
-		camd35_reconnect(ts);
+	ret = c->ops.get_cw(c, &ca_id, &idx, c->key->cw);
+	if (ret <= 0)
 		return ret;
-	}
-
-	// EMM request, ignore it. Sometimes OSCAM sends two EMM requests after CW
-	if (data[0] == 0x05)
-		goto READ;
-
-	if (data[0] != 0x01) {
-		ts_LOGf("ERR | Unexpected server response on code word request (ret data[0] == 0x%02x /%s/)\n",
-			data[0],
-			data[0] == 0x08 ? "No card" :
-			data[0] == 0x44 ? "No code word found" : "Unknown err");
-		c->ecm_recv_errors++;
-		usleep(10000);
-		if (c->ecm_recv_errors >= ECM_RECV_ERRORS_LIMIT) {
-			c->key->is_valid_cw = 0;
-			memcpy(c->key->cw, invalid_cw, 16);
-		}
-		return 0;
-	}
-
-	if (data_len < 48) {
-		ts_LOGf("ERR | Code word data_len (%d) mismatch != 48\n", data_len);
-		return 0;
-	}
-
-	if (data[1] < 0x10) {
-		ts_LOGf("ERR | Code word len (%d) mismatch != 16\n", data[1]);
-		return 0;
-	}
 	gettimeofday(&tv2, NULL);
 
-	uint16_t ca_id = (data[10] << 8) | data[11];
-	uint16_t idx   = (data[16] << 8) | data[17];
-	uint8_t *cw = data + 20;
-	memcpy(c->key->cw, cw, 16);
-
 	char cw_dump[16 * 6];
-	ts_hex_dump_buf(cw_dump, 16 * 6, cw, 16, 0);
+	ts_hex_dump_buf(cw_dump, 16 * 6, c->key->cw, 16, 0);
 
 	int valid_cw = memcmp(c->key->cw, invalid_cw, 16) != 0;
 	if (!c->key->is_valid_cw && valid_cw) {
@@ -209,52 +115,13 @@ READ:
 
 #undef ERR
 
-
-static int camd35_send_buf(struct ts *ts, int data_len) {
-	struct camd35 *c = &ts->camd35;
-	int i;
-	uint8_t *bdata = c->buf + 4; // Leave space for auth token
-
-	camd35_connect(ts);
-	camd35_init_auth(ts);
-
-	memmove(bdata, c->buf, data_len); // Move data
-	init_4b(c->auth_token, c->buf); // Put authentication token
-
-	for (i = 0; i < data_len; i += 16) // Encrypt payload
-		AES_encrypt(bdata + i, bdata + i, &c->aes_encrypt_key);
-
-	return fdwrite(c->server_fd, (char *)c->buf, data_len + 4);
-}
-
-static void camd35_buf_init(struct camd35 *c, uint8_t *data, int data_len) {
-	memset(c->buf, 0, CAMD35_HDR_LEN); // Reset header
-	memset(c->buf + CAMD35_HDR_LEN, 0xff, CAMD35_BUF_LEN - CAMD35_HDR_LEN); // Reset data
-	c->buf[1] = data_len; // Data length
-	init_4b(crc32(0L, data, data_len), c->buf + 4); // Data CRC is at buf[4]
-	memcpy(c->buf + CAMD35_HDR_LEN, data, data_len); // Copy data to buf
-}
-
 static int camd35_send_ecm(struct ts *ts, uint16_t ca_id, uint16_t service_id, uint16_t idx, uint8_t *data, uint8_t data_len) {
 	struct camd35 *c = &ts->camd35;
-	uint32_t provider_id = 0;
-	int to_send = boundary(4, CAMD35_HDR_LEN + data_len);
-
-	camd35_buf_init(c, data, (int)data_len);
-
-	c->buf[0] = 0x00; // CMD ECM request
-	init_2b(service_id , c->buf + 8);
-	init_2b(ca_id      , c->buf + 10);
-	init_4b(provider_id, c->buf + 12);
-	init_2b(idx        , c->buf + 16);
-	c->buf[18] = 0xff;
-	c->buf[19] = 0xff;
-
-	int ret = camd35_send_buf(ts, to_send);
+	int ret = c->ops.do_ecm(c, ca_id, service_id, idx, data, data_len);
 	if (ret <= 0) {
 		ts_LOGf("ERR | Error sending ecm packet, reconnecting to camd.\n");
 		ts->is_cw_error = 1;
-		camd35_reconnect(ts);
+		c->ops.reconnect(c);
 		return ret;
 	}
 
@@ -275,21 +142,12 @@ static int camd35_send_ecm(struct ts *ts, uint16_t ca_id, uint16_t service_id, u
 
 static int camd35_send_emm(struct ts *ts, uint16_t ca_id, uint8_t *data, uint8_t data_len) {
 	struct camd35 *c = &ts->camd35;
-	uint32_t prov_id = 0;
-	int to_send = boundary(4, CAMD35_HDR_LEN + data_len);
-
-	camd35_buf_init(c, data, (int)data_len);
-
-	c->buf[0] = 0x06; // CMD incomming EMM
-	init_2b(ca_id  , c->buf + 10);
-	init_4b(prov_id, c->buf + 12);
-
-	int ret = camd35_send_buf(ts, to_send);
+	int ret = c->ops.do_emm(c, ca_id, data, data_len);
 	if (ret < 0) {
 		c->emm_recv_errors++;
 		if (c->emm_recv_errors >= EMM_RECV_ERRORS_LIMIT) {
 			ts_LOGf("ERR | Error sending emm packet, reconnecting to camd.\n");
-			camd35_reconnect(ts);
+			c->ops.reconnect(c);
 			c->emm_recv_errors = 0;
 		}
 	} else {
@@ -374,25 +232,27 @@ void camd_msg_process(struct ts *ts, struct camd_msg *msg) {
 }
 
 void camd_start(struct ts *ts) {
-	camd35_connect(ts);
+	struct camd35 *c = &ts->camd35;
+	c->ops.connect(c);
 	// The input is not file, process messages using async thread
 	if (!(ts->input.type == FILE_IO && ts->input.fd != 0)) {
-		ts->camd35.req_queue = queue_new();
-		ts->camd35.ecm_queue = queue_new();
-		ts->camd35.emm_queue = queue_new();
-		pthread_create(&ts->camd35.thread, NULL , &camd_thread, ts);
+		c->req_queue = queue_new();
+		c->ecm_queue = queue_new();
+		c->emm_queue = queue_new();
+		pthread_create(&c->thread, NULL , &camd_thread, ts);
 	}
 }
 
 void camd_stop(struct ts *ts) {
+	struct camd35 *c = &ts->camd35;
 	ts->camd_stop = 1;
-	if (ts->camd35.thread) {
-		queue_wakeup(ts->camd35.req_queue);
-		pthread_join(ts->camd35.thread, NULL);
-		queue_free(&ts->camd35.req_queue);
-		queue_free(&ts->camd35.ecm_queue);
-		queue_free(&ts->camd35.emm_queue);
-		ts->camd35.thread = 0;
+	if (c->thread) {
+		queue_wakeup(c->req_queue);
+		pthread_join(c->thread, NULL);
+		queue_free(&c->req_queue);
+		queue_free(&c->ecm_queue);
+		queue_free(&c->emm_queue);
+		c->thread = 0;
 	}
-	camd35_disconnect(ts);
+	c->ops.disconnect(c);
 }

camd.h

@@ -20,6 +20,8 @@
 
 #include "data.h"
 
+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);
 void					camd_msg_free   	(struct camd_msg **pmsg);
@@ -28,4 +30,6 @@ 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_proto_cs378x	(struct camd_ops *ops);
+
 #endif

data.h

@@ -61,28 +61,41 @@ struct key {
 // When this limit is reached camd_reconnect is called.
 #define EMM_RECV_ERRORS_LIMIT 100
 
+struct camd35;
+
+struct camd_ops {
+	int (*connect)(struct camd35 *c);
+	void (*disconnect)(struct camd35 *c);
+	int (*reconnect)(struct camd35 *c);
+	int (*do_emm)(struct camd35 *c, uint16_t ca_id, uint8_t *data, uint8_t data_len);
+	int (*do_ecm)(struct camd35 *c, uint16_t ca_id, uint16_t service_id, uint16_t idx, uint8_t *data, uint8_t data_len);
+	int (*get_cw)(struct camd35 *c, uint16_t *ca_id, uint16_t *idx, uint8_t *cw);
+};
+
 struct camd35 {
-	uint8_t			buf[CAMD35_BUF_LEN];
-
 	int				server_fd;
 	struct in_addr	server_addr;
 	unsigned int	server_port;
 	char			user[64];
 	char			pass[64];
-	AES_KEY			aes_encrypt_key;
-	AES_KEY			aes_decrypt_key;
 
 	unsigned int	ecm_recv_errors; // Error counter, reset on successful send/recv
 	unsigned int	emm_recv_errors; // Error counter, reset on successful send/recv
 
-	uint32_t		auth_token;
-
 	struct key		*key;
 
 	pthread_t		thread;
 	QUEUE			*req_queue;
 	QUEUE			*ecm_queue;
 	QUEUE			*emm_queue;
+
+	struct camd_ops ops;
+
+	// cs378x private data
+	uint8_t			buf[CAMD35_BUF_LEN];
+	AES_KEY			aes_encrypt_key;
+	AES_KEY			aes_decrypt_key;
+	uint32_t		auth_token;
 };
 
 enum io_type {

tsdecrypt.c

@@ -628,6 +628,8 @@ int main(int argc, char **argv) {
 
 	parse_options(&ts, argc, argv);
 
+	camd_proto_cs378x(&ts.camd35.ops);
+
 	if (ts.pidfile[0])
 		daemonize(ts.pidfile);