#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
static int OpenDemux ( vlc_object_t * );
static void CloseDemux ( vlc_object_t * );
+VLC_SD_PROBE_HELPER("sap", "Network streams (SAP)", SD_CAT_LAN)
+
vlc_module_begin ()
set_shortname( N_("SAP"))
- set_description( N_("SAP Announcements") )
+ 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_obsolete_bool( "sap-timeshift" ) /* Redumdant since 1.0.0 */
set_capability( "services_discovery", 0 )
set_callbacks( Open, Close )
+ VLC_SD_PROBE_SUBMODULE
+
add_submodule ()
set_description( N_("SDP Descriptions parser") )
add_shortcut( "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->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 );
}
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;
}
- switch (p_sdp->i_media_type)
- { /* Should be in sync with modules/demux/rtp.c */
- case 0: /* PCMU/8000 */
- case 8: /* PCMA/8000 */
- case 10: /* L16/44100/2 */
- case 11: /* L16/44100 */
- case 14: /* MPA/90000 */
- case 32: /* MPV/90000 */
- case 33: /* MP2/90000 */
- break;
- default:
- goto error;
- }
+ 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;
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 );
}
/*****************************************************************************
* 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%";
input_thread_t *p_input;
input_item_t *p_parent_input;
- 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 )
{
char *rtcp;
if( asprintf( &rtcp, ":rtcp-port=%u", p_sdp->rtcp_port ) != -1 )
{
- input_item_AddOption( p_parent_input, rtcp );
+ input_item_AddOption( p_parent_input, rtcp, VLC_INPUT_OPTION_TRUSTED );
free( rtcp );
}
}
p_parent_input->i_type = ITEM_TYPE_NET;
vlc_mutex_unlock( &p_parent_input->lock );
+ vlc_object_release( p_input );
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_input = input_item_NewWithType( VLC_OBJECT(p_sd),
p_sap->p_sdp->psz_uri,
p_sdp->psz_sessionname,
- 0, NULL, -1, ITEM_TYPE_NET );
+ 0, NULL, 0, -1, ITEM_TYPE_NET );
p_sap->p_item = p_input;
if( !p_input )
{
char *rtcp;
if( asprintf( &rtcp, ":rtcp-port=%u", p_sdp->rtcp_port ) != -1 )
{
- input_item_AddOption( p_input, rtcp );
+ input_item_AddOption( p_input, rtcp, VLC_INPUT_OPTION_TRUSTED );
free( rtcp );
}
}
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 (FindAttribute (p_sdp, 0, "rtcp-mux"))
+ if (!strcmp (vlc_proto, "udp") || FindAttribute (p_sdp, 0, "rtcp-mux"))
p_sdp->rtcp_port = 0;
else
{
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;
}
if( ( i_result != Z_OK ) && ( i_result != Z_STREAM_END ) )
{
inflateEnd( &d_stream );
+ free( psz_dst );
return( -1 );
}
}
projects / vlc / blobdiff