X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fsmb.c;h=670457455204e743bcbabdbeb4e2fb0a5a470abe;hb=ba07b415f47044b053132e8f19bfb76b2cc4e0d3;hp=f12706d26e8eadde2cbe933d5656e1f182ac9744;hpb=2e847d8484163b50d8fe98350f3dc96ac8a1a43f;p=vlc diff --git a/modules/access/smb.c b/modules/access/smb.c index f12706d26e..6704574552 100644 --- a/modules/access/smb.c +++ b/modules/access/smb.c @@ -1,24 +1,24 @@ /***************************************************************************** * smb.c: SMB input module ***************************************************************************** - * Copyright (C) 2001-2009 the VideoLAN team + * Copyright (C) 2001-2009 VLC authors and VideoLAN * $Id$ * * Authors: Gildas Bazin * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** @@ -28,20 +28,12 @@ # include "config.h" #endif -#include -#include -#include -#include - +#include #ifdef WIN32 -# ifdef HAVE_FCNTL_H -# include -# endif -# ifdef HAVE_SYS_STAT_H -# include -# endif +# include +# include # include -# define smbc_open(a,b,c) utf8_open(a,b,c) +# 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 @@ -50,7 +42,10 @@ # include #endif -#include +#include +#include +#include +#include /***************************************************************************** * Module descriptor @@ -58,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.") @@ -80,14 +71,11 @@ vlc_module_begin () 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 ) - change_safe() - add_string( "smb-user", NULL, NULL, USER_TEXT, USER_LONGTEXT, + add_string( "smb-user", NULL, USER_TEXT, USER_LONGTEXT, false ) - add_password( "smb-pwd", NULL, NULL, PASS_TEXT, + add_password( "smb-pwd", NULL, PASS_TEXT, PASS_LONGTEXT, false ) - add_string( "smb-domain", NULL, NULL, DOMAIN_TEXT, + add_string( "smb-domain", NULL, DOMAIN_TEXT, DOMAIN_LONGTEXT, false ) add_shortcut( "smb" ) set_callbacks( Open, Close ) @@ -131,32 +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; 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 ) @@ -184,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 ); @@ -230,7 +218,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; } @@ -251,9 +240,6 @@ static int Open( vlc_object_t *p_this ) p_sys->i_smb = i_smb; - /* 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; } @@ -333,8 +319,8 @@ static int Control( access_t *p_access, int i_query, va_list args ) break; case ACCESS_GET_PTS_DELAY: - *va_arg( args, int64_t * ) - = (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: @@ -362,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; @@ -401,7 +371,7 @@ static void Win32AddConnection( access_t *p_access, char *psz_path, 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 ) { @@ -416,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