Changeset 10579
- Timestamp:
- 02/22/15 19:43:04 (9 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/module-dvbapi.c
r10572 r10579 916 916 { continue; } 917 917 918 struct s_cardsystem *cs ;918 struct s_cardsystem *csystem; 919 919 uint16_t c, match; 920 920 cs_log_dbg(D_DVBAPI, "Demuxer %d matching reader %s against available emmpids -> START!", demux_index, rdr->label); … … 939 939 if(match) 940 940 { 941 cs = get_cardsystem_by_caid(caid);942 if(cs )941 csystem = get_cardsystem_by_caid(caid); 942 if(csystem) 943 943 { 944 944 if(caid != ncaid) 945 945 { 946 cs = get_cardsystem_by_caid(ncaid);947 if(cs )946 csystem = get_cardsystem_by_caid(ncaid); 947 if(csystem && csystem->get_tunemm_filter) 948 948 { 949 cs ->get_tunemm_filter(rdr, &dmx_filter, &filter_count);949 csystem->get_tunemm_filter(rdr, &dmx_filter, &filter_count); 950 950 cs_log_dbg(D_DVBAPI, "Demuxer %d setting emm filter for betatunnel: %04X -> %04X", demux_index, ncaid, caid); 951 951 } … … 956 956 } 957 957 } 958 else if (cs ->get_emm_filter)958 else if (csystem->get_emm_filter) 959 959 { 960 cs ->get_emm_filter(rdr, &dmx_filter, &filter_count);960 csystem->get_emm_filter(rdr, &dmx_filter, &filter_count); 961 961 } 962 962 } -
trunk/module-webif.c
r10577 r10579 6076 6076 } 6077 6077 6078 static bool send_EMM(struct s_reader * rdr, uint16_t caid, struct s_cardsystem * cs, const unsigned char *emmhex, uint32_t len)6078 static bool send_EMM(struct s_reader * rdr, uint16_t caid, struct s_cardsystem *csystem, const unsigned char *emmhex, uint32_t len) 6079 6079 { 6080 6080 … … 6096 6096 emm_pack->caid[1] = caid & 0xFF; 6097 6097 6098 if(cs && cs->get_emm_type)6099 { 6100 if(!cs ->get_emm_type(emm_pack, rdr))6098 if(csystem && csystem->get_emm_type) 6099 { 6100 if(!csystem->get_emm_type(emm_pack, rdr)) 6101 6101 { 6102 6102 rdr_log_dbg(rdr, D_EMM, "get_emm_type() returns error"); … … 6113 6113 } 6114 6114 6115 static bool process_single_emm(struct templatevars * vars, struct s_reader * rdr, uint16_t caid, struct s_cardsystem * cs, const char *ep)6115 static bool process_single_emm(struct templatevars * vars, struct s_reader * rdr, uint16_t caid, struct s_cardsystem *csystem, const char *ep) 6116 6116 { 6117 6117 … … 6140 6140 tpl_addVar(vars, TPLADD, "SIZE", buff); 6141 6141 6142 if(send_EMM(rdr, caid, cs , emmhex, len))6142 if(send_EMM(rdr, caid, csystem, emmhex, len)) 6143 6143 { 6144 6144 tpl_addMsg(vars, "Single EMM has been sent."); … … 6152 6152 } 6153 6153 6154 static bool process_emm_file(struct templatevars * vars, struct s_reader * rdr, uint16_t caid, struct s_cardsystem * cs, const char *sFilePath)6154 static bool process_emm_file(struct templatevars * vars, struct s_reader * rdr, uint16_t caid, struct s_cardsystem *csystem, const char *sFilePath) 6155 6155 { 6156 6156 … … 6189 6189 } 6190 6190 len /= 2; 6191 if(send_EMM(rdr, caid, cs , emmhex, len))6191 if(send_EMM(rdr, caid, csystem, emmhex, len)) 6192 6192 { 6193 6193 ++wemms; … … 6239 6239 uint16_t caid = (-1 != tcaid) ? (uint16_t)tcaid : 0; 6240 6240 char buff[7] = ""; 6241 struct s_cardsystem *cs = NULL;6241 struct s_cardsystem *csystem = NULL; 6242 6242 int32_t proxy = is_cascading_reader(rdr); 6243 6243 … … 6250 6250 } 6251 6251 6252 cs = get_cardsystem_by_caid(caid);6253 if(!cs )6252 csystem = get_cardsystem_by_caid(caid); 6253 if(!csystem) 6254 6254 { 6255 6255 rdr_log_dbg(rdr, D_EMM, "unable to find cardsystem for caid %04X", caid); … … 6259 6259 else if(!proxy && rdr->csystem_active) // local active reader 6260 6260 { 6261 cs = &rdr->csystem;6261 csystem = &rdr->csystem; 6262 6262 caid = rdr->caid; 6263 6263 } 6264 6264 6265 if(cs )6266 { 6267 tpl_addVar(vars, TPLADD, "SYSTEM", cs ->desc);6265 if(csystem) 6266 { 6267 tpl_addVar(vars, TPLADD, "SYSTEM", csystem->desc); 6268 6268 } 6269 6269 else … … 6281 6281 } 6282 6282 6283 process_single_emm(vars, rdr, caid, cs , getParam(params, "ep"));6284 process_emm_file(vars, rdr, caid, cs , getParam(params, "emmfile"));6283 process_single_emm(vars, rdr, caid, csystem, getParam(params, "ep")); 6284 process_emm_file(vars, rdr, caid, csystem, getParam(params, "emmfile")); 6285 6285 } 6286 6286 else -
trunk/oscam-emm.c
r10572 r10579 38 38 * the emm is checked against it and returns 1 for a valid emm or 0 if not 39 39 */ 40 static int8_t do_simple_emm_filter(struct s_reader *rdr, struct s_cardsystem *cs , EMM_PACKET *ep, int8_t cl_dvbapi)40 static int8_t do_simple_emm_filter(struct s_reader *rdr, struct s_cardsystem *csystem, EMM_PACKET *ep, int8_t cl_dvbapi) 41 41 { 42 42 if(is_network_reader(rdr)) { return 1; } // dont evaluate on network readers, server with local reader will check it … … 50 50 51 51 // Call cardsystems emm filter 52 cs ->get_emm_filter(rdr, &dmx_filter, &filter_count);52 csystem->get_emm_filter(rdr, &dmx_filter, &filter_count); 53 53 54 54 // Only check matching emmtypes: … … 342 342 { continue; } 343 343 344 struct s_cardsystem *cs = NULL;344 struct s_cardsystem *csystem = NULL; 345 345 346 346 if(is_network_reader(aureader)) // network reader (R_CAMD35 R_NEWCAMD R_CS378X R_CCCAM) … … 349 349 { continue; } 350 350 351 cs = get_cardsystem_by_caid(caid);352 if(!cs )351 csystem = get_cardsystem_by_caid(caid); 352 if(!csystem) 353 353 { 354 354 rdr_log_dbg(aureader, D_EMM, "unable to find cardsystem for caid %04X", caid); … … 359 359 { 360 360 if(aureader->csystem_active) 361 { cs = &aureader->csystem; }362 } 363 364 if(cs && cs->get_emm_type)365 { 366 if(!cs ->get_emm_type(ep, aureader))361 { csystem = &aureader->csystem; } 362 } 363 364 if(csystem && csystem->get_emm_type) 365 { 366 if(!csystem->get_emm_type(ep, aureader)) 367 367 { 368 368 rdr_log_dbg(aureader, D_EMM, "emm skipped, get_emm_type() returns error"); … … 372 372 } 373 373 374 if(!ep->skip_filter_check && cs && cs->get_emm_filter)375 { 376 if(!do_simple_emm_filter(aureader, cs , ep, 1)) // do check with dvbapi fixup enabled377 { 378 if(!do_simple_emm_filter(aureader, cs , ep, 0)) // do check with dvbapi fixup disabled374 if(!ep->skip_filter_check && csystem && csystem->get_emm_filter) 375 { 376 if(!do_simple_emm_filter(aureader, csystem, ep, 1)) // do check with dvbapi fixup enabled 377 { 378 if(!do_simple_emm_filter(aureader, csystem, ep, 0)) // do check with dvbapi fixup disabled 379 379 { 380 380 rdr_log_dbg(aureader, D_EMM, "emm skipped, do_simple_emm_filter() returns invalid"); … … 385 385 } 386 386 387 if(cs && cs->do_emm_reassembly)387 if(csystem && csystem->do_emm_reassembly) 388 388 { 389 389 if(assemble) 390 390 { 391 if(!cs ->do_emm_reassembly(aureader, client, ep))391 if(!csystem->do_emm_reassembly(aureader, client, ep)) 392 392 { continue; } // skip this reader 393 393 } … … 662 662 eptmp->emmlen = eptmp->emm[2] + 3; 663 663 } 664 struct s_cardsystem *cs = get_cardsystem_by_caid(reader->caid);665 if(cs && cs->get_emm_type && !cs->get_emm_type(eptmp, reader))664 struct s_cardsystem *csystem = get_cardsystem_by_caid(reader->caid); 665 if(csystem && csystem->get_emm_type && !csystem->get_emm_type(eptmp, reader)) 666 666 { 667 667 rdr_log_dbg(reader, D_EMM, "emm skipped, get_emm_type() returns error");
Note:
See TracChangeset
for help on using the changeset viewer.