Changeset 4123
- Timestamp:
- 12/15/10 18:36:05 (13 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/globals.h
r4116 r4123 1098 1098 int cc_minimize_cards; 1099 1099 int cc_keep_connected; 1100 int cc_stealth; 1101 int cc_reshare_services; 1100 1102 struct s_ip *rad_allowed; 1101 1103 char rad_usr[32]; -
trunk/module-cccam.c
r4116 r4123 649 649 memset(buf, 0, CC_MAXMSGSIZE); 650 650 651 memcpy(buf, cc->node_id, 8); 651 if (cfg->cc_stealth) 652 { 653 int i; 654 for (i=0;i<8;i++) 655 buf[i] = fast_rnd(); 656 } 657 else 658 memcpy(buf, cc->node_id, 8); 652 659 char cc_build[7]; 653 660 cc_check_version((char *) cfg->cc_version, cc_build); … … 2916 2923 * Reports all caid/providers to the connected clients 2917 2924 * returns 1=ok, 0=error 2925 * 2926 * cfg->cc_reshare_services=0 CCCAM reader reshares only received cards 2927 * =1 CCCAM reader reshares received cards + defined services 2928 * =2 CCCAM reader reshared only defined services as virtual cards 2918 2929 */ 2919 2930 int cc_srv_report_cards(struct s_client *cl) { … … 2973 2984 2974 2985 flt = 0; 2975 if ( rdr->typ != R_CCCAM&& rdr->ftab.filts) {2986 if ((rdr->typ != R_CCCAM||cfg->cc_reshare_services) && rdr->ftab.filts) { 2976 2987 for (j = 0; j < CS_MAXFILTERS; j++) { 2977 2988 if (rdr->ftab.filts[j].caid && … … 3011 3022 } 3012 3023 3013 if ( rdr->typ != R_CCCAM&& !rdr->caid[0] && !flt) {3024 if ((rdr->typ != R_CCCAM||cfg->cc_reshare_services) && !rdr->caid[0] && !flt) { 3014 3025 for (j = 0; j < CS_MAXCAIDTAB; j++) { 3015 3026 //cs_log("CAID map CCcam card report caid: %04X cmap: %04X", rdr->ctab.caid[j], rdr->ctab.cmap[j]); … … 3030 3041 } 3031 3042 3032 if ( rdr->typ != R_CCCAM&& rdr->caid[0] && !flt && chk_ctab(rdr->caid[0], &cl->ctab)) {3043 if ((rdr->typ != R_CCCAM||cfg->cc_reshare_services) && rdr->caid[0] && !flt && chk_ctab(rdr->caid[0], &cl->ctab)) { 3033 3044 //cs_log("tcp_connected: %d card_status: %d ", rdr->tcp_connected, rdr->card_status); 3034 3045 ushort caid = rdr->caid[0]; … … 3056 3067 } 3057 3068 3058 if (rdr->typ == R_CCCAM && !flt) {3069 if (rdr->typ == R_CCCAM && cfg->cc_reshare_services<2) { 3059 3070 3060 3071 cs_debug_mask(D_TRACE, "%s asking reader %s for cards...", -
trunk/oscam-config.c
r4092 r4123 1098 1098 { 1099 1099 if (!strcmp(token, "port")) { 1100 if(strlen(value) == 0) {1100 if(strlen(value) == 0) 1101 1101 cfg->cc_port = 0; 1102 return; 1103 } else { 1102 else 1104 1103 cfg->cc_port = atoi(value); 1105 return;1106 }1107 1104 } 1108 1105 //if (!strcmp(token, "serverip")) { cfg->cc_srvip=inet_addr(value); return; } 1109 1106 1110 1107 if (!strcmp(token, "reshare")) { 1111 if(strlen(value) == 0) {1108 if(strlen(value) == 0) 1112 1109 cfg->cc_reshare = 0; 1113 return; 1114 } else { 1110 else 1115 1111 cfg->cc_reshare=atoi(value); 1116 return; 1117 } 1118 } 1112 return; 1113 } 1114 1115 if (!strcmp(token, "stealth")) { 1116 if(strlen(value) == 0) 1117 cfg->cc_stealth = 1; 1118 else 1119 cfg->cc_stealth=atoi(value); 1120 } 1121 1122 if (!strcmp(token, "reshare_mode")) { 1123 if(strlen(value) == 0) 1124 cfg->cc_reshare_services = 0; 1125 else 1126 cfg->cc_reshare_services=atoi(value); 1127 } 1128 1119 1129 if (!strcmp(token, "ignorereshare")) { 1120 1130 if(strlen(value) == 0)
Note:
See TracChangeset
for help on using the changeset viewer.