From 22eaf61c40b2a4b857701c51c15b1627bc2a89de Mon Sep 17 00:00:00 2001 From: bowman-gh Date: Tue, 8 Jan 2013 12:13:49 +0100 Subject: [PATCH] Fill out the private descriptor fields correctly (tsid and onid) --- src/capmt.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) mode change 100644 => 100755 src/capmt.c diff --git a/src/capmt.c b/src/capmt.c old mode 100644 new mode 100755 index cac49c14..ea306ecd --- a/src/capmt.c +++ b/src/capmt.c @@ -719,7 +719,9 @@ capmt_table_input(struct th_descrambler *td, struct service *t, uint16_t sid = t->s_dvb_service_id; uint16_t ecmpid = st->es_pid; - uint16_t transponder = 0; + uint16_t transponder = t->s_dvb_mux_instance->tdmi_transport_stream_id; + uint16_t onid = t->s_dvb_mux_instance->tdmi_network_id; + /* don't do too much requests */ if (current_caid == total_caids && caid != ct->ct_caid_last) @@ -757,9 +759,9 @@ capmt_table_input(struct th_descrambler *td, struct service *t, capmt_descriptor_t prd = { .cad_type = CAPMT_DESC_PRIVATE, .cad_length = 0x08, - .cad_data = { 0x00, 0x00, 0x00, 0x00, - sid >> 8, sid & 0xFF, - transponder >> 8, transponder & 0xFF + .cad_data = { 0x00, 0x00, 0x00, 0x00, // enigma namespace goes here + transponder >> 8, transponder & 0xFF, + onid >> 8, onid & 0xFF, }}; memcpy(&buf[pos], &prd, prd.cad_length + 2); pos += prd.cad_length + 2;