Changeset 1616

Timestamp:

02/19/10 16:19:58 (11 years ago)

Author:

merek

Message:

Revert Changes from r1542, this causes problems with config prio's

Location:

trunk

Files:

• oscam-config.c (modified) (3 diffs)
• oscam.c (modified) (1 diff)

trunk/oscam-config.c

@@ -517 +517 @@
     cfg->ncd_keepalive=atoi(value);
     return;
-  }
-  else
-  {
-    cfg->ncd_keepalive = 1;
   }
   if (token[0] != '#')
@@ -753 +749 @@
   strcpy(cfg->ac_logfile, "./oscam_ac.log");
 #endif
+  cfg->ncd_keepalive=1;
   sprintf(token, "%s%s", cs_confdir, cs_conf);
   if (!(fp=fopen(token, "r")))
@@ -952 +949 @@
             memset(account, 0, sizeof(struct s_auth));
             account->au = (-1);
-            account->ncd_keepalive = 1;
+            account->monlvl = cfg->mon_level;
+            account->tosleep = cfg->tosleep;
+            account->c35_suppresscmd08 = cfg->c35_suppresscmd08;
+            account->ncd_keepalive = cfg->ncd_keepalive;
             for (i = 1; i < CS_MAXCAIDTAB; account->ctab.mask[i++] = 0xffff);
             for (i = 1; i < CS_MAXTUNTAB; account->ttab.bt_srvid[i++] = 0x0000);

trunk/oscam.c

@@ -355 +355 @@
                 client[i].autoau    = account->autoau;
                 client[i].expirationdate = account->expirationdate;
-
-                //set first to global value and then to specific (higher prio)
-                client[i].ncd_keepalive = cfg->ncd_keepalive;
                 client[i].ncd_keepalive = account->ncd_keepalive;
-
-                //set first to global value and then to specific (higher prio)
-                client[i].c35_suppresscmd08 = cfg->c35_suppresscmd08;
                 client[i].c35_suppresscmd08 = account->c35_suppresscmd08;
-
-                //set first to global value and then to specific (higher prio)
-                client[i].tosleep   = (60*cfg->tosleep);
                 client[i].tosleep   = (60*account->tosleep);
-
-                //set first to global value and then to specific (higher prio)
-                client[i].monlvl    = cfg->mon_level;
                 client[i].monlvl    = account->monlvl;
-
                 client[i].disabled  = account->disabled;
                 client[i].fchid     = account->fchid;  // CHID filters