Changeset 5346
- Timestamp:
- 06/03/11 00:36:47 (13 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/module-cccam.c
r5345 r5346 1598 1598 card->hop = buf[10]; 1599 1599 card->reshare = buf[11]; 1600 card->is_ext = ext; 1601 card->card_type = CT_REMOTECARD; 1600 1602 set_card_timeout(card); 1601 1603 memcpy(card->hexserial, buf + 12, 8); //HEXSERIAL!! … … 1901 1903 card->origin_id = card->id; 1902 1904 card->grp = rdr->grp; 1903 card->card_type = CT_REMOTECARD;1904 1905 card->rdr_reshare = rdr->cc_reshare; 1905 1906 -
trunk/module-cccam.h
r5345 r5346 103 103 SIDTABBITS sidtabno; 104 104 time_t timeout; 105 uint8_t is_ext; 105 106 }; 106 107 -
trunk/module-cccshare.c
r5345 r5346 86 86 87 87 int32_t can_use_ext(struct cc_card *card) { 88 if (card->card_type == CT_REMOTECARD) 89 return card->is_ext; 90 88 91 if (card->sidtab) 89 92 return (card->sidtab->num_srvid>0); 90 93 else 91 return ll_count(card->goodsids) ;94 return ll_count(card->goodsids) && ll_count(card->badsids); 92 95 return 0; 93 96 } … … 138 141 ofs+=2; 139 142 buf[21]++; //nassign 140 if (buf[21] >= 2 00)143 if (buf[21] >= 240) 141 144 break; 142 145 } … … 160 163 ofs+=2; 161 164 buf[22]++; //nreject 162 if (buf[22] >= 2 00)165 if (buf[22] >= 240) 163 166 break; 164 167 } 165 168 } 166 169 } 167 } 170 if (buf[22] >= 240) 171 break; 172 } 173 168 174 } else { 169 175 //assigned sids: … … 847 853 struct s_sidtab *ptr; 848 854 for (j=0,ptr=cfg.sidtab; ptr; ptr=ptr->next,j++) { 849 if (!(rdr->sidtabno&((SIDTABBITS)1<<j)) && ( !rdr->sidtabok ||rdr->sidtabok&((SIDTABBITS)1<<j))) {855 if (!(rdr->sidtabno&((SIDTABBITS)1<<j)) && (rdr->sidtabok&((SIDTABBITS)1<<j))) { 850 856 int32_t k; 851 857 for (k=0;k<ptr->num_caid;k++) {
Note:
See TracChangeset
for help on using the changeset viewer.