X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fftp.c;h=0a4b707c3ef26c4ba8b90daec34396c3b73aa372;hb=12efa4ae18f835561237a886bedcab642a668c97;hp=327f77532b5e92c9ac48f993d256fcb23b0840c3;hpb=3561b9b28f58eb7a4183e158a8fd973800d31ceb;p=vlc diff --git a/modules/access/ftp.c b/modules/access/ftp.c index 327f77532b..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 @@ -68,38 +69,40 @@ static void OutClose( vlc_object_t * ); #define ACCOUNT_LONGTEXT N_("Account that will be " \ "used for the connection.") -vlc_module_begin(); - set_shortname( "FTP" ); - set_description( N_("FTP input") ); - set_capability( "access", 0 ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_ACCESS ); +vlc_module_begin () + set_shortname( "FTP" ) + set_description( N_("FTP input") ) + set_capability( "access", 0 ) + 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 ); - 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 ); -vlc_module_end(); + 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 ) + add_shortcut( "ftp" ) + set_callbacks( OutOpen, OutClose ) +vlc_module_end () /***************************************************************************** * Local prototypes *****************************************************************************/ 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 ); @@ -111,13 +114,15 @@ struct access_sys_t int fd_data; 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 ) @@ -131,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; } @@ -141,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; } @@ -151,7 +156,9 @@ 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; if( ftp_SendCommand( p_access, p_sys, "USER %s", psz ) < 0 || ftp_ReadCommand( p_access, p_sys, &i_answer, NULL ) < 0 ) @@ -171,7 +178,9 @@ 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; if( ftp_SendCommand( p_access, p_sys, "PASS %s", psz ) < 0 || ftp_ReadCommand( p_access, p_sys, &i_answer, NULL ) < 0 ) @@ -188,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 ) @@ -201,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" ); @@ -211,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; } @@ -282,7 +289,7 @@ static int Connect( vlc_object_t *p_access, access_sys_t *p_sys ) static int parseURL( vlc_url_t *url, const char *path ) { if( path == NULL ) - return -1; + return VLC_EGENERIC; /* *** Parse URL and get server addr/port and path *** */ while( *path == '/' ) @@ -291,18 +298,33 @@ static int parseURL( vlc_url_t *url, const char *path ) vlc_UrlParse( url, path, 0 ); if( url->psz_host == NULL || *url->psz_host == '\0' ) - return -1; + return VLC_EGENERIC; 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 == '/' ) + /* FIXME: we should issue a series of CWD, one per slash */ + if( url->psz_path ) + { + assert( url->psz_path[0] == '/' ); url->psz_path++; + } - return 0; + 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; } @@ -318,24 +340,39 @@ static int InOpen( vlc_object_t *p_this ) /* Init p_access */ 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 ) @@ -350,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 ); @@ -361,16 +400,21 @@ static int OutOpen( vlc_object_t *p_this ) sout_access_out_t *p_access = (sout_access_out_t *)p_this; access_sys_t *p_sys; - p_sys = malloc( sizeof( *p_sys ) ); - if( p_sys == NULL ) + p_sys = calloc( 1, sizeof( *p_sys ) ); + if( !p_sys ) return VLC_ENOMEM; - memset( p_sys, 0, sizeof( *p_sys ) ); /* Init p_access */ p_sys->fd_data = -1; + p_sys->out = true; 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; @@ -432,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 ) @@ -446,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 ) @@ -469,22 +510,41 @@ 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_access->i_object_type == VLC_OBJECT_ACCESS ); + assert( !p_sys->out ); 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; + } } /***************************************************************************** @@ -516,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* ); @@ -542,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; /* */ @@ -586,12 +638,14 @@ static int ftp_SendCommand( vlc_object_t *p_access, access_sys_t *p_sys, char *psz_cmd; va_start( args, psz_fmt ); - vasprintf( &psz_cmd, psz_fmt, args ); + if( vasprintf( &psz_cmd, psz_fmt, args ) == -1 ) + return VLC_EGENERIC; + va_end( args ); 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; @@ -669,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; @@ -753,19 +807,30 @@ 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_access->i_object_type == VLC_OBJECT_ACCESS) - ? "RETR" : "STOR", - 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_access->i_object_type == VLC_OBJECT_ACCESS ) ); + shutdown( p_sys->fd_data, p_sys->out ? SHUT_RD : SHUT_WR ); return VLC_SUCCESS; } @@ -783,16 +848,13 @@ static int ftp_StopStream ( vlc_object_t *p_access, access_sys_t *p_sys ) if( p_sys->fd_data != -1 ) { - int i_answer; - ftp_ReadCommand( p_access, p_sys, &i_answer, NULL ); - if ( i_answer != 227 ) - /* If answer is from the previous command, - * rathen that succesful ABOR - read next command */ - ftp_ReadCommand( p_access, p_sys, NULL, NULL ); - net_Close( p_sys->fd_data ); p_sys->fd_data = -1; + /* Read the final response from RETR/STOR, i.e. 426 or 226 */ + ftp_ReadCommand( p_access, p_sys, NULL, NULL ); } + /* Read the response from ABOR, i.e. 226 or 225 */ + ftp_ReadCommand( p_access, p_sys, NULL, NULL ); return VLC_SUCCESS; }