Changeset 1858

Timestamp:

03/21/10 08:13:29 (13 years ago)

Author:

merek

Message:

Some backports from modular branch r1856

Location:

trunk

Files:

• oscam.c (modified) (2 diffs)
• reader-cryptoworks.c (modified) (1 diff)
• reader-dre.c (modified) (1 diff)
• reader-viaccess.c (modified) (1 diff)
• reader-videoguard2.c (modified) (1 diff)

trunk/oscam.c

@@ -2107 +2107 @@
 {
     int au;
+    char *typtext[]={"UNKNOWN", "UNIQUE", "SHARED", "GLOBAL"}; 
+
     au = client[cs_idx].au;
-
     cs_ddump_mask(D_ATR, ep->emm, ep->l, "emm:");
 
@@ -2118 +2119 @@
 
     cs_ddump_mask(D_EMM, ep->hexserial, 8, "emm UA/SA:");
+    cs_debug_mask(D_EMM, "emmtype %s. Reader %s has serial %s.", typtext[ep->type], reader[au].label, cs_hexdump(0, reader[au].hexserial, 8)); 
 
     switch (ep->type) {
         case UNKNOWN:
-            cs_debug_mask(D_EMM, "emmtype UNKNOWN. Reader %s has serial %s.", reader[au].label, cs_hexdump(0, reader[au].hexserial, 8));
             if (reader[au].blockemm_unknown) return;
             break;
 
         case UNIQUE:
-            cs_debug_mask(D_EMM, "emmtype UNIQUE. Reader %s has serial %s.", reader[au].label, cs_hexdump(0, reader[au].hexserial, 8));
             if (reader[au].blockemm_u) return;
             break;
 
         case SHARED:
-            cs_debug_mask(D_EMM, "emmtype SHARED. Reader %s has serial %s.", reader[au].label, cs_hexdump(0, reader[au].hexserial, 8));
             if (reader[au].blockemm_s) return;
             break;

trunk/reader-cryptoworks.c

@@ -459 +459 @@
 int cryptoworks_get_emm_type(EMM_PACKET *ep, struct s_reader * rdr) //returns TRUE if shared emm matches SA, unique emm matches serial, or global or unknown
 {
+  rdr=rdr;
   switch (ep->emm[0]) {
         case 0x82:

trunk/reader-dre.c

@@ -304 +304 @@
 int dre_get_emm_type(EMM_PACKET *ep, struct s_reader * rdr)
 {
+  rdr=rdr;
   switch (ep->emm[0]) {
         case 0x87:

trunk/reader-viaccess.c

@@ -357 +357 @@
 int viaccess_get_emm_type(EMM_PACKET *ep, struct s_reader * rdr) //returns TRUE if shared emm matches SA, unique emm matches serial, or global or unknown
 {
-    ep->type=UNKNOWN; //FIXME not sure how this maps onto global, unique and shared!
-    return TRUE; //FIXME let it all pass without checking serial or SA, without filling ep->hexserial
+    rdr=rdr; 
+    switch (ep->emm[0]) { 
+        case 0x8C: 
+        case 0x8D: 
+            ep->type=GLOBAL; 
+            break; 
+        case 0x8E: 
+            ep->type=SHARED; 
+            break; 
+        case 0x88: 
+            ep->type=UNIQUE; // ? 
+            break; 
+        default: 
+            ep->type=UNKNOWN; 
+            break; 
+    } 
+    return TRUE; 
 }
 

trunk/reader-videoguard2.c

@@ -1319 +1319 @@
 int videoguard_get_emm_type(EMM_PACKET *ep, struct s_reader * rdr) //returns TRUE if shared emm matches SA, unique emm matches serial, or global or unknown
 {
+    rdr=rdr;
     ep->type=UNKNOWN; //FIXME not sure how this maps onto global, unique and shared!
     return TRUE; //FIXME let it all pass without checking serial or SA, without filling ep->hexserial