# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
#include <vlc_plugin.h>
#include <assert.h>
-#include <vlc_playlist.h>
#include <vlc_demux.h>
+#include <vlc_services_discovery.h>
#include <vlc_network.h>
#include <vlc_charset.h>
-#include <ctype.h>
-#include <errno.h>
-
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
-#ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-#endif
#ifdef HAVE_POLL
# include <poll.h>
#endif
#define SAP_PARSE_TEXT N_( "Try to parse the announce" )
#define SAP_PARSE_LONGTEXT N_( \
"This enables actual parsing of the announces by the SAP module. " \
- "Otherwise, all announcements are parsed by the \"livedotcom\" " \
+ "Otherwise, all announcements are parsed by the \"live555\" " \
"(RTP/RTSP) module." )
#define SAP_STRICT_TEXT N_( "SAP Strict mode" )
#define SAP_STRICT_LONGTEXT N_( \
"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." )
-#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 int OpenDemux ( vlc_object_t * );
static void CloseDemux ( vlc_object_t * );
-vlc_module_begin();
- set_shortname( _("SAP"));
- set_description( _("SAP Announcements") );
- set_category( CAT_PLAYLIST );
- set_subcategory( SUBCAT_PLAYLIST_SD );
+VLC_SD_PROBE_HELPER("sap", "Network streams (SAP)", SD_CAT_LAN)
+
+vlc_module_begin ()
+ set_shortname( N_("SAP"))
+ set_description( N_("Network streams (SAP)") )
+ set_category( CAT_PLAYLIST )
+ set_subcategory( SUBCAT_PLAYLIST_SD )
add_string( "sap-addr", NULL, NULL,
- SAP_ADDR_TEXT, SAP_ADDR_LONGTEXT, true );
- add_bool( "sap-ipv4", 1 , NULL,
- SAP_IPV4_TEXT,SAP_IPV4_LONGTEXT, true );
- add_bool( "sap-ipv6", 1 , NULL,
- SAP_IPV6_TEXT, SAP_IPV6_LONGTEXT, true );
+ SAP_ADDR_TEXT, SAP_ADDR_LONGTEXT, true )
+ add_bool( "sap-ipv4", true, NULL,
+ SAP_IPV4_TEXT,SAP_IPV4_LONGTEXT, true )
+ add_bool( "sap-ipv6", true, NULL,
+ SAP_IPV6_TEXT, SAP_IPV6_LONGTEXT, true )
add_integer( "sap-timeout", 1800, NULL,
- SAP_TIMEOUT_TEXT, SAP_TIMEOUT_LONGTEXT, true );
- add_bool( "sap-parse", 1 , NULL,
- SAP_PARSE_TEXT,SAP_PARSE_LONGTEXT, true );
- add_bool( "sap-strict", 0 , NULL,
- SAP_STRICT_TEXT,SAP_STRICT_LONGTEXT, true );
+ SAP_TIMEOUT_TEXT, SAP_TIMEOUT_LONGTEXT, true )
+ add_bool( "sap-parse", true, NULL,
+ SAP_PARSE_TEXT,SAP_PARSE_LONGTEXT, true )
+ add_bool( "sap-strict", false, NULL,
+ SAP_STRICT_TEXT,SAP_STRICT_LONGTEXT, true )
#if 0
- add_bool( "sap-cache", 0 , NULL,
- SAP_CACHE_TEXT,SAP_CACHE_LONGTEXT, true );
+ add_bool( "sap-cache", false, NULL,
+ SAP_CACHE_TEXT,SAP_CACHE_LONGTEXT, true )
#endif
- add_bool( "sap-timeshift", 0 , NULL,
- SAP_TIMESHIFT_TEXT,SAP_TIMESHIFT_LONGTEXT, true );
+ add_obsolete_bool( "sap-timeshift" ) /* Redumdant since 1.0.0 */
+
+ set_capability( "services_discovery", 0 )
+ set_callbacks( Open, Close )
- set_capability( "services_discovery", 0 );
- set_callbacks( Open, Close );
+ VLC_SD_PROBE_SUBMODULE
- add_submodule();
- set_description( _("SDP Descriptions parser") );
- add_shortcut( "sdp" );
- set_capability( "demux", 51 );
- set_callbacks( OpenDemux, CloseDemux );
-vlc_module_end();
+ add_submodule ()
+ set_description( N_("SDP Descriptions parser") )
+ add_shortcut( "sdp" )
+ set_capability( "demux", 51 )
+ set_callbacks( OpenDemux, CloseDemux )
+vlc_module_end ()
/*****************************************************************************
/* "computed" URI */
char *psz_uri;
int i_media_type;
+ unsigned rtcp_port;
/* a= global attributes */
int i_attributes;
struct attribute_t
{
const char *value;
- char name[0];
+ char name[];
};
struct sap_announce_t
/* SAP annnounces must only contain one SDP */
sdp_t *p_sdp;
- int i_input_id;
+ input_item_t * p_item;
};
struct services_discovery_sys_t
{
+ vlc_thread_t thread;
+
/* Socket descriptors */
int i_fd;
int *pi_fd;
/* Modes */
bool b_strict;
bool b_parse;
- bool b_timeshift;
int i_timeout;
};
/* Main functions */
static int Demux( demux_t *p_demux );
static int Control( demux_t *, int, va_list );
- static void Run ( services_discovery_t *p_sd );
+ static void *Run ( void *p_sd );
/* Main parsing functions */
static int ParseConnection( vlc_object_t *p_obj, sdp_t *p_sdp );
return a > b ? b : a;
}
+static bool IsWellKnownPayload (int type)
+{
+ switch (type)
+ { /* Should be in sync with modules/demux/rtp.c */
+ case 0: /* PCMU/8000 */
+ case 3:
+ case 8: /* PCMA/8000 */
+ case 10: /* L16/44100/2 */
+ case 11: /* L16/44100 */
+ case 12:
+ case 14: /* MPA/90000 */
+ case 32: /* MPV/90000 */
+ case 33: /* MP2/90000 */
+ return true;
+ }
+ return false;
+}
+
/*****************************************************************************
* Open: initialize and create stuff
*****************************************************************************/
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 = var_CreateGetInteger( p_sd, "sap-strict");
- p_sys->b_parse = var_CreateGetInteger( p_sd, "sap-parse" );
+ p_sys->b_strict = var_CreateGetBool( p_sd, "sap-strict");
+ p_sys->b_parse = var_CreateGetBool( p_sd, "sap-parse" );
#if 0
- if( var_CreateGetInteger( p_sd, "sap-cache" ) )
+ if( var_CreateGetBool( p_sd, "sap-cache" ) )
{
CacheLoad( p_sd );
}
#endif
- /* Cache sap_timeshift value */
- p_sys->b_timeshift = var_CreateGetInteger( p_sd, "sap-timeshift" );
-
- /* Set our name */
- services_discovery_SetLocalizedName( p_sd, _("SAP") );
-
p_sys->i_announces = 0;
p_sys->pp_announces = NULL;
+ /* TODO: create sockets here, and fix racy sockets table */
+ if (vlc_clone (&p_sys->thread, Run, p_sd, VLC_THREAD_PRIORITY_LOW))
+ {
+ free (p_sys);
+ return VLC_EGENERIC;
+ }
return VLC_SUCCESS;
}
int errval = VLC_EGENERIC;
size_t i_len;
- if( !var_CreateGetInteger( p_demux, "sap-parse" ) )
+ if( !var_CreateGetBool( p_demux, "sap-parse" ) )
{
/* We want livedotcom module to parse this SDP file */
return VLC_EGENERIC;
{
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 (!IsWellKnownPayload (p_sdp->i_media_type))
goto error;
-
if( p_sdp->psz_uri == NULL ) goto error;
p_demux->p_sys = (demux_sys_t *)malloc( sizeof(demux_sys_t) );
+ if( unlikely( !p_demux->p_sys ) )
+ goto error;
p_demux->p_sys->p_sdp = p_sdp;
p_demux->pf_control = Control;
p_demux->pf_demux = Demux;
{
services_discovery_t *p_sd = ( services_discovery_t* )p_this;
services_discovery_sys_t *p_sys = p_sd->p_sys;
-
int i;
+ vlc_cancel (p_sys->thread);
+ vlc_join (p_sys->thread, NULL);
+
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" ) )
+ if( var_InheritBool( p_sd, "sap-cache" ) )
{
CacheSave( p_sd );
}
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 );
- }
+
+ if( p_demux->p_sys->p_sdp )
+ FreeSDP( p_demux->p_sys->p_sdp );
+ free( p_demux->p_sys );
}
/*****************************************************************************
*****************************************************************************/
#define MAX_SAP_BUFFER 5000
-static void Run( services_discovery_t *p_sd )
+static void *Run( void *data )
{
+ services_discovery_t *p_sd = data;
char *psz_addr;
int i;
int timeout = -1;
+ int canc = vlc_savecancel ();
/* Braindead Winsock DNS resolver will get stuck over 2 seconds per failed
* DNS queries, even if the DNS server returns an error with milliseconds.
* 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" ) )
+ if( var_CreateGetBool( p_sd, "sap-ipv4" ) )
{
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" ) )
+ if( var_CreateGetBool( p_sd, "sap-ipv6" ) )
{
char psz_address[NI_MAXNUMERICHOST] = "ff02::2:7ffe%";
psz_addr = var_CreateGetString( p_sd, "sap-addr" );
if( psz_addr && *psz_addr )
- {
InitSocket( p_sd, psz_addr, SAP_PORT );
- free( psz_addr );
- }
+ free( psz_addr );
if( p_sd->p_sys->i_fd == 0 )
{
msg_Err( p_sd, "unable to listen on any address" );
- return;
+ return NULL;
}
- vlc_object_lock( p_sd );
-
/* read SAP packets */
- while( vlc_object_alive( p_sd ) )
+ for (;;)
{
+ vlc_restorecancel (canc);
unsigned n = p_sd->p_sys->i_fd;
- struct pollfd ufd[n+1];
+ struct pollfd ufd[n];
for (unsigned i = 0; i < n; i++)
{
ufd[i].revents = 0;
}
- /* Make sure we track vlc_object_signal() */
- ufd[n].fd = vlc_object_waitpipe( p_sd );
- ufd[n].events = POLLIN | POLLHUP;
- ufd[n].revents = 0;
-
- if( ufd[n].fd == -1 )
- {
- /* On windows, fd will be -1, as we can't select on a pipe()-ed
- * fildes. Because we have no other solution to track that
- * object is killed, we make sure the timeout won't be to long. */
- if( timeout > 1000 || timeout == -1 )
- timeout = 1000;
- }
-
- vlc_object_unlock( p_sd );
-
- if (poll (ufd, n+1, timeout) > 0)
+ int val = poll (ufd, n, timeout);
+ canc = vlc_savecancel ();
+ if (val > 0)
{
for (unsigned i = 0; i < n; i++)
{
timeout = -1; /* We can safely poll indefinitly. */
else if( timeout < 200 )
timeout = 200; /* Don't wakeup too fast. */
-
- vlc_object_lock( p_sd );
}
- vlc_object_unlock( p_sd );
+ assert (0);
}
/**********************************************************************
input_thread_t *p_input;
input_item_t *p_parent_input;
- playlist_t *p_playlist = pl_Yield( p_demux );
- p_input = (input_thread_t *)vlc_object_find( p_demux, VLC_OBJECT_INPUT,
- FIND_PARENT );
+ p_input = demux_GetParentInput( p_demux );
assert( p_input );
if( !p_input )
{
return VLC_EGENERIC;
}
+ /* This item hasn't been held by input_GetItem
+ * don't release it */
p_parent_input = input_GetItem( p_input );
input_item_SetURI( p_parent_input, p_sdp->psz_uri );
input_item_SetName( p_parent_input, p_sdp->psz_sessionname );
+ if( p_sdp->rtcp_port )
+ {
+ char *rtcp;
+ if( asprintf( &rtcp, ":rtcp-port=%u", p_sdp->rtcp_port ) != -1 )
+ {
+ input_item_AddOption( p_parent_input, rtcp, VLC_INPUT_OPTION_TRUSTED );
+ free( rtcp );
+ }
+ }
vlc_mutex_lock( &p_parent_input->lock );
p_parent_input->i_type = ITEM_TYPE_NET;
- if( p_playlist->status.p_item &&
- p_playlist->status.p_item->p_input == p_parent_input )
- {
- playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, true,
- 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;
}
p_sdp->psz_uri = NULL;
/* Multi-media or no-parse -> pass to LIVE.COM */
- if( ( p_sdp->i_media_type != 14
- && p_sdp->i_media_type != 32
- && p_sdp->i_media_type != 33)
- || p_sd->p_sys->b_parse == false )
+ if( !IsWellKnownPayload( p_sdp->i_media_type ) || !p_sd->p_sys->b_parse )
{
free( p_sdp->psz_uri );
if (asprintf( &p_sdp->psz_uri, "sdp://%s", p_sdp->psz_sdp ) == -1)
p_sdp->psz_uri = NULL;
}
- if( p_sdp->psz_uri == NULL ) return VLC_EGENERIC;
+ if( p_sdp->psz_uri == NULL )
+ {
+ FreeSDP( p_sdp );
+ return VLC_EGENERIC;
+ }
for( i = 0 ; i< p_sd->p_sys->i_announces ; i++ )
{
p_announce->i_period_trust++;
/* Compute the average period */
- p_announce->i_period = (p_announce->i_period + (mdate() - p_announce->i_last)) / 2;
- p_announce->i_last = mdate();
+ mtime_t now = mdate();
+ p_announce->i_period = (p_announce->i_period + (now - p_announce->i_last)) / 2;
+ p_announce->i_last = now;
}
FreeSDP( p_sdp ); p_sdp = NULL;
return VLC_SUCCESS;
p_sap->i_hash = i_hash;
p_sap->p_sdp = p_sdp;
- /* Create the actual playlist item here */
- p_input = input_ItemNewWithType( VLC_OBJECT(p_sd),
+ /* Released in RemoveAnnounce */
+ p_input = input_item_NewWithType( 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;
+ 0, NULL, 0, -1, ITEM_TYPE_NET );
+ p_sap->p_item = p_input;
if( !p_input )
{
free( p_sap );
return NULL;
}
- if( p_sys->b_timeshift )
- input_ItemAddOption( p_input, ":access-filter=timeshift" );
+ if( p_sdp->rtcp_port )
+ {
+ char *rtcp;
+ if( asprintf( &rtcp, ":rtcp-port=%u", p_sdp->rtcp_port ) != -1 )
+ {
+ input_item_AddOption( p_input, rtcp, VLC_INPUT_OPTION_TRUSTED );
+ free( rtcp );
+ }
+ }
psz_value = GetAttribute( p_sap->p_sdp->pp_attributes, p_sap->p_sdp->i_attributes, "tool" );
if( psz_value != NULL )
{
- input_ItemAddInfo( p_input, _("Session"), _("Tool"), "%s", psz_value );
+ input_item_AddInfo( p_input, _("Session"), _("Tool"), "%s", psz_value );
}
if( strcmp( p_sdp->username, "-" ) )
{
- input_ItemAddInfo( p_input, _("Session"), _("User"), "%s",
+ input_item_AddInfo( p_input, _("Session"), _("User"), "%s",
p_sdp->username );
}
services_discovery_AddItem( p_sd, p_input, psz_value /* category name */ );
TAB_APPEND( p_sys->i_announces, p_sys->pp_announces, p_sap );
- vlc_gc_decref( p_input );
+
return p_sap;
}
const char *name)
{
/* Look for media attribute, and fallback to session */
- return GetAttribute (sdp->mediav[media].pp_attributes,
- sdp->mediav[media].i_attributes, name)
- ?: GetAttribute (sdp->pp_attributes, sdp->i_attributes, name);
+ const char *attr = GetAttribute (sdp->mediav[media].pp_attributes,
+ sdp->mediav[media].i_attributes, name);
+ if (attr == NULL)
+ attr = GetAttribute (sdp->pp_attributes, sdp->i_attributes, name);
+ return attr;
}
return VLC_EGENERIC;
}
+ if (!strcmp (vlc_proto, "udp") || FindAttribute (p_sdp, 0, "rtcp-mux"))
+ p_sdp->rtcp_port = 0;
+ else
+ {
+ const char *rtcp = FindAttribute (p_sdp, 0, "rtcp");
+ if (rtcp)
+ p_sdp->rtcp_port = atoi (rtcp);
+ else
+ if (port & 1) /* odd port -> RTCP; next even port -> RTP */
+ p_sdp->rtcp_port = port++;
+ else /* even port -> RTP; next odd port -> RTCP */
+ p_sdp->rtcp_port = port + 1;
+ }
+
if (flags & 1)
{
/* Connection-oriented media */
else
{
/* Non-connected (normally multicast) media */
-
char psz_source[258] = "";
const char *sfilter = FindAttribute (p_sdp, 0, "source-filter");
if (sfilter != NULL)
goto error;
}
- if ((sscanf (data, "%63s %"PRIu64" %"PRIu64" IN IP%u %1023s",
+ if ((sscanf (data, "%63s %"SCNu64" %"SCNu64" IN IP%u %1023s",
p_sdp->username, &p_sdp->session_id,
&p_sdp->session_version, &p_sdp->orig_ip_version,
p_sdp->orig_host) != 5)
|| ((p_sdp->orig_ip_version != 4)
&& (p_sdp->orig_ip_version != 6)))
{
- msg_Dbg (p_obj, "SDP origin not supported: %s\n", data);
+ msg_Dbg (p_obj, "SDP origin not supported: %s", data);
/* Or maybe out-of-range, but this looks suspicious */
return NULL;
}
}
assert (p_sdp->psz_sessionname == NULL); // no memleak here
p_sdp->psz_sessionname = strdup (data);
- EnsureUTF8 (p_sdp->psz_sessionname);
if (p_sdp->psz_sessionname == NULL)
goto error;
+ EnsureUTF8 (p_sdp->psz_sessionname);
break;
}
if( ( i_result != Z_OK ) && ( i_result != Z_STREAM_END ) )
{
inflateEnd( &d_stream );
+ free( psz_dst );
return( -1 );
}
}
p_announce->p_sdp = NULL;
}
- if( p_announce->i_input_id > -1 )
+ if( p_announce->p_item )
{
- playlist_DeleteFromInput( pl_Yield( p_sd ),
- p_announce->i_input_id, false );
- pl_Release( p_sd );
+ services_discovery_RemoveItem( p_sd, p_announce->p_item );
+ vlc_gc_decref( p_announce->p_item );
+ p_announce->p_item = NULL;
}
for( i = 0; i< p_sd->p_sys->i_announces; i++)
projects / vlc / blobdiff