* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
#include <vlc_access.h>
#include <sys/ioctl.h>
#include <unistd.h>
#include <sys/stat.h>
#include <sys/poll.h>
+#include <netinet/in.h>
/* DVB Card Drivers */
#include <linux/dvb/version.h>
# include <dvbpsi/pmt.h>
# include <dvbpsi/dr.h>
# include <dvbpsi/psi.h>
+# include <dvbpsi/demux.h>
+# include <dvbpsi/sdt.h>
#else
# include "dvbpsi.h"
# include "descriptor.h"
# include "tables/pmt.h"
# include "descriptors/dr.h"
# include "psi.h"
+# include "demux.h"
+# include "sdt.h"
#endif
#ifdef ENABLE_HTTPD
static void ConditionalAccessOpen( access_t * p_access, int i_session_id );
static void DateTimeOpen( access_t * p_access, int i_session_id );
static void MMIOpen( access_t * p_access, int i_session_id );
-static char *dvbsi_to_utf8( char *psz_instring, size_t i_length );
/*****************************************************************************
* Utility functions
#define T_DATA_LAST 0xA0
#define T_DATA_MORE 0xA1
-static void Dump( vlc_bool_t b_outgoing, uint8_t *p_data, int i_size )
+static void Dump( bool b_outgoing, uint8_t *p_data, int i_size )
{
#ifdef DEBUG_TPDU
int i;
for ( i = 0; i < i_size && i < MAX_DUMP; i++)
fprintf(stderr, "%02X ", p_data[i]);
fprintf(stderr, "%s\n", i_size >= MAX_DUMP ? "..." : "");
+#else
+ VLC_UNUSED(b_outgoing); VLC_UNUSED(p_data); VLC_UNUSED(i_size);
#endif
}
default:
break;
}
- Dump( VLC_TRUE, p_data, i_size );
+ Dump( true, p_data, i_size );
if ( write( p_sys->i_ca_handle, p_data, i_size ) != i_size )
{
- msg_Err( p_access, "cannot write to CAM device (%s)",
- strerror(errno) );
+ msg_Err( p_access, "cannot write to CAM device (%m)" );
return VLC_EGENERIC;
}
if ( i_size < 5 )
{
- msg_Err( p_access, "cannot read from CAM device (%d:%s)", i_size,
- strerror(errno) );
+ msg_Err( p_access, "cannot read from CAM device (%d:%m)", i_size );
+ if( pi_size == NULL )
+ free( p_data );
return VLC_EGENERIC;
}
{
msg_Err( p_access, "invalid read from CAM device (%d instead of %d)",
p_data[1], i_tcid );
+ if( pi_size == NULL )
+ free( p_data );
return VLC_EGENERIC;
}
&& p_data[i_size - 4] == T_SB
&& p_data[i_size - 3] == 2
&& (p_data[i_size - 1] & DATA_INDICATOR))
- ? VLC_TRUE : VLC_FALSE;
+ ? true : false;
- Dump( VLC_FALSE, p_data, i_size );
+ Dump( false, p_data, i_size );
if ( pi_size == NULL )
free( p_data );
if ( !p_sys->p_sessions[i_session_id - 1].i_resource_id )
break;
}
- if ( i_session_id == MAX_SESSIONS )
+ if ( i_session_id > MAX_SESSIONS )
{
msg_Err( p_access, "too many sessions !" );
return;
switch ( i_resource_id )
{
case RI_RESOURCE_MANAGER:
- ResourceManagerOpen( p_access, i_session_id ); break;
+ ResourceManagerOpen( p_access, i_session_id ); break;
case RI_APPLICATION_INFORMATION:
- ApplicationInformationOpen( p_access, i_session_id ); break;
+ ApplicationInformationOpen( p_access, i_session_id ); break;
case RI_CONDITIONAL_ACCESS_SUPPORT:
- ConditionalAccessOpen( p_access, i_session_id ); break;
+ ConditionalAccessOpen( p_access, i_session_id ); break;
case RI_DATE_TIME:
- DateTimeOpen( p_access, i_session_id ); break;
+ DateTimeOpen( p_access, i_session_id ); break;
case RI_MMI:
- MMIOpen( p_access, i_session_id ); break;
+ MMIOpen( p_access, i_session_id ); break;
case RI_HOST_CONTROL:
default:
switch ( i_resource_id )
{
case RI_RESOURCE_MANAGER:
- ResourceManagerOpen( p_access, i_session_id ); break;
+ ResourceManagerOpen( p_access, i_session_id ); break;
case RI_APPLICATION_INFORMATION:
- ApplicationInformationOpen( p_access, i_session_id ); break;
+ ApplicationInformationOpen( p_access, i_session_id ); break;
case RI_CONDITIONAL_ACCESS_SUPPORT:
- ConditionalAccessOpen( p_access, i_session_id ); break;
+ ConditionalAccessOpen( p_access, i_session_id ); break;
case RI_DATE_TIME:
- DateTimeOpen( p_access, i_session_id ); break;
+ DateTimeOpen( p_access, i_session_id ); break;
case RI_MMI:
- MMIOpen( p_access, i_session_id ); break;
+ MMIOpen( p_access, i_session_id ); break;
case RI_HOST_CONTROL:
default:
}
else
{
- char *psz_hex;
ca_msg.length = i_size + p - p_apdu;
if ( i_size == 0 ) ca_msg.length=3;
- psz_hex = (char*)malloc( ca_msg.length*3 + 1);
memcpy( ca_msg.msg, p_apdu, i_size + p - p_apdu );
i_ret = ioctl(p_sys->i_ca_handle, CA_SEND_MSG, &ca_msg );
if ( i_ret < 0 )
{
- msg_Err( p_access, "Error sending to CAM: %s", strerror(errno) );
+ msg_Err( p_access, "Error sending to CAM: %m" );
i_ret = VLC_EGENERIC;
}
}
msg_Dbg( p_access, "entering MMI menus on session %d", i_session_id );
APDUSend( p_access, i_session_id, AOT_ENTER_MENU, NULL, 0 );
- p_sys->pb_slot_mmi_expected[i_slot] = VLC_TRUE;
+ p_sys->pb_slot_mmi_expected[i_slot] = true;
}
/*****************************************************************************
uint16_t pi_system_ids[MAX_CASYSTEM_IDS + 1];
} system_ids_t;
-static vlc_bool_t CheckSystemID( system_ids_t *p_ids, uint16_t i_id )
+static bool CheckSystemID( system_ids_t *p_ids, uint16_t i_id )
{
int i = 0;
- if( !p_ids ) return VLC_TRUE;
+ if( !p_ids ) return true;
while ( p_ids->pi_system_ids[i] )
{
if ( p_ids->pi_system_ids[i] == i_id )
- return VLC_TRUE;
+ return true;
i++;
}
- return VLC_FALSE;
+ return false;
}
/*****************************************************************************
* CAPMTNeedsDescrambling
*****************************************************************************/
-static vlc_bool_t CAPMTNeedsDescrambling( dvbpsi_pmt_t *p_pmt )
+static bool CAPMTNeedsDescrambling( dvbpsi_pmt_t *p_pmt )
{
dvbpsi_descriptor_t *p_dr;
dvbpsi_pmt_es_t *p_es;
{
if( p_dr->i_tag == 0x9 )
{
- return VLC_TRUE;
+ return true;
}
}
-
+
for( p_es = p_pmt->p_first_es; p_es != NULL; p_es = p_es->p_next )
{
for( p_dr = p_es->p_first_descriptor; p_dr != NULL;
{
if( p_dr->i_tag == 0x9 )
{
- return VLC_TRUE;
+ return true;
}
}
}
- return VLC_FALSE;
+ return false;
}
/*****************************************************************************
{
uint8_t *p_data;
int i;
-
+
if ( i_size )
p_data = realloc( p_capmt, i_capmt_size + 6 + i_size );
else
0x3 /* only */, 0x1 /* ok_descrambling */,
&i_capmt_size );
- if ( i_capmt_size )
+ if( i_capmt_size )
+ {
APDUSend( p_access, i_session_id, AOT_CA_PMT, p_capmt, i_capmt_size );
+ free( p_capmt );
+ }
}
/*****************************************************************************
CAPMTFirst( p_access, i_session_id, p_pmt );
return;
}
-
-
+
+
msg_Dbg( p_access, "adding CAPMT for SID %d on session %d",
p_pmt->i_program_number, i_session_id );
0x4 /* add */, 0x1 /* ok_descrambling */,
&i_capmt_size );
- if ( i_capmt_size )
+ if( i_capmt_size )
+ {
APDUSend( p_access, i_session_id, AOT_CA_PMT, p_capmt, i_capmt_size );
+ free( p_capmt );
+ }
}
/*****************************************************************************
0x5 /* update */, 0x1 /* ok_descrambling */,
&i_capmt_size );
- if ( i_capmt_size )
+ if( i_capmt_size )
+ {
APDUSend( p_access, i_session_id, AOT_CA_PMT, p_capmt, i_capmt_size );
+ free( p_capmt );
+ }
}
/*****************************************************************************
0x5 /* update */, 0x4 /* not selected */,
&i_capmt_size );
- if ( i_capmt_size )
+ if( i_capmt_size )
+ {
APDUSend( p_access, i_session_id, AOT_CA_PMT, p_capmt, i_capmt_size );
+ free( p_capmt );
+ }
}
/*****************************************************************************
i_tag = AOT_ANSW;
i_size = 1 + strlen( p_object->u.answ.psz_answ );
p_data = malloc( i_size );
- p_data[0] = (p_object->u.answ.b_ok == VLC_TRUE) ? 0x1 : 0x0;
+ p_data[0] = (p_object->u.answ.b_ok == true) ? 0x1 : 0x0;
strncpy( (char *)&p_data[1], p_object->u.answ.psz_answ, i_size - 1 );
break;
APDUSend( p_access, i_session_id, i_tag, p_data, i_size );
free( p_data );
- p_sys->pb_slot_mmi_expected[i_slot] = VLC_TRUE;
+ p_sys->pb_slot_mmi_expected[i_slot] = true;
}
/*****************************************************************************
APDUSend( p_access, i_session_id, AOT_CLOSE_MMI, NULL, 0 );
- p_sys->pb_slot_mmi_expected[i_slot] = VLC_TRUE;
+ p_sys->pb_slot_mmi_expected[i_slot] = true;
}
/*****************************************************************************
en50221_MMIFree( &p_mmi->last_object );
p_mmi->last_object.i_object_type = EN50221_MMI_ENQ;
- p_mmi->last_object.u.enq.b_blind = (*d & 0x1) ? VLC_TRUE : VLC_FALSE;
+ p_mmi->last_object.u.enq.b_blind = (*d & 0x1) ? true : false;
d += 2; /* skip answer_text_length because it is not mandatory */
l -= 2;
p_mmi->last_object.u.enq.psz_text = malloc( l + 1 );
p_mmi->last_object.u.enq.psz_text[l] = '\0';
msg_Dbg( p_access, "MMI enq: %s%s", p_mmi->last_object.u.enq.psz_text,
- p_mmi->last_object.u.enq.b_blind == VLC_TRUE ? " (blind)" : "" );
- p_sys->pb_slot_mmi_expected[i_slot] = VLC_FALSE;
- p_sys->pb_slot_mmi_undisplayed[i_slot] = VLC_TRUE;
+ p_mmi->last_object.u.enq.b_blind == true ? " (blind)" : "" );
+ p_sys->pb_slot_mmi_expected[i_slot] = false;
+ p_sys->pb_slot_mmi_undisplayed[i_slot] = true;
}
/*****************************************************************************
msg_Dbg( p_access, "MMI choice: %s", psz_text );
}
}
- p_sys->pb_slot_mmi_expected[i_slot] = VLC_FALSE;
- p_sys->pb_slot_mmi_undisplayed[i_slot] = VLC_TRUE;
+ p_sys->pb_slot_mmi_expected[i_slot] = false;
+ p_sys->pb_slot_mmi_undisplayed[i_slot] = true;
}
/*****************************************************************************
free( p_sys->p_sessions[i_session_id - 1].p_sys );
msg_Dbg( p_access, "closing MMI session (%d)", i_session_id );
- p_sys->pb_slot_mmi_expected[i_slot] = VLC_FALSE;
- p_sys->pb_slot_mmi_undisplayed[i_slot] = VLC_TRUE;
+ p_sys->pb_slot_mmi_expected[i_slot] = false;
+ p_sys->pb_slot_mmi_undisplayed[i_slot] = true;
}
/*****************************************************************************
if ( TPDURecv( p_access, i_slot, &i_tag, NULL, NULL ) == VLC_SUCCESS
&& i_tag == T_CTC_REPLY )
{
- p_sys->pb_active_slot[i_slot] = VLC_TRUE;
+ p_sys->pb_active_slot[i_slot] = true;
break;
}
- if ( TPDUSend( p_access, i_slot, T_CREATE_TC, NULL, 0 )
+ if ( TPDUSend( p_access, i_slot, T_CREATE_TC, NULL, NULL )
!= VLC_SUCCESS )
{
msg_Err( p_access,
/*****************************************************************************
* en50221_Init : Initialize the CAM for en50221
*****************************************************************************/
-int E_(en50221_Init)( access_t * p_access )
+int en50221_Init( access_t * p_access )
{
access_sys_t *p_sys = p_access->p_sys;
#if HLCI_WAIT_CAM_READY
while( ca_msg.msg[8] == 0xff && ca_msg.msg[9] == 0xff )
{
- if( p_access->b_die ) return VLC_EGENERIC;
+ if( !vlc_object_alive (p_access) ) return VLC_EGENERIC;
msleep(1);
msg_Dbg( p_access, "CAM: please wait" );
APDUSend( p_access, 1, AOT_APPLICATION_INFO_ENQ, NULL, 0 );
/*****************************************************************************
* en50221_Poll : Poll the CAM for TPDUs
*****************************************************************************/
-int E_(en50221_Poll)( access_t * p_access )
+int en50221_Poll( access_t * p_access )
{
access_sys_t *p_sys = p_access->p_sys;
int i_slot;
{
msg_Dbg( p_access, "en50221_Poll: slot %d has been removed",
i_slot );
- p_sys->pb_active_slot[i_slot] = VLC_FALSE;
- p_sys->pb_slot_mmi_expected[i_slot] = VLC_FALSE;
- p_sys->pb_slot_mmi_undisplayed[i_slot] = VLC_FALSE;
+ p_sys->pb_active_slot[i_slot] = false;
+ p_sys->pb_slot_mmi_expected[i_slot] = false;
+ p_sys->pb_slot_mmi_undisplayed[i_slot] = false;
/* Close all sessions for this slot. */
for ( i_session_id = 1; i_session_id <= MAX_SESSIONS;
if ( !p_sys->pb_tc_has_data[i_slot] )
{
- if ( TPDUSend( p_access, i_slot, T_DATA_LAST, NULL, 0 ) !=
+ if ( TPDUSend( p_access, i_slot, T_DATA_LAST, NULL, NULL ) !=
VLC_SUCCESS )
{
msg_Err( p_access,
/*****************************************************************************
* en50221_SetCAPMT :
*****************************************************************************/
-int E_(en50221_SetCAPMT)( access_t * p_access, dvbpsi_pmt_t *p_pmt )
+int en50221_SetCAPMT( access_t * p_access, dvbpsi_pmt_t *p_pmt )
{
access_sys_t *p_sys = p_access->p_sys;
int i, i_session_id;
- vlc_bool_t b_update = VLC_FALSE;
- vlc_bool_t b_needs_descrambling = CAPMTNeedsDescrambling( p_pmt );
+ bool b_update = false;
+ bool b_needs_descrambling = CAPMTNeedsDescrambling( p_pmt );
for ( i = 0; i < MAX_PROGRAMS; i++ )
{
&& p_sys->pp_selected_programs[i]->i_program_number
== p_pmt->i_program_number )
{
- b_update = VLC_TRUE;
+ b_update = true;
if ( !b_needs_descrambling )
{
/*****************************************************************************
* en50221_OpenMMI :
*****************************************************************************/
-int E_(en50221_OpenMMI)( access_t * p_access, int i_slot )
+int en50221_OpenMMI( access_t * p_access, int i_slot )
{
access_sys_t *p_sys = p_access->p_sys;
/*****************************************************************************
* en50221_CloseMMI :
*****************************************************************************/
-int E_(en50221_CloseMMI)( access_t * p_access, int i_slot )
+int en50221_CloseMMI( access_t * p_access, int i_slot )
{
access_sys_t *p_sys = p_access->p_sys;
/*****************************************************************************
* en50221_GetMMIObject :
*****************************************************************************/
-en50221_mmi_object_t *E_(en50221_GetMMIObject)( access_t * p_access,
+en50221_mmi_object_t *en50221_GetMMIObject( access_t * p_access,
int i_slot )
{
access_sys_t *p_sys = p_access->p_sys;
int i_session_id;
- if ( p_sys->pb_slot_mmi_expected[i_slot] == VLC_TRUE )
+ if ( p_sys->pb_slot_mmi_expected[i_slot] == true )
return NULL; /* should not happen */
for ( i_session_id = 1; i_session_id <= MAX_SESSIONS; i_session_id++ )
/*****************************************************************************
* en50221_SendMMIObject :
*****************************************************************************/
-void E_(en50221_SendMMIObject)( access_t * p_access, int i_slot,
+void en50221_SendMMIObject( access_t * p_access, int i_slot,
en50221_mmi_object_t *p_object )
{
access_sys_t *p_sys = p_access->p_sys;
/*****************************************************************************
* en50221_End :
*****************************************************************************/
-void E_(en50221_End)( access_t * p_access )
+void en50221_End( access_t * p_access )
{
access_sys_t *p_sys = p_access->p_sys;
int i_session_id, i;
return p;
}
-static char *dvbsi_to_utf8( char *psz_instring, size_t i_length )
+char *dvbsi_to_utf8( char *psz_instring, size_t i_length )
{
- const char *psz_encoding;
- char *psz_stringstart, *psz_outstring, *psz_tmp;
+ const char *psz_encoding, *psz_stringstart;
+ char *psz_outstring, *psz_tmp;
char psz_encbuf[12];
size_t i_in, i_out;
vlc_iconv_t iconv_handle;
projects / vlc / blobdiff