Changeset 596

Timestamp:

12/01/09 15:25:41 (11 years ago)

Author:

cogsi

Message:

cccam sid blocking code to skip peer if unable to descramble (untested)

File:

• branches/cccam-test/module-cccam.c (modified) (10 diffs)

branches/cccam-test/module-cccam.c

@@ -96 +96 @@
 void *llist_itr_init(LLIST *l, LLIST_ITR *itr)
 {
-  pthread_mutex_lock(&l->lock);
+ // pthread_mutex_lock(&l->lock);
   if (l->first) {
 
@@ -111 +111 @@
 void llist_itr_release(LLIST_ITR *itr)
 {
-  pthread_mutex_unlock(&itr->l->lock);
+ // pthread_mutex_unlock(&itr->l->lock);
 }
 
@@ -228 +228 @@
 
   uint32 count;
+  uint16 cur_sid;
 };
 
@@ -514 +515 @@
 
   cc->cur_card = NULL;
+  cc->cur_sid = er->srvid;
 
   card = llist_itr_init(cc->cards, &itr);
@@ -519 +521 @@
   while (card) {
     if (card->caid == er->caid) {   // caid matches
+      int s = 0;
+
+      LLIST_ITR sitr;
+      uint16 *sid = llist_itr_init(card->badsids, &sitr);
+      while (sid) {
+        if (*sid == cc->cur_sid) {
+          s = 1;
+          break;
+        }
+        sid = llist_itr_next(&sitr);
+      }
+      llist_itr_release(&sitr);
+
       LLIST_ITR pitr;
       char *prov = llist_itr_init(card->provs, &pitr);
-      while (prov) {
+      while (prov && !s) {
         if (B24(prov) == er->prid) {  // provid matches
           if ((h < 0) || (card->hop < h)) {  // card is closer
@@ -567 +582 @@
   }
 
-  if (n) return 0;
-  else return -1;
+  return 0;
 }
 
@@ -591 +605 @@
 
       card->provs = llist_create();
+      card->badsids = llist_create();
       card->id = B32(buf+4);
       card->caid = B16(buf+12);
@@ -623 +638 @@
 
         llist_destroy(card->provs);
+        llist_destroy(card->badsids);
         free(card);
 
@@ -636 +652 @@
   case MSG_CW_NOK1:
   case MSG_CW_NOK2:
-    cs_log("cccam: cw nok");
+    cs_log("cccam: cw nok, sid = %x", cc->cur_sid);
+
+    int f = 0;
+    LLIST_ITR itr;
+    uint16 *sid = llist_itr_init(cc->cur_card->badsids, &itr);
+    while (sid && !f) {
+      if (*sid == cc->cur_sid) {
+        llist_itr_release(&itr);
+        f = 1;
+      }
+      sid = llist_itr_next(&itr);
+    }
+    llist_itr_release(&itr);
+
+    if (!f) {
+      sid = malloc(sizeof(uint16));
+      *sid = cc->cur_sid;
+
+      sid = llist_append(cc->cur_card->badsids, sid);
+      cs_debug("   added sid block for card %08x", cc->cur_card->id);
+    }
+    bzero(cc->dcw, 16);
+    return 0;
     break;
   case MSG_CW:
@@ -663 +701 @@
     cs_debug("cccam: recv chk - MSG_CW %d - %s", cc->count, cs_hexdump(0, dcw, 16));
     *rc = 1;
-    //return 0;
     return(cc->count);
-  }
-
-  return -1;
+  } else if ((buf[1] == (MSG_CW_NOK1)) || (buf[1] == (MSG_CW_NOK2))) {
+    /*memcpy(dcw, cc->dcw, 16);
+    return *rc = 1;
+    return(cc->count);*/
+  }
+
+  return (-1);
 }