Changeset 1701

Timestamp:

02/26/10 09:42:53 (11 years ago)

Author:

merek

Message:

• Moved Webinterface config options to [webif] section, notify if build without webif support and webif was configured
• Some more Ifdefs
• Fix var in s_reader
• Update README

Location:

trunk

Files:

• README (modified) (2 diffs)
• globals.h (modified) (2 diffs)
• oscam-config.c (modified) (9 diffs)

trunk/README

@@ -28 +28 @@
 Enable features:
 
-CS_ANTICASC   - enable anti-cascading
-CS_LOGHISTORY - enable log history
+CS_ANTICASC   - enable anti-cascading (default)
+CS_LOGHISTORY - enable log history (default)
 CS_WITH_GBOX  - enable gbox support
 HAVE_DVBAPI   - enable DVB API support
@@ -36 +36 @@
 Enable features with cmake:
 
--DCS_ANTICASC=1   - enable anti-cascading
--DCS_LOGHISTORY=1 - enable log history
+-DCS_ANTICASC=1   - enable anti-cascading (default)
+-DCS_LOGHISTORY=1 - enable log history (default)
 -DCS_WITH_GBOX=1  - enable gbox support
 -DHAVE_DVBAPI=1   - enable DVB API support

trunk/globals.h

@@ -425 +425 @@
 struct s_reader
 {
+  int       smargopatch; //FIXME workaround for Smargo until native mode works
   int       pid;
   int       cs_idx;
@@ -900 +901 @@
 extern void chk_t_global(char *token, char *value);
 extern void chk_t_monitor(char *token, char *value);
+
+#ifdef HAVE_DVBAPI
 extern void chk_t_dvbapi(char *token, char *value);
+#endif
+
+#ifdef WEBIF
+extern void chk_t_webif(char *token, char *value);
+#endif
+
 extern void chk_account(char *token, char *value, struct s_auth *account);
 extern void chk_sidtab(char *token, char *value, struct s_sidtab *sidtab);

trunk/oscam-config.c

@@ -23 +23 @@
 {
     TAG_GLOBAL,     // must be first !
-    TAG_MONITOR,    // monitor
+    TAG_MONITOR,        // monitor
     TAG_CAMD33,     // camd 3.3x
     TAG_CAMD35,     // camd 3.5x UDP
-    TAG_NEWCAMD,    // newcamd
-    TAG_RADEGAST,   // radegast
+    TAG_NEWCAMD,        // newcamd
+    TAG_RADEGAST,       // radegast
     TAG_SERIAL,     // serial (static)
     TAG_CS357X,     // camd 3.5x UDP
@@ -35 +35 @@
 #endif
     TAG_CCCAM,      // cccam
-    TAG_DVBAPI
+    TAG_DVBAPI,     // dvbapi
+    TAG_WEBIF       // webif
 #ifdef CS_ANTICASC
-    ,TAG_ANTICASC   // anti-cascading
+    ,TAG_ANTICASC       // anti-cascading
 #endif
 } cs_proto_type_t;
@@ -46 +47 @@
               "gbox",
 #endif
-                        "cccam", "dvbapi",
+                        "cccam", "dvbapi", "webif",
 #ifdef CS_ANTICASC
                       "anticasc",
@@ -620 +621 @@
     }
 
+    if (!strcmp(token, "hideclient_to")) {
+        if(strlen(value) == 0) {
+            cfg->mon_hideclient_to = 0;
+            return;
+        } else {
+            cfg->mon_hideclient_to = atoi(value);
+            return;
+        }
+    }
+
+    if (token[0] != '#')
+        cs_log("Warning: keyword '%s' in monitor section not recognized",token);
+}
+
 #ifdef WEBIF
+void chk_t_webif(char *token, char *value)
+{
     if (!strcmp(token, "httpport")) {
         if(strlen(value) == 0) {
@@ -679 +696 @@
         }
     }
-#endif
-
-    if (!strcmp(token, "hideclient_to")) {
-        if(strlen(value) == 0) {
-            cfg->mon_hideclient_to = 0;
-            return;
-        } else {
-            cfg->mon_hideclient_to = atoi(value);
-            return;
-        }
-    }
 
     if (token[0] != '#')
-        cs_log("Warning: keyword '%s' in monitor section not recognized",token);
-}
+        cs_log("Warning: keyword '%s' in webif section not recognized",token);
+}
+#endif
+
 
 void chk_t_camd33(char *token, char *value)
@@ -1002 +1010 @@
 {
     if (!strcmp(token, "enabled"))  { cfg->dvbapi_enabled=atoi(value); return; }
-    if (!strcmp(token, "au"))       { cfg->dvbapi_au=atoi(value); return; }
+    if (!strcmp(token, "au"))   { cfg->dvbapi_au=atoi(value); return; }
     if (!strcmp(token, "boxtype"))  { cs_strncpy(cfg->dvbapi_boxtype, value, sizeof(cfg->dvbapi_boxtype)); return; }
     if (!strcmp(token, "user"))     { cs_strncpy(cfg->dvbapi_usr, value, sizeof(cfg->dvbapi_usr)); return; }
@@ -1034 +1042 @@
         case TAG_DVBAPI  : fprintf(stderr, "Warning: OSCam compiled without DVB API support.\n"); break;
 #endif
+
+#ifdef WEBIF
+        case TAG_WEBIF  : chk_t_webif(token, value); break;
+#else
+        case TAG_WEBIF  : fprintf(stderr, "Warning: OSCam compiled without Webinterface support.\n"); break;
+#endif
+
 #ifdef CS_ANTICASC
         case TAG_ANTICASC: chk_t_ac(token, value); break;
@@ -1496 +1511 @@
     fprintf_conf(f, CONFVARWIDTH, "hideclient_to", "%d\n", cfg->mon_hideclient_to);
     fprintf_conf(f, CONFVARWIDTH, "monlevel", "%d\n", cfg->mon_level);
-#ifdef WEBIF
-    fprintf_conf(f, CONFVARWIDTH, "httpport", "%d\n", cfg->http_port);
-    fprintf_conf(f, CONFVARWIDTH, "httpuser", "%s\n", cfg->http_user);
-    fprintf_conf(f, CONFVARWIDTH, "httppwd", "%s\n", cfg->http_pwd);
-    fprintf_conf(f, CONFVARWIDTH, "httpcss", "%s\n", cfg->http_css);
-    fprintf_conf(f, CONFVARWIDTH, "httpscript", "%s\n", cfg->http_script);
-    fprintf_conf(f, CONFVARWIDTH, "httprefresh", "%d\n", cfg->http_refresh);
-    fprintf_conf(f, CONFVARWIDTH, "httphideidleclients", "%d\n", cfg->http_hide_idle_clients);
-#endif
     fputc((int)'\n', f);
 
@@ -1654 +1660 @@
         fprintf_conf(f, CONFVARWIDTH, "boxtype", "%s\n", cfg->dvbapi_boxtype);
         fprintf_conf(f, CONFVARWIDTH, "user", "%s\n", cfg->dvbapi_usr);
+        fputc((int)'\n', f);
+    }
+#endif
+
+#ifdef WEBIF
+    /*webinterface*/
+    if (cfg->http_port > 0) {
+        fprintf(f,"[webif]\n");
+        fprintf_conf(f, CONFVARWIDTH, "httpport", "%d\n", cfg->http_port);
+        fprintf_conf(f, CONFVARWIDTH, "httpuser", "%s\n", cfg->http_user);
+        fprintf_conf(f, CONFVARWIDTH, "httppwd", "%s\n", cfg->http_pwd);
+        fprintf_conf(f, CONFVARWIDTH, "httpcss", "%s\n", cfg->http_css);
+        fprintf_conf(f, CONFVARWIDTH, "httpscript", "%s\n", cfg->http_script);
+        fprintf_conf(f, CONFVARWIDTH, "httprefresh", "%d\n", cfg->http_refresh);
+        fprintf_conf(f, CONFVARWIDTH, "httphideidleclients", "%d\n", cfg->http_hide_idle_clients);
         fputc((int)'\n', f);
     }