Changeset 4033 for trunk/module-cccam.c
- Timestamp:
- 12/03/10 08:38:25 (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/module-cccam.c
r4024 r4033 2673 2673 2674 2674 struct cc_card *card = create_card(NULL); 2675 uint8 rid[4]; 2676 rid[3] = rdr->cc_id >> 24; 2677 rid[2] = rdr->cc_id >> 16; 2678 rid[1] = j >> 8; 2679 rid[0] = j & 0xFF; 2680 memcpy(&card->remote_id, rid, 4); 2675 card->remote_id = rdr->cc_id>>24|rdr->cc_id>>16|j>>8|j&0xFF; 2681 2676 card->caid = caid; 2682 2677 card->hop = hop; … … 2850 2845 2851 2846 struct s_reader *rdr; 2847 int ridx = 0; 2852 2848 for (rdr = first_reader; rdr; rdr = rdr->next) { 2849 ridx++; 2853 2850 if (!rdr->fd || !rdr->enable || rdr->deleted) 2854 2851 continue; … … 2862 2859 2863 2860 if (!rdr->cc_id) { 2864 int r = get_ridx(rdr)+ 0x64;2861 int r = ridx + 0x64; 2865 2862 rdr->cc_id = r << 24 | r << 16 | fast_rnd() << 8 | fast_rnd(); 2866 2863 } … … 2906 2903 } 2907 2904 2908 if (rdr->typ != R_CCCAM && !rdr->caid[0] && !flt) { 2909 flt = 0; 2905 if (rdr->typ != R_CCCAM && !flt) { 2910 2906 for (j = 0; j < CS_MAXCAIDTAB; j++) { 2911 2907 //cs_log("CAID map CCcam card report caid: %04X cmap: %04X", rdr->ctab.caid[j], rdr->ctab.cmap[j]); … … 2915 2911 lcaid = rdr->ctab.cmap[j]; 2916 2912 2917 if (lcaid && (lcaid != 0xFFFF) ) {2913 if (lcaid && (lcaid != 0xFFFF) && chk_ctab(lcaid, &cl->ctab)) { 2918 2914 struct cc_card *card = create_card2(rdr, j, lcaid, hop, reshare); 2919 2915 if (au_allowed) 2920 2916 cc_UA_oscam2cccam(rdr->hexserial, card->hexserial, lcaid); 2921 2917 2922 if (chk_ctab(lcaid, &cl->ctab)) 2923 add_card_to_serverlist(rdr, cl, server_cards, card, reshare); 2924 else 2925 cc_free_card(card); 2918 add_card_to_serverlist(rdr, cl, server_cards, card, reshare); 2926 2919 flt = 1; 2927 2920 } … … 2952 2945 //cs_log("Main CCcam card report provider: %02X%02X%02X%02X", buf[21+(j*7)], buf[22+(j*7)], buf[23+(j*7)], buf[24+(j*7)]); 2953 2946 } 2954 if ((rdr->tcp_connected || rdr->card_status == CARD_INSERTED) /*&& !rdr->cc_id*/) { 2955 //rdr->cc_id = b2i(3, buf + 5); 2947 if (rdr->tcp_connected || rdr->card_status == CARD_INSERTED) { 2956 2948 add_card_to_serverlist(rdr, cl, server_cards, card, reshare); 2957 2949 } … … 3023 3015 //cs_debug_mask(D_TRACE, "%s card %d caid %04X hop %d", getprefix(), card->id, card->caid, card->hop); 3024 3016 3025 ok = report_card(cl, card, new_reported_carddatas) >= 0;3017 ok = report_card(cl, card, new_reported_carddatas) >= 0; 3026 3018 ll_iter_remove(it); 3027 3019 }
Note:
See TracChangeset
for help on using the changeset viewer.