X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fsmb.c;h=8bf0cab0c8a0ee597bde5c509c2a2d9c395be5d3;hb=ad3ea21d61c1acebba5d89aa2a2d96cab9edd0b1;hp=7e868228acfab1bbdba6d932c90b445bcbff1d11;hpb=be19f7facceb129ef8977ed0ad2b41c593954629;p=vlc diff --git a/modules/access/smb.c b/modules/access/smb.c index 7e868228ac..8bf0cab0c8 100644 --- a/modules/access/smb.c +++ b/modules/access/smb.c @@ -1,7 +1,7 @@ /***************************************************************************** * smb.c: SMB input module ***************************************************************************** - * Copyright (C) 2001-2004 the VideoLAN team + * Copyright (C) 2001-2009 the VideoLAN team * $Id$ * * Authors: Gildas Bazin @@ -24,36 +24,28 @@ /***************************************************************************** * Preamble *****************************************************************************/ - - #ifdef HAVE_CONFIG_H # include "config.h" #endif -#include -#include -#include - +#include #ifdef WIN32 -#ifdef HAVE_FCNTL_H # include -#endif -# ifdef HAVE_SYS_STAT_H -# include -# endif +# include # 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 # define smbc_close close #else # include -# define USE_CTX 1 #endif -#include +#include +#include +#include +#include /***************************************************************************** * Module descriptor @@ -61,10 +53,6 @@ static int Open ( vlc_object_t * ); static void Close( vlc_object_t * ); -#define CACHING_TEXT N_("Caching value in ms") -#define CACHING_LONGTEXT N_( \ - "Caching value for SMB streams. This " \ - "value should be set in milliseconds." ) #define USER_TEXT N_("SMB user name") #define USER_LONGTEXT N_("User name that will " \ "be used for the connection.") @@ -75,20 +63,20 @@ 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 ) - add_integer( "smb-caching", 2 * DEFAULT_PTS_DELAY / 1000, NULL, - CACHING_TEXT, CACHING_LONGTEXT, true ); - add_string( "smb-user", NULL, NULL, USER_TEXT, USER_LONGTEXT, - false ); - add_string( "smb-pwd", NULL, NULL, PASS_TEXT, - PASS_LONGTEXT, false ); - add_string( "smb-domain", NULL, NULL, DOMAIN_TEXT, - DOMAIN_LONGTEXT, false ); + add_string( "smb-user", NULL, USER_TEXT, USER_LONGTEXT, + false ) + add_password( "smb-pwd", NULL, PASS_TEXT, + PASS_LONGTEXT, false ) + add_string( "smb-domain", NULL, DOMAIN_TEXT, + DOMAIN_LONGTEXT, false ) add_shortcut( "smb" ) set_callbacks( Open, Close ) vlc_module_end () @@ -97,17 +85,12 @@ 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 { -#ifdef USE_CTX - SMBCCTX *p_smb; - SMBCFILE *p_file; -#else int i_smb; -#endif }; #ifdef WIN32 @@ -116,6 +99,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 @@ -128,39 +119,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; - -#ifdef USE_CTX - SMBCCTX *p_smb; - SMBCFILE *p_file; -#else int i_smb; -#endif /* 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 ) @@ -188,25 +172,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 ); @@ -216,42 +200,8 @@ static int Open( vlc_object_t *p_this ) if( i_ret == -1 ) return VLC_ENOMEM; -#ifdef USE_CTX - if( !(p_smb = smbc_new_context()) ) - { - free( psz_uri ); - return VLC_ENOMEM; - } - p_smb->debug = 1; - p_smb->callbacks.auth_fn = smb_auth; - - if( !smbc_init_context( p_smb ) ) - { - msg_Err( p_access, "cannot initialize context (%m)" ); - smbc_free_context( p_smb, 1 ); - free( psz_uri ); - return VLC_EGENERIC; - } - - if( !(p_file = (p_smb->open)( p_smb, psz_uri, O_RDONLY, 0 )) ) - { - msg_Err( p_access, "open failed for '%s' (%m)", - p_access->psz_path ); - smbc_free_context( p_smb, 1 ); - free( psz_uri ); - return VLC_EGENERIC; - } - - /* Init p_access */ - STANDARD_READ_ACCESS_INIT; - - i_ret = p_smb->fstat( p_smb, p_file, &filestat ); - if( i_ret ) msg_Err( p_access, "stat failed (%m)" ); - else p_access->info.i_size = filestat.st_size; -#else - #ifndef WIN32 - if( smbc_init( smb_auth, 1 ) ) + if( smbc_init( smb_auth, 0 ) ) { free( psz_uri ); return VLC_EGENERIC; @@ -269,7 +219,7 @@ static int Open( vlc_object_t *p_this ) if( (i_smb = smbc_open( psz_uri, O_RDONLY, 0 )) < 0 ) { msg_Err( p_access, "open failed for '%s' (%m)", - p_access->psz_path ); + p_access->psz_location ); free( psz_uri ); return VLC_EGENERIC; } @@ -283,20 +233,12 @@ static int Open( vlc_object_t *p_this ) errno = i_ret; msg_Err( p_access, "stat failed (%m)" ); } - else p_access->info.i_size = filestat.st_size; -#endif + else + p_access->info.i_size = filestat.st_size; free( psz_uri ); -#ifdef USE_CTX - p_sys->p_smb = p_smb; - p_sys->p_file = p_file; -#else p_sys->i_smb = i_smb; -#endif - - /* Update default_pts to a suitable value for smb access */ - var_Create( p_access, "smb-caching", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); return VLC_SUCCESS; } @@ -309,37 +251,24 @@ static void Close( vlc_object_t *p_this ) access_t *p_access = (access_t*)p_this; access_sys_t *p_sys = p_access->p_sys; -#ifdef USE_CTX -# ifndef HAVE__SMBCCTX_CLOSE_FN - p_sys->p_smb->close( p_sys->p_smb, p_sys->p_file ); -# else - p_sys->p_smb->close_fn( p_sys->p_smb, p_sys->p_file ); -# endif - smbc_free_context( p_sys->p_smb, 1 ); -#else smbc_close( p_sys->i_smb ); -#endif - 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 ); -#ifdef USE_CTX - i_ret = p_sys->p_smb->lseek(p_sys->p_smb, p_sys->p_file, i_pos, SEEK_SET); -#else i_ret = smbc_lseek( p_sys->i_smb, i_pos, SEEK_SET ); -#endif if( i_ret == -1 ) { msg_Err( p_access, "seek failed (%m)" ); @@ -362,11 +291,7 @@ static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len ) if( p_access->info.b_eof ) return 0; -#ifdef USE_CTX - i_read = p_sys->p_smb->read(p_sys->p_smb, p_sys->p_file, p_buffer, i_len); -#else i_read = smbc_read( p_sys->i_smb, p_buffer, i_len ); -#endif if( i_read < 0 ) { msg_Err( p_access, "read failed (%m)" ); @@ -384,32 +309,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; - int *pi_int; - 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 * ) = INT64_C(1000) + * var_InheritInteger( p_access, "network-caching" ); break; case ACCESS_SET_PAUSE_STATE: @@ -437,28 +348,12 @@ static void Win32AddConnection( access_t *p_access, char *psz_path, char *psz_user, char *psz_pwd, char *psz_domain ) { - DWORD (*OurWNetAddConnection2)( LPNETRESOURCE, LPCTSTR, LPCTSTR, DWORD ); char psz_remote[MAX_PATH], psz_server[MAX_PATH], psz_share[MAX_PATH]; NETRESOURCE net_resource; DWORD i_result; char *psz_parser; VLC_UNUSED( psz_domain ); - HINSTANCE hdll = LoadLibrary(_T("MPR.DLL")); - if( !hdll ) - { - msg_Warn( p_access, "couldn't load mpr.dll" ); - return; - } - - OurWNetAddConnection2 = - (void *)GetProcAddress( hdll, _T("WNetAddConnection2A") ); - if( !OurWNetAddConnection2 ) - { - msg_Warn( p_access, "couldn't find WNetAddConnection2 in mpr.dll" ); - return; - } - memset( &net_resource, 0, sizeof(net_resource) ); net_resource.dwType = RESOURCETYPE_DISK; @@ -473,10 +368,10 @@ static void Win32AddConnection( access_t *p_access, char *psz_path, strlcpy( psz_share, psz_parser, sizeof( psz_share ) ); } - sprintf( psz_remote, "\\\\%s\\%s", psz_server, psz_share ); + snprintf( psz_remote, sizeof( psz_remote ), "\\\\%s\\%s", psz_server, psz_share ); net_resource.lpRemoteName = psz_remote; - i_result = OurWNetAddConnection2( &net_resource, psz_pwd, psz_user, 0 ); + i_result = WNetAddConnection2( &net_resource, psz_pwd, psz_user, 0 ); if( i_result != NO_ERROR ) { @@ -491,7 +386,5 @@ static void Win32AddConnection( access_t *p_access, char *psz_path, { msg_Dbg( p_access, "failed to connect to %s", psz_remote ); } - - FreeLibrary( hdll ); } #endif // WIN32