- Timestamp:
- 03/18/11 08:03:05 (13 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/module-cccshare.c
r4826 r4834 122 122 int reader_reshare = card->origin_reader?card->origin_reader->cc_reshare:cfg.cc_reshare; 123 123 int reshare = (reader_reshare < usr_reshare) ? reader_reshare : usr_reshare; 124 if (reshare < 0)125 continue;126 127 124 int new_reshare; 128 125 if (cfg.cc_ignore_reshare || usr_ignorereshare) … … 130 127 else { 131 128 new_reshare = card->reshare; 129 if (card->card_type == CT_REMOTECARD) 130 new_reshare--; 132 131 if (new_reshare > reshare) 133 132 new_reshare = reshare; 134 133 } 134 if (new_reshare < 0) 135 continue; 135 136 136 137 if (!card->id) -
trunk/oscam.c
r4831 r4834 39 39 //Cache for ecms, cws and rcs: 40 40 LLIST *ecmcache; 41 42 //cachesize43 int cache_size = 0;44 41 45 42 struct s_config cfg; … … 564 561 } 565 562 cleanup_ecmtasks(cl); 566 if (cl->thread == pthread_self())567 pthread_setspecific(getclient, NULL);568 563 cl->thread = 0; 569 564 add_garbage(cl->emmcache); … … 1379 1374 //cs_log("cache1 CHECK: grp=%lX", grp); 1380 1375 1381 cs_debug_mask(D_TRACE, "cachesize %d", ll_count(ecmcache));1376 //cs_debug_mask(D_TRACE, "cachesize %d", ll_count(ecmcache)); 1382 1377 time_t now = time(NULL); 1383 1378 time_t timeout = now-(time_t)(cfg.ctimeout/1000)-CS_CACHE_TIMEOUT; … … 1431 1426 #endif 1432 1427 struct s_ecm *ecm = er->ecmcacheptr; 1433 if (!ecm ) return;1428 if (!ecm || ecm->rc < rc) return; 1434 1429 1435 1430 //cs_log("store ecm from reader %d", er->selected_reader);
Note:
See TracChangeset
for help on using the changeset viewer.