added ecmfmt "t"

t = used tier (videoguard)

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

Author: Aeon

globals.h

@@ -1055,6 +1055,7 @@ struct s_ecm_answer
 	char            msglog[MSGLOGSIZE];
 	struct timeb    time_request_sent;  //using for evaluate ecm_time
 	int32_t         ecm_time;
+	uint16_t        tier; //only filled by local videoguard reader atm
 #ifdef WITH_LB
 	int32_t     value;
 	int32_t     time;

module-cw-cycle-check.c

@@ -242,7 +242,7 @@ static int32_t checkcwcycle_int(ECM_REQUEST *er, char *er_ecmf , char *user, uch
 			cs_hexdump(0, cwc->ecm_md5[cwc->cwc_hist_entry].md5, 16, cwc_md5, sizeof(cwc_md5));
 			cs_hexdump(0, (void *)&cwc->ecm_md5[cwc->cwc_hist_entry].csp_hash, 4, cwc_csp, sizeof(cwc_csp));
 			cs_hexdump(0, cwc->cw, 16, cwc_cw, sizeof(cwc_cw));
-			ecmfmt(cwc_ecmf, ECM_FMT_LEN, cwc->caid, 0, cwc->provid, cwc->chid, 0, cwc->sid, cwc->ecmlen, cwc_md5, cwc_csp, cwc_cw, 0, 0, NULL);
+			ecmfmt(cwc_ecmf, ECM_FMT_LEN, cwc->caid, 0, cwc->provid, cwc->chid, 0, cwc->sid, cwc->ecmlen, cwc_md5, cwc_csp, cwc_cw, 0, 0, NULL, NULL);
 
 // Cycletime over Cacheex
 			if (cfg.cwcycle_usecwcfromce)

module-dvbapi-chancache.c

@@ -151,7 +151,7 @@ struct s_channel_cache *dvbapi_find_channel_cache(int32_t demux_id, int32_t pidi
 
 #ifdef WITH_DEBUG
 				char buf[ECM_FMT_LEN];
-				ecmfmt(buf, ECM_FMT_LEN, c->caid, 0, c->prid, c->chid, c->pid, c->srvid, 0, 0, 0, 0, 0, 0, NULL);
+				ecmfmt(buf, ECM_FMT_LEN, c->caid, 0, c->prid, c->chid, c->pid, c->srvid, 0, 0, 0, 0, 0, 0, NULL, NULL);
 				cs_log_dbg(D_DVBAPI, "Demuxer %d found in channel cache: %s", demux_id, buf);
 #endif
 				return c;
@@ -200,7 +200,7 @@ int32_t dvbapi_edit_channel_cache(int32_t demux_id, int32_t pidindex, uint8_t ad
 		ll_append(channel_cache, c);
 #ifdef WITH_DEBUG
 		char buf[ECM_FMT_LEN];
-		ecmfmt(buf, ECM_FMT_LEN, c->caid, 0, c->prid, c->chid, c->pid, c->srvid, 0, 0, 0, 0, 0, 0, NULL);
+		ecmfmt(buf, ECM_FMT_LEN, c->caid, 0, c->prid, c->chid, c->pid, c->srvid, 0, 0, 0, 0, 0, 0, NULL, NULL);
 		cs_log_dbg(D_DVBAPI, "Demuxer %d added to channel cache: %s", demux_id, buf);
 #endif
 		count++;

oscam-ecm.c

@@ -2437,7 +2437,7 @@ void get_cw(struct s_client *client, ECM_REQUEST *er)
 
 
 int32_t ecmfmt(char *result, size_t size, uint16_t caid, uint16_t onid, uint32_t prid, uint16_t chid, uint16_t pid,
-		 uint16_t srvid, uint16_t l, char *ecmd5hex, char *csphash, char *cw, uint16_t origin_peer, uint8_t distance, char *payload)
+		 uint16_t srvid, uint16_t l, char *ecmd5hex, char *csphash, char *cw, uint16_t origin_peer, uint8_t distance, char *payload, char *tier)
 {
 	if(!cfg.ecmfmt)
 	{
@@ -2476,6 +2476,10 @@ int32_t ecmfmt(char *result, size_t size, uint16_t caid, uint16_t onid, uint32_t
 
 		switch(*c)
 		{
+		case 't':
+			type = ECMFMT_STRING;
+			svalue = tier;
+			break;
 		case 'c':
 			type = ECMFMT_NUMBER;
 			ifmt = "%04X";
@@ -2614,15 +2618,30 @@ int32_t format_ecm(ECM_REQUEST *ecm, char *result, size_t size)
 	char csphash[(4*2)+1] = { 0 };
 	char cwhex[(16*2)+1];
 	char *payload = NULL;
+	char *tier = NULL;
 #ifdef READER_VIDEOGUARD
 	char payload_string[(3*2)+1];
+	char tier_string[83];
 	static const uint8_t nullBytes[6] = { 0, 0, 0, 0, 0, 0};
+	struct s_ecm_answer *ea;
 
-	if(ecm->selected_reader
-		&& memcmp(ecm->selected_reader->VgLastPayload, nullBytes, 6))
-	{
-		cs_hexdump(0, ecm->selected_reader->VgLastPayload, 3, payload_string, sizeof(payload_string));
-		payload = payload_string;	
+	if(ecm->selected_reader && caid_is_videoguard(ecm->selected_reader->caid))
+	{	
+		for(ea = ecm->matching_rdr; ea; ea = ea->next)
+		{
+			if((ea->status & REQUEST_ANSWERED) && !is_network_reader(ea->reader))
+			{
+				get_tiername(ea->tier, ecm->selected_reader->caid, tier_string);
+				tier = tier_string;
+				break;
+			}
+		}
+			
+		if(memcmp(ecm->selected_reader->VgLastPayload, nullBytes, 6))
+		{
+			cs_hexdump(0, ecm->selected_reader->VgLastPayload, 3, payload_string, sizeof(payload_string));
+			payload = payload_string;	
+		}
 	}
 #endif
 	cs_hexdump(0, ecm->ecmd5, 16, ecmd5hex, sizeof(ecmd5hex));
@@ -2633,11 +2652,11 @@ int32_t format_ecm(ECM_REQUEST *ecm, char *result, size_t size)
 #ifdef MODULE_GBOX
 	struct gbox_ecm_request_ext *ere = ecm->src_data;
 	if(ere && check_client(ecm->client) && get_module(ecm->client)->num == R_GBOX && ere->gbox_hops)
-		{ return ecmfmt(result, size, ecm->caid, ecm->onid, ecm->prid, ecm->chid, ecm->pid, ecm->srvid, ecm->ecmlen, ecmd5hex, csphash, cwhex, ere->gbox_peer, ere->gbox_hops, payload); }
+		{ return ecmfmt(result, size, ecm->caid, ecm->onid, ecm->prid, ecm->chid, ecm->pid, ecm->srvid, ecm->ecmlen, ecmd5hex, csphash, cwhex, ere->gbox_peer, ere->gbox_hops, payload, tier); }
 	else if (ecm->selected_reader && ecm->selected_reader->typ == R_GBOX && ecm->gbox_ecm_id)
-		{ return ecmfmt(result, size, ecm->caid, ecm->onid, ecm->prid, ecm->chid, ecm->pid, ecm->srvid, ecm->ecmlen, ecmd5hex, csphash, cwhex, ecm->gbox_ecm_id, 0, payload); }
+		{ return ecmfmt(result, size, ecm->caid, ecm->onid, ecm->prid, ecm->chid, ecm->pid, ecm->srvid, ecm->ecmlen, ecmd5hex, csphash, cwhex, ecm->gbox_ecm_id, 0, payload, tier); }
 	else
 #endif
-		return ecmfmt(result, size, ecm->caid, ecm->onid, ecm->prid, ecm->chid, ecm->pid, ecm->srvid, ecm->ecmlen, ecmd5hex, csphash, cwhex, 0, 0, payload);
+		return ecmfmt(result, size, ecm->caid, ecm->onid, ecm->prid, ecm->chid, ecm->pid, ecm->srvid, ecm->ecmlen, ecmd5hex, csphash, cwhex, 0, 0, payload, tier);
 }
 

oscam-ecm.h

@@ -43,7 +43,7 @@ uint8_t checkCWpart(uchar *cw, int8_t part);
     } while(0)
 
 int32_t ecmfmt(char *result, size_t size, uint16_t caid, uint16_t onid, uint32_t prid, uint16_t chid, uint16_t pid,
-		 uint16_t srvid, uint16_t l, char *ecmd5hex, char *csphash, char *cw, uint16_t origin_peer, uint8_t distance, char *payload);
+		 uint16_t srvid, uint16_t l, char *ecmd5hex, char *csphash, char *cw, uint16_t origin_peer, uint8_t distance, char *payload, char *tier);
 
 int32_t format_ecm(ECM_REQUEST *ecm, char *result, size_t size);
 

reader-videoguard2.c

@@ -1167,6 +1167,11 @@ static int32_t videoguard2_do_ecm(struct s_reader *reader, const ECM_REQUEST *er
 			switch(tag)
 				{
 				case 0x0F:	// Debug ecm info
+					if(t_len > 6)
+					{
+						t_len = 6;
+					}
+									
 					memcpy(buff_0F, t_body, t_len);
 					break;
 				case 0x25:  // CW2 tag
@@ -1183,7 +1188,11 @@ static int32_t videoguard2_do_ecm(struct s_reader *reader, const ECM_REQUEST *er
 				}
 		ind += t_len + 2;
 		}
-
+		
+		if(12 < payloadLen)
+		{
+			ea->tier = b2i(2, &payload[10]);
+		}
 
 		memcpy(reader->VgLastPayload, buff_0F, 6);