Changeset 4045
- Timestamp:
- 12/06/10 22:39:11 (13 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/module-cccam.c
r4044 r4045 1319 1319 cc_send_pending_emms(cl); 1320 1320 1321 rdr->emmwritten[ep->type]++; 1322 1321 1323 cs_debug_mask(D_FUT, "cc_send_emm out"); 1322 1324 return 1; … … 2577 2579 ulong get_reader_prid(struct s_reader *rdr, int j) { 2578 2580 ulong prid; 2579 if (!(rdr->typ & R_IS_CASCADING)) { // Rea dcardreaders have 4-byte Providers2581 if (!(rdr->typ & R_IS_CASCADING)) { // Real cardreaders have 4-byte Providers 2580 2582 prid = (rdr->prid[j][0] << 24) | (rdr->prid[j][1] << 16) 2581 2583 | (rdr->prid[j][2] << 8) | (rdr->prid[j][3] & 0xFF); … … 2946 2948 //cs_log("Ident CCcam card report provider: %02X%02X%02X", buf[21 + (k*7)]<<16, buf[22 + (k*7)], buf[23 + (k*7)]); 2947 2949 if (au_allowed) { 2948 int l; //Setting SA (Shared Addresses): 2949 for (l = 0; l < rdr->nprov; l++) { 2950 ulong rprid = get_reader_prid(rdr, l); 2951 if (rprid == prid) 2952 cc_SA_oscam2cccam(&rdr->sa[l][0], prov->sa); 2953 } 2950 //Setting SA (Shared Addresses): 2951 cc_SA_oscam2cccam(&rdr->sa[j][0], prov->sa); 2954 2952 } 2955 2953 ll_append(card->providers, prov); … … 3265 3263 if (cmi >= cfg->cmaxidle) { 3266 3264 cmi = 0; 3267 if (cfg->cc_keep_connected && cc->extended_mode && !wait_for_keepalive) { //special handling for "oscam"-cccam clients:3265 if (cfg->cc_keep_connected && !wait_for_keepalive) { 3268 3266 if (cc_cmd_send(cl, NULL, 0, MSG_KEEPALIVE) < 0) 3269 3267 break; -
trunk/oscam-http.c
r4044 r4045 1728 1728 //add SA: 1729 1729 if (prov->sa[0] || prov->sa[1] || prov->sa[2] || prov->sa[3]) { 1730 sprintf(p, " SA:%02X%02X%02X%02X <BR>\n",1730 sprintf(p, " SA:%02X%02X%02X%02X", 1731 1731 prov->sa[0], prov->sa[1], prov->sa[2], prov->sa[3]); 1732 1732 p = strend(p); 1733 1733 } 1734 1734 sprintf(p, "<BR>\n"); 1735 p = strend(p); 1735 1736 } 1736 1737
Note:
See TracChangeset
for help on using the changeset viewer.