Changeset 3501
- Timestamp:
- 10/13/10 11:05:27 (13 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/globals.h
r3499 r3501 496 496 uchar locals_done; 497 497 int btun; // mark er as betatunneled 498 int reader_count; //count of requesting readers 498 499 499 500 #ifdef CS_WITH_DOUBLECHECK -
trunk/module-cccam.c
r3495 r3501 2493 2493 } 2494 2494 if (!ignore) { //Filtered by service 2495 int new_reshare=cfg->cc_ignore_reshare?reshare: card->maxdown-1;2495 int new_reshare=cfg->cc_ignore_reshare?reshare:(card->maxdown-1); 2496 2496 if (new_reshare>reshare) 2497 2497 new_reshare=reshare; -
trunk/oscam-config.c
r3499 r3501 1636 1636 if (!strcmp(token, "cccreshare")) { 1637 1637 if (strlen(value) == 0) { 1638 account->cccreshare = 10;1638 account->cccreshare = 0; 1639 1639 return; 1640 1640 } else { -
trunk/oscam.c
r3495 r3501 1595 1595 send_reader_stat(er->reader[0], er, er->rc); 1596 1596 1597 cs_log("%s (%04X&%06X/%04X/%02X:%04X): %s (%d ms)%s %s%s",1597 cs_log("%s (%04X&%06X/%04X/%02X:%04X): %s (%d ms)%s (of %d)%s%s", 1598 1598 uname, er->caid, er->prid, er->srvid, er->l, lc, 1599 er->rcEx?erEx:stxt[er->rc], client->cwlastresptime, sby, schaninfo, sreason);1599 er->rcEx?erEx:stxt[er->rc], client->cwlastresptime, sby, er->reader_count, schaninfo, sreason); 1600 1600 1601 1601 #ifdef WEBIF … … 2181 2181 2182 2182 if(er->rc > 99) { 2183 2183 er->reader_count=0; 2184 2184 if (cfg->lb_mode) { 2185 2185 int reader_avail[CS_MAXREADER]; … … 2192 2192 if (reader_avail[i]) { 2193 2193 m|=er->reader[i] = reader_avail[i]; 2194 if (reader_avail[i] == 1) // do not count fallback readers (==2 fallback) 2195 er->reader_count++; 2194 2196 } 2195 2197 } … … 2198 2200 { 2199 2201 for (i = m = 0; i < CS_MAXREADER; i++) 2200 if (matching_reader(er, &reader[i])) 2202 if (matching_reader(er, &reader[i])) { 2201 2203 m|=er->reader[i] = (reader[i].fallback)? 2: 1; 2204 if (!reader[i].fallback) // do not count fallback readers 2205 er->reader_count++; 2206 } 2202 2207 } 2203 2208
Note:
See TracChangeset
for help on using the changeset viewer.