/*****************************************************************************
* sap.c : SAP interface module
*****************************************************************************
- * Copyright (C) 2004 VideoLAN
+ * Copyright (C) 2004-2005 the VideoLAN team
* $Id$
*
- * Authors: Clément Stenac <zorglub@videolan.org>
+ * Authors: Clément Stenac <zorglub@videolan.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
* Includes
*****************************************************************************/
+#define _GNU_SOURCE
#include <stdlib.h> /* malloc(), free() */
#include <vlc/vlc.h>
-#include <vlc/intf.h>
-
#include <vlc/input.h>
+#include <vlc/intf.h>
-#include "network.h"
-#include "charset.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 */
-#define IPV6_ADDR_2 "::2:7FFE"
+#define SAP_V6_1 "FF0"
+/* Scope is inserted between them */
+#define SAP_V6_2 "::2:7FFE"
+/* See RFC3513 for list of valid scopes */
+/* FIXME: find a way to listen to link-local scope */
+static const char ipv6_scopes[] = "1456789ABCDE";
/*****************************************************************************
* Module descriptor
*****************************************************************************/
#define SAP_ADDR_TEXT 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_ADDR_LONGTEXT N_( "The SAP module normally chooses itself the " \
+ "right addresses to listen to. However, you " \
+ "can specify a specific address." )
+#define SAP_IPV4_TEXT N_( "IPv4 SAP" )
#define SAP_IPV4_LONGTEXT N_( \
- "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" )
+ "Listen to IPv4 announcements " \
+ "on the standard address." )
+#define SAP_IPV6_TEXT N_( "IPv6 SAP" )
#define SAP_IPV6_LONGTEXT N_( \
- "Set this if you want the SAP module to listen to IPv6 announces " \
- "on the standard address" )
+ "Listen to IPv6 announcements " \
+ "on the standard addresses." )
#define SAP_SCOPE_TEXT N_( "IPv6 SAP scope" )
#define SAP_SCOPE_LONGTEXT N_( \
- "Sets the scope for IPv6 announces (default is 8)" )
+ "Scope for IPv6 announcements (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 " \
+ "Delay after which SAP items get deleted if no new announcement " \
"is received." )
-#define SAP_PARSE_TEXT N_( "Try to parse the SAP" )
+#define SAP_PARSE_TEXT N_( "Try to parse the announce" )
#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 enables actual parsing of the announces by the SAP module. " \
+ "Otherwise, all announcements are parsed by the \"livedotcom\" " \
+ "(RTP/RTSP) 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" )
+ "announcements." )
#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." \
+ "This enables a SAP caching mechanism. " \
"This will result in lower SAP startup time, but you could end up " \
- "with items corresponding to legacy streams." )
+ "with items corresponding to legacy streams." )
+#define SAP_TIMESHIFT_TEXT N_("Allow timeshifting")
+#define SAP_TIMESHIFT_LONGTEXT N_( "This automatically enables timeshifting " \
+ "for streams discovered through SAP announcements." )
/* Callbacks */
static int Open ( vlc_object_t * );
static void CloseDemux ( vlc_object_t * );
vlc_module_begin();
- set_description( _("SAP announces") );
+ set_shortname( _("SAP"));
+ set_description( _("SAP Announcements") );
set_category( CAT_PLAYLIST );
set_subcategory( SUBCAT_PLAYLIST_SD );
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);
add_integer( "sap-timeout", 1800, NULL,
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 );
+#if 0
add_bool( "sap-cache", 0 , NULL,
SAP_CACHE_TEXT,SAP_CACHE_LONGTEXT, VLC_TRUE );
+#endif
+ add_bool( "sap-timeshift", 0 , NULL,
+ SAP_TIMESHIFT_TEXT,SAP_TIMESHIFT_LONGTEXT, VLC_TRUE );
set_capability( "services_discovery", 0 );
set_callbacks( Open, Close );
/* "computed" URI */
char *psz_uri;
- int i_in; /* IP version */
+ int i_in; /* IP version */
int i_media;
int i_media_type;
/* SAP annnounces must only contain one SDP */
sdp_t *p_sdp;
- playlist_item_t *p_item;
+ int i_input_id;
+ int i_item_id_cat;
+ int i_item_id_one;
};
struct services_discovery_sys_t
int *pi_fd;
/* playlist node */
- playlist_item_t *p_node;
-
- /* charset conversion */
- vlc_iconv_t iconvHandle;
+ playlist_item_t *p_node_cat;
+ playlist_item_t *p_node_one;
/* Table of announces */
int i_announces;
/* Modes */
vlc_bool_t b_strict;
vlc_bool_t b_parse;
+ vlc_bool_t b_timeshift;
int i_timeout;
};
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 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 );
+ 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 );
#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 * );
-
-#define FREE( p ) \
- if( p ) { free( p ); (p) = NULL; }
/*****************************************************************************
* Open: initialize and create stuff
*****************************************************************************/
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 = 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_sys->i_timeout = var_CreateGetInteger( p_sd, "sap-timeout" );
p_sd->pf_run = Run;
p_sd->p_sys = p_sys;
p_sys->pi_fd = NULL;
p_sys->i_fd = 0;
- p_sys->b_strict = config_GetInt( p_sd, "sap-strict");
- 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 0
+ if( var_CreateGetInteger( p_sd, "sap-cache" ) )
{
CacheLoad( p_sd );
}
+#endif
- if( config_GetInt( p_sd, "sap-ipv4" ) )
- {
- InitSocket( p_sd, SAP_V4_ADDRESS, SAP_PORT );
- }
- if( config_GetInt( p_sd, "sap-ipv6" ) )
- {
- /* [ + 8x4+7*':' + ] */
- char psz_address[42];
- char c_scope;
- char *psz_scope = config_GetPsz( 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 );
- }
-
- psz_addr = config_GetPsz( 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");
- return VLC_EGENERIC;
- }
+ /* Cache sap_timeshift value */
+ p_sys->b_timeshift = var_CreateGetInteger( p_sd, "sap-timeshift" )
+ ? VLC_TRUE : VLC_FALSE;
/* Create our playlist node */
- p_playlist = (playlist_t *)vlc_object_find( p_sd, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
- if( !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,
- _("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 );
+ pl_Yield( p_sd );
- vlc_object_release( p_playlist );
+ playlist_NodesPairCreate( pl_Get( p_sd ), _("SAP sessions"),
+ &p_sys->p_node_cat, &p_sys->p_node_one,
+ VLC_TRUE );
p_sys->i_announces = 0;
p_sys->pp_announces = NULL;
uint8_t *p_peek;
int i_max_sdp = 1024;
int i_sdp = 0;
- char *psz_sdp = (char *)malloc( i_max_sdp );
+ char *psz_sdp = NULL;
sdp_t *p_sdp = NULL;
- if( !psz_sdp )
+ if( !var_CreateGetInteger( p_demux, "sap-parse" ) )
{
+ /* We want livedotcom module to parse this SDP file */
return VLC_EGENERIC;
}
/* 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( ;; )
{
}
i_max_sdp += 1000;
- psz_sdp = (uint8_t*)realloc( psz_sdp, i_max_sdp );
+ psz_sdp = (char *)realloc( psz_sdp, i_max_sdp );
}
p_sdp = ParseSDP( VLC_OBJECT(p_demux), psz_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 )
+ 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->pf_control = Control;
p_demux->pf_demux = Demux;
- free( psz_sdp );
+ FREENULL( psz_sdp );
return VLC_SUCCESS;
error:
- free( psz_sdp );
- if( p_sdp ) FreeSDP( p_sdp );
+ FREENULL( psz_sdp );
+ if( p_sdp ) FreeSDP( p_sdp ); p_sdp = NULL;
stream_Seek( p_demux->s, 0 );
- return VLC_EGENERIC;
+ 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] );
}
+ FREENULL( p_sys->pi_fd );
+#if 0
if( config_GetInt( p_sd, "sap-cache" ) )
{
CacheSave( p_sd );
}
+#endif
for( i = p_sys->i_announces - 1; i>= 0; i-- )
{
RemoveAnnounce( p_sd, p_sys->pp_announces[i] );
}
+ FREENULL( p_sys->pp_announces );
- p_playlist = (playlist_t *) vlc_object_find( p_sd, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
-
- if( p_playlist )
- {
- 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 );
-
+ playlist_NodeDelete( pl_Get(p_sd), p_sys->p_node_cat, VLC_TRUE,
+ VLC_TRUE );
+ playlist_NodeDelete( pl_Get(p_sd), p_sys->p_node_one, VLC_TRUE,
+ VLC_TRUE );
+ pl_Release( p_sd );
free( p_sys );
}
*****************************************************************************/
static void CloseDemux( vlc_object_t *p_this )
{
-
+ demux_t *p_demux = (demux_t *)p_this;
+ if( p_demux->p_sys )
+ {
+ if( p_demux->p_sys->p_sdp ) { FreeSDP( p_demux->p_sys->p_sdp ); p_demux->p_sys->p_sdp = NULL; }
+ free( p_demux->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 );
+ char *psz_addr;
+ int i;
- /* read SAP packets */
- while( !p_sd->b_die )
+ /* Braindead Winsock DNS resolver will get stuck over 2 seconds per failed
+ * DNS queries, even if the DNS server returns an error with milliseconds.
+ * You don't want to know why the bug (as of XP SP2) wasn't fixed since
+ * Winsock 1.1 from Windows 95, if not Windows 3.1.
+ * Anyway, to avoid a 30 seconds delay for failed IPv6 socket creation,
+ * we have to open sockets in Run() rather than Open(). */
+ if( var_CreateGetInteger( p_sd, "sap-ipv4" ) )
{
- int i_read;
- p_buffer = (uint8_t *)malloc( MAX_SAP_BUFFER );
+ 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( var_CreateGetInteger( p_sd, "sap-ipv6" ) )
+ {
+ char psz_address[] = SAP_V6_1"0"SAP_V6_2;
+ const char *c_scope;
- if( !p_buffer )
+ for( c_scope = ipv6_scopes; *c_scope; c_scope++ )
{
- msg_Err( p_sd, "out of memory");
- p_sd->b_die = VLC_TRUE;
- continue;
+ psz_address[sizeof(SAP_V6_1) - 1] = *c_scope;
+ InitSocket( p_sd, psz_address, SAP_PORT );
}
+ }
+
+ psz_addr = var_CreateGetString( p_sd, "sap-addr" );
+ if( psz_addr && *psz_addr )
+ {
+ InitSocket( p_sd, psz_addr, SAP_PORT );
+ free( psz_addr );
+ }
+
+ if( p_sd->p_sys->i_fd == 0 )
+ {
+ msg_Err( p_sd, "unable to listen on any address" );
+ return;
+ }
+
+ /* read SAP packets */
+ while( !p_sd->b_die )
+ {
+ int i_read;
+ uint8_t p_buffer[MAX_SAP_BUFFER+1];
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 )
+ {
+ RemoveAnnounce( p_sd, p_sd->p_sys->pp_announces[i] );
+ }
}
-#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 )
{
sdp_t *p_sdp = p_demux->p_sys->p_sdp;
- playlist_t *p_playlist;
+ input_thread_t *p_input;
+ input_item_t *p_parent_input;
- p_playlist = (playlist_t *)vlc_object_find( p_demux, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
+ playlist_t *p_playlist = pl_Yield( p_demux );
+ p_input = (input_thread_t *)vlc_object_find( p_demux, VLC_OBJECT_INPUT,
+ FIND_PARENT );
+ assert( p_input );
+ if( !p_input )
+ {
+ msg_Err( p_demux, "parent input could not be found" );
+ return VLC_EGENERIC;
+ }
- p_playlist->status.p_item->i_flags |= PLAYLIST_DEL_FLAG;
+ p_parent_input = p_input->input.p_item;
- playlist_Add( p_playlist, p_sdp->psz_uri, p_sdp->psz_sessionname,
- PLAYLIST_APPEND, PLAYLIST_END );
+ vlc_mutex_lock( &p_parent_input->lock );
+ FREENULL( p_parent_input->psz_uri );
+ p_parent_input->psz_uri = strdup( p_sdp->psz_uri );
+ FREENULL( p_parent_input->psz_name );
+ p_parent_input->psz_name = strdup( EnsureUTF8( p_sdp->psz_sessionname ) );
+ p_parent_input->i_type = ITEM_TYPE_NET;
- vlc_object_release( p_playlist );
- if( p_sdp ) FreeSDP( p_sdp );
+ if( p_playlist->status.p_item &&
+ p_playlist->status.p_item->p_input == p_parent_input )
+ {
+ playlist_Control( p_playlist, PLAYLIST_VIEWPLAY,
+ p_playlist->status.p_node, p_playlist->status.p_item );
+ }
+
+ vlc_mutex_unlock( &p_parent_input->lock );
+ vlc_object_release( p_input );
+ vlc_object_release( p_playlist );
- return VLC_SUCCESS;
+ return VLC_SUCCESS;
}
static int Control( demux_t *p_demux, int i_query, va_list args )
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;
+ char *psz_sdp, *psz_foo, *psz_initial_sdp;
+ uint8_t *p_decompressed_buffer = NULL;
sdp_t *p_sdp;
vlc_bool_t b_compressed;
vlc_bool_t b_need_delete = VLC_FALSE;
-#ifdef HAVE_ZLIB_H
- 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;
-msg_Dbg( p_sd, "." );
if( i_version != 1 )
{
msg_Dbg( p_sd, "strange sap version %d found", i_version );
return VLC_EGENERIC;
}
- psz_sdp = &p_buffer[4];
+ psz_sdp = (char *)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" );
+ msg_Warn( p_sd, "too short SAP packet" );
return VLC_EGENERIC;
}
}
psz_sdp += 16;
if( i_read <= 21 )
{
- msg_Warn( p_sd,"too short SAP packet\n" );
+ msg_Warn( p_sd, "too short SAP packet" );
return VLC_EGENERIC;
}
}
if( b_compressed )
{
#ifdef HAVE_ZLIB_H
- i_decompressed_size = Decompress( psz_sdp,
- &p_decompressed_buffer,i_read - ( psz_sdp - p_buffer ) );
- if( i_decompressed_size > 0 && i_decompressed_size < MAX_SAP_BUFFER )
+ int i_decompressed_size;
+
+ i_decompressed_size = Decompress( (uint8_t *)psz_sdp,
+ &p_decompressed_buffer, i_read - ( psz_sdp - (char *)p_buffer ) );
+ if( i_decompressed_size > 0 )
{
- memcpy( psz_sdp, p_decompressed_buffer, i_decompressed_size );
+ psz_sdp = (char *)p_decompressed_buffer;
+ realloc( p_decompressed_buffer, i_decompressed_size++ );
psz_sdp[i_decompressed_size] = '\0';
- free( p_decompressed_buffer );
+ }
+ else
+ {
+ msg_Warn( p_sd, "decompression of sap packet failed" );
+ return VLC_EGENERIC;
}
#else
- msg_Warn( p_sd, "Ignoring compressed sap packet" );
+ msg_Warn( p_sd, "ignoring compressed sap packet" );
return VLC_EGENERIC;
#endif
}
{
psz_sdp++;
}
- if( psz_sdp != psz_foo && strcasecmp( psz_foo, "application/sdp" ) )
+ if( ( psz_sdp != psz_foo ) && strcasecmp( psz_foo, "application/sdp" ) )
{
- msg_Dbg( p_sd, "unhandled content type: %s", psz_foo );
+ msg_Dbg( p_sd, "unhandled content type: %s", psz_foo );
}
- if( psz_sdp -p_buffer >= i_read )
+ if( ( psz_sdp - (char *)p_buffer ) >= i_read )
{
msg_Warn( p_sd, "package without content" );
return VLC_EGENERIC;
if( b_need_delete )
{
RemoveAnnounce( p_sd, p_sd->p_sys->pp_announces[i]);
- return VLC_SUCCESS;
}
else
{
p_sd->p_sys->pp_announces[i]->i_last = mdate();
- FreeSDP( p_sdp );
- return VLC_SUCCESS;
}
+ FreeSDP( p_sdp ); p_sdp = NULL;
+ return VLC_SUCCESS;
}
}
/* Add item */
if( p_sdp->i_media > 1 )
{
- msg_Dbg( p_sd, "passing to LIVE.COM" );
+ msg_Dbg( p_sd, "passing to liveMedia" );
}
CreateAnnounce( p_sd, i_hash, p_sdp );
+ FREENULL( p_decompressed_buffer );
return VLC_SUCCESS;
}
sap_announce_t *CreateAnnounce( services_discovery_t *p_sd, uint16_t i_hash,
sdp_t *p_sdp )
{
- playlist_t *p_playlist;
+ input_item_t *p_input;
playlist_item_t *p_item, *p_child;
- char *psz_value;
+ char *psz_value;
sap_announce_t *p_sap = (sap_announce_t *)malloc(
sizeof(sap_announce_t ) );
-
- 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;
+ services_discovery_sys_t *p_sys;
+ if( p_sap == NULL )
return NULL;
- }
+
+ p_sys = p_sd->p_sys;
+
+ EnsureUTF8( p_sdp->psz_sessionname );
p_sap->i_last = mdate();
p_sap->i_hash = i_hash;
p_sap->p_sdp = p_sdp;
- p_sap->p_item = NULL;
- /* Create the playlist item here */
- p_item = playlist_ItemNew( p_sd, p_sap->p_sdp->psz_uri, psz_value );
- free( psz_value );
-
- if( !p_item )
+ /* Create the actual playlist item here */
+ p_input = input_ItemNewWithType( VLC_OBJECT(p_sd),
+ p_sap->p_sdp->psz_uri,
+ p_sdp->psz_sessionname,
+ 0, NULL, -1, ITEM_TYPE_NET );
+ p_sap->i_input_id = p_input->i_id;
+ if( !p_input )
{
+ free( p_sap );
return NULL;
}
+ if( p_sys->b_timeshift )
+ input_ItemAddOption( p_input, ":access-filter=timeshift" );
+
psz_value = GetAttribute( p_sap->p_sdp, "tool" );
if( psz_value != NULL )
{
- vlc_input_item_AddInfo( &p_item->input, _("Session"),
- _("Tool"), psz_value );
+ input_ItemAddInfo( p_input, _("Session"),_("Tool"), psz_value );
}
if( strcmp( p_sdp->psz_username, "-" ) )
{
- vlc_input_item_AddInfo( &p_item->input, _("Session"),
+ input_ItemAddInfo( p_input, _("Session"),
_("User"), p_sdp->psz_username );
}
+ /* Handle group */
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 )
{
- char *psz_grp = convert_from_utf8( p_sd, psz_value );
+ EnsureUTF8( psz_value );
- if( psz_grp != NULL )
- {
- p_child = playlist_ChildSearchName( p_sd->p_sys->p_node,
- psz_grp );
+ p_child = playlist_ChildSearchName( p_sys->p_node_cat, psz_value );
- if( p_child == NULL )
- p_child = playlist_NodeCreate( p_playlist, VIEW_CATEGORY,
- psz_grp, p_sd->p_sys->p_node );
- free( psz_grp );
- }
- else
+ if( p_child == NULL )
{
- vlc_object_release( p_playlist );
- msg_Err( p_sd, "out of memory");
- free( p_sap );
- return NULL;
+ p_child = playlist_NodeCreate( pl_Get( p_sd ), psz_value,
+ p_sys->p_node_cat );
+ p_child->i_flags &= ~PLAYLIST_SKIP_FLAG;
}
}
else
{
- p_child = p_sd->p_sys->p_node;
+ p_child = p_sys->p_node_cat;
}
+ p_item = playlist_NodeAddInput( pl_Get( p_sd ), p_input, p_child,
+ PLAYLIST_APPEND, PLAYLIST_END );
p_item->i_flags &= ~PLAYLIST_SKIP_FLAG;
+ p_item->i_flags &= ~PLAYLIST_SAVE_FLAG;
+ p_sap->i_item_id_cat = p_item->i_id;
- playlist_NodeAddItem( p_playlist, p_item, VIEW_CATEGORY, p_child,
- PLAYLIST_APPEND, PLAYLIST_END );
-
- vlc_object_release( p_playlist );
-
- p_sap->p_item = p_item;
+ p_item = playlist_NodeAddInput( pl_Get( p_sd ), p_input,
+ p_sys->p_node_one, PLAYLIST_APPEND, PLAYLIST_END );
+ p_item->i_flags &= ~PLAYLIST_SKIP_FLAG;
+ p_item->i_flags &= ~PLAYLIST_SAVE_FLAG;
+ p_sap->i_item_id_one = p_item->i_id;
- TAB_APPEND( p_sd->p_sys->i_announces,
- p_sd->p_sys->pp_announces, p_sap );
+ TAB_APPEND( p_sys->i_announces, p_sys->pp_announces, p_sap );
return p_sap;
}
/* Fill p_sdp->psz_uri */
static int ParseConnection( vlc_object_t *p_obj, sdp_t *p_sdp )
{
- char *psz_eof;
- char *psz_parse;
+ char *psz_eof = NULL;
+ char *psz_parse = NULL;
char *psz_uri = NULL;
char *psz_proto = NULL;
+ char psz_source[256];
int i_port = 0;
/* Parse c= field */
if( psz_eof )
{
- *psz_eof = 0;
+ *psz_eof = '\0';
}
else
{
msg_Dbg( p_obj, "incorrect c field, %s", p_sdp->psz_connection );
}
- psz_uri = strdup( psz_parse );
+ if( p_sdp->i_in == 6 && ( isxdigit( *psz_parse ) || *psz_parse == ':' ) )
+ {
+ asprintf( &psz_uri, "[%s]", psz_parse );
+ }
+ else psz_uri = strdup( psz_parse );
}
*psz_eof = '\0';
if( strncmp( psz_parse, "audio", 5 ) &&
- strncmp( psz_parse, "video",5 ) )
+ strncmp( psz_parse, "video", 5 ) )
{
msg_Warn( p_obj, "unhandled media type -%s-", psz_parse );
- FREE( psz_uri );
+ FREENULL( psz_uri );
return VLC_EGENERIC;
}
else
{
msg_Warn( p_obj, "unable to parse m field (1)");
- FREE( psz_uri );
+ FREENULL( psz_uri );
return VLC_EGENERIC;
}
else
{
msg_Warn( p_obj, "unable to parse m field (2)");
- FREE( psz_uri );
+ FREENULL( psz_uri );
return VLC_EGENERIC;
}
psz_parse = psz_eof + 1;
p_sdp->i_media_type = atoi( psz_parse );
-
+
}
else
{
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" );
i_port = 1234;
}
- if( ismult( psz_uri ) )
- {
- asprintf( &p_sdp->psz_uri, "%s://@%s:%i", psz_proto, psz_uri, i_port );
- }
- else
- {
- asprintf( &p_sdp->psz_uri, "%s://%s:%i", psz_proto, psz_uri, i_port );
- }
- FREE( psz_uri );
- FREE( psz_proto );
+ /* handle SSM case */
+ psz_parse = GetAttribute( p_sdp, "source-filter" );
+ psz_source[0] = '\0';
+
+ if( psz_parse ) sscanf( psz_parse, " incl IN IP%*s %*s %255s ", psz_source);
+
+ asprintf( &p_sdp->psz_uri, "%s://%s@%s:%i", psz_proto, psz_source,
+ psz_uri, i_port );
+
+ FREENULL( psz_uri );
+ FREENULL( psz_proto );
return VLC_SUCCESS;
}
sdp_t *p_sdp;
vlc_bool_t b_invalid = VLC_FALSE;
vlc_bool_t b_end = VLC_FALSE;
-msg_Dbg( p_obj, "%s", psz_sdp );
if( psz_sdp == NULL )
{
return NULL;
if( psz_sdp[0] != 'v' || psz_sdp[1] != '=' )
{
- msg_Warn( p_obj, "Bad packet" );
+ 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 ); p_sdp = NULL;
return NULL;
}
p_sdp->i_session_id = atoll( psz_sess_id );
- FREE( psz_sess_id );
+ FREENULL( psz_sess_id );
GET_FIELD( psz_sess_id );
- FREE( psz_sess_id );
+ FREENULL( psz_sess_id );
GET_FIELD( p_sdp->psz_network_type );
GET_FIELD( p_sdp->psz_address_type );
if( b_invalid )
{
- FreeSDP( p_sdp );
+ FreeSDP( p_sdp ); p_sdp = NULL;
return NULL;
}
return p_sdp;
}
-
-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;
- 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))
- return( VLC_TRUE );
- else
- return( VLC_FALSE );
- }
-
- if( *psz_end != '.' ) { return( VLC_FALSE ); }
-
- return( i_value < 224 ? VLC_FALSE : VLC_TRUE );
-}
-
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 );
+ int i_fd = net_OpenUDP( p_sd, psz_address, i_port, NULL, 0 );
if( i_fd != -1 )
{
+ net_StopSend( 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;
printf( "inflateInit() failed. Result: %d\n", i_result );
return( -1 );
}
-#if 0
- p_playlist->pp_items[p_playlist->i_index]->b_autodeletion = VLC_TRUE;
- i_position = p_playlist->i_index;
-
- /* Gather the complete sdp file */
- for( ;; )
- {
- int i_read = stream_Read( p_demux->s, &p_sdp[i_sdp], i_sdp_max - i_sdp - 1 );
-#endif
d_stream.next_in = (Bytef *)psz_src;
d_stream.avail_in = i_len;
n = 0;
static void FreeSDP( sdp_t *p_sdp )
{
int i;
- FREE( p_sdp->psz_sdp );
- FREE( p_sdp->psz_sessionname );
- FREE( p_sdp->psz_connection );
- FREE( p_sdp->psz_media );
- FREE( p_sdp->psz_uri );
+ FREENULL( p_sdp->psz_sdp );
+ FREENULL( p_sdp->psz_sessionname );
+ FREENULL( p_sdp->psz_connection );
+ FREENULL( p_sdp->psz_media );
+ FREENULL( p_sdp->psz_uri );
+ FREENULL( p_sdp->psz_username );
+ FREENULL( p_sdp->psz_network_type );
- FREE( p_sdp->psz_address );
- FREE( p_sdp->psz_address_type );
+ FREENULL( p_sdp->psz_address );
+ FREENULL( p_sdp->psz_address_type );
for( i= p_sdp->i_attributes - 1; i >= 0 ; i-- )
{
struct attribute_t *p_attr = p_sdp->pp_attributes[i];
- FREE( p_sdp->pp_attributes[i]->psz_field );
- FREE( p_sdp->pp_attributes[i]->psz_value );
+ FREENULL( p_sdp->pp_attributes[i]->psz_field );
+ FREENULL( p_sdp->pp_attributes[i]->psz_value );
REMOVE_ELEM( p_sdp->pp_attributes, p_sdp->i_attributes, i);
- FREE( p_attr );
+ FREENULL( p_attr );
}
- free( p_sdp );
+ FREENULL( p_sdp );
}
static int RemoveAnnounce( services_discovery_t *p_sd,
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_item )
+ if( p_announce->p_sdp )
{
- playlist_LockDelete( p_playlist, p_announce->p_item->input.i_id );
+ FreeSDP( p_announce->p_sdp );
+ p_announce->p_sdp = NULL;
}
+ if( p_announce->i_input_id > -1 )
+ playlist_LockDeleteAllFromInput( pl_Get(p_sd), p_announce->i_input_id );
+
for( i = 0; i< p_sd->p_sys->i_announces; i++)
{
if( p_sd->p_sys->pp_announces[i] == p_announce )
}
}
- vlc_object_release( p_playlist );
-
free( p_announce );
return VLC_SUCCESS;
static void CacheLoad( services_discovery_t *p_sd )
{
- msg_Warn( p_sd, "Cache not implemented") ;
+ msg_Warn( p_sd, "cache not implemented") ;
}
static void CacheSave( services_discovery_t *p_sd )
{
- msg_Warn( p_sd, "Cache not implemented") ;
+ msg_Warn( p_sd, "cache not implemented") ;
}
projects / vlc / blobdiff