X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fservices_discovery%2Fsap.c;h=a6aee7728d50987bab3599e4278680883cd51745;hb=421d5ae77d686b592aaa4fa45ac4a2c1c3629fe0;hp=919c6d272264c24b5d87fe4db97dfc534f19669a;hpb=25232e200b39db62c3e49f9269c215a71873c7f9;p=vlc

diff --git a/modules/services_discovery/sap.c b/modules/services_discovery/sap.c
index 919c6d2722..a6aee7728d 100644
--- 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" )
@@ -321,11 +319,11 @@ static int Open( vlc_object_t *p_this )
     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 );
     }
@@ -355,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;
@@ -449,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 );
     }
@@ -497,14 +495,14 @@ static void *Run( void *data )
      * 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%";
 
@@ -1246,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)