Changeset 1725

Timestamp:

02/26/10 21:44:51 (11 years ago)

Author:

alno

Message:

some repair in write_config (httpallowed), Implement disableuserfile (avoid logging although path is given) , implement parameter httpreadonly (for later usage)

Location:

trunk

Files:

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

trunk/globals.h

@@ -626 +626 @@
     char        *logfile;
     int     disablelog;
+    int     disableuserfile;
     int     usrfileflag;
     struct s_auth   *account;
@@ -643 +644 @@
     char        http_tpl[128];
     char        http_script[128];
-    int     http_refresh;
-    int     http_hide_idle_clients;
-    struct s_ip *http_allowed;
+    int         http_refresh;
+    int         http_hide_idle_clients;
+    struct  s_ip *http_allowed;
+    int         http_readonly;
 #endif
     int     c33_port;

trunk/oscam-config.c

@@ -284 +284 @@
     }
 
+    if (!strcmp(token, "disableuserfile")) {
+        if (strlen(value) == 0) {
+            cfg->disableuserfile = 0;
+            return;
+        } else {
+            cfg->disableuserfile = atoi(value);
+            return;
+        }
+    }
+
     if (!strcmp(token, "serverip")) {
         if (strlen(value) == 0) {
@@ -683 +693 @@
             return;
         } else {
-            cfg->http_hide_idle_clients=atoi(value);
+            cfg->http_hide_idle_clients = atoi(value);
             return;
         }
@@ -694 +704 @@
         } else {
             chk_iprange(value, &cfg->http_allowed);
+            return;
+        }
+    }
+
+    if (!strcmp(token, "httpreadonly")) {
+        if(strlen(value) == 0) {
+            cfg->http_readonly = 0;
+            return;
+        } else {
+            cfg->http_readonly = atoi(value);
             return;
         }
@@ -1532 +1552 @@
     if (cfg->cwlogdir != NULL) fprintf_conf(f, CONFVARWIDTH, "cwlogdir", "%s\n", cfg->cwlogdir);
     fprintf_conf(f, CONFVARWIDTH, "disablelog", "%d\n", cfg->disablelog);
+    fprintf_conf(f, CONFVARWIDTH, "disableuserfile", "%d\n", cfg->disableuserfile);
     fprintf_conf(f, CONFVARWIDTH, "usrfileflag", "%d\n", cfg->usrfileflag);
     fprintf_conf(f, CONFVARWIDTH, "clienttimeout", "%ld\n", cfg->ctimeout/1000);
@@ -1729 +1750 @@
         fprintf_conf(f, CONFVARWIDTH, "httpscript", "%s\n", cfg->http_script);
         fprintf_conf(f, CONFVARWIDTH, "httprefresh", "%d\n", cfg->http_refresh);
-        fprintf_conf(f, CONFVARWIDTH, "httpallowed", "%d\n", cfg->http_allowed);
+        fprintf_conf(f, CONFVARWIDTH, "httpallowed", "");
+        dot = "";
+        for (cip = cfg->http_allowed; cip; cip = cip->next){
+            fprintf(f,"%s%s", dot, cs_inet_ntoa(cip->ip[0]));
+        if (cip->ip[0] != cip->ip[1])   fprintf(f,"-%s", cs_inet_ntoa(cip->ip[1]));
+        dot = ",";
+        }
+        fputc((int)'\n', f);
         fprintf_conf(f, CONFVARWIDTH, "httphideidleclients", "%d\n", cfg->http_hide_idle_clients);
+        fprintf_conf(f, CONFVARWIDTH, "httpreadonly", "%d\n", cfg->http_readonly);
         fputc((int)'\n', f);
     }

trunk/oscam-log.c

@@ -357 +357 @@
 void cs_statistics(int idx)
 {
-  time_t t;
-  struct tm *lt;
-
-  if (fps)
-  {
-    float cwps;
-
-    switch_log(cfg->usrfile, &fps, cs_init_statistics);
-    time(&t);
-    lt=localtime(&t);
-    if (client[idx].cwfound+client[idx].cwnot>0)
-    {
-      cwps=client[idx].last-client[idx].login;
-      cwps/=client[idx].cwfound+client[idx].cwnot;
-    }
-    else
-      cwps=0;
-
-    fprintf(fps, "%02d.%02d.%02d %02d:%02d:%02d %3.1f %s %s %d %d %d %d %d %d %d %ld %ld %s %04X:%04X\n",
-                  lt->tm_mday, lt->tm_mon+1, lt->tm_year%100,
-                  lt->tm_hour, lt->tm_min, lt->tm_sec, cwps,
-                  client[idx].usr[0] ? client[idx].usr : "-",
-                  cs_inet_ntoa(client[idx].ip), client[idx].port,
-                  client[idx].cwfound, client[idx].cwcache, client[idx].cwnot, client[idx].cwignored,
-                  client[idx].cwtout, client[idx].cwtun, client[idx].login, client[idx].last,
-                  ph[client[idx].ctyp].desc,client[idx].last_caid,client[idx].last_srvid);
-    fflush(fps);
-  }
-}
+    time_t t;
+    struct tm *lt;
+
+    if (fps)
+    {
+        float cwps;
+
+        switch_log(cfg->usrfile, &fps, cs_init_statistics);
+        time(&t);
+        lt=localtime(&t);
+        if (client[idx].cwfound+client[idx].cwnot>0)
+        {
+            cwps=client[idx].last-client[idx].login;
+            cwps/=client[idx].cwfound+client[idx].cwnot;
+        }
+        else
+            cwps=0;
+        if(!cfg->disableuserfile) {
+            fprintf(fps, "%02d.%02d.%02d %02d:%02d:%02d %3.1f %s %s %d %d %d %d %d %d %d %ld %ld %s %04X:%04X\n",
+                    lt->tm_mday, lt->tm_mon+1, lt->tm_year%100,
+                    lt->tm_hour, lt->tm_min, lt->tm_sec, cwps,
+                    client[idx].usr[0] ? client[idx].usr : "-",
+                            cs_inet_ntoa(client[idx].ip), client[idx].port,
+                            client[idx].cwfound, client[idx].cwcache, client[idx].cwnot, client[idx].cwignored,
+                            client[idx].cwtout, client[idx].cwtun, client[idx].login, client[idx].last,
+                            ph[client[idx].ctyp].desc,client[idx].last_caid,client[idx].last_srvid);
+            fflush(fps);
+        }
+    }
+}