Changeset 4321
- Timestamp:
- 01/05/11 11:04:20 (13 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/module-cccam.c
r4302 r4321 241 241 while ((srvid = ll_iter_next(it))) { 242 242 if (sid_eq(srvid, srvid_blocked)) { 243 ll_iter_release(it); 244 return 1; 243 break; 245 244 } 246 245 } 247 246 ll_iter_release(it); 248 return 0;247 return (int)srvid; 249 248 } 250 249 … … 254 253 while ((srvid = ll_iter_next(it))) { 255 254 if (sid_eq(srvid, srvid_good)) { 256 ll_iter_release(it); 257 return 1; 255 break; 258 256 } 259 257 } 260 258 ll_iter_release(it); 261 return 0;259 return (int)srvid; 262 260 } 263 261 … … 1379 1377 uint8 hs[8]; 1380 1378 cc_UA_oscam2cccam(ep->hexserial, hs, caid); 1379 cs_debug_mask(D_EMM, 1380 "%s au info: searching card for caid %04X oscam-UA: %s", 1381 getprefix(), b2i(2, ep->caid), cs_hexdump(0, ep->hexserial, 8)); 1382 cs_debug_mask(D_EMM, 1383 "%s au info: searching card for caid %04X cccam-UA: %s", 1384 getprefix(), b2i(2, ep->caid), cs_hexdump(0, hs, 8)); 1385 1381 1386 emm_card = get_card_by_hexserial(cl, hs, caid); 1382 1387 } … … 2950 2955 if (cfg->cc_reshare_services==3 && cfg->sidtab && cl->sidtabok) { 2951 2956 struct s_sidtab *ptr; 2952 for (j=0,ptr=cfg->sidtab; ptr; j++) {2957 for (j=0,ptr=cfg->sidtab; ptr; ptr=ptr->next,j++) { 2953 2958 if (cl->sidtabok&((SIDTABBITS)1<<j)) { 2954 2959 int k; … … 2966 2971 flt=1; 2967 2972 } 2968 ptr=ptr->next;2969 2973 } 2970 2974 } … … 3003 3007 if ((cfg->cc_reshare_services==1||cfg->cc_reshare_services==2) && cfg->sidtab && rdr->sidtabok) { 3004 3008 struct s_sidtab *ptr; 3005 for (j=0,ptr=cfg->sidtab; ptr; j++) {3009 for (j=0,ptr=cfg->sidtab; ptr; ptr=ptr->next,j++) { 3006 3010 if (rdr->sidtabok&((SIDTABBITS)1<<j)) { 3007 3011 int k; … … 3019 3023 flt=1; 3020 3024 } 3021 ptr=ptr->next;3022 3025 } 3023 3026 } -
trunk/oscam-http.c
r4317 r4321 1780 1780 char *reader_ = getParam(params, "label"); 1781 1781 1782 if (cfg->saveinithistory && strlen(reader_) > 0) {1783 struct s_reader *rdr = get_reader_by_label(getParam(params, "label"));1782 struct s_reader *rdr = get_reader_by_label(getParam(params, "label")); 1783 if ((cfg->saveinithistory && strlen(reader_) > 0) || rdr->typ == R_CCCAM) { 1784 1784 1785 1785 if (rdr->typ == R_CCCAM && rdr->enable == 1) { … … 1875 1875 } 1876 1876 1877 if (!apicall) tpl_addVar(vars, 1, "PROVIDERS", provider);1877 if (!apicall) tpl_addVar(vars, 1, "PROVIDERS", buf); 1878 1878 1879 1879 ll_iter_release(pit); -
trunk/oscam-http.h
r4308 r4321 1042 1042 <OPTION value=\"2.1.3\" ##VERSIONSELECTED3##>2.1.3</OPTION>\ 1043 1043 <OPTION value=\"2.1.4\" ##VERSIONSELECTED4##>2.1.4</OPTION>\ 1044 <OPTION value=\"2.2.0\" ##VERSIONSELECTED5##>2.2.0 (experimental)</OPTION>\1045 <OPTION value=\"2.2.1\" ##VERSIONSELECTED6##>2.2.1 (experimental)</OPTION>\1044 <OPTION value=\"2.2.0\" ##VERSIONSELECTED5##>2.2.0</OPTION>\ 1045 <OPTION value=\"2.2.1\" ##VERSIONSELECTED6##>2.2.1</OPTION>\ 1046 1046 </SELECT></TD></TR>\n\ 1047 1047 <TR><TD>Update Interval:</TD><TD><input name=\"updateinterval\" type=\"text\" size=\"5\" maxlength=\"4\" value=\"##UPDATEINTERVAL##\"></TD></TR>\n\
Note:
See TracChangeset
for help on using the changeset viewer.