Changeset 8464

Timestamp:

03/03/13 21:12:26 (8 years ago)

Author:

gf

Message:

cfg: Remove camd35 vars from struct s_config when the module is disabled.

Location:

trunk

Files:

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

trunk/globals.h

@@ -1652 +1652 @@
     struct s_ip     *c33_plain;
 #endif
+#if defined(MODULE_CAMD35) || defined(MODULE_CAMD35_TCP)
     int32_t         c35_port;
     IN_ADDR_T       c35_srvip;
-    int8_t          c35_suppresscmd08;
     int8_t          c35_tcp_suppresscmd08;
     int8_t          c35_udp_suppresscmd08;
     PTAB            c35_tcp_ptab;
     IN_ADDR_T       c35_tcp_srvip;
+#endif
+    int8_t          c35_suppresscmd08; // used in cccam module
     PTAB            ncd_ptab;
     IN_ADDR_T       ncd_srvip;

trunk/oscam-conf-mk.c

@@ -156 +156 @@
  */
 char *mk_t_camd35tcp_port(void) {
+#if defined(MODULE_CAMD35) || defined(MODULE_CAMD35_TCP)
     int32_t i, j, pos = 0, needed = 1;
 
@@ -190 +191 @@
     }
     return value;
+#else
+    return NULL;
+#endif
 }
 

trunk/oscam-config-global.c

@@ -784 +784 @@
     config_sections_free(oscam_conf, &cfg);
     clear_ptab(&cfg.ncd_ptab);
+#ifdef MODULE_CAMD35_TCP
     clear_ptab(&cfg.c35_tcp_ptab);
+#endif
 }