Changeset 4116
- Timestamp:
- 12/14/10 22:50:10 (13 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/globals.h
r4111 r4116 1335 1335 extern int chk_ctab(ushort caid, CAIDTAB *ctab); 1336 1336 extern int chk_srvid_match_by_caid_prov(ushort caid, ulong provid, SIDTAB *sidtab); 1337 extern int chk_srvid_by_caid_prov(struct s_client *, ushort caid, ulong provid , int chk_neg);1337 extern int chk_srvid_by_caid_prov(struct s_client *, ushort caid, ulong provid); 1338 1338 extern void kill_thread(struct s_client *cl); 1339 1339 extern int get_threadnum(struct s_client *client); -
trunk/module-cccam.c
r4106 r4116 2988 2988 memset(prov, 0, sizeof(struct cc_provider)); 2989 2989 prov->prov = rdr->ftab.filts[j].prids[k]; 2990 if (!chk_srvid_by_caid_prov(cl, caid, prov->prov, 0)) { 2990 2991 if (!chk_srvid_by_caid_prov(cl, caid, prov->prov)) { 2991 2992 ignore = 1; 2992 2993 } … … 3080 3081 ulong prid = prov->prov; 3081 3082 if (!chk_srvid_by_caid_prov(cl, card->caid, 3082 prid , 0) || !chk_srvid_by_caid_prov(3083 rdr->client, card->caid, prid , 0)) {3083 prid) || !chk_srvid_by_caid_prov( 3084 rdr->client, card->caid, prid)) { 3084 3085 ignore = 1; 3085 3086 break; -
trunk/oscam-chk.c
r3998 r4116 69 69 } 70 70 71 int chk_srvid_by_caid_prov(struct s_client *cl, ushort caid, ulong provid , int chk_neg) {71 int chk_srvid_by_caid_prov(struct s_client *cl, ushort caid, ulong provid) { 72 72 int nr, rc=0; 73 73 SIDTAB *sidtab; … … 75 75 if (!cl->sidtabok) 76 76 { 77 if ( chk_neg &&!cl->sidtabno) return(1);77 if (!cl->sidtabno) return(1); 78 78 rc=1; 79 79 } … … 81 81 if (sidtab->num_caid | sidtab->num_provid | sidtab->num_srvid) 82 82 { 83 if ( chk_neg && (cl->sidtabno&((SIDTABBITS)1<<nr))&&83 if ((cl->sidtabno&((SIDTABBITS)1<<nr)) && !sidtab->num_srvid && 84 84 (chk_srvid_match_by_caid_prov(caid, provid, sidtab))) 85 85 return(0); 86 if ((cl->sidtabok&((SIDTABBITS)1<<nr)) && 86 if ((cl->sidtabok&((SIDTABBITS)1<<nr)) && !sidtab->num_srvid && 87 87 (chk_srvid_match_by_caid_prov(caid, provid, sidtab))) 88 88 rc=1;
Note:
See TracChangeset
for help on using the changeset viewer.