#include <vlc/input.h>
#include "network.h"
+#include "charset.h"
#include <errno.h> /* ENOMEM */
static void CloseDemux ( vlc_object_t * );
vlc_module_begin();
- set_description( _("SAP interface") );
+ set_shortname( _("SAP"));
+ set_description( _("SAP announces") );
+ set_category( CAT_PLAYLIST );
+ set_subcategory( SUBCAT_PLAYLIST_SD );
add_string( "sap-addr", NULL, NULL,
SAP_ADDR_TEXT, SAP_ADDR_LONGTEXT, VLC_TRUE );
int i_in; /* IP version */
int i_media;
+ int i_media_type;
int i_attributes;
attribute_t **pp_attributes;
/* playlist node */
playlist_item_t *p_node;
+ /* charset conversion */
+ vlc_iconv_t iconvHandle;
+
/* Table of announces */
int i_announces;
struct sap_announce_t **pp_announces;
int i_timeout;
};
+struct demux_sys_t
+{
+ sdp_t *p_sdp;
+};
+
/*****************************************************************************
* Local prototypes
*****************************************************************************/
/* Helper functions */
static char *GetAttribute( sdp_t *p_sdp, const char *psz_search );
static vlc_bool_t IsSameSession( sdp_t *p_sdp1, sdp_t *p_sdp2 );
+ static char *convert_from_utf8( struct services_discovery_t *p_sd,
+ char *psz_unicode );
static int InitSocket( services_discovery_t *p_sd, char *psz_address, int i_port );
#ifdef HAVE_ZLIB_H
static int Decompress( unsigned char *psz_src, unsigned char **_dst, int i_len );
playlist_t *p_playlist;
playlist_view_t *p_view;
- char *psz_addr;
+ char *psz_addr, *psz_charset;
+ vlc_value_t val;
p_sys->i_timeout = config_GetInt( p_sd,"sap-timeout" );
+ vlc_current_charset( &psz_charset );
+ p_sys->iconvHandle = vlc_iconv_open( psz_charset, "UTF-8" );
+ free( psz_charset );
+ if( p_sys->iconvHandle == (vlc_iconv_t)(-1) )
+ {
+ msg_Warn( p_sd, "Unable to do requested conversion" );
+ }
+
p_sd->pf_run = Run;
p_sd->p_sys = p_sys;
p_view = playlist_ViewFind( p_playlist, VIEW_CATEGORY );
p_sys->p_node = playlist_NodeCreate( p_playlist, VIEW_CATEGORY,
_("SAP"), p_view->p_root );
+ p_sys->p_node->i_flags |= PLAYLIST_RO_FLAG;
+ val.b_bool = VLC_TRUE;
+ var_Set( p_playlist, "intf-change", val );
vlc_object_release( p_playlist );
{
demux_t *p_demux = (demux_t *)p_this;
uint8_t *p_peek;
+ int i_max_sdp = 1024;
+ int i_sdp = 0;
+ char *psz_sdp = NULL;
+ sdp_t *p_sdp = NULL;
/* Probe for SDP */
if( p_demux->s )
{
- if( stream_Peek( p_demux->s, &p_peek, 7 ) < 7 )
- {
- msg_Err( p_demux, "cannot peek" );
- return VLC_EGENERIC;
- }
+ if( stream_Peek( p_demux->s, &p_peek, 7 ) < 7 ) return VLC_EGENERIC;
+
if( strncmp( (char*)p_peek, "v=0\r\n", 5 ) &&
strncmp( (char*)p_peek, "v=0\n", 4 ) &&
( p_peek[0] < 'a' || p_peek[0] > 'z' || p_peek[1] != '=' ) )
{
- msg_Warn( p_demux, "SDP (UDP) module discarded" );
return VLC_EGENERIC;
}
}
+ psz_sdp = (char *)malloc( i_max_sdp );
+ if( !psz_sdp ) return VLC_EGENERIC;
+
+ /* Gather the complete sdp file */
+ for( ;; )
+ {
+ int i_read = stream_Read( p_demux->s,
+ &psz_sdp[i_sdp], i_max_sdp - i_sdp - 1 );
+
+ if( i_read < 0 )
+ {
+ msg_Err( p_demux, "failed to read SDP" );
+ goto error;
+ }
+
+ i_sdp += i_read;
+
+ if( i_read < i_max_sdp - i_sdp - 1 )
+ {
+ psz_sdp[i_sdp] = '\0';
+ break;
+ }
+
+ i_max_sdp += 1000;
+ psz_sdp = (uint8_t*)realloc( psz_sdp, i_max_sdp );
+ }
+
+ p_sdp = ParseSDP( VLC_OBJECT(p_demux), psz_sdp );
+
+ if( !p_sdp )
+ {
+ msg_Warn( p_demux, "invalid SDP");
+ goto error;
+ }
+
+ if( p_sdp->i_media > 1 )
+ {
+ goto error;
+ }
+
+ if( ParseConnection( VLC_OBJECT( p_demux ), p_sdp ) )
+ {
+ p_sdp->psz_uri = NULL;
+ }
+ if( p_sdp->i_media_type != 33 && p_sdp->i_media_type != 32 &&
+ p_sdp->i_media_type != 14 )
+ goto error;
+
+ if( p_sdp->psz_uri == NULL ) goto error;
+
+ p_demux->p_sys = (demux_sys_t *)malloc( sizeof(demux_sys_t) );
+ p_demux->p_sys->p_sdp = p_sdp;
p_demux->pf_control = Control;
p_demux->pf_demux = Demux;
+ free( psz_sdp );
return VLC_SUCCESS;
+
+error:
+ free( psz_sdp );
+ if( p_sdp ) FreeSDP( p_sdp );
+ stream_Seek( p_demux->s, 0 );
+ return VLC_EGENERIC;
}
/*****************************************************************************
if( p_playlist )
{
- playlist_NodeDelete( p_playlist, p_sys->p_node, VLC_TRUE );
+ playlist_NodeDelete( p_playlist, p_sys->p_node, VLC_TRUE , VLC_TRUE );
vlc_object_release( p_playlist );
}
+ if( p_sys->iconvHandle != (vlc_iconv_t)(-1) )
+ vlc_iconv_close( p_sys->iconvHandle );
+
free( p_sys );
}
/* read SAP packets */
while( !p_sd->b_die )
{
+ int i_read;
p_buffer = (uint8_t *)malloc( MAX_SAP_BUFFER );
if( !p_buffer )
continue;
}
- int i_read = net_Select( p_sd, p_sd->p_sys->pi_fd, NULL,
- p_sd->p_sys->i_fd, p_buffer,
- MAX_SAP_BUFFER, 500000 );
+ i_read = net_Select( p_sd, p_sd->p_sys->pi_fd, NULL,
+ p_sd->p_sys->i_fd, p_buffer,
+ MAX_SAP_BUFFER, 500000 );
#if 0
/* Check for items that need deletion */
for( i = 0 ; i< p_sd->p_sys->i_announces ; i++ )
/* Remove the sap_announce from the array */
REMOVE_ELEM( p_sd->p_sys->pp_announces,
- p_sd->p_sys->i_announces,
- i );
+ p_sd->p_sys->i_announces, i );
free( p_announce );
**********************************************************************/
static int Demux( demux_t *p_demux )
{
- int i_max_sdp = 1024;
- int i_sdp = 0;
- char *psz_sdp = (char *)malloc( i_max_sdp );
- sdp_t *p_sdp;
-
- playlist_t *p_playlist;
-
- if( !psz_sdp )
- {
- return -1;
- }
-
- /* Gather the complete sdp file */
- for( ;; )
- {
- int i_read = stream_Read( p_demux->s,
- &psz_sdp[i_sdp], i_max_sdp - i_sdp - 1 );
-
- if( i_read < 0 )
-
- {
- msg_Err( p_demux, "failed to read SDP" );
- return VLC_EGENERIC;
- }
-
- i_sdp += i_read;
-
- if( i_read < i_max_sdp - i_sdp - 1 )
- {
- psz_sdp[i_sdp] = '\0';
- break;
- }
-
- i_max_sdp += 1000;
- psz_sdp = (uint8_t*)realloc( psz_sdp, i_max_sdp );
- }
-
- p_sdp = ParseSDP( VLC_OBJECT(p_demux), psz_sdp );
-
- if( !p_sdp )
- {
- msg_Warn( p_demux, "invalid SDP");
- return -1;
- }
-
- if( p_sdp->i_media > 1 )
- {
- return -1;
- }
-
- if( ParseConnection( VLC_OBJECT( p_demux ), p_sdp ) )
- {
- p_sdp->psz_uri = NULL;
- }
-
- if( p_sdp->psz_uri == NULL ) return VLC_EGENERIC;
+ sdp_t *p_sdp = p_demux->p_sys->p_sdp;
+ playlist_t *p_playlist;
p_playlist = (playlist_t *)vlc_object_find( p_demux, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
PLAYLIST_APPEND, PLAYLIST_END );
vlc_object_release( p_playlist );
-
- FreeSDP( p_sdp );
- free( psz_sdp );
+ if( p_sdp ) FreeSDP( p_sdp );
return VLC_SUCCESS;
}
* Local functions
**************************************************************/
+/* i_read is at least > 6 */
static int ParseSAP( services_discovery_t *p_sd, uint8_t *p_buffer, int i_read )
{
int i_version, i_address_type, i_hash, i;
uint8_t *psz_sdp;
+ uint8_t *psz_initial_sdp;
sdp_t *p_sdp;
vlc_bool_t b_compressed;
vlc_bool_t b_need_delete = VLC_FALSE;
int i_decompressed_size;
uint8_t *p_decompressed_buffer;
#endif
+ uint8_t *psz_foo;
/* First, check the sap announce is correct */
i_version = p_buffer[0] >> 5;
-
if( i_version != 1 )
{
msg_Dbg( p_sd, "strange sap version %d found", i_version );
}
psz_sdp = &p_buffer[4];
+ psz_initial_sdp = psz_sdp;
if( i_address_type == 0 ) /* ipv4 source address */
{
psz_sdp += 4;
+ if( i_read <= 9 )
+ {
+ msg_Warn( p_sd,"too short SAP packet\n" );
+ return VLC_EGENERIC;
+ }
}
else /* ipv6 source address */
{
psz_sdp += 16;
+ if( i_read <= 21 )
+ {
+ msg_Warn( p_sd,"too short SAP packet\n" );
+ return VLC_EGENERIC;
+ }
}
if( b_compressed )
}
/* Add the size of authentification info */
+ if( i_read < p_buffer[1] + (psz_sdp - psz_initial_sdp ) )
+ {
+ msg_Warn( p_sd, "too short SAP packet\n");
+ return VLC_EGENERIC;
+ }
psz_sdp += p_buffer[1];
+ psz_foo = psz_sdp;
/* Skip payload type */
/* Handle announces without \0 between SAP and SDP */
while( *psz_sdp != '\0' && ( psz_sdp[0] != 'v' && psz_sdp[1] != '=' ) )
{
+ if( psz_sdp - psz_initial_sdp >= i_read - 5 )
+ {
+ msg_Warn( p_sd, "empty SDP ?");
+ }
psz_sdp++;
}
{
psz_sdp++;
}
-
+ if( psz_sdp != psz_foo && strcasecmp( psz_foo, "application/sdp" ) )
+ {
+ msg_Dbg( p_sd, "unhandled content type: %s", psz_foo );
+ }
+ if( psz_sdp -p_buffer >= i_read )
+ {
+ msg_Warn( p_sd, "package without content" );
+ return VLC_EGENERIC;
+ }
/* Parse SDP info */
p_sdp = ParseSDP( VLC_OBJECT(p_sd), psz_sdp );
}
/* Decide whether we should add a playlist item for this SDP */
+ /* Parse connection information (c= & m= ) */
+ if( ParseConnection( VLC_OBJECT(p_sd), p_sdp ) )
+ {
+ p_sdp->psz_uri = NULL;
+ }
/* Multi-media or no-parse -> pass to LIVE.COM */
- if( p_sdp->i_media > 1 || p_sd->p_sys->b_parse == VLC_FALSE )
+ if( p_sdp->i_media > 1 || ( p_sdp->i_media_type != 14 &&
+ p_sdp->i_media_type != 32 &&
+ p_sdp->i_media_type != 33) ||
+ p_sd->p_sys->b_parse == VLC_FALSE )
{
+ if( p_sdp->psz_uri ) free( p_sdp->psz_uri );
asprintf( &p_sdp->psz_uri, "sdp://%s", p_sdp->psz_sdp );
}
- else
- {
- /* Parse connection information (c= & m= ) */
- if( ParseConnection( VLC_OBJECT(p_sd), p_sdp ) )
- {
- p_sdp->psz_uri = NULL;
- }
- }
if( p_sdp->psz_uri == NULL ) return VLC_EGENERIC;
char *psz_value;
sap_announce_t *p_sap = (sap_announce_t *)malloc(
sizeof(sap_announce_t ) );
- if( !p_sap )
+
+ psz_value = convert_from_utf8( p_sd, p_sdp->psz_sessionname );
+ if( p_sap == NULL || psz_value == NULL )
{
msg_Err( p_sd, "out of memory");
+ FREE( p_sap );
+ FREE( psz_value );
p_sd->b_die = VLC_TRUE;
return NULL;
}
p_sap->p_item = NULL;
/* Create the playlist item here */
- p_item = playlist_ItemNew( p_sd, p_sap->p_sdp->psz_uri,
- p_sap->p_sdp->psz_sessionname );
+ p_item = playlist_ItemNew( p_sd, p_sap->p_sdp->psz_uri, psz_value );
+ free( psz_value );
if( !p_item )
{
return NULL;
}
+ psz_value = GetAttribute( p_sap->p_sdp, "tool" );
+ if( psz_value != NULL )
+ {
+ vlc_input_item_AddInfo( &p_item->input, _("Session"),
+ _("Tool"), psz_value );
+ }
+ if( strcmp( p_sdp->psz_username, "-" ) )
+ {
+ vlc_input_item_AddInfo( &p_item->input, _("Session"),
+ _("User"), p_sdp->psz_username );
+ }
+
psz_value = GetAttribute( p_sap->p_sdp, "x-plgroup" );
if( psz_value == NULL )
if( psz_value != NULL )
{
- p_child = playlist_ChildSearchName( p_sd->p_sys->p_node, psz_value );
+ char *psz_grp = convert_from_utf8( p_sd, psz_value );
+
+ if( psz_grp != NULL )
+ {
+ p_child = playlist_ChildSearchName( p_sd->p_sys->p_node,
+ psz_grp );
- if( p_child == NULL )
+ if( p_child == NULL )
+ p_child = playlist_NodeCreate( p_playlist, VIEW_CATEGORY,
+ psz_grp, p_sd->p_sys->p_node );
+ free( psz_grp );
+ }
+ else
{
- p_child = playlist_NodeCreate( p_playlist, VIEW_CATEGORY,
- psz_value, p_sd->p_sys->p_node );
+ vlc_object_release( p_playlist );
+ msg_Err( p_sd, "out of memory");
+ free( p_sap );
+ return NULL;
}
}
else
}
p_item->i_flags &= ~PLAYLIST_SKIP_FLAG;
+ p_item->i_flags &= ~PLAYLIST_SAVE_FLAG;
playlist_NodeAddItem( p_playlist, p_item, VIEW_CATEGORY, p_child,
PLAYLIST_APPEND, PLAYLIST_END );
p_sap->p_item = p_item;
TAB_APPEND( p_sd->p_sys->i_announces,
- p_sd->p_sys->pp_announces,
- p_sap );
+ p_sd->p_sys->pp_announces, p_sap );
return p_sap;
}
}
else
{
- msg_Dbg( p_obj, "incorrect c field");
+ msg_Dbg( p_obj, "incorrect c field, %s", p_sdp->psz_connection );
}
psz_uri = strdup( psz_parse );
if( psz_eof )
{
*psz_eof = '\0';
+ psz_proto = strdup( psz_parse );
+
+ psz_parse = psz_eof + 1;
+ p_sdp->i_media_type = atoi( psz_parse );
+
}
else
{
- msg_Dbg( p_obj, "incorrect m field");
+ msg_Dbg( p_obj, "incorrect m field, %s", p_sdp->psz_media );
+ p_sdp->i_media_type = 33;
+ psz_proto = strdup( psz_parse );
}
- psz_proto = strdup( psz_parse );
}
if( psz_proto && !strncmp( psz_proto, "RTP/AVP", 7 ) )
free( psz_proto );
psz_proto = strdup( "udp" );
}
-
/* FIXME: HTTP support */
sdp_t *p_sdp;
vlc_bool_t b_invalid = VLC_FALSE;
vlc_bool_t b_end = VLC_FALSE;
-
if( psz_sdp == NULL )
{
return NULL;
if( psz_sdp[0] != 'v' || psz_sdp[1] != '=' )
{
- msg_Warn( p_obj, "bad SDP packet, begins with 0x%x(%c) 0x%x(%c)",
- psz_sdp[0],psz_sdp[0],psz_sdp[1],psz_sdp[1]);
+ msg_Warn( p_obj, "Bad packet" );
return NULL;
}
case( 'a' ): /* attribute */
{
char *psz_eon = strchr( &psz_sdp[2], ':' );
-
- attribute_t *p_attr = (attribute_t *)malloc(
- sizeof( attribute_t ) );
+ attribute_t *p_attr = malloc( sizeof( attribute_t ) );
/* Attribute with value */
if( psz_eon )
}
+static char *convert_from_utf8( struct services_discovery_t *p_sd,
+ char *psz_unicode )
+{
+ char *psz_local, *psz_in, *psz_out;
+ size_t ret, i_in, i_out;
+
+ if( psz_unicode == NULL )
+ return NULL;
+ if ( p_sd->p_sys->iconvHandle == (vlc_iconv_t)(-1) )
+ return strdup( psz_unicode );
+
+ psz_in = psz_unicode;
+ i_in = strlen( psz_unicode );
+
+ i_out = 2 * i_in;
+ psz_local = malloc( i_out + 1 );
+ if( psz_local == NULL )
+ return strdup( psz_unicode );
+ psz_out = psz_local;
+
+ ret = vlc_iconv( p_sd->p_sys->iconvHandle,
+ &psz_in, &i_in, &psz_out, &i_out);
+ if( ret == (size_t)(-1) || i_in )
+ {
+ msg_Warn( p_sd, "Failed to convert \"%s\" from UTF-8", psz_unicode );
+ return strdup( psz_unicode );
+ }
+ *psz_out = '\0';
+ return psz_local;
+}
+
+
/***********************************************************************
* ismult: returns true if we have a multicast address
***********************************************************************/
-
static int ismult( char *psz_uri )
{
char *psz_end;
return( i_value < 224 ? VLC_FALSE : VLC_TRUE );
}
-static int InitSocket( services_discovery_t *p_sd, char *psz_address, int i_port )
+static int InitSocket( services_discovery_t *p_sd, char *psz_address,
+ int i_port )
{
int i_fd = net_OpenUDP( p_sd, psz_address, i_port, "", 0 );
if( i_fd != -1 )
{
- INSERT_ELEM( p_sd->p_sys->pi_fd,
- p_sd->p_sys->i_fd,
- p_sd->p_sys->i_fd,
- i_fd );
+ INSERT_ELEM( p_sd->p_sys->pi_fd, p_sd->p_sys->i_fd,
+ p_sd->p_sys->i_fd, i_fd );
return VLC_SUCCESS;
}
playlist_t *p_playlist = (playlist_t *)vlc_object_find( p_sd,
VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
- if( p_announce->p_sdp )
- {
- FreeSDP( p_announce->p_sdp );
- }
+ if( p_announce->p_sdp ) FreeSDP( p_announce->p_sdp );
- if( !p_playlist )
- {
- return VLC_EGENERIC;
- }
+ if( !p_playlist ) return VLC_EGENERIC;
if( p_announce->p_item )
{
- playlist_Delete( p_playlist, p_announce->p_item->input.i_id );
+ playlist_LockDelete( p_playlist, p_announce->p_item->input.i_id );
}
for( i = 0; i< p_sd->p_sys->i_announces; i++)
p_sdp1->psz_address_type && p_sdp2->psz_address_type &&
p_sdp1->psz_address && p_sdp2->psz_address )
{
- if(
- !strcmp( p_sdp1->psz_username , p_sdp2->psz_username ) &&
+ if(!strcmp( p_sdp1->psz_username , p_sdp2->psz_username ) &&
!strcmp( p_sdp1->psz_network_type , p_sdp2->psz_network_type ) &&
!strcmp( p_sdp1->psz_address_type , p_sdp2->psz_address_type ) &&
!strcmp( p_sdp1->psz_address , p_sdp2->psz_address ) &&
projects / vlc / blobdiff