Changeset 3683
Legend:
- Unmodified
- Added
- Removed
-
trunk/globals.h
r3682 r3683 517 517 int checked; 518 518 uchar cw_checked[16]; 519 intorigin_reader;519 struct s_reader *origin_reader; 520 520 #endif 521 521 -
trunk/module-dvbapi.c
r3682 r3683 18 18 void * azbox_main(void * cli); 19 19 #endif 20 21 extern struct s_reader reader[CS_MAXREADER];22 20 23 21 const char *boxdesc[] = { "none", "dreambox", "duckbox", "ufs910", "dbox2", "ipbox", "ipbox-pmt", "dm7000", "qboxhd" }; -
trunk/oscam.c
r3682 r3683 1518 1518 #ifdef CS_WITH_GBOX 1519 1519 if(reader[er->reader[0]].typ==R_GBOX) 1520 snprintf(sby, sizeof(sby)-1, " by %s(%04X)", reader[er->reader[0]].label,er->gbxCWFrom);1520 snprintf(sby, sizeof(sby)-1, " by %s(%04X)", er->reader0->label,er->gbxCWFrom); 1521 1521 else 1522 1522 #endif … … 1648 1648 if (er->checked == 0) {//First CW, save it and wait for next one 1649 1649 er->checked = 1; 1650 er->origin_reader = er-> reader[0]; //contains ridx1650 er->origin_reader = er->selected_reader; 1651 1651 memcpy(er->cw_checked, er->cw, sizeof(er->cw)); 1652 cs_log("DOUBLE CHECK FIRST CW by %s idx %d cpti %d", reader[er->origin_reader].label, er->idx, er->cpti);1652 cs_log("DOUBLE CHECK FIRST CW by %s idx %d cpti %d", er->origin_reader->label, er->idx, er->cpti); 1653 1653 } 1654 else if (er->origin_reader != er-> reader[0]) { //Second (or third and so on) cw. We have to compare1654 else if (er->origin_reader != er->selected_reader) { //Second (or third and so on) cw. We have to compare 1655 1655 if (memcmp(er->cw_checked, er->cw, sizeof(er->cw)) == 0) { 1656 1656 er->checked++; 1657 cs_log("DOUBLE CHECKED! %d. CW by %s idx %d cpti %d", er->checked, reader[er->reader[0]].label, er->idx, er->cpti);1657 cs_log("DOUBLE CHECKED! %d. CW by %s idx %d cpti %d", er->checked, er->selected_reader->label, er->idx, er->cpti); 1658 1658 } 1659 1659 else { 1660 cs_log("DOUBLE CHECKED NONMATCHING! %d. CW by %s idx %d cpti %d", er->checked, reader[er->reader[0]].label, er->idx, er->cpti);1660 cs_log("DOUBLE CHECKED NONMATCHING! %d. CW by %s idx %d cpti %d", er->checked, er->selected_reader->label, er->idx, er->cpti); 1661 1661 } 1662 1662 }
Note:
See TracChangeset
for help on using the changeset viewer.