/*****************************************************************************
* sap.c : SAP interface module
*****************************************************************************
- * Copyright (C) 2004 VideoLAN
+ * Copyright (C) 2004-2005 VideoLAN
* $Id$
*
* Authors: Clément Stenac <zorglub@videolan.org>
#include <vlc/input.h>
#include "network.h"
+#include "charset.h"
-#include <errno.h> /* ENOMEM */
+#include <ctype.h>
+#include <errno.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
/* SAP is always on that port */
#define SAP_PORT 9875
-#define SAP_V4_ADDRESS "224.2.127.254"
+/* Global-scope SAP address */
+#define SAP_V4_GLOBAL_ADDRESS "224.2.127.254"
+/* Organization-local SAP address */
+#define SAP_V4_ORG_ADDRESS "239.195.255.255"
+/* Local (smallest non-link-local scope) SAP address */
+#define SAP_V4_LOCAL_ADDRESS "239.255.255.255"
+/* Link-local SAP address */
+#define SAP_V4_LINK_ADDRESS "224.0.0.255"
#define ADD_SESSION 1
#define IPV6_ADDR_1 "FF0" /* Scope is inserted between them */
* Module descriptor
*****************************************************************************/
#define SAP_ADDR_TEXT N_( "SAP multicast address" )
-#define SAP_ADDR_LONGTEXT N_( "SAP multicast address" )
+#define SAP_ADDR_LONGTEXT N_( "Listen for SAP announces on another address" )
#define SAP_IPV4_TEXT N_( "IPv4-SAP listening" )
#define SAP_IPV4_LONGTEXT N_( \
- "Set this if you want the SAP module to listen to IPv4 announces" )
+ "Set this if you want the SAP module to listen to IPv4 announces " \
+ "on the standard address." )
#define SAP_IPV6_TEXT N_( "IPv6-SAP listening" )
#define SAP_IPV6_LONGTEXT N_( \
- "Set this if you want the SAP module to listen to IPv6 announces" )
+ "Set this if you want the SAP module to listen to IPv6 announces " \
+ "on the standard address." )
#define SAP_SCOPE_TEXT N_( "IPv6 SAP scope" )
#define SAP_SCOPE_LONGTEXT N_( \
- "Sets the scope for IPv6 announces (default is 8)" )
+ "Sets the scope for IPv6 announces (default is 8)." )
#define SAP_TIMEOUT_TEXT N_( "SAP timeout (seconds)" )
#define SAP_TIMEOUT_LONGTEXT N_( \
"Sets the time before SAP items get deleted if no new announce " \
#define SAP_PARSE_TEXT N_( "Try to parse the SAP" )
#define SAP_PARSE_LONGTEXT N_( \
"When SAP can it will try to parse the SAP. If you don't select " \
- "this, all announces will be parsed by the livedotcom module" )
+ "this, all announces will be parsed by the livedotcom module." )
+#define SAP_STRICT_TEXT N_( "SAP Strict mode" )
+#define SAP_STRICT_LONGTEXT N_( \
+ "When this is set, the SAP parser will discard some non-compliant " \
+ "announces." )
#define SAP_CACHE_TEXT N_("Use SAP cache")
#define SAP_CACHE_LONGTEXT N_( \
- "If this option is selected, a SAP caching mechanism will be used." \
+ "If this option is selected, a SAP caching mechanism will be used. " \
"This will result in lower SAP startup time, but you could end up " \
"with items corresponding to legacy streams." )
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 );
add_bool( "sap-ipv4", 1 , NULL,
SAP_IPV4_TEXT,SAP_IPV4_LONGTEXT, VLC_TRUE );
- add_bool( "sap-ipv6", 0 , NULL,
+ add_bool( "sap-ipv6", 1 , NULL,
SAP_IPV6_TEXT, SAP_IPV6_LONGTEXT, VLC_TRUE );
add_string( "sap-ipv6-scope", "8" , NULL,
SAP_SCOPE_TEXT, SAP_SCOPE_LONGTEXT, VLC_TRUE);
SAP_TIMEOUT_TEXT, SAP_TIMEOUT_LONGTEXT, VLC_TRUE );
add_bool( "sap-parse", 1 , NULL,
SAP_PARSE_TEXT,SAP_PARSE_LONGTEXT, VLC_TRUE );
+ add_bool( "sap-strict", 0 , NULL,
+ SAP_STRICT_TEXT,SAP_STRICT_LONGTEXT, VLC_TRUE );
add_bool( "sap-cache", 0 , NULL,
SAP_CACHE_TEXT,SAP_CACHE_LONGTEXT, VLC_TRUE );
int i_in; /* IP version */
int i_media;
+ int i_media_type;
int i_attributes;
attribute_t **pp_attributes;
/* SAP annnounces must only contain one SDP */
sdp_t *p_sdp;
- playlist_item_t *p_item;
+ int i_item_id;
+// playlist_item_t *p_item;
};
struct services_discovery_sys_t
/* playlist node */
playlist_item_t *p_node;
+ playlist_t *p_playlist;
+
+ /* charset conversion */
+ vlc_iconv_t iconvHandle;
/* Table of announces */
int i_announces;
int i_timeout;
};
+struct demux_sys_t
+{
+ sdp_t *p_sdp;
+};
+
/*****************************************************************************
* Local prototypes
*****************************************************************************/
static void CacheLoad( services_discovery_t *p_sd );
static void CacheSave( services_discovery_t *p_sd );
/* 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 int InitSocket( services_discovery_t *p_sd, char *psz_address, int i_port );
+ 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 );
- static void FreeSDP( sdp_t *p_sdp );
+ static int Decompress( unsigned char *psz_src, unsigned char **_dst, int i_len );
#endif
+ static void FreeSDP( sdp_t *p_sdp );
/* Detect multicast addresses */
-static int ismult( char * );
+static vlc_bool_t ismult( char * );
#define FREE( p ) \
if( p ) { free( p ); (p) = NULL; }
services_discovery_sys_t *p_sys = (services_discovery_sys_t *)
malloc( sizeof( services_discovery_sys_t ) );
- playlist_t *p_playlist;
playlist_view_t *p_view;
+ char *psz_addr, *psz_charset;
+ vlc_value_t val;
+
+ p_sys->i_timeout = var_CreateGetInteger( p_sd, "sap-timeout" );
- 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_Err( p_sd, "unable to perform characters conversion" );
+ return VLC_EGENERIC;
+ }
p_sd->pf_run = Run;
p_sd->p_sys = p_sys;
p_sys->pi_fd = NULL;
p_sys->i_fd = 0;
- /* FIXME */
- p_sys->b_strict = VLC_FALSE;
- p_sys->b_parse = config_GetInt( p_sd, "sap-parse" );
+ p_sys->b_strict = var_CreateGetInteger( p_sd, "sap-strict");
+ p_sys->b_parse = var_CreateGetInteger( p_sd, "sap-parse" );
- if( config_GetInt( p_sd, "sap-cache" ) )
+ if( var_CreateGetInteger( p_sd, "sap-cache" ) )
{
CacheLoad( p_sd );
}
- if( config_GetInt( p_sd, "sap-ipv4" ) )
+ if( var_CreateGetInteger( p_sd, "sap-ipv4" ) )
{
- InitSocket( p_sd, SAP_V4_ADDRESS, SAP_PORT );
+ InitSocket( p_sd, SAP_V4_GLOBAL_ADDRESS, SAP_PORT );
+ InitSocket( p_sd, SAP_V4_ORG_ADDRESS, SAP_PORT );
+ InitSocket( p_sd, SAP_V4_LOCAL_ADDRESS, SAP_PORT );
+ InitSocket( p_sd, SAP_V4_LINK_ADDRESS, SAP_PORT );
}
- if( config_GetInt( p_sd, "sap-ipv6" ) )
+ if( var_CreateGetInteger( p_sd, "sap-ipv6" ) )
{
- /* TODO */
+ /* [ + 8x4+7*':' + ] */
+ char psz_address[42];
+ char c_scope;
+ char *psz_scope = var_CreateGetString( p_sd, "sap-ipv6-scope" );
+
+ if( psz_scope == NULL || *psz_scope == '\0')
+ {
+ c_scope = '8';
+ }
+ else
+ {
+ c_scope = psz_scope[0];
+ }
+ snprintf( psz_address, 42, "[%s%c%s]", IPV6_ADDR_1, c_scope,
+ IPV6_ADDR_2 );
+ InitSocket( p_sd, psz_address, SAP_PORT );
}
- /* TODO : Handle additionnal adresses */
+ psz_addr = var_CreateGetString( p_sd, "sap-addr" );
+ if( psz_addr && *psz_addr )
+ {
+ InitSocket( p_sd, psz_addr, SAP_PORT );
+ }
if( p_sys->i_fd == 0 )
{
- msg_Err( p_sd, "unable to read on any address");
+ msg_Err( p_sd, "unable to read on any address" );
return VLC_EGENERIC;
}
/* Create our playlist node */
- p_playlist = (playlist_t *)vlc_object_find( p_sd, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
- if( !p_playlist )
+ p_sys->p_playlist = (playlist_t *)vlc_object_find( p_sd,
+ VLC_OBJECT_PLAYLIST,
+ FIND_ANYWHERE );
+ if( !p_sys->p_playlist )
{
msg_Warn( p_sd, "unable to find playlist, cancelling SAP listening");
return VLC_EGENERIC;
}
- p_view = playlist_ViewFind( p_playlist, VIEW_CATEGORY );
- p_sys->p_node = playlist_NodeCreate( p_playlist, VIEW_CATEGORY,
+ p_view = playlist_ViewFind( p_sys->p_playlist, VIEW_CATEGORY );
+ p_sys->p_node = playlist_NodeCreate( p_sys->p_playlist, VIEW_CATEGORY,
_("SAP"), p_view->p_root );
-
- vlc_object_release( p_playlist );
+ p_sys->p_node->i_flags |= PLAYLIST_RO_FLAG;
+ p_sys->p_node->i_flags =~ PLAYLIST_SKIP_FLAG;
+ val.b_bool = VLC_TRUE;
+ var_Set( p_sys->p_playlist, "intf-change", val );
p_sys->i_announces = 0;
p_sys->pp_announces = NULL;
{
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;
}
/*****************************************************************************
services_discovery_t *p_sd = ( services_discovery_t* )p_this;
services_discovery_sys_t *p_sys = p_sd->p_sys;
- playlist_t *p_playlist;
int i;
for( i = p_sys->i_fd-1 ; i >= 0 ; i-- )
{
net_Close( p_sys->pi_fd[i] );
}
+ FREE( p_sys->pi_fd );
if( config_GetInt( p_sd, "sap-cache" ) )
{
{
RemoveAnnounce( p_sd, p_sys->pp_announces[i] );
}
+ FREE( p_sys->pp_announces );
- p_playlist = (playlist_t *) vlc_object_find( p_sd, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
-
- if( p_playlist )
+ if( p_sys->p_playlist )
{
- playlist_NodeDelete( p_playlist, p_sys->p_node, VLC_TRUE );
- vlc_object_release( p_playlist );
+ playlist_NodeDelete( p_sys->p_playlist, p_sys->p_node, VLC_TRUE,
+ VLC_TRUE );
+ vlc_object_release( p_sys->p_playlist );
}
+ vlc_iconv_close( p_sys->iconvHandle );
+
free( p_sys );
}
static void Run( services_discovery_t *p_sd )
{
- uint8_t *p_buffer;
- /* Dirty hack to slow down the startup of the sap interface */
- /* Unneeded now : our node is in no_select mode */
- // msleep( 500000 );
+ int i;
/* read SAP packets */
while( !p_sd->b_die )
{
- p_buffer = (uint8_t *)malloc( MAX_SAP_BUFFER );
+ int i_read;
+ uint8_t p_buffer[MAX_SAP_BUFFER + 1];
- if( !p_buffer )
- {
- msg_Err( p_sd, "out of memory");
- p_sd->b_die = VLC_TRUE;
- continue;
- }
+ 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 );
- 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 );
-#if 0
/* Check for items that need deletion */
- for( i = 0 ; i< p_sd->p_sys->i_announces ; i++ )
+ for( i = 0; i < p_sd->p_sys->i_announces; i++ )
{
- struct sap_announce_t *p_announce;
- mtime_t i_timeout = ( mtime_t ) 1000000*p_sys->i_timeout;
- if( mdate() - p_sd->p_sys->pp_announces[i]->i_last > i_timeout )
- {
- msg_Dbg( p_sd,"Time out for %s, deleting (%i/%i)",
- p_sd->p_sys->pp_announces[i]->psz_name,
- i , p_sd->p_sys->i_announces );
-
- /* Remove the playlist item */
- p_playlist = vlc_object_find( p_sd, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
- if( p_playlist )
- {
- int i_pos = playlist_GetPositionById( p_playlist,
- p_sd->p_sys->pp_announces[i]->i_id );
- playlist_Delete( p_playlist, i_pos );
- vlc_object_release( p_playlist );
- }
-
- /* Free the p_announce */
- p_announce = p_sd->p_sys->pp_announces[i];
- if( p_announce->psz_name )
- free( p_announce->psz_name );
- if( p_announce->psz_uri )
- free( p_announce->psz_uri );
-
- /* Remove the sap_announce from the array */
- REMOVE_ELEM( p_sd->p_sys->pp_announces,
- p_sd->p_sys->i_announces,
- i );
-
- free( p_announce );
-
- }
+ mtime_t i_timeout = ( mtime_t ) 1000000 * p_sd->p_sys->i_timeout;
+
+ if( mdate() - p_sd->p_sys->pp_announces[i]->i_last > i_timeout )
+ {
+ struct sap_announce_t *p_announce;
+ p_announce = p_sd->p_sys->pp_announces[i];
+
+ /* Remove the playlist item */
+ playlist_LockDelete( p_sd->p_sys->p_playlist,
+ p_announce->i_item_id );
+
+ /* Remove the sap_announce from the array */
+ REMOVE_ELEM( p_sd->p_sys->pp_announces,
+ p_sd->p_sys->i_announces, i );
+
+ free( p_announce );
+ }
}
-#endif
/* Minimum length is > 6 */
if( i_read <= 6 )
{
msg_Warn( p_sd, "socket read error" );
}
- free( p_buffer );
continue;
}
/* Parse the packet */
ParseSAP( p_sd, p_buffer, i_read );
-
- free( p_buffer );
}
}
**********************************************************************/
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,
+ p_playlist = (playlist_t *)vlc_object_find( p_demux, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
- p_playlist->status.p_item->i_flags |= PLAYLIST_DEL_FLAG;
+ p_playlist->status.p_item->i_flags |= PLAYLIST_DEL_FLAG;
- playlist_Add( p_playlist, p_sdp->psz_uri, p_sdp->psz_sessionname,
+ playlist_Add( p_playlist, p_sdp->psz_uri, p_sdp->psz_sessionname,
PLAYLIST_APPEND, PLAYLIST_END );
- vlc_object_release( p_playlist );
-
- FreeSDP( p_sdp );
- free( psz_sdp );
+ vlc_object_release( p_playlist );
+ if( p_sdp ) FreeSDP( p_sdp );
- return VLC_SUCCESS;
+ return VLC_SUCCESS;
}
static int Control( demux_t *p_demux, int i_query, va_list args )
* 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;
sap_announce_t *CreateAnnounce( services_discovery_t *p_sd, uint16_t i_hash,
sdp_t *p_sdp )
{
- playlist_t *p_playlist;
playlist_item_t *p_item, *p_child;
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");
- p_sd->b_die = VLC_TRUE;
+ FREE( p_sap );
+ FREE( psz_value );
return NULL;
}
p_sap->i_last = mdate();
p_sap->i_hash = i_hash;
p_sap->p_sdp = p_sdp;
- p_sap->p_item = NULL;
+ p_sap->i_item_id = -1;
/* 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 )
{
+ free( p_sap );
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 )
psz_value = GetAttribute( p_sap->p_sdp, "plgroup" );
}
- p_playlist = (playlist_t *)vlc_object_find( p_sd, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
- if( !p_playlist )
- {
- msg_Err( p_sd, "playlist not found" );
- FREE( psz_value );
- free( p_sap );
- return 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( p_child == NULL )
+ if( psz_grp != NULL )
{
- p_child = playlist_NodeCreate( p_playlist, VIEW_CATEGORY,
- psz_value, p_sd->p_sys->p_node );
+ p_child = playlist_ChildSearchName( p_sd->p_sys->p_node,
+ psz_grp );
+
+ if( p_child == NULL )
+ {
+ p_child = playlist_NodeCreate( p_sd->p_sys->p_playlist,
+ VIEW_CATEGORY, psz_grp,
+ p_sd->p_sys->p_node );
+ p_child->i_flags =~ PLAYLIST_SKIP_FLAG;
+ }
+ free( psz_grp );
+ }
+ else
+ {
+ 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 );
+ playlist_NodeAddItem( p_sd->p_sys->p_playlist, p_item, VIEW_CATEGORY,
+ p_child, PLAYLIST_APPEND, PLAYLIST_END );
- vlc_object_release( p_playlist );
-
- p_sap->p_item = p_item;
+ p_sap->i_item_id = p_item->input.i_id;
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( "rtp" );
}
- if( psz_proto && !strncmp( psz_proto, "UDP", 3 ) )
+ if( psz_proto && !strncasecmp( psz_proto, "UDP", 3 ) )
{
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;
}
p_sdp = (sdp_t *)malloc( sizeof( sdp_t ) );
+ if( p_sdp == NULL )
+ return NULL;
p_sdp->psz_sdp = strdup( psz_sdp );
+ if( p_sdp->psz_sdp == NULL )
+ {
+ free( p_sdp );
+ return NULL;
+ }
p_sdp->psz_sessionname = NULL;
p_sdp->psz_media = NULL;
if( psz_sdp[1] != '=' )
{
msg_Warn( p_obj, "invalid packet" ) ;
- /* MEMLEAK ! */
+ FreeSDP( p_sdp );
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;
+ vlc_bool_t b_warn = VLC_FALSE;
+
+ if( psz_unicode == NULL )
+ return NULL;
+
+ psz_in = psz_unicode;
+ i_in = strlen( psz_unicode );
+
+#ifndef MB_CUR_MAX
+ i_out = 6 * i_in;
+#else
+ i_out = MB_CUR_MAX * i_in;
+#endif
+ psz_local = malloc( i_out + 1 );
+ if( psz_local == NULL )
+ return NULL;
+ psz_out = psz_local;
+
+ do
+ {
+ ret = vlc_iconv( p_sd->p_sys->iconvHandle,
+ &psz_in, &i_in, &psz_out, &i_out);
+ if( i_in )
+ {
+ *psz_in = '?';
+ b_warn = VLC_TRUE;
+ }
+ else
+ if( ret == (size_t)(-1) )
+ {
+ msg_Err( p_sd, "character conversion failure : %s",
+ strerror( errno ) );
+ free( psz_local );
+ return NULL;
+ }
+ }
+ while( i_in );
+
+ if( b_warn )
+ msg_Warn( p_sd, "in \"%s\" : %s", psz_unicode,
+ strerror( errno ) );
+
+ *psz_out = '\0';
+ return psz_local;
+}
+
+
/***********************************************************************
* ismult: returns true if we have a multicast address
***********************************************************************/
-
-static int ismult( char *psz_uri )
+static vlc_bool_t ismult( char *psz_uri )
{
char *psz_end;
int i_value;
- i_value = strtol( psz_uri, &psz_end, 0 );
-
/* IPv6 */
if( psz_uri[0] == '[')
{
if( strncasecmp( &psz_uri[1], "FF0" , 3) ||
- strncasecmp( &psz_uri[2], "FF0" , 3))
+ ( !isalnum( psz_uri[1]) && strncasecmp( &psz_uri[2], "FF0" , 3) ) )
return( VLC_TRUE );
else
return( VLC_FALSE );
}
+
+ i_value = strtol( psz_uri, &psz_end, 0 );
if( *psz_end != '.' ) { return( VLC_FALSE ); }
- return( i_value < 224 ? VLC_FALSE : VLC_TRUE );
+ return ( ( i_value < 224 ) || ( i_value >= 240 ) ) ? 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;
}
FREE( p_sdp->psz_connection );
FREE( p_sdp->psz_media );
FREE( p_sdp->psz_uri );
+ FREE( p_sdp->psz_username );
+ FREE( p_sdp->psz_network_type );
FREE( p_sdp->psz_address );
FREE( p_sdp->psz_address_type );
sap_announce_t *p_announce )
{
int i;
- 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_playlist )
- {
- return VLC_EGENERIC;
- }
+ if( p_announce->p_sdp ) FreeSDP( p_announce->p_sdp );
- if( p_announce->p_item )
+ if( p_announce->i_item_id > -1 )
{
- playlist_Delete( p_playlist, p_announce->p_item->input.i_id );
+ playlist_LockDelete( p_sd->p_sys->p_playlist, p_announce->i_item_id );
}
for( i = 0; i< p_sd->p_sys->i_announces; i++)
}
}
- vlc_object_release( p_playlist );
-
free( p_announce );
return VLC_SUCCESS;
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