X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fdvb_ci%2Fdvbci_camgr.cpp;h=42317b3e58a0a97e8884db6a2057cc2e3bbb1afc;hp=2ad1f1e363bb36c06a31ccd214138e78ae24477c;hb=f8399204b2ce53dfd2c394f9d67b204356f2d40a;hpb=640fa7fc2dab8135f04952e3dec9abd1d715a328

diff --git a/lib/dvb_ci/dvbci_camgr.cpp b/lib/dvb_ci/dvbci_camgr.cpp
index 2ad1f1e..42317b3 100644
--- a/lib/dvb_ci/dvbci_camgr.cpp
+++ b/lib/dvb_ci/dvbci_camgr.cpp
@@ -1,29 +1,43 @@
 /* DVB CI CA Manager */
 
+#include <lib/base/eerror.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]);
+	eDebugNoNewLine("SESSION(%d)/CA %02x %02x %02x: ", session_nb, tag[0], tag[1],tag[2]);
 	for (int i=0; i<len; i++)
-		printf("%02x ", ((const unsigned char*)data)[i]);
-	printf("\n");
+		eDebugNoNewLine("%02x ", ((const unsigned char*)data)[i]);
+	eDebug("");
 
 	if ((tag[0]==0x9f) && (tag[1]==0x80))
 	{
 		switch (tag[2])
 		{
 		case 0x31:
-			printf("ca info:\n");
+			eDebug("ca info:");
 			for (int i=0; i<len; i+=2)
 			{
-				printf("%04x ", (((const unsigned char*)data)[i]<<8)|(((const unsigned char*)data)[i+1]));
-				caids.insert((((const unsigned char*)data)[i]<<8)|(((const unsigned char*)data)[i+1]));
+				eDebugNoNewLine("%04x ", (((const unsigned char*)data)[i]<<8)|(((const unsigned char*)data)[i+1]));
+				caids.push_back((((const unsigned char*)data)[i]<<8)|(((const unsigned char*)data)[i+1]));
 			}
-			printf("\n");
+			std::sort(caids.begin(), caids.end());
+			eDebug("");
+			eDVBCIInterfaces::getInstance()->recheckPMTHandlers();
 			break;
 		default:
-			printf("unknown APDU tag 9F 80 %02x\n", tag[2]);
+			eDebug("unknown APDU tag 9F 80 %02x", tag[2]);
 			break;
 		}
 	}
@@ -42,8 +56,18 @@ int eDVBCICAManagerSession::doAction()
 		return 0;
 	}
 	case stateFinal:
-		printf("stateFinal und action! kann doch garnicht sein ;)\n");
+		eDebug("stateFinal und action! kann doch garnicht sein ;)");
 	default:
 		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;
+}
+