Changeset 8822
- Timestamp:
- 08/08/13 21:39:16 (11 years ago)
- Location:
- trunk
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/globals.h
r8811 r8822 807 807 uint16_t gbox_ecm_id; 808 808 uint8_t gbox_ecm_ok; 809 uint8_t gbox_hops; 810 uint16_t gbox_peer; 809 811 #endif 810 812 -
trunk/module-dvbapi.c
r8779 r8822 98 98 #ifdef WITH_DEBUG 99 99 char buf[ECM_FMT_LEN]; 100 ecmfmt(c->caid, 0, c->prid, c->chid, c->pid, c->srvid, 0, 0, 0, 0, buf, ECM_FMT_LEN );100 ecmfmt(c->caid, 0, c->prid, c->chid, c->pid, c->srvid, 0, 0, 0, 0, buf, ECM_FMT_LEN, 0, 0); 101 101 cs_debug_mask(D_DVBAPI, "[DVBAPI] found in channel cache: %s", buf); 102 102 #endif … … 143 143 #ifdef WITH_DEBUG 144 144 char buf[ECM_FMT_LEN]; 145 ecmfmt(c->caid, 0, c->prid, c->chid, c->pid, c->srvid, 0, 0, 0, 0, buf, ECM_FMT_LEN );145 ecmfmt(c->caid, 0, c->prid, c->chid, c->pid, c->srvid, 0, 0, 0, 0, buf, ECM_FMT_LEN, 0, 0); 146 146 cs_debug_mask(D_DVBAPI, "[DVBAPI] added to channel cache: %s", buf); 147 147 #endif -
trunk/module-gbox.c
r8698 r8822 665 665 memcpy(ei->checksums, data + n - 14, 14); 666 666 er->gbox_crc = gbox_get_ecmchecksum(er); 667 er->gbox_hops = data[-15 + n] + 1; 668 er->gbox_peer = ei->peer; 667 669 668 670 er->prid = chk_provid(er->ecm, er->caid); 669 cs_debug_mask(D_READER, "<- ECM (%d<-) from server (%s:%d) to cardserver (%04X) SID %02X%02X", data[-15 + n] + 1, gbox->peer.hostname,cli->port,ei->peer,data[0x0C],data[0x0D]);671 cs_debug_mask(D_READER, "<- ECM (%d<-) from server (%s:%d) to cardserver (%04X) SID %02X%02X", er->gbox_hops, gbox->peer.hostname,cli->port,ei->peer,data[0x0C],data[0x0D]); 670 672 get_cw(cl, er); 671 673 //TODO:gbox_cw_cache(cli,er); -
trunk/oscam-ecm.c
r8779 r8822 384 384 er->cacheex_wait.millitm = er->tps.millitm; 385 385 er->cacheex_wait_time = 0; 386 #endif 387 #ifdef MODULE_GBOX 388 er->gbox_ecm_id = 0; 389 er->gbox_hops = 0; 386 390 #endif 387 391 er->rc = E_UNHANDLED; … … 1733 1737 } 1734 1738 1735 int32_t ecmfmt(uint16_t caid, uint16_t onid, uint32_t prid, uint16_t chid, uint16_t pid, uint16_t srvid, uint16_t l, char *ecmd5hex, char *csphash, char *cw, char *result, size_t size )1739 int32_t ecmfmt(uint16_t caid, uint16_t onid, uint32_t prid, uint16_t chid, uint16_t pid, uint16_t srvid, uint16_t l, char *ecmd5hex, char *csphash, char *cw, char *result, size_t size, uint16_t origin_peer, uint8_t distance) 1736 1740 { 1737 1741 if (!cfg.ecmfmt) … … 1753 1757 case 'e': flen = 5; break; 1754 1758 case 'w': flen = 17; break; 1759 case 'j': flen = 2; value = distance; break; 1760 case 'g': flen = 4; value = origin_peer; break; 1755 1761 case '\\': 1756 1762 c++; … … 1795 1801 #endif 1796 1802 cs_hexdump(0, ecm->cw, 16, cwhex, sizeof(cwhex)); 1797 return ecmfmt(ecm->caid, ecm->onid, ecm->prid, ecm->chid, ecm->pid, ecm->srvid, ecm->ecmlen, ecmd5hex, csphash, cwhex, result, size); 1798 } 1803 #ifdef MODULE_GBOX 1804 if (ecm->gbox_hops) 1805 return ecmfmt(ecm->caid, ecm->onid, ecm->prid, ecm->chid, ecm->pid, ecm->srvid, ecm->ecmlen, ecmd5hex, csphash, cwhex, result, size, ecm->gbox_peer, ecm->gbox_hops); 1806 else 1807 #endif 1808 return ecmfmt(ecm->caid, ecm->onid, ecm->prid, ecm->chid, ecm->pid, ecm->srvid, ecm->ecmlen, ecmd5hex, csphash, cwhex, result, size, 0, 0); 1809 } -
trunk/oscam-ecm.h
r8666 r8822 38 38 } while(0) 39 39 40 int32_t ecmfmt(uint16_t caid, uint16_t onid, uint32_t prid, uint16_t chid, uint16_t pid, uint16_t srvid, uint16_t l, char *ecmd5hex, char *csphash, char *cw, char *result, size_t size );40 int32_t ecmfmt(uint16_t caid, uint16_t onid, uint32_t prid, uint16_t chid, uint16_t pid, uint16_t srvid, uint16_t l, char *ecmd5hex, char *csphash, char *cw, char *result, size_t size, uint16_t origin_peer, uint8_t distance); 41 41 int32_t format_ecm(ECM_REQUEST *ecm, char *result, size_t size); 42 42
Note:
See TracChangeset
for help on using the changeset viewer.