Changeset 4098

Timestamp:

12/12/10 22:59:18 (13 years ago)

Author:

schlocke

Message:

cccam: removed non-working preferred card, changed keepconnected mgcamd
compatibility

Location:

trunk

Files:

• globals.h (modified) (1 diff)
• module-cccam.c (modified) (6 diffs)
• module-stat.c (modified) (1 diff)

trunk/globals.h

@@ -547 +547 @@
   ushort        idx;
   ulong         prid;
-  void          *preferred_card;
   struct s_reader *selected_reader;
   int           matching_rdr[CS_MAXREADER];

trunk/module-cccam.c

@@ -412 +412 @@
         if (cl->ecmtask[i].idx == ecm_idx && cl->ecmtask[i].rc == 101)
             cl->ecmtask[i].rc = 100; //Mark unused
-            cl->ecmtask[i].preferred_card = NULL;
     }
 }
@@ -1104 +1103 @@
 
     pthread_mutex_lock(&cc->cards_busy);
-    if (cur_er->preferred_card && 
-        ((struct cc_card*)cur_er->preferred_card)->origin_reader == rdr) { 
-            //card is defined by client, use this card!
-        it = ll_iter_create(cc->cards);
-        while ((card = ll_iter_next(it))) {
-            if (same_card(card, cur_er->preferred_card)) { //Found this card!
-                if (!is_sid_blocked(card, &cur_srvid)) {
-                    cs_debug_mask(D_TRACE, "%s found preferred card %d", getprefix(), card->id);
-                    break;
-                }
-            }
-        }
-        ll_iter_release(it);
-    }
-    else card = NULL;
-    
-    if (!card) {
-        //search cache:
-        current_card = cc_find_current_card_by_srvid(cc, cur_er->caid,
-            cur_er->prid, &cur_srvid);
-        if (current_card) {
-            if (!current_card->card || is_sid_blocked(current_card->card,
-                &cur_srvid)) {
-                cc_remove_current_card(cc, current_card);
-                current_card = NULL;
-            }
-        }
-        if (current_card)
-            card = current_card->card;
-        else
-            card = NULL;
-    }
+    //search cache:
+    current_card = cc_find_current_card_by_srvid(cc, cur_er->caid,
+        cur_er->prid, &cur_srvid);
+    if (current_card) {
+        if (!current_card->card || is_sid_blocked(current_card->card,
+            &cur_srvid)) {
+            cc_remove_current_card(cc, current_card);
+            current_card = NULL;
+        }
+    }
+    if (current_card)
+        card = current_card->card;
+    else
+        card = NULL;
     
     //then check all other cards
@@ -2207 +2188 @@
                 er->idx = ++cc->server_ecm_idx;
                 
-                er->preferred_card = cc_get_card_by_id(server_card->id, cc->reported_carddatas);
-
                 cs_debug_mask(
                         D_TRACE,
@@ -3368 +3347 @@
 
     cmi = 0;
-    wait_for_keepalive = 0;
+    wait_for_keepalive = 100;
+    //some clients, e.g. mgcamd, does not support keepalive. So if not answered, keep connection
     // check for client timeout, if timeout occurs try to send keepalive
     while (cl->pfd)
@@ -3376 +3356 @@
             cmi += 10;
             if (cmi >= cfg->cmaxidle) {
-                cmi = 0;
                 if (cfg->cc_keep_connected) {
-                    if (!wait_for_keepalive) {
+                    if (wait_for_keepalive<3 || wait_for_keepalive == 100) {
                         if (cc_cmd_send(cl, NULL, 0, MSG_KEEPALIVE) < 0)
                             break;
                                     cs_debug("cccam: keepalive");
                                     cc->answer_on_keepalive = time(NULL);
-                                    wait_for_keepalive = 1;
+                                    wait_for_keepalive++;
                     }
-                                continue;
+                    else if (wait_for_keepalive<100) break;
                 } else {
                     cs_debug_mask(D_TRACE, "%s keepalive after maxidle is reached",
@@ -3397 +3376 @@
         else { //data is parsed!
             cmi = 0;
-            wait_for_keepalive = 0;
+            if (i == MSG_KEEPALIVE)
+                wait_for_keepalive = 0;
         }
         if (cc->mode != CCCAM_MODE_NORMAL || cl->dup)

trunk/module-stat.c

@@ -318 +318 @@
         if (er->matching_rdr[i]) {
             int weight = rdr->lb_weight <= 0?100:rdr->lb_weight;
-            if (er->preferred_card && ((struct cc_card*)(er->preferred_card))->origin_reader==rdr)
-                weight*=2;
                 
             stat = get_stat(rdr, er->caid, er->prid, er->srvid);