Changeset 94

Timestamp:

May 30, 2009, 5:35:30 PM (11 years ago)

Author:

smurzch2

Message:

Wait for local cards on oscam startup before oening network ports

Thanks to okmikel for the patch.
This is controlled with the global config:
WaitForCards? = 1

Location:

trunk

Files:

• Distribution/doc/oscam-conf.txt (modified) (1 diff)
• globals.h (modified) (3 diffs)
• oscam-config.c (modified) (1 diff)
• oscam.c (modified) (1 diff)
• reader-common.c (modified) (4 diffs)
• reader-common.h (modified) (1 diff)
• reader-conax.c (modified) (1 diff)
• reader-cryptoworks.c (modified) (1 diff)
• reader-irdeto.c (modified) (1 diff)
• reader-seca.c (modified) (2 diffs)
• reader-viaccess.c (modified) (1 diff)
• reader-videoguard2.c (modified) (1 diff)

trunk/Distribution/doc/oscam-conf.txt

@@ -62 +62 @@
                 empfehlung: diesen Parameter nicht verwenden.
 UnlockParental = unlock parental mode
-
+WaitForCards   = 1: wait for local cards on oscam startup before oening network ports,
+                 0: no wait
 
 [monitor]

trunk/globals.h

@@ -161 +161 @@
 
 #define CS_ANTICASC
+
+// moved from reader-common.h
+#define CARD_INSERTED  1
+#define CARD_NEED_INIT 2
+#define CARD_FAILURE   4
 
 enum {E1_GLOBAL=0, E1_USER, E1_READER, E1_SERVER, E1_LSERVER};
@@ -368 +373 @@
   int       rewritemm;
   int       online;
+  int       card_status;
   struct    s_module ph;
   uchar     ncd_key[16];
@@ -505 +511 @@
   int       max_log_size;
   int       show_ecm_dw;
+  int       waitforcards;
   uchar      gbox_pwd[8];
   uchar     ignorefile[512];

trunk/oscam-config.c

@@ -329 +329 @@
   if( !strcmp(token, "showecmdw") )
     cfg->show_ecm_dw = atoi(value);
+
+  if( !strcmp(token, "waitforcards") )
+    cfg->waitforcards = atoi(value);
 }
 

trunk/oscam.c

@@ -2050 +2050 @@
   init_service(98); // resolver
   init_cardreader();
+  
+  if (cfg->waitforcards)
+  {
+      int card_init_done;
+
+      cs_log("Waiting for local card init ....");
+
+      sleep(3);  // short sleep for card detect to work proberly
+
+      for(;;)
+      {
+          card_init_done = 1;
+
+          for (i = 0; i < CS_MAXREADER; i++)
+          {
+              if (!reader[i].online && reader[i].card_status)
+              {
+                  if (!(reader[i].card_status & CARD_FAILURE))
+                  {
+                      card_init_done = 0;
+                      break;
+                  }
+              }
+          }
+
+          if (card_init_done)
+              break;
+
+          cs_sleepms(300);              // wait a little bit
+
+          alarm(cfg->cmaxidle + cfg->ctimeout / 1000 + 1); 
+      }
+
+      cs_log("Init for all local cards done !");
+  }
+  
+
 #ifdef CS_ANTICASC
   if( !cfg->ac_enabled )

trunk/reader-common.c

@@ -10 +10 @@
 ushort cta_lr, atr_size=0;
 static int cs_ptyp_orig; //reinit=1, 
-static int card_status=0;
 
 #define SC_IRDETO 1
@@ -247 +246 @@
   if (reader_card_inserted())
   {
-    if (!(card_status & CARD_INSERTED))
+    if (!(reader[ridx].card_status & CARD_INSERTED))
     {
       cs_log("card detected");
-      card_status=CARD_INSERTED | (reader_reset() ? 0 : CARD_FAILURE);
-      if (card_status & CARD_FAILURE)
+      reader[ridx].card_status  = CARD_NEED_INIT;
+      reader[ridx].card_status = CARD_INSERTED | (reader_reset() ? 0 : CARD_FAILURE);
+      if (reader[ridx].card_status & CARD_FAILURE)
+      {
         cs_log("card initializing error");
+      }
       else
       {
         client[cs_idx].au=ridx;
-        reader[ridx].online=1;
         reader_card_info();
       }
@@ -270 +271 @@
   else
   {
-    if (card_status&CARD_INSERTED)
+    if (reader[ridx].card_status & CARD_INSERTED)
     {
       reader_nullcard();
@@ -280 +281 @@
       cs_log("card ejected");
     }
-    card_status=0;
+    reader[ridx].card_status=0;
     reader[ridx].online=0;
   }
-  return(card_status==CARD_INSERTED);
+  return reader[ridx].card_status==CARD_INSERTED;
 }
 

trunk/reader-common.h

@@ -6 +6 @@
 #define SCT_LEN(sct) (3+((sct[1]&0x0f)<<8)+sct[2])
 #define MAX_LEN      256
-
-#define CARD_INSERTED   1
-#define CARD_NEED_INIT  2
-#define CARD_FAILURE    4

trunk/reader-conax.c

@@ -296 +296 @@
     }
   }
+
+  reader[ridx].online = 1;
+
   return(1);
 }

trunk/reader-cryptoworks.c

@@ -626 +626 @@
     
   }
+
+  reader[ridx].online = 1;
+
   return(1);
 }

trunk/reader-irdeto.c

@@ -414 +414 @@
     }
   }
+
+  reader[ridx].online = 1;
+
   return(1);
 }

trunk/reader-seca.c

@@ -294 +294 @@
         return(0);
     }
+
+  reader[ridx].online = 1;
+
+  return 1;
 }
 #endif
@@ -347 +351 @@
   if (valid==1) //if not expired
     cs_log("SA:%02X%02X%02X%02X.",cta_res[18],cta_res[19],cta_res[20],cta_res[21]);
+
+  reader[ridx].online = 1;
+
   return(1);
 }

trunk/reader-viaccess.c

@@ -630 +630 @@
   }
 
+  reader[ridx].online = 1;
+
   return 0;
 }

trunk/reader-videoguard2.c

@@ -797 +797 @@
   /* info is displayed in init, or when processing info */
   read_tiers ();
+
+  reader[ridx].online = 1;
+
   return(1);
 }