Add support Tongfang3 (NTIC2) CAS (Thanks to @nx111)

* Add support Tongfang3 (NTIC2) CAS (Thanks to @nx111) cherry-pick >https://git.streamboard.tv/common/oscam/-/commit/178662a1c636579f24b4f6845962f4a5837d528d
fairbird · Oct 3, 2024 · a6d32b3 · a6d32b3
1 parent 748cbb9
commit a6d32b3
Show file tree

Hide file tree

Showing 8 changed files with 253 additions and 99 deletions.
diff --git a/globals.h b/globals.h
@@ -1692,8 +1692,14 @@ struct s_reader
 	CAIDTAB         ctab;
 	uint32_t        boxid;
 #ifdef READER_TONGFANG
-	uint32_t        tongfang3_calibsn;
-	uint8_t           tongfang3_commkey[8];
+	uint32_t	tongfang_version;
+	uint8_t         tongfang3_commkey[8];
+	uint32_t	tongfang3_calibsn;
+	uint32_t	tongfang_boxid;
+	uint8_t		tongfang3_deskey[8];
+	uint8_t		tongfang3_deskey_length;
+	uint8_t		stbid[8];
+	uint8_t		stbid_length;
 #endif
 #ifdef READER_JET
 	uint8_t         jet_vendor_key[32];

diff --git a/module-cccam.c b/module-cccam.c
@@ -1289,8 +1289,7 @@ int32_t get_UA_ofs(uint16_t caid)
 		case 0x0D: // CRYPTOWORKS
 			//ofs = 1;
 			//break;
-		case 0x4A: // STREAMGUARD:
-		case 0x4B: // TONGFANG
+		case 0x4A: // TONGFANG
 		case 0x09: // VIDEOGUARD
 		case 0x0B: // CONAX
 		case 0x18: // NAGRA

diff --git a/module-webif.c b/module-webif.c
@@ -3128,6 +3128,24 @@ static char *send_ncam_reader_config(struct templatevars *vars, struct uriparams
 	if(rdr->tongfang3_calibsn)
 		{ tpl_printf(vars, TPLADD, "TONGFANGCALIBSN", "%08X", rdr->tongfang3_calibsn); }
 
+	if(rdr->tongfang_boxid)
+		{ tpl_printf(vars, TPLADD, "TONGFANGBOXID", "%08X", rdr->tongfang_boxid); }
+
+	if(rdr->tongfang3_deskey_length > 0)
+	{
+		for(i = 0; i < rdr->tongfang3_deskey_length ; i++)
+		{
+			tpl_printf(vars, TPLAPPEND, "TONGFANGDESKEY", "%02X", rdr->tongfang3_deskey[i]);
+		}
+	}
+
+	if(rdr->stbid_length > 0)
+	{
+		for(i = 0; i < rdr->stbid_length ; i++)
+		{
+			tpl_printf(vars, TPLAPPEND, "STBID", "%02X", rdr->stbid[i]);
+		}
+	}
 #endif
 #ifdef READER_JET
 	for(i = 0; (size_t)i < sizeof(rdr->jet_authorize_id) && rdr->jet_authorize_id[i] == 0; i++);

diff --git a/ncam-config-reader.c b/ncam-config-reader.c
@@ -305,14 +305,104 @@ static void tongfang3_calibsn_fn(const char *token, char *value, void *setting,
 	struct s_reader *rdr = setting;
 	if(value)
 	{
-		rdr->tongfang3_calibsn = cs_strlen(value) ? a2i(value, 4) : 0;
+		rdr->tongfang3_calibsn = strlen(value) ? a2i(value, 4) : 0;
 		return;
 	}
 	if(rdr->tongfang3_calibsn)
 		fprintf_conf(f, token, "%08X\n", rdr->tongfang3_calibsn);
 	else if(cfg.http_full_cfg)
 		{ fprintf_conf(f, token, "\n"); }
 }
+
+static void tongfang_boxid_fn(const char *token, char *value, void *setting, FILE *f)
+{
+	struct s_reader *rdr = setting;
+	if(value)
+	{
+		rdr->tongfang_boxid = cs_strlen(value) ? a2i(value, 4) : 0;
+		return;
+	}
+	if(rdr->tongfang_boxid)
+		{ fprintf_conf(f, token, "%08X\n", rdr->tongfang_boxid); }
+	else if(cfg.http_full_cfg)
+		{ fprintf_conf(f, token, "\n"); }
+}
+
+static void stbid_fn(const char *token, char *value, void *setting, FILE *f)
+{
+	struct s_reader *rdr = setting;
+	if(value)
+	{
+		int32_t len = cs_strlen(value);
+		if(len != 16)
+		{
+			rdr->stbid_length = 0;
+			memset(rdr->stbid, 0, 8);
+		}
+		else
+		{
+			if(key_atob_l(value, rdr->stbid, len))
+			{
+				fprintf(stderr, "reader stbid parse error, %s=%s\n", token, value);
+				rdr->stbid_length = 0;
+				memset(rdr->stbid, 0, sizeof(rdr->stbid));
+			}
+			else
+			{
+				rdr->stbid_length = len/2;
+			}
+		}
+		return;
+	}
+	int32_t len = rdr->stbid_length;
+	if(len > 0)
+	{
+		char tmp[len * 2 + 1];
+		fprintf_conf(f, "stbid", "%s\n", cs_hexdump(0, rdr->stbid, len, tmp, sizeof(tmp)));
+	}
+	else if(cfg.http_full_cfg)
+	{
+		fprintf_conf(f, "stbid", "\n");
+	}
+}
+
+static void tongfang3_deskey_fn(const char *token, char *value, void *setting, FILE *f)
+{
+	struct s_reader *rdr = setting;
+	if(value)
+	{
+		int32_t len = cs_strlen(value);
+		if(len != 16)
+		{
+			rdr->tongfang3_deskey_length = 0;
+			memset(rdr->tongfang3_deskey, 0, 8);
+		}
+		else
+		{
+			if(key_atob_l(value, rdr->tongfang3_deskey, len))
+			{
+				fprintf(stderr, "reader tongfang3_deskey parse error, %s=%s\n", token, value);
+				rdr->tongfang3_deskey_length = 0;
+				memset(rdr->tongfang3_deskey, 0, sizeof(rdr->tongfang3_deskey));
+			}
+			else
+			{
+				rdr->tongfang3_deskey_length = len/2;
+			}
+		}
+		return;
+	}
+	int32_t len = rdr->tongfang3_deskey_length;
+	if(len > 0)
+	{
+		char tmp[len * 2 + 1];
+		fprintf_conf(f, "tongfang3_deskey", "%s\n", cs_hexdump(0, rdr->tongfang3_deskey, len, tmp, sizeof(tmp)));
+	}
+	else if(cfg.http_full_cfg)
+	{
+		fprintf_conf(f, "tongfang3_deskey", "\n");
+	}
+}
 #endif
 
 static void rsakey_fn(const char *token, char *value, void *setting, FILE *f)
@@ -1300,6 +1390,9 @@ static const struct config_list reader_opts[] =
 #endif
 #ifdef READER_TONGFANG
 	DEF_OPT_FUNC("tongfang3_calibsn"              , 0,                                    tongfang3_calibsn_fn),
+	DEF_OPT_FUNC("tongfang_boxid"                 , 0,                                    tongfang_boxid_fn),
+	DEF_OPT_FUNC("stbid"                          , 0,                                    stbid_fn),
+	DEF_OPT_FUNC("tongfang3_deskey"               , 0,                                    tongfang3_deskey_fn),
 #endif
 #ifdef READER_JET
 	DEF_OPT_FUNC("jet_authorize_id"               , 0,                                    jet_authorize_id_fn),
@@ -1444,6 +1537,9 @@ static bool reader_check_setting(const struct config_list *UNUSED(clist), void *
 #if defined(READER_DRE) || defined(READER_DRECAS)
 		"exec_cmd_file",
 #endif
+#if defined(READER_TONGFANG)
+		"tongfang3_calibsn", "tongfang_boxid", "stbid", "tongfang3_deskey",
+#endif
 #ifdef WITH_AZBOX
 		"mode",
 #endif