Changeset 1607

Timestamp:

02/18/10 20:04:36 (11 years ago)

Author:

alno

Message:

WebIf:

• fix "reader param "enable" missed in this branch" (Ticket 411)

Location:

branches/monitor-improvement

Files:

• globals.h (modified) (1 diff)
• oscam-config.c (modified) (2 diffs)
• oscam.c (modified) (1 diff)

branches/monitor-improvement/globals.h

@@ -425 +425 @@
   int       pid;
   int       cs_idx;
+  int       enable;
   int       fd;
   ulong     grp;

branches/monitor-improvement/oscam-config.c

@@ -1663 +1663 @@
   strtolower(value);
 
+  if (!strcmp(token, "enable")) { rdr->enable=atoi(value) ? 1 : 0; return; }
   if (!strcmp(token, "services")) { chk_services(value, &rdr->sidtabok, &rdr->sidtabno); return; }
   if (!strcmp(token, "inactivitytimeout")) {   rdr->tcp_ito = atoi(value);  return; }
@@ -1864 +1865 @@
       if (reader[nr].label[0] && reader[nr].typ) nr++;
       memset(&reader[nr], 0, sizeof(struct s_reader));
+      reader[nr].enable = 1;
       reader[nr].tcp_rto = 30;
       reader[nr].show_cls = 10;

branches/monitor-improvement/oscam.c

@@ -1033 +1033 @@
 static void init_cardreader()
 {
-  for (ridx=0; ridx<CS_MAXREADER; ridx++)
-    if (reader[ridx].device[0])
-      switch(cs_fork(0, 99))
-      {
-        case -1:
-          cs_exit(1);
-        case  0:
-          break;
-        default:
-          wait4master();
-          start_cardreader();
-      }
+    for (ridx=0; ridx<CS_MAXREADER; ridx++)
+        if ((reader[ridx].device[0]) && (reader[ridx].enable == 1))
+            switch(cs_fork(0, 99)) {
+                case -1:
+                    cs_exit(1);
+                case  0:
+                    break;
+                default:
+
+        wait4master();
+        start_cardreader();
+    }
 }