Changeset 3893

Timestamp:

11/13/10 00:08:09 (13 years ago)

Author:

schlocke

Message:

webinf/Entitlements cccam: OK

Location:

trunk

Files:

• globals.h (modified) (1 diff)
• module-stat.c (modified) (1 diff)
• oscam-http.c (modified) (5 diffs)
• reader-conax.c (modified) (1 diff)
• reader-cryptoworks.c (modified) (1 diff)
• reader-dre.c (modified) (1 diff)
• reader-irdeto.c (modified) (1 diff)
• reader-nagra.c (modified) (1 diff)
• reader-seca.c (modified) (1 diff)
• reader-tongfang.c (modified) (1 diff)
• reader-viaccess.c (modified) (1 diff)
• reader-videoguard1.c (modified) (1 diff)
• reader-videoguard2.c (modified) (1 diff)

trunk/globals.h

@@ -514 +514 @@
 struct s_cardsystem
 {
-    char desc[16];
+    char *desc;
     int  (*card_init)();
     int  (*card_info)();

trunk/module-stat.c

@@ -343 +343 @@
                     stat->ecm_count = 1; //not zero, so we know it's decodeable
                 stat->rc = 0;
+                stat->request_count = 0;
             }
         }

trunk/oscam-http.c

@@ -1657 +1657 @@
 }
 
+char *strend(char *ch) {
+    while (*ch) ch++;
+    return ch;
+}
+
 void send_oscam_entitlement(struct templatevars *vars, FILE *f, struct uriparams *params) {
     /* build entitlements from reader init history */
@@ -1700 +1705 @@
             if (rcc && rdr->tcp_connected == 2 && rcc->cards) {
                 pthread_mutex_lock(&rcc->cards_busy);
+                char *buf = malloc(4000);
 
 
@@ -1707 +1713 @@
 
                 
-                            tpl_printf(vars, 1, "HOST", "%s:%d", rdr->device, rdr->r_port);
-
-                    tpl_printf(vars, 1, "CAID", "%04X", card->caid);
+                            tpl_printf(vars, 0, "HOST", "%s:%d", rdr->device, rdr->r_port);
+
+                    tpl_printf(vars, 0, "CAID", "%04X", card->caid);
                     
                     int cs = get_cardsystem(card->caid);
                     if (cs)
-                        tpl_printf(vars, 1, "SYSTEM", "%s", cardsystem[cs-1].desc);
+                        tpl_printf(vars, 0, "SYSTEM", "%s", cardsystem[cs-1].desc);
                     else
-                        tpl_printf(vars, 1, "SYSTEM", "???");
+                        tpl_printf(vars, 0, "SYSTEM", "???");
                 
-                    tpl_printf(vars, 1, "IDCARD", "%08X", card->remote_id);
+                    tpl_printf(vars, 0, "IDCARD", "%08X", card->remote_id);
                     
-                    tpl_printf(vars, 1, "UPHOPS", "%d", card->hop),
+                    tpl_printf(vars, 0, "UPHOPS", "%d", card->hop),
                     
-                    tpl_printf(vars, 1, "MAXDOWN", "%d", card->maxdown);
+                    tpl_printf(vars, 0, "MAXDOWN", "%d", card->maxdown);
                     
                     LL_ITER *pit = ll_iter_create(card->providers);
+                    char *p = buf;
+                    *p = 0;
                     struct cc_provider *prov;
                     while ((prov = ll_iter_next(pit))) {
                         provider = get_provider(card->caid, prov->prov);
-
-                        tpl_printf(vars, 1, "PROVIDERS", "%s<BR>\n", provider);
+                        sprintf(p, "%s<BR>\n", provider);
+                        p = strend(p);
                     }
+                    tpl_printf(vars, 0, "PROVIDERS", buf);
                     ll_iter_release(pit);
 
                     
                     LL_ITER *nit = ll_iter_create(card->remote_nodes);
+                                p = buf;
+                                *p = 0;
                     uint8 *node;
                     while ((node = ll_iter_next(nit))) {
-                        tpl_printf(vars, 1, "NODES", "%02X%02X%02X%02X%02X%02X%02X%02X<BR>\n",
+                        sprintf(p, "%02X%02X%02X%02X%02X%02X%02X%02X<BR>\n",
                             node[0], node[1], node[2], node[3], node[4], node[5], node[6], node[7]);
+                        p = strend(p);
                     }
+                    tpl_printf(vars, 0, "NODES", buf);
 
                     ll_iter_release(nit);
@@ -1747 +1760 @@
                 }
                 ll_iter_release(it);
+                free(buf);
                 pthread_mutex_unlock(&rcc->cards_busy);
 
@@ -1764 +1778 @@
 
             //remove following line if code above is implemented (needed to fill tpl on legacy way)
-            tpl_addVar(vars, 0, "ENTITLEMENTCONTENT", tpl_getTpl(vars, "ENTITLEMENTGENERICBIT"));
+            //tpl_addVar(vars, 0, "ENTITLEMENTCONTENT", tpl_getTpl(vars, "ENTITLEMENTGENERICBIT"));
 
         } else {

trunk/reader-conax.c

@@ -335 +335 @@
     ph->get_emm_filter=conax_get_emm_filter;
     ph->caids[0]=0x0B;
-}
+    ph->desc="conax";
+}

trunk/reader-cryptoworks.c

@@ -752 +752 @@
     ph->get_emm_filter=cryptoworks_get_emm_filter;
     ph->caids[0]=0x0D;
-}
+    ph->desc="cryptoworks";
+}

trunk/reader-dre.c

@@ -454 +454 @@
     ph->get_emm_filter=dre_get_emm_filter;
     ph->caids[0]=0x4A;
-}
+    ph->desc="dre";
+}

trunk/reader-irdeto.c

@@ -567 +567 @@
     ph->caids[0]=0x06;
     ph->caids[1]=0x17;
-}
+    ph->desc="irdeto";
+}

trunk/reader-nagra.c

@@ -1088 +1088 @@
     ph->get_emm_filter=nagra2_get_emm_filter;
     ph->caids[0]=0x18;
-}
+    ph->desc="nagra";
+}

trunk/reader-seca.c

@@ -365 +365 @@
     ph->get_emm_filter=seca_get_emm_filter;
     ph->caids[0]=0x01;
-}
+    ph->desc="seca";
+}

trunk/reader-tongfang.c

@@ -208 +208 @@
     ph->get_emm_type=tongfang_get_emm_type;
     ph->caids[0]=0x4B;
-}
+    ph->desc="tongfang";
+}

trunk/reader-viaccess.c

@@ -963 +963 @@
     ph->get_emm_filter=viaccess_get_emm_filter;
     ph->caids[0]=0x05;
-}
+    ph->desc="viaccess";
+}

trunk/reader-videoguard1.c

@@ -346 +346 @@
     ph->get_emm_filter=videoguard_get_emm_filter;
     ph->caids[0]=0x09;
-}
+    ph->desc="videoguard1";
+}

trunk/reader-videoguard2.c

@@ -708 +708 @@
     ph->get_emm_filter=videoguard_get_emm_filter;
     ph->caids[0]=0x09;
+    ph->desc="videoguard2";
 }