Changeset 7632
- Timestamp:
- 10/07/12 18:37:18 (11 years ago)
- Location:
- trunk
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Makefile
r7618 r7632 268 268 SRC-$(sort $(CONFIG_MODULE_CAMD35) $(CONFIG_MODULE_CAMD35_TCP)) += module-camd35.c 269 269 SRC-$(CONFIG_MODULE_CCCAM) += module-cccam.c 270 SRC-$(CONFIG_MODULE_CCC AM) += module-cccshare.c270 SRC-$(CONFIG_MODULE_CCCSHARE) += module-cccshare.c 271 271 SRC-$(CONFIG_MODULE_CONSTCW) += module-constcw.c 272 272 SRC-$(CONFIG_CS_CACHEEX) += module-csp.c -
trunk/README.config
r7534 r7632 53 53 Available options: 54 54 addons: WEBIF TOUCH HAVE_DVBAPI IRDETO_GUESSING CS_ANTICASC WITH_DEBUG MODULE_MONITOR WITH_SSL WITH_LB CS_CACHEEX LCDSUPPORT LEDSUPPORT IPV6SUPPORT 55 protocols: MODULE_CAMD33 MODULE_CAMD35 MODULE_CAMD35_TCP MODULE_NEWCAMD MODULE_CCCAM MODULE_ GBOX MODULE_RADEGAST MODULE_SERIAL MODULE_CONSTCW MODULE_PANDORA55 protocols: MODULE_CAMD33 MODULE_CAMD35 MODULE_CAMD35_TCP MODULE_NEWCAMD MODULE_CCCAM MODULE_CCCSHARE MODULE_GBOX MODULE_RADEGAST MODULE_SERIAL MODULE_CONSTCW MODULE_PANDORA 56 56 readers: WITH_CARDREADER READER_NAGRA READER_IRDETO READER_CONAX READER_CRYPTOWORKS READER_SECA READER_VIACCESS READER_VIDEOGUARD READER_DRE READER_TONGFANG READER_BULCRYPT 57 57 -
trunk/config.sh
r7566 r7632 2 2 3 3 addons="WEBIF TOUCH HAVE_DVBAPI IRDETO_GUESSING CS_ANTICASC WITH_DEBUG MODULE_MONITOR WITH_SSL WITH_LB CS_CACHEEX LCDSUPPORT LEDSUPPORT IPV6SUPPORT" 4 protocols="MODULE_CAMD33 MODULE_CAMD35 MODULE_CAMD35_TCP MODULE_NEWCAMD MODULE_CCCAM MODULE_ GBOX MODULE_RADEGAST MODULE_SERIAL MODULE_CONSTCW MODULE_PANDORA"4 protocols="MODULE_CAMD33 MODULE_CAMD35 MODULE_CAMD35_TCP MODULE_NEWCAMD MODULE_CCCAM MODULE_CCCSHARE MODULE_GBOX MODULE_RADEGAST MODULE_SERIAL MODULE_CONSTCW MODULE_PANDORA" 5 5 readers="WITH_CARDREADER READER_NAGRA READER_IRDETO READER_CONAX READER_CRYPTOWORKS READER_SECA READER_VIACCESS READER_VIDEOGUARD READER_DRE READER_TONGFANG READER_BULCRYPT" 6 6 … … 24 24 CONFIG_MODULE_NEWCAMD=y 25 25 CONFIG_MODULE_CCCAM=y 26 CONFIG_MODULE_CCCSHARE=y 26 27 CONFIG_MODULE_GBOX=y 27 28 CONFIG_MODULE_RADEGAST=y … … 273 274 MODULE_NEWCAMD "newcamd" $(check_test "MODULE_NEWCAMD") \ 274 275 MODULE_CCCAM "CCcam" $(check_test "MODULE_CCCAM") \ 276 MODULE_CCCSHARE "CCcam share" $(check_test "MODULE_CCCSHARE") \ 275 277 MODULE_GBOX "gbox" $(check_test "MODULE_GBOX") \ 276 278 MODULE_RADEGAST "radegast" $(check_test "MODULE_RADEGAST") \ … … 475 477 '-l'|'--list-config') 476 478 enabled_any $(get_opts readers) && enable_opt WITH_CARDREADER >/dev/null 479 enabled MODULE_CCCSHARE && enable_opt MODULE_CCCAM >/dev/null 477 480 for OPT in $addons $protocols $readers 478 481 do -
trunk/module-cccam.h
r7631 r7632 18 18 void cccam_init_share(void); 19 19 20 #if defined(MODULE_CCC AM) && defined(MODULE_CCCSHARE)20 #if defined(MODULE_CCCSHARE) 21 21 void cccam_done_share(void); 22 #else 23 static inline void cccam_done_share(void) { } 24 #endif 25 26 #if defined(MODULE_CCCAM) 22 27 bool cccam_forward_origin_card(ECM_REQUEST *er); 23 28 bool cccam_snprintf_cards_stat(struct s_client *cl, char *emmtext, size_t emmtext_sz); 24 29 bool cccam_client_extended_mode(struct s_client *cl); 25 30 #else 26 static inline void cccam_done_share(void) { }27 31 static inline bool cccam_forward_origin_card(ECM_REQUEST *UNUSED(er)) { return false; } 28 32 static inline bool cccam_snprintf_cards_stat(struct s_client *UNUSED(cl), char *UNUSED(emmtext), size_t UNUSED(emmtext_sz)) { return false; } -
trunk/module-webif.c
r7631 r7632 2514 2514 #define ENTITLEMENT_PAGE_SIZE 500 2515 2515 2516 #ifdef MODULE_CCC AM2516 #ifdef MODULE_CCCSHARE 2517 2517 static void print_cards(struct templatevars *vars, struct uriparams *params, struct cc_card **cardarray, int32_t cardsize, 2518 2518 int8_t show_global_list, struct s_reader *rdr, int32_t offset, int32_t apicall) … … 2690 2690 int32_t show_global_list = sharelist_ && sharelist_[0]=='1'; 2691 2691 2692 int32_t offset = atoi(getParam(params, "offset")); //should be 0 if parameter is missed on very first call2693 2694 2692 struct s_reader *rdr = get_reader_by_label(getParam(params, "label")); 2695 2693 if (show_global_list || strlen(reader_) || (rdr && rdr->typ == R_CCCAM)) { … … 2707 2705 } 2708 2706 2707 #ifdef MODULE_CCCSHARE 2708 int32_t offset = atoi(getParam(params, "offset")); //should be 0 if parameter is missed on very first call 2709 2709 int32_t cardsize; 2710 2710 if (show_global_list) { 2711 #ifdef MODULE_CCCSHARE2712 2711 int32_t i; 2713 2712 LLIST **sharelist = get_and_lock_sharelist(); … … 2720 2719 struct cc_card **cardarray = get_sorted_card_copy(sharelist2, 0, &cardsize); 2721 2720 ll_destroy(sharelist2); 2722 2723 2721 print_cards(vars, params, cardarray, cardsize, 1, NULL, offset, apicall); 2724 2725 2722 free(cardarray); 2726 2727 2723 } else { 2728 2724 struct s_client *rc = rdr->client; 2729 2725 struct cc_data *rcc = (rc)?rc->cc:NULL; 2730 2731 2726 if (rcc && rcc->cards) { 2732 2727 struct cc_card **cardarray = get_sorted_card_copy(rcc->cards, 0, &cardsize); … … 2734 2729 free(cardarray); 2735 2730 } 2736 #endif 2737 } 2738 2731 } 2732 #endif 2739 2733 2740 2734 } else {
Note:
See TracChangeset
for help on using the changeset viewer.