Changeset 1606


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

WebIf:

  • Merging revisions 1600-1603 of trunk (ump1718)
Location:
branches/monitor-improvement
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • branches/monitor-improvement/CMakeLists.txt

    r1600 r1606  
    379379if (OSCamOperatingSystem MATCHES "Mac OS X")
    380380add_definitions ("-O2 -Winline -Wall -Wextra -finline-functions -fomit-frame-pointer -m32")
     381elseif (OSCAM_SYSTEM_NAME MATCHES "NSLU2")
     382add_definitions ("-O2 -Winline -Wall -finline-functions -fomit-frame-pointer")
    381383else (OSCamOperatingSystem MATCHES "Mac OS X")
    382384add_definitions ("-O2 -Winline -Wall -Wextra -finline-functions -fomit-frame-pointer")
  • branches/monitor-improvement/Distribution/doc/man/oscam.1

    r1517 r1606  
    9292\fBSIGUSR1\fP
    9393.RS 3n
    94 switch debug level to 63 (debug all)/switch debug level to 0 (no debugging)
     94shift debug level to next level (see debug level mask above)
    9595.RE
    9696.PP
  • branches/monitor-improvement/Distribution/doc/txt/oscam.txt

    r1517 r1606  
    7676
    7777       SIGUSR1
    78       switch  debug  level  to  63 (debug all)/switch debug level to 0 (no
    79       debugging)
     78      shift debug level to next level (see debug level mask above)
    8079
    8180       SIGUSR2
  • branches/monitor-improvement/csctapi/icc_async.c

    r1587 r1606  
    186186        *card = FALSE;
    187187   
    188     cs_debug_mask (D_TRACE, "IFD: Status = %s", in ? "card": "no card");
     188    //cs_debug_mask (D_TRACE, "IFD: Status = %s", in ? "card": "no card");
    189189   
    190190    return OK;
  • branches/monitor-improvement/oscam-config.c

    r1600 r1606  
    866866    return;
    867867  }
    868   else
    869   {
    870     account->ncd_keepalive = 1;
    871   }
    872868  /*
    873869   *  case insensitive
     
    13771373            memset(account, 0, sizeof(struct s_auth));
    13781374            account->au = (-1);
     1375            account->ncd_keepalive = 1;
    13791376            for (i = 1; i < CS_MAXCAIDTAB; account->ctab.mask[i++] = 0xffff);
    13801377            for (i = 1; i < CS_MAXTUNTAB; account->ttab.bt_srvid[i++] = 0x0000);
  • branches/monitor-improvement/oscam.c

    r1604 r1606  
    416416  int i;
    417417
    418   cs_dblevel ^= D_ALL_DUMP;
     418    switch (cs_dblevel) {
     419        case 0:
     420            cs_dblevel = 1;
     421            break;
     422        case 32:
     423            cs_dblevel = 63;
     424            break;
     425        case 63:
     426            cs_dblevel = 0;
     427            break;
     428        default:
     429            cs_dblevel <<= 1;
     430    }
    419431  if (master_pid==getpid())
    420432    for (i=0; i<CS_MAXPID && client[i].pid; i++)
Note: See TracChangeset for help on using the changeset viewer.