Rename struct camd35 to struct camd.

camd-cs378x.c

@@ -28,22 +28,22 @@
 #include "util.h"
 #include "camd.h"
 
-static int cs378x_connect(struct camd35 *c) {
+static int cs378x_connect(struct camd *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) {
+static void cs378x_disconnect(struct camd *c) {
 	shutdown_fd(&c->server_fd);
 }
 
-static int cs378x_reconnect(struct camd35 *c) {
+static int cs378x_reconnect(struct camd *c) {
 	cs378x_disconnect(c);
 	return cs378x_connect(c);
 }
 
-static int cs378x_recv(struct camd35 *c, uint8_t *data, int *data_len) {
+static int cs378x_recv(struct camd *c, uint8_t *data, int *data_len) {
 	int i;
 
 	// Read AUTH token
@@ -52,7 +52,7 @@ static int cs378x_recv(struct camd35 *c, uint8_t *data, int *data_len) {
 		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);
+		ts_LOGf("WARN: recv auth 0x%08x != camd_auth 0x%08x\n", auth_token, c->auth_token);
 
 	*data_len = 256;
 	for (i = 0; i < *data_len; i += 16) { // Read and decrypt payload
@@ -64,7 +64,7 @@ static int cs378x_recv(struct camd35 *c, uint8_t *data, int *data_len) {
 	return *data_len;
 }
 
-static int cs378x_send_buf(struct camd35 *c, int data_len) {
+static int cs378x_send_buf(struct camd *c, int data_len) {
 	int i;
 	unsigned char dump[16];
 
@@ -90,7 +90,7 @@ static int cs378x_send_buf(struct camd35 *c, int data_len) {
 	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) {
+static void cs378x_buf_init(struct camd *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
@@ -98,7 +98,7 @@ static void cs378x_buf_init(struct camd35 *c, uint8_t *data, int data_len) {
 	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) {
+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) {
 	uint32_t provider_id = 0;
 	int to_send = boundary(4, CAMD35_HDR_LEN + data_len);
 
@@ -115,7 +115,7 @@ static int cs378x_do_ecm(struct camd35 *c, uint16_t ca_id, uint16_t service_id,
 	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) {
+static int cs378x_do_emm(struct camd *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);
 
@@ -128,7 +128,7 @@ static int cs378x_do_emm(struct camd35 *c, uint16_t ca_id, uint8_t *data, uint8_
 	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) {
+static int cs378x_get_cw(struct camd *c, uint16_t *ca_id, uint16_t *idx, uint8_t *cw) {
 	uint8_t *data = c->buf;
 	int data_len = 0;
 	int ret = 0;

camd.c

@@ -60,8 +60,8 @@ int camd_tcp_connect(struct in_addr ip, int port) {
 	return fd;
 }
 
-static int camd35_recv_cw(struct ts *ts) {
-	struct camd35 *c = &ts->camd35;
+static int camd_recv_cw(struct ts *ts) {
+	struct camd *c = &ts->camd;
 	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 };
 	uint16_t ca_id = 0;
@@ -115,8 +115,8 @@ static int camd35_recv_cw(struct ts *ts) {
 
 #undef ERR
 
-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;
+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) {
+	struct camd *c = &ts->camd;
 	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");
@@ -125,7 +125,7 @@ static int camd35_send_ecm(struct ts *ts, uint16_t ca_id, uint16_t service_id, u
 		return ret;
 	}
 
-	ret = camd35_recv_cw(ts);
+	ret = camd_recv_cw(ts);
 	if (ret < 48) {
 		ts->is_cw_error = 1;
 		if (ts->key.ts && time(NULL) - ts->key.ts > KEY_VALID_TIME) {
@@ -140,8 +140,8 @@ static int camd35_send_ecm(struct ts *ts, uint16_t ca_id, uint16_t service_id, u
 	return ret;
 }
 
-static int camd35_send_emm(struct ts *ts, uint16_t ca_id, uint8_t *data, uint8_t data_len) {
-	struct camd35 *c = &ts->camd35;
+static int camd_send_emm(struct ts *ts, uint16_t ca_id, uint8_t *data, uint8_t data_len) {
+	struct camd *c = &ts->camd;
 	int ret = c->ops.do_emm(c, ca_id, data, data_len);
 	if (ret < 0) {
 		c->emm_recv_errors++;
@@ -159,12 +159,12 @@ static int camd35_send_emm(struct ts *ts, uint16_t ca_id, uint8_t *data, uint8_t
 static void camd_do_msg(struct camd_msg *msg) {
 	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)
+		if (camd_send_emm(msg->ts, msg->ca_id, msg->data, msg->data_len) > 0)
 			msg->ts->emm_processed_count++;
 	}
 	if (msg->type == ECM_MSG) {
 		msg->ts->ecm_seen_count++;
-		if (camd35_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->idx, msg->data, msg->data_len) > 0)
 			msg->ts->ecm_processed_count++;
 	}
 
@@ -205,12 +205,12 @@ static void *camd_thread(void *in_ts) {
 
 	while (1) {
 		struct camd_msg *msg;
-		void *req = queue_get(ts->camd35.req_queue); // Waits...
+		void *req = queue_get(ts->camd.req_queue); // Waits...
 		if (!req || ts->camd_stop)
 			break;
-		msg = queue_get_nowait(ts->camd35.ecm_queue);
+		msg = queue_get_nowait(ts->camd.ecm_queue);
 		if (!msg)
-			msg = queue_get_nowait(ts->camd35.emm_queue);
+			msg = queue_get_nowait(ts->camd.emm_queue);
 		if (!msg)
 			break;
 		camd_do_msg(msg);
@@ -220,19 +220,19 @@ static void *camd_thread(void *in_ts) {
 
 void camd_msg_process(struct ts *ts, struct camd_msg *msg) {
 	msg->ts = ts;
-	if (ts->camd35.thread) {
+	if (ts->camd.thread) {
 		if (msg->type == EMM_MSG)
-			queue_add(ts->camd35.emm_queue, msg);
+			queue_add(ts->camd.emm_queue, msg);
 		if (msg->type == ECM_MSG)
-			queue_add(ts->camd35.ecm_queue, msg);
-		queue_add(ts->camd35.req_queue, msg);
+			queue_add(ts->camd.ecm_queue, msg);
+		queue_add(ts->camd.req_queue, msg);
 	} else {
 		camd_do_msg(msg);
 	}
 }
 
 void camd_start(struct ts *ts) {
-	struct camd35 *c = &ts->camd35;
+	struct camd *c = &ts->camd;
 	c->ops.connect(c);
 	// The input is not file, process messages using async thread
 	if (!(ts->input.type == FILE_IO && ts->input.fd != 0)) {
@@ -244,7 +244,7 @@ void camd_start(struct ts *ts) {
 }
 
 void camd_stop(struct ts *ts) {
-	struct camd35 *c = &ts->camd35;
+	struct camd *c = &ts->camd;
 	ts->camd_stop = 1;
 	if (c->thread) {
 		queue_wakeup(c->req_queue);

data.c

@@ -60,12 +60,12 @@ void data_init(struct ts *ts) {
 	gettimeofday(&ts->key.ts_keyset, NULL);
 
 	// CAMD
-	memset(&ts->camd35, 0, sizeof(ts->camd35));
-	ts->camd35.server_fd    = -1;
-	ts->camd35.server_port  = 2233;
-	ts->camd35.key          = &ts->key;
-	strcpy(ts->camd35.user, "user");
-	strcpy(ts->camd35.pass, "pass");
+	memset(&ts->camd, 0, sizeof(ts->camd));
+	ts->camd.server_fd    = -1;
+	ts->camd.server_port  = 2233;
+	ts->camd.key          = &ts->key;
+	strcpy(ts->camd.user, "user");
+	strcpy(ts->camd.pass, "pass");
 
 	// Config
 	ts->syslog_port = 514;

data.h

@@ -61,18 +61,18 @@ struct key {
 // When this limit is reached camd_reconnect is called.
 #define EMM_RECV_ERRORS_LIMIT 100
 
-struct camd35;
+struct camd;
 
 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);
+	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, 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 (*get_cw)(struct camd *c, uint16_t *ca_id, uint16_t *idx, uint8_t *cw);
 };
 
-struct camd35 {
+struct camd {
 	int				server_fd;
 	struct in_addr	server_addr;
 	unsigned int	server_port;
@@ -157,7 +157,7 @@ struct ts {
 
 	// CAMD handling
 	struct key			key;
-	struct camd35		camd35;
+	struct camd			camd;
 
 	// Config
 	char				ident[128];

tsdecrypt.c

@@ -195,8 +195,8 @@ static void show_help(struct ts *ts) {
 	printf("\n");
 	printf("CAMD server options:\n");
 	printf(" -s --camd-server <addr>    | Set CAMD server ip_address:port (1.2.3.4:2233).\n");
-	printf(" -U --camd-user <user>      | Set CAMD server user. Default: %s\n", ts->camd35.user);
-	printf(" -P --camd-pass <pass>      | Set CAMD server password. Default: %s\n", ts->camd35.pass);
+	printf(" -U --camd-user <user>      | Set CAMD server user. Default: %s\n", ts->camd.user);
+	printf(" -P --camd-pass <pass>      | Set CAMD server password. Default: %s\n", ts->camd.pass);
 	printf("\n");
 	printf("EMM options:\n");
 	printf(" -e --emm                   | Enable sending EMM's to CAMD. Default: %s\n", ts->emm_send ? "enabled" : "disabled");
@@ -352,20 +352,20 @@ static void parse_options(struct ts *ts, int argc, char **argv) {
 				p = strrchr(optarg, ':');
 				if (p) {
 					*p = 0x00;
-					ts->camd35.server_port = atoi(p + 1);
+					ts->camd.server_port = atoi(p + 1);
 				}
-				if (inet_aton(optarg, &ts->camd35.server_addr) == 0)
+				if (inet_aton(optarg, &ts->camd.server_addr) == 0)
 					server_err = 1;
 				else
 					server_err = 0;
 				break;
 			case 'U':
-				strncpy(ts->camd35.user, optarg, sizeof(ts->camd35.user) - 1);
-				ts->camd35.user[sizeof(ts->camd35.user) - 1] = 0;
+				strncpy(ts->camd.user, optarg, sizeof(ts->camd.user) - 1);
+				ts->camd.user[sizeof(ts->camd.user) - 1] = 0;
 				break;
 			case 'P':
-				strncpy(ts->camd35.pass, optarg, sizeof(ts->camd35.pass) - 1);
-				ts->camd35.pass[sizeof(ts->camd35.pass) - 1] = 0;
+				strncpy(ts->camd.pass, optarg, sizeof(ts->camd.pass) - 1);
+				ts->camd.pass[sizeof(ts->camd.pass) - 1] = 0;
 				break;
 
 			case 'e':
@@ -499,9 +499,9 @@ static void parse_options(struct ts *ts, int argc, char **argv) {
 				ts_LOGf("Out filter : Pass through TDT/TOT.\n");
 		}
 	}
-	ts_LOGf("Server addr: tcp://%s:%u/\n", inet_ntoa(ts->camd35.server_addr), ts->camd35.server_port);
-	ts_LOGf("Server user: %s\n", ts->camd35.user);
-	ts_LOGf("Server pass: %s\n", ts->camd35.pass);
+	ts_LOGf("Server addr: tcp://%s:%u/\n", inet_ntoa(ts->camd.server_addr), ts->camd.server_port);
+	ts_LOGf("Server user: %s\n", ts->camd.user);
+	ts_LOGf("Server pass: %s\n", ts->camd.pass);
 
 	ts_LOGf("TS discont : %s\n", ts->ts_discont ? "report" : "ignore");
 	ts->threaded = !(ts->input.type == FILE_IO && ts->input.fd != 0);
@@ -628,7 +628,7 @@ int main(int argc, char **argv) {
 
 	parse_options(&ts, argc, argv);
 
-	camd_proto_cs378x(&ts.camd35.ops);
+	camd_proto_cs378x(&ts.camd.ops);
 
 	if (ts.pidfile[0])
 		daemonize(ts.pidfile);