X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=modules%2Faccess%2Fsmb.c;h=4d06b0b3dc1fdb6046c5e7ce645563bf5f3f0c86;hb=bc09c365ab435fda0185e60a423f69d6dfa348c8;hp=58b19b3d0a281fb66c19368db3772d0893eb0d67;hpb=21bbd0a8c27d5b4101089c2a2ea06ee4eebb1653;p=vlc diff --git a/modules/access/smb.c b/modules/access/smb.c index 58b19b3d0a..4d06b0b3dc 100644 --- a/modules/access/smb.c +++ b/modules/access/smb.c @@ -24,26 +24,24 @@ /***************************************************************************** * Preamble *****************************************************************************/ - - #ifdef HAVE_CONFIG_H # include "config.h" #endif #include +#include #include #include #ifdef WIN32 -#ifdef HAVE_FCNTL_H -# include -#endif +# ifdef HAVE_FCNTL_H +# include +# endif # ifdef HAVE_SYS_STAT_H # include # endif # include -# define smbc_open(a,b,c) open(a,b,c) -# define stat _stati64 +# define smbc_open(a,b,c) vlc_open(a,b,c) # define smbc_fstat(a,b) _fstati64(a,b) # define smbc_read read # define smbc_lseek _lseeki64 @@ -74,9 +72,11 @@ static void Close( vlc_object_t * ); #define DOMAIN_LONGTEXT N_("Domain/Workgroup that " \ "will be used for the connection.") +#define SMB_HELP N_("Samba (Windows network shares) input") vlc_module_begin () set_shortname( "SMB" ) set_description( N_("SMB input") ) + set_help(SMB_HELP) set_capability( "access", 0 ) set_category( CAT_INPUT ) set_subcategory( SUBCAT_INPUT_ACCESS ) @@ -97,7 +97,7 @@ vlc_module_end () * Local prototypes *****************************************************************************/ static ssize_t Read( access_t *, uint8_t *, size_t ); -static int Seek( access_t *, int64_t ); +static int Seek( access_t *, uint64_t ); static int Control( access_t *, int, va_list ); struct access_sys_t @@ -111,6 +111,14 @@ static void Win32AddConnection( access_t *, char *, char *, char *, char * ); static void smb_auth( const char *srv, const char *shr, char *wg, int wglen, char *un, int unlen, char *pw, int pwlen ) { + VLC_UNUSED(srv); + VLC_UNUSED(shr); + VLC_UNUSED(wg); + VLC_UNUSED(wglen); + VLC_UNUSED(un); + VLC_UNUSED(unlen); + VLC_UNUSED(pw); + VLC_UNUSED(pwlen); //wglen = unlen = pwlen = 0; } #endif @@ -123,32 +131,32 @@ static int Open( vlc_object_t *p_this ) access_t *p_access = (access_t*)p_this; access_sys_t *p_sys; struct stat filestat; - char *psz_path, *psz_uri; + char *psz_location, *psz_uri; char *psz_user = NULL, *psz_pwd = NULL, *psz_domain = NULL; int i_ret; int i_smb; /* Parse input URI * [[[domain;]user[:password@]]server[/share[/path[/file]]]] */ - psz_path = strchr( p_access->psz_path, '/' ); - if( !psz_path ) + psz_location = strchr( p_access->psz_location, '/' ); + if( !psz_location ) { - msg_Err( p_access, "invalid SMB URI: smb://%s", psz_path ); + msg_Err( p_access, "invalid SMB URI: smb://%s", psz_location ); return VLC_EGENERIC; } else { - char *psz_tmp = strdup( p_access->psz_path ); + char *psz_tmp = strdup( p_access->psz_location ); char *psz_parser; - psz_tmp[ psz_path - p_access->psz_path ] = 0; - psz_path = p_access->psz_path; + psz_tmp[ psz_location - p_access->psz_location ] = 0; + psz_location = p_access->psz_location; psz_parser = strchr( psz_tmp, '@' ); if( psz_parser ) { /* User info is there */ *psz_parser = 0; - psz_path = p_access->psz_path + (psz_parser - psz_tmp) + 1; + psz_location = p_access->psz_location + (psz_parser - psz_tmp) + 1; psz_parser = strchr( psz_tmp, ':' ); if( psz_parser ) @@ -176,25 +184,25 @@ static int Open( vlc_object_t *p_this ) /* Build an SMB URI * smb://[[[domain;]user[:password@]]server[/share[/path[/file]]]] */ - if( !psz_user ) psz_user = var_CreateGetString( p_access, "smb-user" ); + if( !psz_user ) psz_user = var_InheritString( p_access, "smb-user" ); if( psz_user && !*psz_user ) { free( psz_user ); psz_user = NULL; } - if( !psz_pwd ) psz_pwd = var_CreateGetString( p_access, "smb-pwd" ); + if( !psz_pwd ) psz_pwd = var_InheritString( p_access, "smb-pwd" ); if( psz_pwd && !*psz_pwd ) { free( psz_pwd ); psz_pwd = NULL; } - if( !psz_domain ) psz_domain = var_CreateGetString( p_access, "smb-domain" ); + if( !psz_domain ) psz_domain = var_InheritString( p_access, "smb-domain" ); if( psz_domain && !*psz_domain ) { free( psz_domain ); psz_domain = NULL; } #ifdef WIN32 if( psz_user ) - Win32AddConnection( p_access, psz_path, psz_user, psz_pwd, psz_domain); - i_ret = asprintf( &psz_uri, "//%s", psz_path ); + Win32AddConnection( p_access, psz_location, psz_user, psz_pwd, psz_domain); + i_ret = asprintf( &psz_uri, "//%s", psz_location ); #else if( psz_user ) i_ret = asprintf( &psz_uri, "smb://%s%s%s%s%s@%s", psz_domain ? psz_domain : "", psz_domain ? ";" : "", psz_user, psz_pwd ? ":" : "", - psz_pwd ? psz_pwd : "", psz_path ); + psz_pwd ? psz_pwd : "", psz_location ); else - i_ret = asprintf( &psz_uri, "smb://%s", psz_path ); + i_ret = asprintf( &psz_uri, "smb://%s", psz_location ); #endif free( psz_user ); @@ -222,7 +230,8 @@ static int Open( vlc_object_t *p_this ) #endif if( (i_smb = smbc_open( psz_uri, O_RDONLY, 0 )) < 0 ) { - msg_Err( p_access, "open failed for '%s' (%m)", p_access->psz_path ); + msg_Err( p_access, "open failed for '%s' (%m)", + p_access->psz_location ); free( psz_uri ); return VLC_EGENERIC; } @@ -258,20 +267,19 @@ static void Close( vlc_object_t *p_this ) access_sys_t *p_sys = p_access->p_sys; smbc_close( p_sys->i_smb ); - smbc_free_context( smbc_set_context(NULL), 1 ); - free( p_sys ); } /***************************************************************************** * Seek: try to go at the right place *****************************************************************************/ -static int Seek( access_t *p_access, int64_t i_pos ) +static int Seek( access_t *p_access, uint64_t i_pos ) { access_sys_t *p_sys = p_access->p_sys; int64_t i_ret; - if( i_pos < 0 ) return VLC_EGENERIC; + if( i_pos >= INT64_MAX ) + return VLC_EGENERIC; msg_Dbg( p_access, "seeking to %"PRId64, i_pos ); @@ -316,31 +324,18 @@ static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len ) *****************************************************************************/ static int Control( access_t *p_access, int i_query, va_list args ) { - bool *pb_bool; - int64_t *pi_64; - switch( i_query ) { case ACCESS_CAN_SEEK: - pb_bool = (bool*)va_arg( args, bool* ); - *pb_bool = true; - break; case ACCESS_CAN_FASTSEEK: - pb_bool = (bool*)va_arg( args, bool* ); - *pb_bool = true; - break; case ACCESS_CAN_PAUSE: - pb_bool = (bool*)va_arg( args, bool* ); - *pb_bool = true; - break; case ACCESS_CAN_CONTROL_PACE: - pb_bool = (bool*)va_arg( args, bool* ); - *pb_bool = true; + *va_arg( args, bool* ) = true; break; case ACCESS_GET_PTS_DELAY: - pi_64 = (int64_t*)va_arg( args, int64_t * ); - *pi_64 = (int64_t)var_GetInteger( p_access, "smb-caching" ) * 1000; + *va_arg( args, int64_t * ) + = var_GetInteger( p_access, "smb-caching" ) * 1000; break; case ACCESS_SET_PAUSE_STATE: