Changeset 1971
- Timestamp:
- 04/06/10 14:23:20 (14 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/globals.h
r1969 r1971 476 476 int logemm; 477 477 int cachemm; 478 int cachecm;479 478 int rewritemm; 480 479 int card_status; … … 626 625 ulong ftimeout; 627 626 ulong cmaxidle; 627 int cachecm; 628 628 int ulparent; 629 629 ulong delay; -
trunk/oscam-config.c
r1967 r1971 399 399 } 400 400 401 if (!strcmp(token, "ecmcache")) { 402 if(strlen(value) == 0) { 403 cfg->cachecm = 1; 404 return; 405 } else { 406 cfg->cachecm = atoi(value); 407 return; 408 } 409 } 410 401 411 if (!strcmp(token, "bindwait")) { 402 412 if (strlen(value) == 0) { … … 1271 1281 cfg->usrfile = NULL; 1272 1282 cfg->cwlogdir = NULL; 1283 cfg->cachecm = 1; 1273 1284 #ifdef WEBIF 1274 1285 strcpy(cfg->http_user, ""); … … 2819 2830 } 2820 2831 2821 if (!strcmp(token, "ecmcache")) {2822 if(strlen(value) == 0) {2823 rdr->cachecm = 1;2824 return;2825 } else {2826 rdr->cachecm = atoi(value);2827 return;2828 }2829 }2830 2831 2832 if (!strcmp(token, "blocknano")) { 2832 2833 //wildcard is used … … 3055 3056 reader[nr].cardmhz = 357; 3056 3057 reader[nr].deprecated = 0; 3057 reader[nr].cachecm = 1;3058 3058 strcpy(reader[nr].pincode, "none"); 3059 3059 for (i=1; i<CS_MAXCAIDTAB; reader[nr].ctab.mask[i++]=0xffff); -
trunk/oscam-reader.c
r1969 r1971 388 388 } 389 389 // cache2 390 if (reader->cachecm) { 391 if (check_ecmcache(er, client[er->cidx].grp)) 392 { 393 er->rc=2; 394 write_ecm_answer(fd_c2m, er); 395 return; 396 } 390 if (check_ecmcache(er, client[er->cidx].grp)) 391 { 392 er->rc=2; 393 write_ecm_answer(fd_c2m, er); 394 return; 397 395 } 398 396 if (proxy) -
trunk/oscam.c
r1969 r1971 1342 1342 int check_ecmcache(ECM_REQUEST *er, ulong grp) 1343 1343 { 1344 // disable cache1 and cache2 1345 if (!cfg->cachecm) return(0); 1346 1344 1347 int i; 1345 1348 //cs_ddump(ecmd5, CS_ECMSTORESIZE, "ECM search"); … … 2128 2131 2129 2132 // cache1 2130 if(reader[ridx].cachecm) { 2131 if (check_ecmcache(er, client[cs_idx].grp)) 2132 er->rc = 1; 2133 } 2133 if (check_ecmcache(er, client[cs_idx].grp)) 2134 er->rc = 1; 2134 2135 2135 2136 #ifdef CS_ANTICASC
Note:
See TracChangeset
for help on using the changeset viewer.