X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fftp.c;h=0a4b707c3ef26c4ba8b90daec34396c3b73aa372;hb=7e39dc8b10afd76ab1b40844d971cdcb63e8d843;hp=e95a62ab186f5beb939b16d08ee2468a6fc260a3;hpb=f6d9ebe61895ec8b37d42c5dab5db7f521c82dbf;p=vlc diff --git a/modules/access/ftp.c b/modules/access/ftp.c index e95a62ab18..0a4b707c3e 100644 --- a/modules/access/ftp.c +++ b/modules/access/ftp.c @@ -36,11 +36,12 @@ #include #include -#include +#include #include -#include "vlc_url.h" +#include #include +#include #ifndef IPPORT_FTP # define IPPORT_FTP 21u @@ -75,23 +76,25 @@ vlc_module_begin () set_category( CAT_INPUT ) set_subcategory( SUBCAT_INPUT_ACCESS ) add_integer( "ftp-caching", 2 * DEFAULT_PTS_DELAY / 1000, NULL, - CACHING_TEXT, CACHING_LONGTEXT, true ); + CACHING_TEXT, CACHING_LONGTEXT, true ) + change_safe() add_string( "ftp-user", "anonymous", NULL, USER_TEXT, USER_LONGTEXT, - false ); + false ) add_string( "ftp-pwd", "anonymous@example.com", NULL, PASS_TEXT, - PASS_LONGTEXT, false ); + PASS_LONGTEXT, false ) add_string( "ftp-account", "anonymous", NULL, ACCOUNT_TEXT, - ACCOUNT_LONGTEXT, false ); + ACCOUNT_LONGTEXT, false ) add_shortcut( "ftp" ) set_callbacks( InOpen, InClose ) add_submodule () - set_shortname( "FTP" ) - set_description( N_("FTP upload output") ) - set_capability( "sout access", 0 ) - set_category( CAT_SOUT ) - set_subcategory( SUBCAT_SOUT_ACO ) - set_callbacks( OutOpen, OutClose ) + set_shortname( "FTP" ) + set_description( N_("FTP upload output") ) + set_capability( "sout access", 0 ) + set_category( CAT_SOUT ) + set_subcategory( SUBCAT_SOUT_ACO ) + add_shortcut( "ftp" ) + set_callbacks( OutOpen, OutClose ) vlc_module_end () /***************************************************************************** @@ -99,7 +102,7 @@ vlc_module_end () *****************************************************************************/ static ssize_t Read( access_t *, uint8_t *, size_t ); static ssize_t Write( sout_access_out_t *, block_t * ); -static int Seek( access_t *, int64_t ); +static int Seek( access_t *, uint64_t ); static int OutSeek( sout_access_out_t *, off_t ); static int Control( access_t *, int, va_list ); @@ -112,13 +115,14 @@ struct access_sys_t char sz_epsv_ip[NI_MAXNUMERICHOST]; bool out; + bool directory; }; #define GET_OUT_SYS( p_this ) \ ((access_sys_t *)(((sout_access_out_t *)(p_this))->p_sys)) static int ftp_SendCommand( vlc_object_t *, access_sys_t *, const char *, ... ); static int ftp_ReadCommand( vlc_object_t *, access_sys_t *, int *, char ** ); -static int ftp_StartStream( vlc_object_t *, access_sys_t *, int64_t ); +static int ftp_StartStream( vlc_object_t *, access_sys_t *, uint64_t ); static int ftp_StopStream ( vlc_object_t *, access_sys_t * ); static int Login( vlc_object_t *p_access, access_sys_t *p_sys ) @@ -132,7 +136,7 @@ static int Login( vlc_object_t *p_access, access_sys_t *p_sys ) if( fd == -1 ) { msg_Err( p_access, "connection failed" ); - intf_UserFatal( p_access, false, _("Network interaction failed"), + dialog_Fatal( p_access, _("Network interaction failed"), "%s", _("VLC could not connect with the given server.") ); return -1; } @@ -142,7 +146,7 @@ static int Login( vlc_object_t *p_access, access_sys_t *p_sys ) if( i_answer / 100 != 2 ) { msg_Err( p_access, "connection rejected" ); - intf_UserFatal( p_access, false, _("Network interaction failed"), + dialog_Fatal( p_access, _("Network interaction failed"), "%s", _("VLC's connection to the given server was rejected.") ); return -1; } @@ -152,7 +156,7 @@ static int Login( vlc_object_t *p_access, access_sys_t *p_sys ) if( p_sys->url.psz_username && *p_sys->url.psz_username ) psz = strdup( p_sys->url.psz_username ); else - psz = var_CreateGetString( p_access, "ftp-user" ); + psz = var_InheritString( p_access, "ftp-user" ); if( !psz ) return -1; @@ -174,7 +178,7 @@ static int Login( vlc_object_t *p_access, access_sys_t *p_sys ) if( p_sys->url.psz_password && *p_sys->url.psz_password ) psz = strdup( p_sys->url.psz_password ); else - psz = var_CreateGetString( p_access, "ftp-pwd" ); + psz = var_InheritString( p_access, "ftp-pwd" ); if( !psz ) return -1; @@ -193,7 +197,7 @@ static int Login( vlc_object_t *p_access, access_sys_t *p_sys ) break; case 3: msg_Dbg( p_access, "account needed" ); - psz = var_CreateGetString( p_access, "ftp-account" ); + psz = var_InheritString( p_access, "ftp-account" ); if( ftp_SendCommand( p_access, p_sys, "ACCT %s", psz ) < 0 || ftp_ReadCommand( p_access, p_sys, &i_answer, NULL ) < 0 ) @@ -206,9 +210,9 @@ static int Login( vlc_object_t *p_access, access_sys_t *p_sys ) if( i_answer / 100 != 2 ) { msg_Err( p_access, "account rejected" ); - intf_UserFatal( p_access, false, - _("Network interaction failed"), - _("Your account was rejected.") ); + dialog_Fatal( p_access, + _("Network interaction failed"), + "%s", _("Your account was rejected.") ); return -1; } msg_Dbg( p_access, "account accepted" ); @@ -216,16 +220,14 @@ static int Login( vlc_object_t *p_access, access_sys_t *p_sys ) default: msg_Err( p_access, "password rejected" ); - intf_UserFatal( p_access, false, - _("Network interaction failed"), - _("Your password was rejected.") ); + dialog_Fatal( p_access, _("Network interaction failed"), + "%s", _("Your password was rejected.") ); return -1; } break; default: msg_Err( p_access, "user rejected" ); - intf_UserFatal( p_access, false, - _("Network interaction failed"), + dialog_Fatal( p_access, _("Network interaction failed"), "%s", _("Your connection attempt to the server was rejected.") ); return -1; } @@ -301,12 +303,27 @@ static int parseURL( vlc_url_t *url, const char *path ) if( url->i_port <= 0 ) url->i_port = IPPORT_FTP; /* default port */ - /* FTP URLs are relative to user's default directory (RFC1738) + if( url->psz_path == NULL ) + return VLC_SUCCESS; + /* FTP URLs are relative to user's default directory (RFC1738 §3.2) For absolute path use ftp://foo.bar//usr/local/etc/filename */ - - if( url->psz_path && *url->psz_path == '/' ) + /* FIXME: we should issue a series of CWD, one per slash */ + if( url->psz_path ) + { + assert( url->psz_path[0] == '/' ); url->psz_path++; + } + char *type = strstr( url->psz_path, ";type=" ); + if( type ) + { + *type = '\0'; + if( strchr( "iI", type[6] ) == NULL ) + return VLC_EGENERIC; /* ASCII and directory not supported */ + } + decode_URI( url->psz_path ); + /* FIXME: check for UTF-8 support, otherwise only ASCII is allowed */ + EnsureUTF8( url->psz_path ); return VLC_SUCCESS; } @@ -324,24 +341,38 @@ static int InOpen( vlc_object_t *p_this ) STANDARD_READ_ACCESS_INIT p_sys->fd_data = -1; p_sys->out = false; + p_sys->directory = false; - if( parseURL( &p_sys->url, p_access->psz_path ) ) + if( parseURL( &p_sys->url, p_access->psz_location ) ) goto exit_error; if( Connect( p_this, p_sys ) ) goto exit_error; /* get size */ - if( ftp_SendCommand( p_this, p_sys, "SIZE %s", p_sys->url.psz_path ? : "" ) < 0 || - ftp_ReadCommand( p_this, p_sys, NULL, &psz_arg ) != 2 ) + if( p_sys->url.psz_path == NULL ) + p_sys->directory = true; + else + if( ftp_SendCommand( p_this, p_sys, "SIZE %s", p_sys->url.psz_path ) < 0 ) + goto error; + else + if ( ftp_ReadCommand( p_this, p_sys, NULL, &psz_arg ) == 2 ) { - msg_Err( p_access, "cannot get file size" ); - net_Close( p_sys->fd_cmd ); - goto exit_error; + p_access->info.i_size = atoll( &psz_arg[4] ); + free( psz_arg ); + msg_Dbg( p_access, "file size: %"PRIu64, p_access->info.i_size ); } - p_access->info.i_size = atoll( &psz_arg[4] ); - free( psz_arg ); - msg_Dbg( p_access, "file size: %"PRId64, p_access->info.i_size ); + else + if( ftp_SendCommand( p_this, p_sys, "CWD %s", p_sys->url.psz_path ) < 0 ) + goto error; + else + if( ftp_ReadCommand( p_this, p_sys, NULL, NULL ) != 2 ) + { + msg_Err( p_access, "file or directory does not exist" ); + goto error; + } + else + p_sys->directory = true; /* Start the 'stream' */ if( ftp_StartStream( p_this, p_sys, 0 ) < 0 ) @@ -356,6 +387,8 @@ static int InOpen( vlc_object_t *p_this ) return VLC_SUCCESS; +error: + net_Close( p_sys->fd_cmd ); exit_error: vlc_UrlClean( &p_sys->url ); free( p_sys ); @@ -377,6 +410,11 @@ static int OutOpen( vlc_object_t *p_this ) if( parseURL( &p_sys->url, p_access->psz_path ) ) goto exit_error; + if( p_sys->url.psz_path == NULL ) + { + msg_Err( p_this, "no filename specified" ); + goto exit_error; + } if( Connect( p_this, p_sys ) ) goto exit_error; @@ -438,12 +476,9 @@ static void OutClose( vlc_object_t *p_this ) /***************************************************************************** * Seek: try to go at the right place *****************************************************************************/ -static int _Seek( vlc_object_t *p_access, access_sys_t *p_sys, int64_t i_pos ) +static int _Seek( vlc_object_t *p_access, access_sys_t *p_sys, uint64_t i_pos ) { - if( i_pos < 0 ) - return VLC_EGENERIC; - - msg_Dbg( p_access, "seeking to %"PRId64, i_pos ); + msg_Dbg( p_access, "seeking to %"PRIu64, i_pos ); ftp_StopStream( (vlc_object_t *)p_access, p_sys ); if( ftp_StartStream( (vlc_object_t *)p_access, p_sys, i_pos ) < 0 ) @@ -452,7 +487,7 @@ static int _Seek( vlc_object_t *p_access, access_sys_t *p_sys, int64_t i_pos ) return VLC_SUCCESS; } -static int Seek( access_t *p_access, int64_t i_pos ) +static int Seek( access_t *p_access, uint64_t i_pos ) { int val = _Seek( (vlc_object_t *)p_access, p_access->p_sys, i_pos ); if( val ) @@ -475,7 +510,6 @@ static int OutSeek( sout_access_out_t *p_access, off_t i_pos ) static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len ) { access_sys_t *p_sys = p_access->p_sys; - int i_read; assert( p_sys->fd_data != -1 ); assert( !p_sys->out ); @@ -483,14 +517,34 @@ static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len ) if( p_access->info.b_eof ) return 0; - i_read = net_Read( p_access, p_sys->fd_data, NULL, p_buffer, i_len, - false ); - if( i_read == 0 ) - p_access->info.b_eof = true; - else if( i_read > 0 ) - p_access->info.i_pos += i_read; - - return i_read; + if( p_sys->directory ) + { + char *psz_line = net_Gets( p_access, p_sys->fd_data, NULL ); + if( !psz_line ) + { + p_access->info.b_eof = true; + return 0; + } + else + { + snprintf( (char*)p_buffer, i_len, "ftp://%s:%d/%s/%s\n", + p_sys->url.psz_host, p_sys->url.i_port, + p_sys->url.psz_path, psz_line ); + free( psz_line ); + return strlen( (const char *)p_buffer ); + } + } + else + { + int i_read = net_Read( p_access, p_sys->fd_data, NULL, + p_buffer, i_len, false ); + if( i_read == 0 ) + p_access->info.b_eof = true; + else if( i_read > 0 ) + p_access->info.i_pos += i_read; + + return i_read; + } } /***************************************************************************** @@ -522,17 +576,15 @@ static ssize_t Write( sout_access_out_t *p_access, block_t *p_buffer ) *****************************************************************************/ static int Control( access_t *p_access, int i_query, va_list args ) { - bool *pb_bool; - int *pi_int; - int64_t *pi_64; - vlc_value_t val; + bool *pb_bool; + int64_t *pi_64; switch( i_query ) { /* */ case ACCESS_CAN_SEEK: pb_bool = (bool*)va_arg( args, bool* ); - *pb_bool = true; + *pb_bool = !p_access->p_sys->directory; break; case ACCESS_CAN_FASTSEEK: pb_bool = (bool*)va_arg( args, bool* ); @@ -548,15 +600,9 @@ static int Control( access_t *p_access, int i_query, va_list args ) break; /* */ - case ACCESS_GET_MTU: - pi_int = (int*)va_arg( args, int * ); - *pi_int = 0; - break; - case ACCESS_GET_PTS_DELAY: pi_64 = (int64_t*)va_arg( args, int64_t * ); - var_Get( p_access, "ftp-caching", &val ); - *pi_64 = (int64_t)var_GetInteger( p_access, "ftp-caching" ) * INT64_C(1000); + *pi_64 = var_GetInteger( p_access, "ftp-caching" ) * INT64_C(1000); break; /* */ @@ -599,8 +645,7 @@ static int ftp_SendCommand( vlc_object_t *p_access, access_sys_t *p_sys, msg_Dbg( p_access, "ftp_SendCommand:\"%s\"", psz_cmd); - if( net_Printf( VLC_OBJECT(p_access), p_sys->fd_cmd, NULL, "%s\r\n", - psz_cmd ) < 0 ) + if( net_Printf( p_access, p_sys->fd_cmd, NULL, "%s\r\n", psz_cmd ) < 0 ) { msg_Err( p_access, "failed to send command" ); return VLC_EGENERIC; @@ -678,7 +723,7 @@ static int ftp_ReadCommand( vlc_object_t *p_access, access_sys_t *p_sys, } static int ftp_StartStream( vlc_object_t *p_access, access_sys_t *p_sys, - int64_t i_start ) + uint64_t i_start ) { char psz_ipv4[16], *psz_ip = p_sys->sz_epsv_ip; int i_answer; @@ -762,14 +807,27 @@ static int ftp_StartStream( vlc_object_t *p_access, access_sys_t *p_sys, msg_Dbg( p_access, "connection with \"%s:%d\" successful", psz_ip, i_port ); - /* "1xx" message */ - if( ftp_SendCommand( p_access, p_sys, "%s %s", - p_sys->out ? "STOR" : "RETR", - p_sys->url.psz_path ?: "" ) < 0 || - ftp_ReadCommand( p_access, p_sys, &i_answer, NULL ) > 2 ) + if( p_sys->directory ) { - msg_Err( p_access, "cannot retrieve file" ); + if( ftp_SendCommand( p_access, p_sys, "NLST" ) < 0 || + ftp_ReadCommand( p_access, p_sys, NULL, &psz_arg ) > 2 ) + { + msg_Err( p_access, "cannot list directory contents" ); return VLC_EGENERIC; + } + } + else + { + /* "1xx" message */ + assert( p_sys->url.psz_path ); + if( ftp_SendCommand( p_access, p_sys, "%s %s", + p_sys->out ? "STOR" : "RETR", + p_sys->url.psz_path ) < 0 + || ftp_ReadCommand( p_access, p_sys, &i_answer, NULL ) > 2 ) + { + msg_Err( p_access, "cannot retrieve file" ); + return VLC_EGENERIC; + } } shutdown( p_sys->fd_data, p_sys->out ? SHUT_RD : SHUT_WR );