Changeset 8464


Ignore:
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:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/globals.h

    r8463 r8464  
    16521652    struct s_ip     *c33_plain;
    16531653#endif
     1654#if defined(MODULE_CAMD35) || defined(MODULE_CAMD35_TCP)
    16541655    int32_t         c35_port;
    16551656    IN_ADDR_T       c35_srvip;
    1656     int8_t          c35_suppresscmd08;
    16571657    int8_t          c35_tcp_suppresscmd08;
    16581658    int8_t          c35_udp_suppresscmd08;
    16591659    PTAB            c35_tcp_ptab;
    16601660    IN_ADDR_T       c35_tcp_srvip;
     1661#endif
     1662    int8_t          c35_suppresscmd08; // used in cccam module
    16611663    PTAB            ncd_ptab;
    16621664    IN_ADDR_T       ncd_srvip;
  • trunk/oscam-conf-mk.c

    r8456 r8464  
    156156 */
    157157char *mk_t_camd35tcp_port(void) {
     158#if defined(MODULE_CAMD35) || defined(MODULE_CAMD35_TCP)
    158159    int32_t i, j, pos = 0, needed = 1;
    159160
     
    190191    }
    191192    return value;
     193#else
     194    return NULL;
     195#endif
    192196}
    193197
  • trunk/oscam-config-global.c

    r8456 r8464  
    784784    config_sections_free(oscam_conf, &cfg);
    785785    clear_ptab(&cfg.ncd_ptab);
     786#ifdef MODULE_CAMD35_TCP
    786787    clear_ptab(&cfg.c35_tcp_ptab);
     788#endif
    787789}
    788790
Note: See TracChangeset for help on using the changeset viewer.