Changeset 10316
- Timestamp:
- 01/26/15 16:08:40 (9 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/module-dvbapi.c
r10284 r10316 1396 1396 if(p && p->force) { match = 1; } // forced pid always started! 1397 1397 1398 if(config_enabled(WITH_LB) && (!match && cfg.lb_auto_betatunnel)) //if this reader does not match, check betatunnel for it 1399 { 1400 uint16_t caid = lb_get_betatunnel_caid_to(er->caid); 1401 if(caid) 1402 { 1403 uint16_t save_caid = er->caid; 1404 er->caid = caid; 1405 match = matching_reader(er, rdr); // check for matching reader 1406 er->caid = save_caid; 1407 } 1408 } 1398 if(!match) // if this reader does not match, check betatunnel for it 1399 match = lb_check_auto_betatunnel(er, rdr); 1409 1400 1410 1401 if(!match && chk_is_betatunnel_caid(er->caid)) // these caids might be tunneled invisible by peers -
trunk/module-stat.c
r10315 r10316 2014 2014 } 2015 2015 2016 bool lb_check_auto_betatunnel(ECM_REQUEST *er, struct s_reader *rdr) 2017 { 2018 if(!cfg.lb_auto_betatunnel) 2019 return 0; 2020 2021 bool match = 0; 2022 uint16_t caid = lb_get_betatunnel_caid_to(er->caid); 2023 if(caid) 2024 { 2025 uint16_t save_caid = er->caid; 2026 er->caid = caid; 2027 match = matching_reader(er, rdr); //matching 2028 er->caid = save_caid; 2029 } 2030 return match; 2031 } 2032 2016 2033 void send_reader_stat(struct s_reader *rdr, ECM_REQUEST *er, struct s_ecm_answer *ea, int8_t rc) 2017 2034 { -
trunk/module-stat.h
r10315 r10316 22 22 void check_lb_auto_betatunnel_mode(ECM_REQUEST *er); 23 23 uint32_t lb_auto_timeout(ECM_REQUEST *er, uint32_t ctimeout); 24 bool lb_check_auto_betatunnel(ECM_REQUEST *er, struct s_reader *rdr); 24 25 #else 25 26 static inline void init_stat(void) { } … … 31 32 static inline void check_lb_auto_betatunnel_mode(ECM_REQUEST *UNUSED(er)) { } 32 33 static inline uint32_t lb_auto_timeout(ECM_REQUEST *UNUSED(er), uint32_t ctimeout) { return ctimeout; } 34 static inline bool lb_check_auto_betatunnel(ECM_REQUEST *UNUSED(er), struct s_reader *UNUSED(rdr)) { return 0; } 33 35 #endif 34 36 -
trunk/oscam-ecm.c
r10315 r10316 2063 2063 } 2064 2064 } 2065 2066 2065 2067 2066 void get_cw(struct s_client *client, ECM_REQUEST *er) … … 2428 2427 { 2429 2428 uint8_t is_fallback = chk_is_fixed_fallback(rdr, er); 2430 2431 2429 int8_t match = matching_reader(er, rdr); 2432 #ifdef WITH_LB 2433 //if this reader does not match, check betatunnel for it 2434 if(!match && cfg.lb_auto_betatunnel) 2435 { 2436 uint16_t caid = lb_get_betatunnel_caid_to(er->caid); 2437 if(caid) 2438 { 2439 uint16_t save_caid = er->caid; 2440 er->caid = caid; 2441 match = matching_reader(er, rdr); //matching 2442 er->caid = save_caid; 2443 } 2444 } 2445 #endif 2430 2431 if(!match) // if this reader does not match, check betatunnel for it 2432 match = lb_check_auto_betatunnel(er, rdr); 2433 2446 2434 if(match) 2447 2435 {
Note:
See TracChangeset
for help on using the changeset viewer.