Changeset 4004
- Timestamp:
- 11/26/10 23:15:30 (13 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/module-cccam.c
r4003 r4004 677 677 break; 678 678 case 0x0B: //CONAX: 679 len = 4;679 len = 6; 680 680 break; 681 681 case 0x06: -
trunk/module-cccam.h
r3948 r4004 182 182 void free_extended_ecm_idx(struct cc_data *cc); 183 183 void cc_free_card(struct cc_card *card); 184 int cc_UA_valid(uint8 *ua); 185 void cc_UA_cccam2oscam(uint8 *in, uint8 *out, uint16 caid); 184 186 185 187 #endif /* MODULECCCAM_H_ */ -
trunk/oscam-http.c
r3973 r4004 1690 1690 struct cc_data *rcc = rc->cc; 1691 1691 1692 if (rcc && r dr->tcp_connected == 2 && rcc->cards) {1692 if (rcc && rcc->cards) { 1693 1693 pthread_mutex_lock(&rcc->cards_busy); 1694 1694 char *buf = malloc(4000); 1695 1695 uint8 serbuf[8]; 1696 1696 1697 1697 LL_ITER *it = ll_iter_create(rcc->cards); … … 1699 1699 1700 1700 tpl_printf(vars, 0, "HOST", "%s:%d", rdr->device, rdr->r_port); 1701 if (cc_UA_valid(card->hexserial)) { //Add UA: 1702 cc_UA_cccam2oscam(card->hexserial, serbuf, card->caid); 1703 tpl_printf(vars, 1, "HOST", "<BR>\nUA_Oscam:%s", cs_hexdump(0, serbuf, 8)); 1704 tpl_printf(vars, 1, "HOST", "<BR>\nUA_CCcam:%s", cs_hexdump(0, card->hexserial, 8)); 1705 } 1701 1706 tpl_printf(vars, 0, "CAID", "%04X", card->caid); 1702 1707 … … 1719 1724 while ((prov = ll_iter_next(pit))) { 1720 1725 provider = get_provider(card->caid, prov->prov); 1721 sprintf(p, "%s <BR>\n", provider);1726 sprintf(p, "%s", provider); 1722 1727 p = strend(p); 1728 //add SA: 1729 if (prov->sa[0] || prov->sa[1] || prov->sa[2] || prov->sa[3]) { 1730 sprintf(p, " SA:%02X%02X%02X%02X<BR>\n", 1731 prov->sa[0], prov->sa[1], prov->sa[2], prov->sa[3]); 1732 p = strend(p); 1733 } 1734 sprintf(p, "<BR>\n"); 1723 1735 } 1724 1736
Note:
See TracChangeset
for help on using the changeset viewer.