Add struct key

camd.c

@@ -13,13 +13,11 @@
 #include "libfuncs/libfuncs.h"
 #include "libts/tsfuncs.h"
 
+#include "data.h"
 #include "util.h"
 #include "camd.h"
 
-
-extern uint8_t cur_cw[16];
-extern int is_valid_cw;
-extern struct dvbcsa_key_s *csakey[2];
+extern struct key key;
 
 static int camd35_server_fd;
 extern struct in_addr camd35_server_addr;
@@ -128,15 +126,15 @@ NEXT:
 	uint16_t ca_id = (data[10] << 8) | data[11];
 	uint16_t idx   = (data[16] << 8) | data[17];
 	uint8_t *cw = data + 20;
-	memcpy(cur_cw, cw, 16);
+	memcpy(key.cw, cw, 16);
 
 	char cw_dump[16 * 6];
 	ts_hex_dump_buf(cw_dump, 16 * 6, cw, 16, 0);
 	ts_LOGf("CW  | CAID: 0x%04x ---------------------------------- IDX: 0x%04x Data: %s\n", ca_id, idx, cw_dump);
 
-	is_valid_cw = valid_cw(cur_cw);
-	dvbcsa_key_set(cur_cw    , csakey[0]);
-	dvbcsa_key_set(cur_cw + 8, csakey[1]);
+	key.is_valid_cw = valid_cw(key.cw);
+	dvbcsa_key_set(key.cw    , key.csakey[0]);
+	dvbcsa_key_set(key.cw + 8, key.csakey[1]);
 
 	return NULL;
 }

data.c

@@ -57,7 +57,7 @@ void LOG_func(const char *msg) {
 extern int debug_level;
 extern unsigned long ts_pack;
 extern int ts_pack_shown;
-extern uint8_t cur_cw[16];
+extern struct key key;
 
 void show_ts_pack(uint16_t pid, char *wtf, char *extra, uint8_t *ts_packet) {
 	char cw1_dump[8 * 6];
@@ -66,8 +66,8 @@ void show_ts_pack(uint16_t pid, char *wtf, char *extra, uint8_t *ts_packet) {
 		if (ts_pack_shown)
 			return;
 		int stype = ts_packet_get_scrambled(ts_packet);
-		ts_hex_dump_buf(cw1_dump, 8 * 6, cur_cw    , 8, 0);
-		ts_hex_dump_buf(cw2_dump, 8 * 6, cur_cw + 8, 8, 0);
+		ts_hex_dump_buf(cw1_dump, 8 * 6, key.cw    , 8, 0);
+		ts_hex_dump_buf(cw2_dump, 8 * 6, key.cw + 8, 8, 0);
 		fprintf(stderr, "@ %s %s %03x %5ld %7ld | %s   %s | %s\n",
 			stype == 0 ? "------" :
 			stype == 2 ? "even 0" :

data.h

@@ -1,6 +1,8 @@
 #ifndef DATA_H
 #define DATA_H
 
+#include <dvbcsa/dvbcsa.h>
+
 #include "libts/tsfuncs.h"
 
 struct ts {
@@ -17,6 +19,12 @@ struct ts {
 	pidmap_t			pidmap;
 };
 
+struct key {
+	uint8_t				cw[16];
+	int					is_valid_cw;
+	struct dvbcsa_key_s	*csakey[2];
+};
+
 struct ts *ts_alloc();
 void ts_free(struct ts **pts);
 

tsdecrypt.c

@@ -13,9 +13,7 @@
 #include "camd.h"
 #include "tables.h"
 
-uint8_t cur_cw[16];
-int is_valid_cw = 0;
-struct dvbcsa_key_s *csakey[2];
+struct key key;
 
 int debug_level = 0;
 unsigned long ts_pack = 0;
@@ -184,11 +182,11 @@ void ts_process_packets(struct ts *ts, uint8_t *data, ssize_t data_len) {
 
 		int scramble_idx = ts_packet_get_scrambled(ts_packet);
 		if (scramble_idx > 1) {
-			if (is_valid_cw) {
+			if (key.is_valid_cw) {
 				// scramble_idx 2 == even key
 				// scramble_idx 3 == odd key
 				ts_packet_set_not_scrambled(ts_packet);
-				dvbcsa_decrypt(csakey[scramble_idx - 2], ts_packet + 4, 184);
+				dvbcsa_decrypt(key.csakey[scramble_idx - 2], ts_packet + 4, 184);
 			} else {
 				// Can't decrypt the packet just make it NULL packet
 				if (pid_filter)
@@ -220,10 +218,10 @@ int main(int argc, char **argv) {
 	ssize_t readen;
 	uint8_t ts_packet[FRAME_SIZE];
 
-	csakey[0] = dvbcsa_key_alloc();
-	csakey[1] = dvbcsa_key_alloc();
+	memset(&key, 0, sizeof(key));
+	key.csakey[0] = dvbcsa_key_alloc();
+	key.csakey[1] = dvbcsa_key_alloc();
 
-	memset(cur_cw, 0, sizeof(cur_cw));
 	ts_set_log_func(LOG_func);
 
 	parse_options(argc, argv);
@@ -240,8 +238,8 @@ int main(int argc, char **argv) {
 	} while (readen > 0);
 	ts_free(&ts);
 
-	dvbcsa_key_free(csakey[0]);
-	dvbcsa_key_free(csakey[1]);
+	dvbcsa_key_free(key.csakey[0]);
+	dvbcsa_key_free(key.csakey[1]);
 
 	camd35_disconnect();
 	exit(0);