Rename single packet csa key variable in struct key to s_csakey.

camd.c

@@ -72,12 +72,12 @@ void camd_set_cw(struct ts *ts, unsigned char *new_cw, int check_validity) {
 	ts->cw_last_warn = c->key->ts;
 
 	if (!check_validity || memcmp(c->key->cw, invalid_cw, 8) != 0) {
-		dvbcsa_key_set   (new_cw, c->key->csakey[0]);
+		dvbcsa_key_set   (new_cw, c->key->s_csakey[0]);
 		dvbcsa_bs_key_set(new_cw, c->key->bs_csakey[0]);
 	}
 
 	if (!check_validity || memcmp(c->key->cw + 8, invalid_cw, 8) != 0) {
-		dvbcsa_key_set(new_cw + 8, c->key->csakey[1]);
+		dvbcsa_key_set(new_cw + 8, c->key->s_csakey[1]);
 		dvbcsa_bs_key_set(new_cw + 8, c->key->bs_csakey[1]);
 	}
 }

data.c

@@ -52,8 +52,8 @@ void data_init(struct ts *ts) {
 
 	// Key
 	memset(&ts->key, 0, sizeof(ts->key));
-	ts->key.csakey[0] = dvbcsa_key_alloc();
-	ts->key.csakey[1] = dvbcsa_key_alloc();
+	ts->key.s_csakey[0] = dvbcsa_key_alloc();
+	ts->key.s_csakey[1] = dvbcsa_key_alloc();
 
 	ts->key.bs_csakey[0] = dvbcsa_bs_key_alloc();
 	ts->key.bs_csakey[1] = dvbcsa_bs_key_alloc();
@@ -130,8 +130,8 @@ void data_free(struct ts *ts) {
 	ts_privsec_free(&ts->last_ecm);
 	ts_privsec_free(&ts->tmp_ecm);
 
-	dvbcsa_key_free(ts->key.csakey[0]);
-	dvbcsa_key_free(ts->key.csakey[1]);
+	dvbcsa_key_free(ts->key.s_csakey[0]);
+	dvbcsa_key_free(ts->key.s_csakey[1]);
 
 	dvbcsa_bs_key_free(ts->key.bs_csakey[0]);
 	dvbcsa_bs_key_free(ts->key.bs_csakey[1]);

data.h

@@ -57,7 +57,7 @@ struct notify {
 struct key {
 	uint8_t				cw[CODEWORD_LENGTH];
 	int					is_valid_cw;
-	struct dvbcsa_key_s	*csakey[2];
+	struct dvbcsa_key_s	*s_csakey[2];
 	struct dvbcsa_bs_key_s	*bs_csakey[2];
 	time_t					ts;				// At what time the key is set
 	struct timeval			ts_keyset;		// At what time the key is set

process.c

@@ -107,7 +107,7 @@ static void decode_packet(struct ts *ts, uint8_t *ts_packet) {
 			// scramble_idx 3 == odd key
 			ts_packet_set_not_scrambled(ts_packet);
 			uint8_t payload_ofs = ts_packet_get_payload_offset(ts_packet);
-			dvbcsa_decrypt(ts->key.csakey[scramble_idx - 2], ts_packet + payload_ofs, 188 - payload_ofs);
+			dvbcsa_decrypt(ts->key.s_csakey[scramble_idx - 2], ts_packet + payload_ofs, 188 - payload_ofs);
 		} else {
 			// Can't decrypt the packet just make it NULL packet
 			if (ts->pid_filter)