Changeset 6311
- Timestamp:
- 01/29/12 13:30:11 (12 years ago)
- Location:
- trunk
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/CMakeLists.txt
r6309 r6311 233 233 # Available options 234 234 set(addons WEBIF HAVE_DVBAPI WITH_STAPI IRDETO_GUESSING CS_ANTICASC WITH_DEBUG WITH_SSL CS_CACHEEX) 235 set(protocols MODULE_CAMD33 MODULE_CAMD35 MODULE_CAMD35_TCP MODULE_NEWCAMD MODULE_CCCAM MODULE_ RADEGAST MODULE_SERIAL MODULE_MONITOR MODULE_CONSTCW)235 set(protocols MODULE_CAMD33 MODULE_CAMD35 MODULE_CAMD35_TCP MODULE_NEWCAMD MODULE_CCCAM MODULE_CCCSHARE MODULE_RADEGAST MODULE_SERIAL MODULE_MONITOR MODULE_CONSTCW) 236 236 set(readers WITH_CARDREADER READER_NAGRA READER_IRDETO READER_CONAX READER_CRYPTOWORKS READER_SECA READER_VIACCESS READER_VIDEOGUARD READER_DRE READER_TONGFANG) 237 237 -
trunk/config.sh
r6309 r6311 17 17 18 18 addons="WEBIF HAVE_DVBAPI WITH_STAPI IRDETO_GUESSING CS_ANTICASC WITH_DEBUG MODULE_MONITOR WITH_SSL WITH_LB CS_CACHEEX LCDSUPPORT IPV6SUPPORT" 19 protocols="MODULE_CAMD33 MODULE_CAMD35 MODULE_CAMD35_TCP MODULE_NEWCAMD MODULE_CCCAM MODULE_ GBOX MODULE_RADEGAST MODULE_SERIAL MODULE_CONSTCW MODULE_PANDORA"19 protocols="MODULE_CAMD33 MODULE_CAMD35 MODULE_CAMD35_TCP MODULE_NEWCAMD MODULE_CCCAM MODULE_CCCSHARE MODULE_GBOX MODULE_RADEGAST MODULE_SERIAL MODULE_CONSTCW MODULE_PANDORA" 20 20 readers="WITH_CARDREADER READER_NAGRA READER_IRDETO READER_CONAX READER_CRYPTOWORKS READER_SECA READER_VIACCESS READER_VIDEOGUARD READER_DRE READER_TONGFANG" 21 21 … … 87 87 ${DIALOG} --checklist "\nChoose protocols:\n " $height $width $listheight \ 88 88 MODULE_CAMD33 "camd 3.3" $(check_test "MODULE_CAMD33") \ 89 MODULE_CAMD35 "camd 3.5 UDP" $(check_test "MODULE_CAMD35") \90 MODULE_CAMD35_TCP "camd 3.5 TCP" $(check_test "MODULE_CAMD35_TCP") \89 MODULE_CAMD35 "camd 3.5 UDP" $(check_test "MODULE_CAMD35") \ 90 MODULE_CAMD35_TCP "camd 3.5 TCP" $(check_test "MODULE_CAMD35_TCP") \ 91 91 MODULE_NEWCAMD "newcamd" $(check_test "MODULE_NEWCAMD") \ 92 92 MODULE_CCCAM "CCcam" $(check_test "MODULE_CCCAM") \ 93 MODULE_GBOX "gbox" $(check_test "MODULE_GBOX") \ 93 MODULE_CCCAM "CCcam Share" $(check_test "MODULE_CCCSHARE") \ 94 MODULE_GBOX "gbox" $(check_test "MODULE_GBOX") \ 94 95 MODULE_RADEGAST "radegast" $(check_test "MODULE_RADEGAST") \ 95 96 MODULE_SERIAL "Serial" $(check_test "MODULE_SERIAL") \ 96 MODULE_CONSTCW "constant CW" $(check_test "MODULE_CONSTCW") \97 MODULE_CONSTCW "constant CW" $(check_test "MODULE_CONSTCW") \ 97 98 MODULE_PANDORA "Pandora" $(check_test "MODULE_PANDORA") \ 98 99 2> ${tempfile} -
trunk/module-cccam.c
r6283 r6311 2089 2089 } 2090 2090 } 2091 2091 #ifdef CCCSHARE 2092 2092 //Check Ident filter: 2093 2093 if (card) { … … 2097 2097 } 2098 2098 } 2099 2099 #endif 2100 2100 if (card) { 2101 2101 //Check if we already have this card: … … 2344 2344 cc->server_ecm_pending++; 2345 2345 er->idx = ++cc->server_ecm_idx; 2346 2346 2347 #ifdef MODULE_CCCSHARE 2348 2347 2349 if (cfg.cc_forward_origin_card) { //search my shares for this card: 2348 2350 cs_debug_mask(D_TRACE, "%s forward card: %04X:%04x search share %d", getprefix(), er->caid, er->srvid, server_card->id); … … 2398 2400 unlock_sharelist(); 2399 2401 } 2402 #endif 2400 2403 2401 2404 cs_debug_mask( … … 3096 3099 3097 3100 cs_debug_mask(D_TRACE, "ccc send cards %s", usr); 3098 3101 #ifdef CCCSHARE 3099 3102 if (!cc_srv_report_cards(cl)) 3100 3103 return -1; 3104 #endif 3101 3105 cs_ftime(&cc->ecm_time); 3102 3106 … … 3497 3501 3498 3502 cc_update_nodeid(); 3499 3503 #ifdef CCCSHARE 3500 3504 if (cfg.cc_port[0]) 3501 init_share(); 3505 init_share(); 3506 #endif 3502 3507 } 3503 3508 #endif -
trunk/module-cccshare.c
r6280 r6311 2 2 3 3 #ifdef MODULE_CCCAM 4 #ifdef MODULE_CCCSHARE 4 5 #include "module-cccam.h" 5 6 #include "reader-common.h" … … 1325 1326 } 1326 1327 #endif 1328 #endif -
trunk/oscam-config.h
r6310 r6311 11 11 12 12 #ifndef WITH_SSL 13 //#define WITH_SSL13 #define WITH_SSL 14 14 #endif 15 15 … … 20 20 #endif 21 21 22 22 23 #ifdef HAVE_DVBAPI 23 24 #ifndef WITH_STAPI … … 26 27 #endif 27 28 29 28 30 #ifndef IRDETO_GUESSING 29 31 #define IRDETO_GUESSING … … 77 79 #define MODULE_CCCAM 78 80 #endif 81 82 #ifdef MODULE_CCCSHARE 83 #define MODULE_CCCSHARE 84 #endif 85 79 86 80 87 #ifndef MODULE_GBOX -
trunk/oscam-http.c
r6309 r6311 574 574 if (strcmp(getParam(params, "button"), "Refresh global list") == 0) { 575 575 cs_debug_mask(D_TRACE, "Entitlements: Refresh Shares start"); 576 #ifdef MODULE_CCCSHARE 576 577 refresh_shares(); 578 #endif 577 579 cs_debug_mask(D_TRACE, "Entitlements: Refresh Shares finished"); 578 580 tpl_addVar(vars, TPLAPPEND, "MESSAGE", "<B>Refresh Shares started</B><BR><BR>"); … … 2452 2454 2453 2455 // @todo alno: sort by click, 0=ascending, 1=descending (maybe two buttons or reverse on second click) 2456 #ifdef MODULE_CCCSHARE 2454 2457 struct cc_card **cardarray = get_sorted_card_copy(cards, 0, &cardsize); 2455 2458 #endif 2456 2459 for(i = offset; i < cardsize; ++i) { 2460 #ifdef MODULE_CCCSHARE 2457 2461 card = cardarray[i]; 2458 2462 #endif 2459 2463 if (count == ENTITLEMENT_PAGE_SIZE) 2460 2464 break; … … 2573 2577 cardcount++; 2574 2578 } 2579 #ifdef MODULE_CCCSHARE 2575 2580 free(cardarray); 2576 2581 #endif 2577 2582 // set previous Link if needed 2578 2583 if (offset >= ENTITLEMENT_PAGE_SIZE) { … … 2635 2640 2636 2641 if (show_global_list) { 2642 #ifdef MODULE_CCCSHARE 2637 2643 int i; 2638 LLIST **sharelist = get_and_lock_sharelist(); 2644 LLIST **sharelist = get_and_lock_sharelist(); 2639 2645 for (i=0;i<CAID_KEY;i++) { 2640 if (sharelist[i]) 2646 if (sharelist[i]) 2641 2647 print_cards(vars, params, sharelist[i], 1, NULL, offset, apicall); 2642 } 2648 } 2643 2649 unlock_sharelist(); 2650 #endif 2644 2651 } else { 2645 2652 struct s_client *rc = rdr->client; -
trunk/oscam.c
r6309 r6311 275 275 #ifdef MODULE_CCCAM 276 276 fprintf(stderr, "cccam "); 277 #endif 278 #ifdef MODULE_CCCSHARE 279 fprintf(stderr, "cccam share "); 277 280 #endif 278 281 #ifdef MODULE_PANDORA … … 679 682 #endif 680 683 681 #ifdef MODULE_CCC AM684 #ifdef MODULE_CCCSHARE 682 685 done_share(); 683 686 #endif … … 4216 4219 module_cccam, 4217 4220 #endif 4221 #ifdef MODULE_CCCSHARE 4222 module_cccshare, 4223 #endif 4218 4224 #ifdef MODULE_PANDORA 4219 4225 module_pandora,
Note:
See TracChangeset
for help on using the changeset viewer.