Changeset 4141 for trunk/module-dvbapi.c
- Timestamp:
- 12/18/10 08:10:55 (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/module-dvbapi.c
r4136 r4141 119 119 120 120 if (ret < 0) 121 cs_debug ("could not start demux filter (Errno: %d)", errno);121 cs_debug_mask(D_DVBAPI, "could not start demux filter (Errno: %d)", errno); 122 122 123 123 return ret; … … 139 139 selected_box = 4; 140 140 disable_pmt_files = 1; 141 cs_debug ("Detected coolstream Api");141 cs_debug_mask(D_DVBAPI, "Detected coolstream Api"); 142 142 return 1; 143 143 #else … … 192 192 if (ret < 0) return 0; 193 193 194 cs_debug ("Detected %s Api: %d", device_path, selected_api);194 cs_debug_mask(D_DVBAPI, "Detected %s Api: %d", device_path, selected_api); 195 195 #endif 196 196 … … 244 244 245 245 if ((dmx_fd = open(device_path, O_RDWR)) < 0) { 246 cs_debug ("error opening device %s (Errno: %d)", device_path, errno);246 cs_debug_mask(D_DVBAPI, "error opening device %s (Errno: %d)", device_path, errno); 247 247 return -1; 248 248 } 249 249 250 cs_debug ("DEVICE open (%s) fd %d", device_path, dmx_fd);250 cs_debug_mask(D_DVBAPI, "DEVICE open (%s) fd %d", device_path, dmx_fd); 251 251 return dmx_fd; 252 252 } … … 288 288 uchar filter[32]; 289 289 290 cs_debug ("set filter pid: %04x", pid);290 cs_debug_mask(D_DVBAPI, "set filter pid: %04x", pid); 291 291 292 292 memset(filter,0,32); … … 334 334 int filter_count=dmx_filter[1]; 335 335 336 cs_debug ("start %d emm filter for %s", filter_count, demux[demux_index].rdr->label);336 cs_debug_mask(D_DVBAPI, "start %d emm filter for %s", filter_count, demux[demux_index].rdr->label); 337 337 338 338 for (j=1;j<=filter_count && j < 8;j++) { … … 355 355 356 356 if (l>-1) { 357 cs_debug ("starting emm filter %s, pid: 0x%04X", typtext[emmtype], demux[demux_index].EMMpids[l].PID);358 cs_ddump (filter, 32, "demux filter:");357 cs_debug_mask(D_DVBAPI, "starting emm filter %s, pid: 0x%04X", typtext[emmtype], demux[demux_index].EMMpids[l].PID); 358 cs_ddump_mask(D_DVBAPI, filter, 32, "demux filter:"); 359 359 dvbapi_set_filter(demux_index, selected_api, demux[demux_index].EMMpids[l].PID, filter, filter+16, 0, demux[demux_index].pidindex, count, TYPE_EMM); 360 360 } else { 361 cs_debug ("no emm pid found");361 cs_debug_mask(D_DVBAPI, "no emm pid found"); 362 362 } 363 363 } … … 378 378 if (demux[demux_id].ECMpids[n].slen == 0) { 379 379 //we already got this caid/ecmpid as global, no need to add the single stream 380 cs_debug ("[SKIP STREAM %d] CAID: %04X\tECM_PID: %04X\tPROVID: %06X", n, caid, ecmpid, provid);380 cs_debug_mask(D_DVBAPI, "[SKIP STREAM %d] CAID: %04X\tECM_PID: %04X\tPROVID: %06X", n, caid, ecmpid, provid); 381 381 continue; 382 382 } 383 383 added=1; 384 384 demux[demux_id].ECMpids[n].stream[demux[demux_id].ECMpids[n].slen++]=stream; 385 cs_debug ("[ADD STREAM %d] CAID: %04X\tECM_PID: %04X\tPROVID: %06X", n, caid, ecmpid, provid);385 cs_debug_mask(D_DVBAPI, "[ADD STREAM %d] CAID: %04X\tECM_PID: %04X\tPROVID: %06X", n, caid, ecmpid, provid); 386 386 } 387 387 } … … 405 405 demux[demux_id].EMMpids[demux[demux_id].EMMpidcount].PROVID = provid; 406 406 demux[demux_id].EMMpids[demux[demux_id].EMMpidcount++].type = type; 407 cs_debug ("[ADD EMMPID] CAID: %04X\tEMM_PID: %04X\tPROVID: %06X - (type %d)", caid, emmpid, provid, type);407 cs_debug_mask(D_DVBAPI, "[ADD EMMPID] CAID: %04X\tEMM_PID: %04X\tPROVID: %06X - (type %d)", caid, emmpid, provid, type); 408 408 } 409 409 … … 411 411 unsigned short i, k; 412 412 413 cs_ddump (buf, len, "cat:");413 cs_ddump_mask(D_DVBAPI, buf, len, "cat:"); 414 414 415 415 for (i = 8; i < (((buf[1] & 0x0F) << 8) | buf[2]) - 1; i += buf[i + 1] + 2) { … … 422 422 case 0x01: 423 423 dvbapi_add_emmpid(demux_id, caid, emm_pid, 0, T_UNIQUE); 424 cs_debug ("[cat] CAID: %04x\tEMM_PID: %04x", caid, emm_pid);424 cs_debug_mask(D_DVBAPI, "[cat] CAID: %04x\tEMM_PID: %04x", caid, emm_pid); 425 425 for (k = i+7; k < i+buf[i+1]+2; k += 4) { 426 426 emm_provider = (buf[k+2] << 8| buf[k+3]); 427 427 emm_pid = (buf[k] & 0x0F) << 8 | buf[k+1]; 428 cs_debug ("[cat] CAID: %04X\tEMM_PID: %04X\tPROVID: %06X", caid, emm_pid, emm_provider);428 cs_debug_mask(D_DVBAPI, "[cat] CAID: %04X\tEMM_PID: %04X\tPROVID: %06X", caid, emm_pid, emm_provider); 429 429 dvbapi_add_emmpid(demux_id, caid, emm_pid, emm_provider, T_SHARED); 430 430 } … … 434 434 if (buf[k]==0x14) { 435 435 emm_provider = buf[k+2] << 16 | (buf[k+3] << 8| (buf[k+4] & 0xF0)); 436 cs_debug ("[cat] CAID: %04x\tEMM_PID: %04x\tPROVID: %06X", caid, emm_pid, emm_provider);436 cs_debug_mask(D_DVBAPI, "[cat] CAID: %04x\tEMM_PID: %04x\tPROVID: %06X", caid, emm_pid, emm_provider); 437 437 dvbapi_add_emmpid(demux_id, caid, emm_pid, emm_provider, T_UNIQUE|T_SHARED|T_GLOBAL); 438 438 } … … 441 441 case 0x18: 442 442 emm_provider = (buf[i+1] == 0x07) ? (buf[i+6] << 16 | (buf[i+7] << 8| (buf[i+8]))) : 0; 443 cs_debug ("[cat] CAID: %04x\tEMM_PID: %04x\tPROVID: %06X", caid, emm_pid, emm_provider);443 cs_debug_mask(D_DVBAPI, "[cat] CAID: %04x\tEMM_PID: %04x\tPROVID: %06X", caid, emm_pid, emm_provider); 444 444 dvbapi_add_emmpid(demux_id, caid, emm_pid, emm_provider, T_UNIQUE|T_SHARED|T_GLOBAL); 445 445 break; 446 446 default: 447 cs_debug ("[cat] CAID: %04x\tEMM_PID: %04x", caid, emm_pid);447 cs_debug_mask(D_DVBAPI, "[cat] CAID: %04x\tEMM_PID: %04x", caid, emm_pid); 448 448 dvbapi_add_emmpid(demux_id, caid, emm_pid, 0, T_UNIQUE|T_SHARED|T_GLOBAL); 449 449 break; … … 492 492 ca_pid2.index = index; 493 493 if (ioctl(ca_fd[i], CA_SET_PID, &ca_pid2)==-1) 494 cs_debug ("Error CA_SET_PID pid=0x%04x index=%d errno=%d", ca_pid2.pid, ca_pid2.index, errno);494 cs_debug_mask(D_DVBAPI, "Error CA_SET_PID pid=0x%04x index=%d errno=%d", ca_pid2.pid, ca_pid2.index, errno); 495 495 else 496 cs_debug ("CA_SET_PID pid=0x%04x index=%d", ca_pid2.pid, ca_pid2.index);496 cs_debug_mask(D_DVBAPI, "CA_SET_PID pid=0x%04x index=%d", ca_pid2.pid, ca_pid2.index); 497 497 } 498 498 } … … 508 508 if (demux[demux_id].program_number==0) return; 509 509 510 cs_debug ("stop descrambling (demux_id: %d)", demux_id);510 cs_debug_mask(D_DVBAPI, "stop descrambling (demux_id: %d)", demux_id); 511 511 512 512 dvbapi_stop_filter(demux_id, TYPE_ECM); … … 597 597 598 598 599 cs_ddump (buffer, len, "emm from fd %d:", demux[demux_index].demux_fd[filter_num].fd);599 cs_ddump_mask(D_DVBAPI, buffer, len, "emm from fd %d:", demux[demux_index].demux_fd[filter_num].fd); 600 600 601 601 struct s_dvbapi_priority *mapentry = dvbapi_check_prio_match(demux_index, demux[demux_index].pidindex, 'm'); 602 602 if (mapentry) { 603 cs_debug ("Mapping EMM from %04X:%06X to %04X:%06X", caid, provider, mapentry->mapcaid, mapentry->mapprovid);603 cs_debug_mask(D_DVBAPI, "Mapping EMM from %04X:%06X to %04X:%06X", caid, provider, mapentry->mapcaid, mapentry->mapprovid); 604 604 caid = mapentry->mapcaid; 605 605 provider = mapentry->mapprovid; … … 692 692 entry->disablefilter=disablefilter; 693 693 694 cs_debug ("stapi prio: ret=%d | %c: %s %s | disable %d", ret, type, entry->devname, entry->pmtfile, disablefilter);694 cs_debug_mask(D_DVBAPI, "stapi prio: ret=%d | %c: %s %s | disable %d", ret, type, entry->devname, entry->pmtfile, disablefilter); 695 695 696 696 if (!dvbapi_priority) { … … 742 742 entry2->srvid=this->srvid; 743 743 744 cs_debug ("prio srvid: ret=%d | %c: %04X %06X %04X %04X %04X -> map %04X %06X | prio %d | delay %d",744 cs_debug_mask(D_DVBAPI, "prio srvid: ret=%d | %c: %04X %06X %04X %04X %04X -> map %04X %06X | prio %d | delay %d", 745 745 ret, entry2->type, entry2->caid, entry2->provid, entry2->srvid, entry2->ecmpid, entry2->chid, entry2->mapcaid, entry2->mapprovid, entry2->force, entry2->delay); 746 746 … … 761 761 } 762 762 763 cs_debug ("prio: ret=%d | %c: %04X %06X %04X %04X %04X -> map %04X %06X | prio %d | delay %d",763 cs_debug_mask(D_DVBAPI, "prio: ret=%d | %c: %04X %06X %04X %04X %04X -> map %04X %06X | prio %d | delay %d", 764 764 ret, entry->type, entry->caid, entry->provid, entry->srvid, entry->ecmpid, entry->chid, entry->mapcaid, entry->mapprovid, entry->force, entry->delay); 765 765 … … 820 820 if (p->type=='p') { 821 821 demux[demux_index].ECMpids[n].status = new_status++; 822 cs_debug ("[PRIORITIZE PID %d] %04X:%06X (position: %d)", n, demux[demux_index].ECMpids[n].CAID, demux[demux_index].ECMpids[n].PROVID, demux[demux_index].ECMpids[n].status);822 cs_debug_mask(D_DVBAPI, "[PRIORITIZE PID %d] %04X:%06X (position: %d)", n, demux[demux_index].ECMpids[n].CAID, demux[demux_index].ECMpids[n].PROVID, demux[demux_index].ECMpids[n].status); 823 823 } else if (p->type=='i') { 824 824 demux[demux_index].ECMpids[n].status = -1; 825 cs_debug ("[IGNORE PID %d] %04X:%06X (file)", n, demux[demux_index].ECMpids[n].CAID, demux[demux_index].ECMpids[n].PROVID);825 cs_debug_mask(D_DVBAPI, "[IGNORE PID %d] %04X:%06X (file)", n, demux[demux_index].ECMpids[n].CAID, demux[demux_index].ECMpids[n].PROVID); 826 826 } 827 827 } … … 841 841 if ((cfg->dvbapi_sidtabno&((SIDTABBITS)1<<nr)) && (chk_srvid_match(&er, sidtab))) { 842 842 demux[demux_index].ECMpids[n].status = -1; //ignore 843 cs_debug ("[IGNORE PID %d] %04X:%06X (service %s) pos %d", n, demux[demux_index].ECMpids[n].CAID, demux[demux_index].ECMpids[n].PROVID, sidtab->label, nr);843 cs_debug_mask(D_DVBAPI, "[IGNORE PID %d] %04X:%06X (service %s) pos %d", n, demux[demux_index].ECMpids[n].CAID, demux[demux_index].ECMpids[n].PROVID, sidtab->label, nr); 844 844 } 845 845 if ((cfg->dvbapi_sidtabok&((SIDTABBITS)1<<nr)) && (chk_srvid_match(&er, sidtab))) { 846 846 demux[demux_index].ECMpids[n].status = new_status++; //priority 847 cs_debug ("[PRIORITIZE PID %d] %04X:%06X (service: %s position: %d)", n, demux[demux_index].ECMpids[n].CAID, demux[demux_index].ECMpids[n].PROVID, sidtab->label, demux[demux_index].ECMpids[n].status);847 cs_debug_mask(D_DVBAPI, "[PRIORITIZE PID %d] %04X:%06X (service: %s position: %d)", n, demux[demux_index].ECMpids[n].CAID, demux[demux_index].ECMpids[n].PROVID, sidtab->label, demux[demux_index].ECMpids[n].status); 848 848 } 849 849 } … … 878 878 break; 879 879 880 cs_debug ("[pmt] type: %02x\tlength: %d", buffer[j], descriptor_length);880 cs_debug_mask(D_DVBAPI, "[pmt] type: %02x\tlength: %d", buffer[j], descriptor_length); 881 881 882 882 if (buffer[j] != 0x09) continue; … … 952 952 dvbapi_stop_filter(demux_id, TYPE_ECM); 953 953 954 cs_debug ("[TRY PID %d] CAID: %04X PROVID: %06X CA_PID: %04X", num, demux[demux_id].ECMpids[num].CAID, demux[demux_id].ECMpids[num].PROVID, demux[demux_id].ECMpids[num].ECM_PID);954 cs_debug_mask(D_DVBAPI, "[TRY PID %d] CAID: %04X PROVID: %06X CA_PID: %04X", num, demux[demux_id].ECMpids[num].CAID, demux[demux_id].ECMpids[num].PROVID, demux[demux_id].ECMpids[num].ECM_PID); 955 955 #ifdef AZBOX 956 956 openxcas_provid = demux[demux_id].ECMpids[num].PROVID; … … 979 979 } 980 980 981 cs_ddump (buffer, length, "capmt:");981 cs_ddump_mask(D_DVBAPI, buffer, length, "capmt:"); 982 982 983 983 for (i = 0; i < MAX_DEMUX; i++) { … … 1043 1043 demux[demux_id].pidindex=-1; 1044 1044 1045 cs_debug ("id: %d\tdemux_index: %d\tca_mask: %02x\tprogram_info_length: %d\tca_pmt_list_management %02x",1045 cs_debug_mask(D_DVBAPI, "id: %d\tdemux_index: %d\tca_mask: %02x\tprogram_info_length: %d\tca_pmt_list_management %02x", 1046 1046 demux_id, demux[demux_id].demux_index, demux[demux_id].ca_mask, program_info_length, ca_pmt_list_management); 1047 1047 … … 1058 1058 es_info_length = ((buffer[i + 3] & 0x0F) << 8) | buffer[i + 4]; 1059 1059 1060 cs_debug ("[pmt] stream_type: %02x\tpid: %04x\tlength: %d", stream_type, elementary_pid, es_info_length);1060 cs_debug_mask(D_DVBAPI, "[pmt] stream_type: %02x\tpid: %04x\tlength: %d", stream_type, elementary_pid, es_info_length); 1061 1061 1062 1062 if (demux[demux_id].STREAMpidcount >= ECM_PIDS) … … 1069 1069 } 1070 1070 } 1071 cs_debug ("Found %d ECMpids and %d STREAMpids in PMT", demux[demux_id].ECMpidcount, demux[demux_id].STREAMpidcount);1071 cs_debug_mask(D_DVBAPI, "Found %d ECMpids and %d STREAMpids in PMT", demux[demux_id].ECMpidcount, demux[demux_id].STREAMpidcount); 1072 1072 1073 1073 char *name = get_servicename(demux[demux_id].program_number, demux[demux_id].ECMpidcount>0 ? demux[demux_id].ECMpids[0].CAID : 0); … … 1126 1126 case 0x3f: 1127 1127 //9F 80 3f 04 83 02 00 <demux index> 1128 cs_ddump (buffer, len, "capmt 3f:");1128 cs_ddump_mask(D_DVBAPI, buffer, len, "capmt 3f:"); 1129 1129 // ipbox fix 1130 1130 if (cfg->dvbapi_boxtype==BOXTYPE_IPBOX) { … … 1339 1339 } 1340 1340 1341 cs_ddump (dest,len/2,"QboxHD pmt.tmp:");1341 cs_ddump_mask(D_DVBAPI, dest,len/2,"QboxHD pmt.tmp:"); 1342 1342 1343 1343 pmt_id = dvbapi_parse_capmt(dest+4, (len/2)-4, -1, dp->d_name); … … 1347 1347 continue; 1348 1348 } 1349 cs_ddump (mbuf,len,"pmt:");1349 cs_ddump_mask(D_DVBAPI, mbuf,len,"pmt:"); 1350 1350 1351 1351 memcpy(dest, "\x03\xFF\xFF\x00\x00\x13\x00", 7); … … 1389 1389 1390 1390 #ifdef COOL 1391 cs_debug ("dvbapi_process_input: demux %d filter %d len %d buffer %x curtable %x curindex %d\n", demux_id, filter_num, len, buffer[0], curpid->table, demux[demux_id].curindex);1391 cs_debug_mask(D_DVBAPI, "dvbapi_process_input: demux %d filter %d len %d buffer %x curtable %x curindex %d\n", demux_id, filter_num, len, buffer[0], curpid->table, demux[demux_id].curindex); 1392 1392 #endif 1393 1393 if (demux[demux_id].demux_fd[filter_num].type==TYPE_ECM) { … … 1414 1414 struct s_dvbapi_priority *chidentry = dvbapi_check_prio_match(demux_id, demux[demux_id].demux_fd[filter_num].pidindex, 'i'); 1415 1415 if (chidentry) { 1416 cs_debug ("ignoring %04X:%06X:%02X", curpid->CAID, curpid->PROVID, curpid->irdeto_chid);1416 cs_debug_mask(D_DVBAPI, "ignoring %04X:%06X:%02X", curpid->CAID, curpid->PROVID, curpid->irdeto_chid); 1417 1417 dvbapi_try_next_caid(demux_id); 1418 1418 return; … … 1457 1457 1458 1458 if (mapentry) { 1459 cs_debug ("Mapping ECM from %04X:%06X to %04X:%06X", er->caid, er->prid, mapentry->mapcaid, mapentry->mapprovid);1459 cs_debug_mask(D_DVBAPI, "Mapping ECM from %04X:%06X to %04X:%06X", er->caid, er->prid, mapentry->mapcaid, mapentry->mapprovid); 1460 1460 er->caid = mapentry->mapcaid; 1461 1461 er->prid = mapentry->mapprovid; … … 1465 1465 memcpy(er->ecm, buffer, er->l); 1466 1466 1467 cs_debug ("request cw for caid %04X provid %06X srvid %04X pid %04X chid %02X", er->caid, er->prid, er->srvid, er->pid, (caid >> 8) == 0x06 ? buffer[7] : 0);1467 cs_debug_mask(D_DVBAPI, "request cw for caid %04X provid %06X srvid %04X pid %04X chid %02X", er->caid, er->prid, er->srvid, er->pid, (caid >> 8) == 0x06 ? buffer[7] : 0); 1468 1468 get_cw(dvbapi_client, er); 1469 1469 } … … 1471 1471 if (demux[demux_id].demux_fd[filter_num].type==TYPE_EMM) { 1472 1472 if (buffer[0]==0x01) { //CAT 1473 cs_debug ("receiving cat");1473 cs_debug_mask(D_DVBAPI, "receiving cat"); 1474 1474 dvbapi_parse_cat(demux_id, buffer, len); 1475 1475 … … 1619 1619 for (i = 0; i < pfdcount; i++) { 1620 1620 if (pfd2[i].revents > 3) 1621 cs_debug ("event %d on fd %d", pfd2[i].revents, pfd2[i].fd);1621 cs_debug_mask(D_DVBAPI, "event %d on fd %d", pfd2[i].revents, pfd2[i].fd); 1622 1622 1623 1623 if (pfd2[i].revents & (POLLHUP | POLLNVAL)) { … … 1644 1644 if (pfd2[i].fd==listenfd) { 1645 1645 connfd = accept(listenfd, (struct sockaddr *)&servaddr, (socklen_t *)&clilen); 1646 cs_debug ("new socket connection fd: %d", connfd);1646 cs_debug_mask(D_DVBAPI, "new socket connection fd: %d", connfd); 1647 1647 1648 1648 disable_pmt_files=1; … … 1653 1653 } 1654 1654 } else { 1655 cs_debug ("PMT Update on socket %d.", pfd2[i].fd);1655 cs_debug_mask(D_DVBAPI, "PMT Update on socket %d.", pfd2[i].fd); 1656 1656 connfd = pfd2[i].fd; 1657 1657 } … … 1660 1660 1661 1661 if (len < 3) { 1662 cs_debug ("camd.socket: too short message received");1662 cs_debug_mask(D_DVBAPI, "camd.socket: too short message received"); 1663 1663 continue; 1664 1664 } … … 1700 1700 memcpy(ca_descr.cw,cw+(n*8),8); 1701 1701 #ifdef COOL 1702 cs_debug ("write cw%d index: %d (ca_mask %d)", n, ca_descr.index, demux[demux_id].ca_mask);1702 cs_debug_mask(D_DVBAPI, "write cw%d index: %d (ca_mask %d)", n, ca_descr.index, demux[demux_id].ca_mask); 1703 1703 coolapi_write_cw(demux[demux_id].ca_mask, demux[demux_id].STREAMpids, demux[demux_id].STREAMpidcount, &ca_descr); 1704 1704 #else … … 1706 1706 for (i=0;i<8;i++) { 1707 1707 if (demux[demux_id].ca_mask & (1 << i)) { 1708 cs_debug ("write cw%d index: %d (ca%d)", n, ca_descr.index, i);1708 cs_debug_mask(D_DVBAPI, "write cw%d index: %d (ca%d)", n, ca_descr.index, i); 1709 1709 if (ca_fd[i]<=0) { 1710 1710 ca_fd[i]=dvbapi_open_device(1, i, demux[demux_id].adapter_index); … … 1714 1714 1715 1715 if (ioctl(ca_fd[i], CA_SET_DESCR, &ca_descr) < 0) 1716 cs_debug ("Error CA_SET_DESCR");1716 cs_debug_mask(D_DVBAPI, "Error CA_SET_DESCR"); 1717 1717 } 1718 1718 } … … 1755 1755 1756 1756 if (er->rc>3) { 1757 cs_debug ("cw not found");1757 cs_debug_mask(D_DVBAPI, "cw not found"); 1758 1758 return; 1759 1759 } … … 1762 1762 if (delayentry) { 1763 1763 if (delayentry->delay<1000) { 1764 cs_debug ("wait %d ms", delayentry->delay);1764 cs_debug_mask(D_DVBAPI, "wait %d ms", delayentry->delay); 1765 1765 cs_sleepms(delayentry->delay); 1766 1766 } … … 1822 1822 #ifdef AZBOX 1823 1823 void azbox_openxcas_ecm_callback(int stream_id, unsigned int seq, int cipher_index, unsigned int caid, unsigned char *ecm_data, int l, unsigned short pid) { 1824 cs_debug ("openxcas: ecm callback received");1824 cs_debug_mask(D_DVBAPI, "openxcas: ecm callback received"); 1825 1825 1826 1826 openxcas_stream_id = stream_id; … … 1842 1842 memcpy(er->ecm, ecm_data, er->l); 1843 1843 1844 cs_debug ("request cw for caid %04X provid %06X srvid %04X pid %04X", er->caid, er->prid, er->srvid, er->pid);1844 cs_debug_mask(D_DVBAPI, "request cw for caid %04X provid %06X srvid %04X pid %04X", er->caid, er->prid, er->srvid, er->pid); 1845 1845 get_cw(dvbapi_client, er); 1846 1846 … … 1865 1865 1866 1866 if (pfd.revents & (POLLHUP | POLLNVAL)) { 1867 cs_debug ("openxcas: ecm/cw error");1867 cs_debug_mask(D_DVBAPI, "openxcas: ecm/cw error"); 1868 1868 break; 1869 1869 } … … 1878 1878 1879 1879 void azbox_openxcas_ex_callback(int stream_id, unsigned int seq, int idx, unsigned int pid, unsigned char *ecm_data, int l) { 1880 cs_debug ("openxcas: ex callback received");1880 cs_debug_mask(D_DVBAPI, "openxcas: ex callback received"); 1881 1881 1882 1882 openxcas_stream_id = stream_id; … … 1896 1896 memcpy(er->ecm, ecm_data, er->l); 1897 1897 1898 cs_debug ("request cw for caid %04X provid %06X srvid %04X pid %04X", er->caid, er->prid, er->srvid, er->pid);1898 cs_debug_mask(D_DVBAPI, "request cw for caid %04X provid %06X srvid %04X pid %04X", er->caid, er->prid, er->srvid, er->pid); 1899 1899 get_cw(dvbapi_client, er); 1900 1900 … … 1902 1902 cs_log("openxcas: unable to stop ex filter"); 1903 1903 else 1904 cs_debug ("openxcas: ex filter stopped");1904 cs_debug_mask(D_DVBAPI, "openxcas: ex filter stopped"); 1905 1905 1906 1906 struct timeb tp; … … 1922 1922 cs_log("openxcas: unable to start ex filter"); 1923 1923 else 1924 cs_debug ("openxcas: ex filter started, pid = %x", openxcas_ecm_pid);1924 cs_debug_mask(D_DVBAPI, "openxcas: ex filter started, pid = %x", openxcas_ecm_pid); 1925 1925 } 1926 1926 … … 1962 1962 switch(msg.cmd) { 1963 1963 case OPENXCAS_SELECT_CHANNEL: 1964 cs_debug ("openxcas: msg: OPENXCAS_SELECT_CHANNEL");1964 cs_debug_mask(D_DVBAPI, "openxcas: msg: OPENXCAS_SELECT_CHANNEL"); 1965 1965 1966 1966 // parse channel info … … 1975 1975 break; 1976 1976 case OPENXCAS_START_PMT_ECM: 1977 cs_debug ("openxcas: msg: OPENXCAS_START_PMT_ECM");1977 cs_debug_mask(D_DVBAPI, "openxcas: msg: OPENXCAS_START_PMT_ECM"); 1978 1978 1979 1979 // parse pmt … … 2002 2002 cs_log("openxcas: unable to add ecm filter"); 2003 2003 else 2004 cs_debug ("openxcas: ecm filter added, pid = %x, caid = %x", openxcas_ecm_pid, 0);2004 cs_debug_mask(D_DVBAPI, "openxcas: ecm filter added, pid = %x, caid = %x", openxcas_ecm_pid, 0); 2005 2005 2006 2006 if (openxcas_start_filter(msg.stream_id, msg.sequence, OPENXCAS_FILTER_ECM) < 0) 2007 2007 cs_log("openxcas: unable to start ecm filter"); 2008 2008 else 2009 cs_debug ("openxcas: ecm filter started");2009 cs_debug_mask(D_DVBAPI, "openxcas: ecm filter started"); 2010 2010 2011 2011 if (!openxcas_create_cipher_ex(msg.stream_id, openxcas_seq, 0, openxcas_ecm_pid, openxcas_video_pid, 0xffff, openxcas_audio_pid, 0xffff, 0xffff, 0xffff)) 2012 2012 cs_log("openxcas: failed to create cipher ex"); 2013 2013 else 2014 cs_debug ("openxcas: cipher created");2014 cs_debug_mask(D_DVBAPI, "openxcas: cipher created"); 2015 2015 break; 2016 2016 case OPENXCAS_STOP_PMT_ECM: 2017 cs_debug ("openxcas: msg: OPENXCAS_STOP_PMT_ECM");2017 cs_debug_mask(D_DVBAPI, "openxcas: msg: OPENXCAS_STOP_PMT_ECM"); 2018 2018 openxcas_stop_filter(msg.stream_id, OPENXCAS_FILTER_ECM); 2019 2019 openxcas_remove_filter(msg.stream_id, OPENXCAS_FILTER_ECM); … … 2023 2023 break; 2024 2024 case OPENXCAS_ECM_CALLBACK: 2025 cs_debug ("openxcas: msg: OPENXCAS_ECM_CALLBACK");2025 cs_debug_mask(D_DVBAPI, "openxcas: msg: OPENXCAS_ECM_CALLBACK"); 2026 2026 struct stOpenXCAS_Data data; 2027 2027 memcpy(&data, msg.buf, msg.buf_len); … … 2030 2030 break; 2031 2031 case OPENXCAS_PID_FILTER_CALLBACK: 2032 cs_debug ("openxcas: msg: OPENXCAS_PID_FILTER_CALLBACK");2032 cs_debug_mask(D_DVBAPI, "openxcas: msg: OPENXCAS_PID_FILTER_CALLBACK"); 2033 2033 openxcas_filter_callback_ex(msg.stream_id, msg.sequence, (struct stOpenXCAS_Data *)msg.buf); 2034 2034 break; 2035 2035 case OPENXCAS_QUIT: 2036 cs_debug ("openxcas: msg: OPENXCAS_QUIT");2036 cs_debug_mask(D_DVBAPI, "openxcas: msg: OPENXCAS_QUIT"); 2037 2037 openxcas_close(); 2038 2038 cs_log("openxcas: exited"); … … 2041 2041 case OPENXCAS_UKNOWN_MSG: 2042 2042 default: 2043 cs_debug ("openxcas: msg: OPENXCAS_UKNOWN_MSG (%d)", msg.cmd);2044 //cs_ddump (&msg, sizeof(msg), "msg dump:");2043 cs_debug_mask(D_DVBAPI, "openxcas: msg: OPENXCAS_UKNOWN_MSG (%d)", msg.cmd); 2044 //cs_ddump_mask(D_DVBAPI, &msg, sizeof(msg), "msg dump:"); 2045 2045 break; 2046 2046 } … … 2052 2052 2053 2053 void azbox_send_dcw(struct s_client *client, ECM_REQUEST *er) { 2054 cs_debug ("openxcas: send_dcw");2054 cs_debug_mask(D_DVBAPI, "openxcas: send_dcw"); 2055 2055 2056 2056 openxcas_busy = 0; … … 2059 2059 for (i=0; i < MAX_DEMUX; i++) { 2060 2060 if (er->rc > 3) { 2061 cs_debug ("cw not found");2061 cs_debug_mask(D_DVBAPI, "cw not found"); 2062 2062 2063 2063 if (demux[i].pidindex==-1) … … 2080 2080 cs_log("openxcas: unable to add ecm filter (%04x)", openxcas_caid); 2081 2081 else 2082 cs_debug ("openxcas: ecm filter added, pid = %x, caid = %x", openxcas_ecm_pid, openxcas_caid);2082 cs_debug_mask(D_DVBAPI, "openxcas: ecm filter added, pid = %x, caid = %x", openxcas_ecm_pid, openxcas_caid); 2083 2083 } else 2084 cs_debug ("openxcas: ecm filter added, pid = %x, caid = %x", openxcas_ecm_pid, 0);2084 cs_debug_mask(D_DVBAPI, "openxcas: ecm filter added, pid = %x, caid = %x", openxcas_ecm_pid, 0); 2085 2085 2086 2086 if (openxcas_start_filter(openxcas_stream_id, openxcas_seq, OPENXCAS_FILTER_ECM) < 0) 2087 2087 cs_log("openxcas: unable to start ecm filter"); 2088 2088 else 2089 cs_debug ("openxcas: ecm filter started");2089 cs_debug_mask(D_DVBAPI, "openxcas: ecm filter started"); 2090 2090 2091 2091 return; … … 2107 2107 cs_log("openxcas: set cw failed"); 2108 2108 else 2109 cs_ddump (openxcas_cw, 16, "openxcas: write cws to descrambler");2109 cs_ddump_mask(D_DVBAPI, openxcas_cw, 16, "openxcas: write cws to descrambler"); 2110 2110 } 2111 2111 #endif
Note:
See TracChangeset
for help on using the changeset viewer.