Changeset 1604


Ignore:
Timestamp:
02/18/10 19:43:44 (11 years ago)
Author:
alno
Message:

WebIf:

  • fix strange behaviors in cfg->delay (cachedelay)
  • set some #ifdef related CS_RDR_INIT_HIST
Location:
branches/monitor-improvement
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/monitor-improvement/oscam-http.c

    r1575 r1604  
    2828
    2929        case REFR_READERS:
     30#ifdef CS_RDR_INIT_HIST
    3031            kill(client[0].pid, SIGUSR2);
    3132            cs_log("Refresh Reader/Tiers requested by WebIF from %s", inet_ntoa(*(struct in_addr *)&in));
     33#endif
    3234            break;
    3335
     
    8183    tpl_printf(vars, 0, "FALLBACKTIMEOUT", "%ld", cfg->ftimeout/1000);
    8284    tpl_printf(vars, 0, "CLIENTMAXIDLE", "%d", cfg->cmaxidle);
    83     tpl_printf(vars, 0, "CACHEDELAY", "%ld", cfg->delay/1000);
     85    tpl_printf(vars, 0, "CACHEDELAY", "%ld", cfg->delay);
    8486    tpl_printf(vars, 0, "BINDWAIT", "%d", cfg->bindwait);
    8587    tpl_printf(vars, 0, "NETPRIO", "%ld", cfg->netprio);
     
    541543            tpl_addVar(vars, 0, "REFRICO", ICREF);
    542544            tpl_addVar(vars, 0, "READERREFRESH", tpl_getTpl(vars, "READERREFRESHBIT"));
     545#ifdef CS_RDR_INIT_HIST
    543546            tpl_addVar(vars, 0, "ENTICO", ICENT);
    544547            tpl_addVar(vars, 0, "ENTITLEMENT", tpl_getTpl(vars, "READERENTITLEBIT"));
     548#endif
    545549        } else {
    546550            tpl_printf(vars, 0, "RIDX", "");
     
    550554            tpl_addVar(vars, 0, "EMMBLOCKED", "");
    551555            tpl_addVar(vars, 0, "READERREFRESH","");
     556#ifdef CS_RDR_INIT_HIST
    552557            tpl_addVar(vars, 0, "ENTITLEMENT","");
     558#endif
    553559        }
    554560
  • branches/monitor-improvement/oscam-http.h

    r1586 r1604  
    109109/fvrVslmAAAAAElFTkSuQmCC"
    110110
     111#ifdef CS_RDR_INIT_HIST
    111112#define ICENT "data:image/png;base64,\
    112113iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJ\
     
    122123nHT+RFmK++Fua44l+obLLoqGlUBgwr6ATz/t5yZbdlR8jTeMnOl51zN+6/gbgy6MSV2PypM4a09W\
    123124vTtJQrT0rEb/ebukDQEGABzNvVc4pYJ1AAAAAElFTkSuQmCC"
     125#endif
    124126
    125127#define ICREF "data:image/png;base64,\
  • branches/monitor-improvement/oscam.c

    r1587 r1604  
    23642364
    23652365  cs_log("auth size=%d", sizeof(struct s_auth));
    2366   //cs_log_config();
    2367   cfg->delay*=1000;
     2366
    23682367  init_sidtab();
    23692368  init_readerdb();
Note: See TracChangeset for help on using the changeset viewer.