git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix memleak when call of convertFunc failes
[enigma2.git]
/
lib
/
dvb_ci
/
dvbci_camgr.cpp
diff --git
a/lib/dvb_ci/dvbci_camgr.cpp
b/lib/dvb_ci/dvbci_camgr.cpp
index d700b0a1e10162b6b5d065b2f28f8ccab093bacc..e1afd17494b41a8b6348620e6c81246821296979 100644
(file)
--- a/
lib/dvb_ci/dvbci_camgr.cpp
+++ b/
lib/dvb_ci/dvbci_camgr.cpp
@@
-2,6
+2,17
@@
#include <lib/dvb_ci/dvbci_camgr.h>
#include <lib/dvb_ci/dvbci_camgr.h>
+eDVBCICAManagerSession::eDVBCICAManagerSession(eDVBCISlot *tslot)
+{
+ slot = tslot;
+ slot->setCAManager(this);
+}
+
+eDVBCICAManagerSession::~eDVBCICAManagerSession()
+{
+ slot->setCAManager(NULL);
+}
+
int eDVBCICAManagerSession::receivedAPDU(const unsigned char *tag, const void *data, int len)
{
printf("SESSION(%d)/CA %02x %02x %02x: ", session_nb, tag[0], tag[1],tag[2]);
int eDVBCICAManagerSession::receivedAPDU(const unsigned char *tag, const void *data, int len)
{
printf("SESSION(%d)/CA %02x %02x %02x: ", session_nb, tag[0], tag[1],tag[2]);
@@
-21,6
+32,7
@@
int eDVBCICAManagerSession::receivedAPDU(const unsigned char *tag, const void *d
caids.push_back((((const unsigned char*)data)[i]<<8)|(((const unsigned char*)data)[i+1]));
}
printf("\n");
caids.push_back((((const unsigned char*)data)[i]<<8)|(((const unsigned char*)data)[i+1]));
}
printf("\n");
+ slot->resendCAPMT();
break;
default:
printf("unknown APDU tag 9F 80 %02x\n", tag[2]);
break;
default:
printf("unknown APDU tag 9F 80 %02x\n", tag[2]);
@@
-47,3
+59,13
@@
int eDVBCICAManagerSession::doAction()
return 0;
}
}
return 0;
}
}
+
+int eDVBCICAManagerSession::sendCAPMT(unsigned char *data, int len)
+{
+ const unsigned char tag[3]={0x9F, 0x80, 0x32}; // ca_pmt
+
+ sendAPDU(tag, data, len);
+
+ return 0;
+}
+