Changeset 1796
- Timestamp:
- 03/06/10 14:56:29 (14 years ago)
- Location:
- branches/modular
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/modular/module-dvbapi.c
r1795 r1796 67 67 unsigned short STREAMpidcount; 68 68 unsigned short STREAMpids[ECM_PIDS]; 69 unsigned char buffer_cache_dmx[ 12];69 unsigned char buffer_cache_dmx[CS_ECMSTORESIZE]; 70 70 unsigned char lastcw0[8]; 71 71 unsigned char lastcw1[8]; … … 470 470 memcpy(epg.emm, buffer, epg.l); 471 471 472 int found=0; 472 473 for (i=0;i<CS_MAXREADER;i++) { 473 474 if (reader[i].caid[0] == demux[demux_index].ca_system_id) { 474 475 client[cs_idx].au=i; 475 // memcpy(epg.hexserial, reader[client[cs_idx].au].hexserial, 8); 476 } 477 } 478 do_emm(&epg); 476 found=1; 477 break; 478 } 479 } 480 if (found==1) 481 do_emm(&epg); 479 482 } 480 483 … … 565 568 unsigned short ca_mask=0x01, demux_index2=0x00; 566 569 567 int ca_pmt_list_management = buffer[0];570 //int ca_pmt_list_management = buffer[0]; 568 571 unsigned int program_number = (buffer[1] << 8) | buffer[2]; 569 572 int program_info_length = ((buffer[4] & 0x0F) << 8) | buffer[5]; … … 810 813 int i,rc; 811 814 pthread_t p1; 815 char md5buf[CS_ECMSTORESIZE]; 812 816 813 817 if (cfg->dvbapi_usr[0]==0) { … … 902 906 if (pfd2[i].fd==demux[demux_index].demux_fd[n].fd) { 903 907 if (demux[demux_index].demux_fd[n].type==TYPE_ECM) { 904 //ECM905 908 if (len != (((buffer[1] & 0xf) << 8) | buffer[2]) + 3) //invaild CAT length 906 909 continue; … … 909 912 continue; 910 913 911 if (memcmp(buffer, demux[demux_index].buffer_cache_dmx, 12) != 0) { 912 memcpy(demux[demux_index].buffer_cache_dmx, buffer, 12); 914 memcpy(md5buf, MD5(buffer, len, NULL), CS_ECMSTORESIZE); 915 916 if (memcmp(md5buf, demux[demux_index].buffer_cache_dmx, CS_ECMSTORESIZE) != 0) { 917 //cs_dump(md5buf,CS_ECMSTORESIZE,"MD5 ECM:"); 918 memcpy(demux[demux_index].buffer_cache_dmx, md5buf, CS_ECMSTORESIZE); 913 919 cs_debug("dvbapi: Read %d bytes\tTable-id: %02x\tCA section length: %d", len, buffer[0], len); 914 920 -
branches/modular/reader-common.c
r1777 r1796 342 342 int rc; 343 343 344 if (rdr->card_system<1) 345 return 0; 346 344 347 if (cardsystem[rdr->card_system-1].get_emm_type) 345 348 rc=cardsystem[rdr->card_system-1].get_emm_type(ep, rdr);
Note:
See TracChangeset
for help on using the changeset viewer.