X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/cbac9c97087fc64f86326060a4360a23538d57e0..d43e4676bd757d1de73b8dd669154ffd42192b10:/lib/dvb_ci/dvbci.cpp diff --git a/lib/dvb_ci/dvbci.cpp b/lib/dvb_ci/dvbci.cpp index 7d96a296..b182a360 100644 --- a/lib/dvb_ci/dvbci.cpp +++ b/lib/dvb_ci/dvbci.cpp @@ -66,6 +66,16 @@ eDVBCISlot *eDVBCIInterfaces::getSlot(int slotid) return 0; } +int eDVBCIInterfaces::getSlotState(int slotid) +{ + eDVBCISlot *slot; + + if( (slot = getSlot(slotid)) == 0 ) + return eDVBCISlot::stateInvalid; + + return slot->getState(); +} + int eDVBCIInterfaces::reset(int slotid) { eDVBCISlot *slot; @@ -74,6 +84,7 @@ int eDVBCIInterfaces::reset(int slotid) return -1; eDVBCISession::deleteSessions(slot); + ciRemoved(slot); return slot->reset(); } @@ -86,28 +97,25 @@ int eDVBCIInterfaces::enableTS(int slotid, int enable) return -1; int tunernum = 0; - if (enable) + PMTHandlerList::iterator it = m_pmt_handlers.begin(); + while (it != m_pmt_handlers.end()) { - PMTHandlerList::iterator it = m_pmt_handlers.begin(); - while (it != m_pmt_handlers.end()) + if ( it->cislot == slot ) { - if ( it->cislot == slot ) + eDVBServicePMTHandler *pmthandler = it->pmthandler; + eUsePtr channel; + if (!pmthandler->getChannel(channel)) { - eDVBServicePMTHandler *pmthandler = it->pmthandler; - eUsePtr channel; - if (!pmthandler->getChannel(channel)) + ePtr frontend; + if (!channel->getFrontend(frontend)) { - ePtr frontend; - if (!channel->getFrontend(frontend)) - { - eDVBFrontend *fe = (eDVBFrontend*) &(*frontend); - tunernum = fe->getID(); - } + eDVBFrontend *fe = (eDVBFrontend*) &(*frontend); + tunernum = fe->getID(); } - break; } - ++it; + break; } + ++it; } return slot->enableTS(enable, tunernum); } @@ -119,19 +127,9 @@ int eDVBCIInterfaces::initialize(int slotid) if( (slot = getSlot(slotid)) == 0 ) return -1; - slot->resetPrevSentCAPMTVersion(); - PMTHandlerList::iterator it = m_pmt_handlers.begin(); - while (it != m_pmt_handlers.end()) - { - if ( it->cislot == slot ) - { - slot->sendCAPMT(it->pmthandler); // send capmt - break; - } - ++it; - } + slot->removeService(); - return slot->initialize(); + return sendCAPMT(slotid); } int eDVBCIInterfaces::sendCAPMT(int slotid) @@ -141,19 +139,15 @@ int eDVBCIInterfaces::sendCAPMT(int slotid) if( (slot = getSlot(slotid)) == 0 ) return -1; - slot->resetPrevSentCAPMTVersion(); PMTHandlerList::iterator it = m_pmt_handlers.begin(); while (it != m_pmt_handlers.end()) { if ( it->cislot == slot ) - { slot->sendCAPMT(it->pmthandler); // send capmt - return 0; - } ++it; } - return -1; + return 0; } int eDVBCIInterfaces::startMMI(int slotid) @@ -206,44 +200,147 @@ int eDVBCIInterfaces::cancelEnq(int slotid) return slot->cancelEnq(); } -void eDVBCIInterfaces::addPMTHandler(eDVBServicePMTHandler *pmthandler) +void eDVBCIInterfaces::ciRemoved(eDVBCISlot *slot) { - CIPmtHandler new_handler(pmthandler); - - eServiceReferenceDVB service; - pmthandler->getService(service); - - eDebug("[eDVBCIInterfaces] addPMTHandler %s", service.toString().c_str()); - - // HACK the first service get the CI.. - eSmartPtrList::iterator ci_it(m_slots.begin()); - for (; ci_it != m_slots.end(); ++ci_it) + for (PMTHandlerList::iterator it(m_pmt_handlers.begin()); + it != m_pmt_handlers.end(); ++it) { - if (ci_it->use_count) - continue; - ci_it->use_count=1; - new_handler.cislot = ci_it; - new_handler.cislot->resetPrevSentCAPMTVersion(); + if (it->cislot == slot) + { + eServiceReferenceDVB ref; + it->pmthandler->getServiceReference(ref); + slot->removeService(ref.getServiceID().get()); + if (!--slot->use_count) + enableTS(slot->getSlotID(), 0); + it->cislot=0; + } } +} - if (ci_it == m_slots.end()) +void eDVBCIInterfaces::recheckPMTHandlers() +{ +// eDebug("recheckPMTHAndlers()"); + for (PMTHandlerList::iterator it(m_pmt_handlers.begin()); + it != m_pmt_handlers.end(); ++it) { - PMTHandlerList::iterator it = m_pmt_handlers.begin(); - while (it != m_pmt_handlers.end()) + CAID_LIST caids; + ePtr service; + eServiceReferenceDVB ref; + eDVBServicePMTHandler *pmthandler = it->pmthandler; + eDVBServicePMTHandler::program p; + + pmthandler->getServiceReference(ref); + pmthandler->getService(service); + if (!pmthandler->getProgramInfo(p)) { - eServiceReferenceDVB ref; - it->pmthandler->getService(ref); - if ( service == ref && it->cislot ) + int cnt=0; + for (std::set::reverse_iterator x(p.caids.rbegin()); x != p.caids.rend(); ++x, ++cnt) + caids.push_front(*x); + if (service && cnt) + service->m_ca = caids; + } + + if (it->cislot) + continue; // already running + + if (service) + caids = service->m_ca; + + if (!caids.empty()) + { + for (eSmartPtrList::iterator ci_it(m_slots.begin()); ci_it != m_slots.end(); ++ci_it) { - new_handler.cislot = it->cislot; - ++new_handler.cislot->use_count; - break; + if (ci_it->getState() == eDVBCISlot::stateInvalid) + ci_it->reset(); + + bool useThis=false; + eDVBCICAManagerSession *ca_manager = ci_it->getCAManager(); + if (ca_manager) + { + const std::vector &ci_caids = ca_manager->getCAIDs(); + for (CAID_LIST::iterator ca(caids.begin()); ca != caids.end(); ++ca) + { + std::vector::const_iterator z = + std::lower_bound(ci_caids.begin(), ci_caids.end(), *ca); + if ( z != ci_caids.end() && *z == *ca ) + { + eDebug("found ci for caid %04x", *z); + useThis=true; + break; + } + } + } + + if (useThis) + { + bool send_ca_pmt = false; + if (ci_it->use_count) // check if this CI can descramble more than one service + { + PMTHandlerList::iterator tmp = m_pmt_handlers.begin(); + while (tmp != m_pmt_handlers.end()) + { + if ( tmp->cislot ) + { + bool canHandleMultipleServices=false; + eServiceReferenceDVB ref2; + tmp->pmthandler->getServiceReference(ref2); + eDVBChannelID s1, s2; + if (ref != ref2) + { + ref.getChannelID(s1); + ref2.getChannelID(s2); + // FIXME .. build a "ci can handle multiple services" config entry + // Yes / No / Auto + if ( eDVBCI_UI::getInstance()->getAppName(ci_it->getSlotID()) == "AlphaCrypt" ) + { + canHandleMultipleServices = true; + eDebug("Alphacrypt can handle multiple services"); + } + } + if (ref == ref2 || (s1 == s2 && canHandleMultipleServices) ) + { + it->cislot = tmp->cislot; + ++it->cislot->use_count; + send_ca_pmt = true; +// eDebug("usecount now %d", it->cislot->use_count); + break; + } + } + ++tmp; + } + } + else + { + ci_it->use_count=1; + it->cislot = ci_it; +// eDebug("usecount now %d", it->cislot->use_count); + enableTS(ci_it->getSlotID(), 1); + send_ca_pmt = true; + } + if (send_ca_pmt) + gotPMT(pmthandler); + } } - ++it; } } +} - m_pmt_handlers.push_back(new_handler); +void eDVBCIInterfaces::addPMTHandler(eDVBServicePMTHandler *pmthandler) +{ + // check if this pmthandler is already registered + PMTHandlerList::iterator it = m_pmt_handlers.begin(); + while (it != m_pmt_handlers.end()) + { + if ( *it++ == pmthandler ) + return; + } + + eServiceReferenceDVB ref; + pmthandler->getServiceReference(ref); + eDebug("[eDVBCIInterfaces] addPMTHandler %s", ref.toString().c_str()); + + m_pmt_handlers.push_back(CIPmtHandler(pmthandler)); + recheckPMTHandlers(); } void eDVBCIInterfaces::removePMTHandler(eDVBServicePMTHandler *pmthandler) @@ -252,41 +349,52 @@ void eDVBCIInterfaces::removePMTHandler(eDVBServicePMTHandler *pmthandler) if (it != m_pmt_handlers.end()) { eDVBCISlot *slot = it->cislot; -// eDVBServicePMTHandler *pmthandler = it->pmthandler; + eDVBServicePMTHandler *pmthandler = it->pmthandler; m_pmt_handlers.erase(it); - if (slot && !--slot->use_count) + + eServiceReferenceDVB service_to_remove; + pmthandler->getServiceReference(service_to_remove); + + bool sameServiceExist=false; + for (PMTHandlerList::iterator i=m_pmt_handlers.begin(); i != m_pmt_handlers.end(); ++i) { -#if 0 - eDebug("[eDVBCIInterfaces] remove last pmt handler for service %s send empty capmt"); - std::vector caids; - caids.push_back(0xFFFF); - slot->resetPrevSentCAPMTVersion(); - slot->sendCAPMT(pmthandler, caids); -#endif - // check if another service is running - it = m_pmt_handlers.begin(); - while (it != m_pmt_handlers.end()) + eServiceReferenceDVB ref; + i->pmthandler->getServiceReference(ref); + if ( ref == service_to_remove ) { - if ( !it->cislot ) - { - it->cislot = slot; - ++slot->use_count; - slot->resetPrevSentCAPMTVersion(); - slot->sendCAPMT(it->pmthandler); - break; - } - ++it; + sameServiceExist=true; + break; + } + } + + if (slot && !sameServiceExist) + { + if (slot->getNumOfServices() > 1) + { + eDebug("[eDVBCIInterfaces] remove last pmt handler for service %s send empty capmt", + service_to_remove.toString().c_str()); + std::vector caids; + caids.push_back(0xFFFF); + slot->sendCAPMT(pmthandler, caids); // send a capmt without caids to remove a running service } + slot->removeService(service_to_remove.getServiceID().get()); + } + + if (slot && !--slot->use_count) + { + ASSERT(!slot->getNumOfServices()); + enableTS(slot->getSlotID(),0); } } + // check if another service is waiting for the CI + recheckPMTHandlers(); } void eDVBCIInterfaces::gotPMT(eDVBServicePMTHandler *pmthandler) { eDebug("[eDVBCIInterfaces] gotPMT"); PMTHandlerList::iterator it=std::find(m_pmt_handlers.begin(), m_pmt_handlers.end(), pmthandler); - eServiceReferenceDVB service; - if ( it != m_pmt_handlers.end() && it->cislot) + if (it != m_pmt_handlers.end() && it->cislot) it->cislot->sendCAPMT(pmthandler); } @@ -302,67 +410,83 @@ int eDVBCIInterfaces::getMMIState(int slotid) int eDVBCISlot::send(const unsigned char *data, size_t len) { - int res; + int res=0; //int i; //printf("< "); //for(i=0;isetRequested(eSocketNotifier::Read | eSocketNotifier::Priority | eSocketNotifier::Write); + if (res < 0 || (unsigned int)res != len) + { + unsigned char *d = new unsigned char[len]; + memcpy(d, data, len); + sendqueue.push( queueData(d, len) ); + notifier->setRequested(eSocketNotifier::Read | eSocketNotifier::Priority | eSocketNotifier::Write); + } return res; } void eDVBCISlot::data(int what) { + if (state == stateInvalid) + return; if(what == eSocketNotifier::Priority) { if(state != stateRemoved) { state = stateRemoved; - enableTS(0); printf("ci removed\n"); + while(sendqueue.size()) + { + delete [] sendqueue.top().data; + sendqueue.pop(); + } + eDVBCIInterfaces::getInstance()->ciRemoved(this); eDVBCISession::deleteSessions(this); notifier->setRequested(eSocketNotifier::Read); - //HACK - eDVBCI_UI::getInstance()->setState(0,0); + eDVBCI_UI::getInstance()->setState(getSlotID(),0); } return; } - __u8 data[4096]; - int r; - r = ::read(fd, data, 4096); - if(state != stateInserted) { - state = stateInserted; eDebug("ci inserted"); - - //HACK - eDVBCI_UI::getInstance()->setState(0,1); - + state = stateInserted; + eDVBCI_UI::getInstance()->setState(getSlotID(),1); + notifier->setRequested(eSocketNotifier::Read|eSocketNotifier::Priority); /* enable PRI to detect removal or errors */ - notifier->setRequested(eSocketNotifier::Read|eSocketNotifier::Priority|eSocketNotifier::Write); } - if(r > 0) { - //int i; - //printf("> "); - //for(i=0;isetRequested(eSocketNotifier::Read|eSocketNotifier::Priority|eSocketNotifier::Write); - return; + if (what & eSocketNotifier::Read) { + __u8 data[4096]; + int r; + r = ::read(fd, data, 4096); + if(r > 0) { +// int i; +// printf("> "); +// for(i=0;isetRequested(eSocketNotifier::Read | eSocketNotifier::Priority); + else if (what & eSocketNotifier::Write) { + if (!sendqueue.empty()) { + const queueData &qe = sendqueue.top(); + int res = ::write(fd, qe.data, qe.len); + if (res >= 0 && (unsigned int)res == qe.len) + { + delete [] qe.data; + sendqueue.pop(); + } } + else + notifier->setRequested(eSocketNotifier::Read|eSocketNotifier::Priority); } } @@ -384,22 +508,22 @@ eDVBCISlot::eDVBCISlot(eMainloop *context, int nr) fd = ::open(filename, O_RDWR | O_NONBLOCK); eDebug("eDVBCISlot has fd %d", fd); - - state = stateInserted; + state = stateInvalid; if (fd >= 0) { - notifier = new eSocketNotifier(context, fd, eSocketNotifier::Read | eSocketNotifier::Priority); + notifier = new eSocketNotifier(context, fd, eSocketNotifier::Read | eSocketNotifier::Priority | eSocketNotifier::Write); CONNECT(notifier->activated, eDVBCISlot::data); } else { perror(filename); } + + enableTS(0, 0); } eDVBCISlot::~eDVBCISlot() { - enableTS(0); } void eDVBCISlot::setAppManager( eDVBCIApplicationManagerSession *session ) @@ -426,19 +550,25 @@ int eDVBCISlot::reset() { printf("edvbcislot: reset requested\n"); - enableTS(0); + if (state == stateInvalid) + { + unsigned char buf[256]; + eDebug("ci flush"); + while(::read(fd, buf, 256)>0); + state = stateResetted; + } + + while(sendqueue.size()) + { + delete [] sendqueue.top().data; + sendqueue.pop(); + } ioctl(fd, 0); return 0; } -int eDVBCISlot::initialize() -{ - printf("edvbcislot: initialize()\n"); - return 0; -} - int eDVBCISlot::startMMI() { printf("edvbcislot: startMMI()\n"); @@ -513,18 +643,34 @@ int eDVBCISlot::sendCAPMT(eDVBServicePMTHandler *pmthandler, const std::vectorgetSpec(table_spec); int pmt_version = table_spec.version & 0x1F; // just 5 bits - if ( pmt_version == prev_sent_capmt_version ) + + eServiceReferenceDVB ref; + pmthandler->getServiceReference(ref); + uint16_t program_number = ref.getServiceID().get(); + std::map::iterator it = + running_services.find(program_number); + + if ( it != running_services.end() && + (pmt_version == it->second) && + !(caids.size() == 1 && caids[0] == 0xFFFF) ) { eDebug("[eDVBCISlot] dont sent self capmt version twice"); return -1; } + std::vector::const_iterator i=ptr->getSections().begin(); if ( i == ptr->getSections().end() ) return -1; else { unsigned char raw_data[2048]; - CaProgramMapSection capmt(*i++, prev_sent_capmt_version != 0xFF ? 0x05 /*update*/ : 0x03 /*only*/, 0x01, caids ); + +// eDebug("send %s capmt for service %04x", +// it != running_services.end() ? "UPDATE" : running_services.empty() ? "ONLY" : "ADD", +// program_number); + + CaProgramMapSection capmt(*i++, + it != running_services.end() ? 0x05 /*update*/ : running_services.empty() ? 0x03 /*only*/ : 0x04 /*add*/, 0x01, caids ); while( i != ptr->getSections().end() ) { // eDebug("append"); @@ -552,22 +698,39 @@ int eDVBCISlot::sendCAPMT(eDVBServicePMTHandler *pmthandler, const std::vectorsendCAPMT(raw_data + hlen, wp - hlen); - prev_sent_capmt_version = pmt_version; + running_services[program_number] = pmt_version; } } return 0; } +void eDVBCISlot::removeService(uint16_t program_number) +{ + if (program_number == 0xFFFF) + running_services.clear(); // remove all + else + running_services.erase(program_number); // remove single service +} + int eDVBCISlot::enableTS(int enable, int tuner) { - printf("eDVBCISlot::enableTS(%d %d)\n", enable, tuner); +// printf("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n"); +// printf("eDVBCISlot::enableTS(%d %d)\n", enable, tuner); FILE *input0, *input1, *ci; if((input0 = fopen("/proc/stb/tsmux/input0", "wb")) == NULL) { @@ -593,9 +756,4 @@ int eDVBCISlot::enableTS(int enable, int tuner) return 0; } -void eDVBCISlot::resendCAPMT() -{ - eDVBCIInterfaces::getInstance()->sendCAPMT(slotid); -} - eAutoInitP0 init_eDVBCIInterfaces(eAutoInitNumbers::dvb, "CI Slots");