X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fservices_discovery%2Fsap.c;h=a6aee7728d50987bab3599e4278680883cd51745;hb=a869d39dc6f521e7bcb74bb8c359f37ce1582535;hp=9e50499e0a0ab0607da9647640e44ef60a8fb2c3;hpb=8c046e25b33d1107ff934045b92eb716848e9f38;p=vlc diff --git a/modules/services_discovery/sap.c b/modules/services_discovery/sap.c index 9e50499e0a..a6aee7728d 100644 --- a/modules/services_discovery/sap.c +++ b/modules/services_discovery/sap.c @@ -26,23 +26,25 @@ /***************************************************************************** * Includes *****************************************************************************/ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include #include -#include #include +#include #include #include -#include -#include - #ifdef HAVE_UNISTD_H # include #endif -#ifdef HAVE_SYS_TIME_H -# include +#ifdef HAVE_POLL +# include #endif #ifdef HAVE_ZLIB_H @@ -94,7 +96,7 @@ #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_( \ @@ -105,9 +107,6 @@ "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 * ); @@ -115,40 +114,43 @@ 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, VLC_TRUE ); - add_bool( "sap-ipv4", 1 , NULL, - SAP_IPV4_TEXT,SAP_IPV4_LONGTEXT, VLC_TRUE ); - add_bool( "sap-ipv6", 1 , NULL, - SAP_IPV6_TEXT, SAP_IPV6_LONGTEXT, VLC_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, 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 ); + 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, VLC_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, VLC_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( "demux2", 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 () /***************************************************************************** @@ -191,6 +193,7 @@ struct sdp_t /* "computed" URI */ char *psz_uri; int i_media_type; + unsigned rtcp_port; /* a= global attributes */ int i_attributes; @@ -204,12 +207,14 @@ struct sdp_t struct attribute_t { const char *value; - char name[0]; + char name[]; }; struct sap_announce_t { mtime_t i_last; + mtime_t i_period; + uint8_t i_period_trust; uint16_t i_hash; uint32_t i_source[4]; @@ -217,11 +222,13 @@ 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; @@ -231,9 +238,8 @@ struct services_discovery_sys_t struct sap_announce_t **pp_announces; /* Modes */ - vlc_bool_t b_strict; - vlc_bool_t b_parse; - vlc_bool_t b_timeshift; + bool b_strict; + bool b_parse; int i_timeout; }; @@ -251,7 +257,7 @@ struct demux_sys_t /* 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 ); @@ -267,11 +273,34 @@ struct demux_sys_t static const char *FindAttribute (const sdp_t *sdp, unsigned media, const char *name); - static vlc_bool_t IsSameSession( sdp_t *p_sdp1, sdp_t *p_sdp2 ); + static bool IsSameSession( sdp_t *p_sdp1, sdp_t *p_sdp2 ); static int InitSocket( services_discovery_t *p_sd, const char *psz_address, int i_port ); static int Decompress( const unsigned char *psz_src, unsigned char **_dst, int i_len ); static void FreeSDP( sdp_t *p_sdp ); +static inline int min_int( int a, int b ) +{ + 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 *****************************************************************************/ @@ -280,33 +309,34 @@ static int Open( vlc_object_t *p_this ) services_discovery_t *p_sd = ( services_discovery_t* )p_this; services_discovery_sys_t *p_sys = (services_discovery_sys_t *) malloc( sizeof( services_discovery_sys_t ) ); + if( !p_sys ) + return VLC_ENOMEM; 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; } @@ -323,7 +353,7 @@ static int OpenDemux( vlc_object_t *p_this ) 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; @@ -377,13 +407,13 @@ static int OpenDemux( vlc_object_t *p_this ) { 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; @@ -405,9 +435,11 @@ static void Close( vlc_object_t *p_this ) { 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] ); @@ -415,7 +447,7 @@ static void Close( vlc_object_t *p_this ) FREENULL( p_sys->pi_fd ); #if 0 - if( config_GetInt( p_sd, "sap-cache" ) ) + if( var_InheritBool( p_sd, "sap-cache" ) ) { CacheSave( p_sd ); } @@ -427,7 +459,6 @@ static void Close( vlc_object_t *p_this ) } FREENULL( p_sys->pp_announces ); - pl_Release( p_sd ); free( p_sys ); } @@ -437,11 +468,10 @@ static void Close( vlc_object_t *p_this ) 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 ); } /***************************************************************************** @@ -451,10 +481,13 @@ static void CloseDemux( vlc_object_t *p_this ) *****************************************************************************/ #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. @@ -462,14 +495,14 @@ static void Run( services_discovery_t *p_sd ) * 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%"; @@ -521,53 +554,90 @@ static void Run( services_discovery_t *p_sd ) 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; } /* read SAP packets */ - while( !p_sd->b_die ) + for (;;) { - int i_read; - uint8_t p_buffer[MAX_SAP_BUFFER+1]; - - i_read = net_Select( p_sd, p_sd->p_sys->pi_fd, - p_sd->p_sys->i_fd, p_buffer, - MAX_SAP_BUFFER ); + vlc_restorecancel (canc); + unsigned n = p_sd->p_sys->i_fd; + struct pollfd ufd[n]; - /* Check for items that need deletion */ - for( i = 0; i < p_sd->p_sys->i_announces; i++ ) + for (unsigned i = 0; i < n; i++) { - mtime_t i_timeout = ( mtime_t ) 1000000 * p_sd->p_sys->i_timeout; + ufd[i].fd = p_sd->p_sys->pi_fd[i]; + ufd[i].events = POLLIN; + ufd[i].revents = 0; + } - if( mdate() - p_sd->p_sys->pp_announces[i]->i_last > i_timeout ) + int val = poll (ufd, n, timeout); + canc = vlc_savecancel (); + if (val > 0) + { + for (unsigned i = 0; i < n; i++) { - RemoveAnnounce( p_sd, p_sd->p_sys->pp_announces[i] ); + if (ufd[i].revents) + { + uint8_t p_buffer[MAX_SAP_BUFFER+1]; + ssize_t i_read; + + i_read = net_Read (p_sd, ufd[i].fd, NULL, p_buffer, + MAX_SAP_BUFFER, false); + if (i_read < 0) + msg_Warn (p_sd, "receive error: %m"); + if (i_read > 6) + { + /* Parse the packet */ + p_buffer[i_read] = '\0'; + ParseSAP (p_sd, p_buffer, i_read); + } + } } } - /* Minimum length is > 6 */ - if( i_read <= 6 ) + mtime_t now = mdate(); + + /* A 1 hour timeout correspong to the RFC Implicit timeout. + * This timeout is tuned in the following loop. */ + timeout = 1000 * 60 * 60; + + /* Check for items that need deletion */ + for( i = 0; i < p_sd->p_sys->i_announces; i++ ) { - if( i_read < 0 ) + mtime_t i_timeout = ( mtime_t ) 1000000 * p_sd->p_sys->i_timeout; + sap_announce_t * p_announce = p_sd->p_sys->pp_announces[i]; + mtime_t i_last_period = now - p_announce->i_last; + + /* Remove the annoucement, if the last announcement was 1 hour ago + * or if the last packet emitted was 3 times the average time + * between two packets */ + if( ( p_announce->i_period_trust > 5 && i_last_period > 3 * p_announce->i_period ) || + i_last_period > i_timeout ) { - msg_Warn( p_sd, "socket read error" ); + RemoveAnnounce( p_sd, p_announce ); + } + else + { + /* Compute next timeout */ + if( p_announce->i_period_trust > 5 ) + timeout = min_int((3 * p_announce->i_period - i_last_period) / 1000, timeout); + timeout = min_int((i_timeout - i_last_period)/1000, timeout); } - continue; } - p_buffer[i_read] = '\0'; - - /* Parse the packet */ - ParseSAP( p_sd, p_buffer, i_read ); + if( !p_sd->p_sys->i_announces ) + timeout = -1; /* We can safely poll indefinitly. */ + else if( timeout < 200 ) + timeout = 200; /* Don't wakeup too fast. */ } + assert (0); } /********************************************************************** @@ -580,9 +650,7 @@ static int Demux( demux_t *p_demux ) 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 ) { @@ -590,31 +658,34 @@ static int Demux( demux_t *p_demux ) 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, VLC_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; } static int Control( demux_t *p_demux, int i_query, va_list args ) { + VLC_UNUSED(p_demux); VLC_UNUSED(i_query); VLC_UNUSED(args); return VLC_EGENERIC; } @@ -642,8 +713,8 @@ static int ParseSAP( services_discovery_t *p_sd, const uint8_t *buf, if ((flags >> 5) != 1) return VLC_EGENERIC; - vlc_bool_t b_ipv6 = (flags & 0x10) != 0; - vlc_bool_t b_need_delete = (flags & 0x04) != 0; + bool b_ipv6 = (flags & 0x10) != 0; + bool b_need_delete = (flags & 0x04) != 0; if (flags & 0x02) { @@ -651,7 +722,7 @@ static int ParseSAP( services_discovery_t *p_sd, const uint8_t *buf, return VLC_EGENERIC; } - vlc_bool_t b_compressed = (flags & 0x01) != 0; + bool b_compressed = (flags & 0x01) != 0; uint16_t i_hash = U16_AT (buf + 2); @@ -724,31 +795,46 @@ static int ParseSAP( services_discovery_t *p_sd, const uint8_t *buf, 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 == VLC_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++ ) { + sap_announce_t * p_announce = p_sd->p_sys->pp_announces[i]; /* FIXME: slow */ /* FIXME: we create a new announce each time the sdp changes */ - if( IsSameSession( p_sd->p_sys->pp_announces[i]->p_sdp, p_sdp ) ) + if( IsSameSession( p_announce->p_sdp, p_sdp ) ) { - if( b_need_delete ) + /* We don't support delete announcement as they can easily + * Be used to highjack an announcement by a third party. + * Intead we cleverly implement Implicit Announcement removal. + * + * if( b_need_delete ) + * RemoveAnnounce( p_sd, p_sd->p_sys->pp_announces[i]); + * else + */ + + if( !b_need_delete ) { - RemoveAnnounce( p_sd, p_sd->p_sys->pp_announces[i]); - } - else - { - p_sd->p_sys->pp_announces[i]->i_last = mdate(); + /* No need to go after six, as we start to trust the + * average period at six */ + if( p_announce->i_period_trust <= 5 ) + p_announce->i_period_trust++; + + /* Compute the average period */ + 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; @@ -775,33 +861,41 @@ sap_announce_t *CreateAnnounce( services_discovery_t *p_sd, uint16_t i_hash, p_sys = p_sd->p_sys; p_sap->i_last = mdate(); + p_sap->i_period = 0; + p_sap->i_period_trust = 0; 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 ); } @@ -823,9 +917,11 @@ static const char *FindAttribute (const sdp_t *sdp, unsigned media, 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; } @@ -883,15 +979,19 @@ static int ParseConnection( vlc_object_t *p_obj, sdp_t *p_sdp ) if (subtype == NULL) { msg_Dbg (p_obj, "missing SDP media subtype: %s", sdp_proto); - p_sdp->i_media_type = 0; + free (sdp_proto); + return VLC_EGENERIC; } else { *subtype++ = '\0'; - p_sdp->i_media_type = atoi (subtype); + /* FIXME: check for multiple payload types in RTP/AVP case. + * FIXME: check for "mpeg" subtype in raw udp case. */ + if (!strcasecmp (sdp_proto, "udp")) + p_sdp->i_media_type = 33; + else + p_sdp->i_media_type = atoi (subtype); } - if (p_sdp->i_media_type == 0) - p_sdp->i_media_type = 33; /* RTP protocol, nul, VLC shortcut, nul, flags byte as follow: * 0x1: Connection-Oriented media. */ @@ -925,6 +1025,20 @@ static int ParseConnection( vlc_object_t *p_obj, sdp_t *p_sdp ) 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 */ @@ -945,7 +1059,6 @@ static int ParseConnection( vlc_object_t *p_obj, sdp_t *p_sdp ) else { /* Non-connected (normally multicast) media */ - char psz_source[258] = ""; const char *sfilter = FindAttribute (p_sdp, 0, "source-filter"); if (sfilter != NULL) @@ -1131,14 +1244,14 @@ static sdp_t *ParseSDP (vlc_object_t *p_obj, const char *psz_sdp) goto error; } - if ((sscanf (data, "%63s "I64Fu" "I64Fu" 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; } @@ -1157,9 +1270,9 @@ static sdp_t *ParseSDP (vlc_object_t *p_obj, const char *psz_sdp) } 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; } @@ -1379,6 +1492,7 @@ static int Decompress( const unsigned char *psz_src, unsigned char **_dst, int i if( ( i_result != Z_OK ) && ( i_result != Z_STREAM_END ) ) { inflateEnd( &d_stream ); + free( psz_dst ); return( -1 ); } } @@ -1432,8 +1546,12 @@ static int RemoveAnnounce( services_discovery_t *p_sd, p_announce->p_sdp = NULL; } - if( p_announce->i_input_id > -1 ) - playlist_DeleteFromInput( pl_Get(p_sd), p_announce->i_input_id, VLC_FALSE ); + if( p_announce->p_item ) + { + 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++) { @@ -1450,7 +1568,7 @@ static int RemoveAnnounce( services_discovery_t *p_sd, return VLC_SUCCESS; } -static vlc_bool_t IsSameSession( sdp_t *p_sdp1, sdp_t *p_sdp2 ) +static bool IsSameSession( sdp_t *p_sdp1, sdp_t *p_sdp2 ) { /* A session is identified by * - username, @@ -1463,9 +1581,9 @@ static vlc_bool_t IsSameSession( sdp_t *p_sdp1, sdp_t *p_sdp2 ) || (p_sdp1->session_id != p_sdp2->session_id) || (p_sdp1->orig_ip_version != p_sdp2->orig_ip_version) || strcmp (p_sdp1->orig_host, p_sdp2->orig_host)) - return VLC_FALSE; + return false; - return VLC_TRUE; + return true; }