Changeset 1154


Ignore:
Timestamp:
01/09/10 23:09:02 (12 years ago)
Author:
alno
Message:

WebIf:

  • Merged 1145-1150 from trunk
Location:
branches/monitor-improvement
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • branches/monitor-improvement/Makefile

    r1140 r1154  
    346346        DS_ST=mips-sgi-irix6.5-strip
    347347
    348 cross-mipsel-router-linux-uclibc: cross-mipsel-router-linux-uclibc929
    349348######################################################################
    350349#
     
    378377    @-$(MAKE) --no-print-directory \
    379378        -f Maketype TYP=$(subst cross-,,$@) \
    380         OS_LIBS="-lm" \
     379        OS_LIBS="-lcrypto -lm" \
    381380        OS_CULI="-lncurses" \
    382381        OS_PTLI="-lpthread" \
  • branches/monitor-improvement/README

    r1117 r1154  
    3030CS_ANTICASC   - enable anti-cascading
    3131CS_LOGHISTORY - enable log history
     32CS_WITH_GBOX  - enable gbox support
    3233HAVE_DVBAPI   - enable DVB API support
    3334
  • branches/monitor-improvement/oscam-config.c

    r1149 r1154  
    3131  TAG_CS357X,   // camd 3.5x UDP
    3232  TAG_CS378X,    // camd 3.5x TCP
    33 #ifdef CS_WITH_GBOX
     33#ifdef CS_WITH_GBOX   
    3434  TAG_GBOX, // gbox
    3535#endif
     
    4141} cs_proto_type_t;
    4242
    43 static char *cctag[]={"global", "monitor", "camd33", "camd35",
     43static char *cctag[]={"global", "monitor", "camd33", "camd35", 
    4444                      "newcamd", "radegast", "serial", "cs357x", "cs378x",
    45 #ifdef CS_WITH_GBOX
    46                       "gbox",
    47 #endif
    48                       "cccam", "dvbapi",
     45#ifdef CS_WITH_GBOX 
     46              "gbox",
     47#endif
     48              "cccam", "dvbapi",
    4949#ifdef CS_ANTICASC
    5050                      "anticasc",
     
    531531
    532532#ifdef CS_WITH_GBOX
    533 void chk_t_gbox(char *token, char *value)
     533static void chk_t_gbox(char *token, char *value)
    534534{
    535535//  if (!strcmp(token, "password")) strncpy(cfg->gbox_pwd, i2b(4, a2i(value, 4)), 4);
  • branches/monitor-improvement/oscam-simples.c

    r1140 r1154  
    235235      return ((b[0]<<16) | (b[1]<<8) | b[2]);
    236236    case 4:
    237       return ((b[0]<<24) | (b[1]<<16) | (b[2]<<8) | b[3]);
     237      return (((b[0]<<24) | (b[1]<<16) | (b[2]<<8) | b[3]) & 0xffffffffL);
    238238    default:
    239239      cs_log("Error in b2i, n=%i",n);
  • branches/monitor-improvement/reader-common.c

    r1140 r1154  
    7575#ifdef HAVE_PCSC
    7676    if (reader[ridx].typ == R_PCSC) {
    77         return pcsc_reader_do_api(&reader[ridx], buf, cta_res, &cta_lr,l);
     77      return (dad == 0) ? pcsc_reader_do_api(&reader[ridx], buf, cta_res, &cta_lr,l) : 0;
    7878    }
    7979
Note: See TracChangeset for help on using the changeset viewer.