Introduce caid checking function for Videoguard.

git-svn-id: http://streamboard.de.vu/svn/oscam/trunk@10591 4b0bc96b-bc66-0410-9d44-ebda105a78c1

globals.h

@@ -2050,6 +2050,7 @@ const char *boxname_get(void);
 static inline bool caid_is_fake(uint16_t caid) { return caid == 0xffff; }
 static inline bool caid_is_biss(uint16_t caid) { return caid >> 8 == 0x26; }
 static inline bool caid_is_irdeto(uint16_t caid) { return caid >> 8 == 0x06; }
+static inline bool caid_is_videoguard(uint16_t caid) { return caid >> 8 == 0x09; }
 static inline bool caid_is_betacrypt(uint16_t caid) { return caid >> 8 == 0x17; }
 static inline bool caid_is_bulcrypt(uint16_t caid) { return caid == 0x5581 || caid == 0x4AEE; }
 

module-cw-cycle-check.c

@@ -124,7 +124,7 @@ static uint8_t checkvalidCW(ECM_REQUEST *er)
 	if(checkCWpart(er->cw, 0) && checkCWpart(er->cw, 1))
 	{ return 1; } //cw1 and cw2 is filled -> we can check for cwc
 
-	if((!checkCWpart(er->cw, 0) || !checkCWpart(er->cw, 1)) && er->caid >> 8 == 0x09)
+	if((!checkCWpart(er->cw, 0) || !checkCWpart(er->cw, 1)) && caid_is_videoguard(er->caid))
 	{
 		cs_log("CAID: %04X uses obviously half cycle cw's : NO need to check it with CWC! Remove CAID: %04X from CWC Config!", er->caid, er->caid);
 		ret = 0;  // cw1 or cw2 is null 

module-webif.c

@@ -3690,7 +3690,7 @@ static char *get_cardsystem_desc_by_caid(uint16_t caid)
 	if(caid >= 0x0100 && caid <= 0x01FF) { return "seca"; }
 	if(caid >= 0x0500 && caid <= 0x05FF) { return "viaccess"; }
 	if(caid_is_irdeto(caid)) { return "irdeto"; }
-	if(caid >= 0x0900 && caid <= 0x09FF) { return "videoguard"; }
+	if(caid_is_videoguard(caid)) { return "videoguard"; }
 	if(caid >= 0x0B00 && caid <= 0x0BFF) { return "conax"; }
 	if(caid >= 0x0D00 && caid <= 0x0DFF) { return "cryptoworks"; }
 	if(caid_is_betacrypt(caid)) { return "betacrypt"; }

oscam-chk.c

@@ -1016,9 +1016,7 @@ int32_t chk_is_null_CW(uchar cw[])
  **/
 int8_t is_halfCW_er(ECM_REQUEST *er)
 {
-  if(
-	 er->caid >> 8 == 0x09
-	 &&
+	if(caid_is_videoguard(er->caid) &&
 	 (er->caid == 0x09C4 || er->caid ==  0x098C || er->caid == 0x0963 || er->caid == 0x09CD || er->caid == 0x0919 || er->caid == 0x093B || er->caid == 0x098E)
 	)
 		return 1;