Removed fake access.

[vlc] / modules / services_discovery / sap.c

diff --git a/modules/services_discovery/sap.c b/modules/services_discovery/sap.c
index 234d98fe27b005911ffb8f77d55f18cbe39d203a..52c3b83ae2e11f5e25f40d80e1d811e12732eaa1 100644 (file)
--- a/modules/services_discovery/sap.c
+++ b/modules/services_discovery/sap.c
@@ -40,15 +40,9 @@
 #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
@@ -120,9 +114,11 @@
     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 )
 
@@ -147,6 +143,8 @@ vlc_module_begin ()
     set_capability( "services_discovery", 0 )
     set_callbacks( Open, Close )
 
+    VLC_SD_PROBE_SUBMODULE
+
     add_submodule ()
         set_description( N_("SDP Descriptions parser") )
         add_shortcut( "sdp" )
@@ -414,6 +412,8 @@ static int OpenDemux( vlc_object_t *p_this )
     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;
@@ -447,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 );
     }
@@ -468,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 );
 }
 
 /*****************************************************************************
@@ -680,6 +679,7 @@ static int Demux( demux_t *p_demux )
     p_parent_input->i_type = ITEM_TYPE_NET;
 
     vlc_mutex_unlock( &p_parent_input->lock );
+    vlc_object_release( p_input );
     return VLC_SUCCESS;
 }
 
@@ -1244,7 +1244,7 @@ static sdp_t *ParseSDP (vlc_object_t *p_obj, const char *psz_sdp)
                     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)