X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fftp.c;h=3aca2f6050521559349cea059b55492325c3ced7;hb=f94a2f9c4a4c7979d9695bb240686c73b6cf7e00;hp=8ea6528e200f9efe3996c63843228179bdbe2ba9;hpb=93c16a0b4e20c301c4f7e1a077e1a31898da88dc;p=vlc diff --git a/modules/access/ftp.c b/modules/access/ftp.c index 8ea6528e20..3aca2f6050 100644 --- a/modules/access/ftp.c +++ b/modules/access/ftp.c @@ -26,10 +26,12 @@ /***************************************************************************** * Preamble *****************************************************************************/ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include -#include -#include #include #include @@ -68,17 +70,17 @@ static void OutClose( vlc_object_t * ); vlc_module_begin(); set_shortname( "FTP" ); set_description( _("FTP input") ); - set_capability( "access2", 0 ); + 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, VLC_TRUE ); + CACHING_TEXT, CACHING_LONGTEXT, true ); add_string( "ftp-user", "anonymous", NULL, USER_TEXT, USER_LONGTEXT, - VLC_FALSE ); + false ); add_string( "ftp-pwd", "anonymous@example.com", NULL, PASS_TEXT, - PASS_LONGTEXT, VLC_FALSE ); + PASS_LONGTEXT, false ); add_string( "ftp-account", "anonymous", NULL, ACCOUNT_TEXT, - ACCOUNT_LONGTEXT, VLC_FALSE ); + ACCOUNT_LONGTEXT, false ); add_shortcut( "ftp" ); set_callbacks( InOpen, InClose ); @@ -88,17 +90,16 @@ vlc_module_begin(); 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 int Read( access_t *, uint8_t *, int ); -static int Write( sout_access_out_t *, block_t * ); +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 OutSeek( sout_access_out_t *, int64_t ); +static int OutSeek( sout_access_out_t *, off_t ); static int Control( access_t *, int, va_list ); struct access_sys_t @@ -129,7 +130,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, VLC_FALSE, _("Network interaction failed"), + intf_UserFatal( p_access, false, _("Network interaction failed"), _("VLC could not connect with the given server.") ); return -1; } @@ -139,7 +140,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, VLC_FALSE, _("Network interaction failed"), + intf_UserFatal( p_access, false, _("Network interaction failed"), _("VLC's connection to the given server was rejected.") ); return -1; } @@ -199,8 +200,8 @@ 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, VLC_FALSE, - _("Network interaction failed"), + intf_UserFatal( p_access, false, + _("Network interaction failed"), _("Your account was rejected.") ); return -1; } @@ -209,17 +210,17 @@ static int Login( vlc_object_t *p_access, access_sys_t *p_sys ) default: msg_Err( p_access, "password rejected" ); - intf_UserFatal( p_access, VLC_FALSE, - _("Network interaction failed"), + intf_UserFatal( p_access, false, + _("Network interaction failed"), _("Your password was rejected.") ); return -1; } break; default: msg_Err( p_access, "user rejected" ); - intf_UserFatal( p_access, VLC_FALSE, - _("Network interaction failed"), - _("Your connection attemp to the server was rejected.") ); + intf_UserFatal( p_access, false, + _("Network interaction failed"), + _("Your connection attempt to the server was rejected.") ); return -1; } @@ -450,7 +451,7 @@ static int Seek( access_t *p_access, int64_t i_pos ) if( val ) return val; - p_access->info.b_eof = VLC_FALSE; + p_access->info.b_eof = false; p_access->info.i_pos = i_pos; return VLC_SUCCESS; @@ -464,7 +465,7 @@ static int OutSeek( sout_access_out_t *p_access, off_t i_pos ) /***************************************************************************** * Read: *****************************************************************************/ -static int Read( access_t *p_access, uint8_t *p_buffer, int i_len ) +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; @@ -476,9 +477,9 @@ static int Read( access_t *p_access, uint8_t *p_buffer, int i_len ) return 0; i_read = net_Read( p_access, p_sys->fd_data, NULL, p_buffer, i_len, - VLC_FALSE ); + false ); if( i_read == 0 ) - p_access->info.b_eof = VLC_TRUE; + p_access->info.b_eof = true; else if( i_read > 0 ) p_access->info.i_pos += i_read; @@ -488,7 +489,7 @@ static int Read( access_t *p_access, uint8_t *p_buffer, int i_len ) /***************************************************************************** * Write: *****************************************************************************/ -static int Write( sout_access_out_t *p_access, block_t *p_buffer ) +static ssize_t Write( sout_access_out_t *p_access, block_t *p_buffer ) { access_sys_t *p_sys = GET_OUT_SYS(p_access); size_t i_write = 0; @@ -514,7 +515,7 @@ static int Write( sout_access_out_t *p_access, block_t *p_buffer ) *****************************************************************************/ static int Control( access_t *p_access, int i_query, va_list args ) { - vlc_bool_t *pb_bool; + bool *pb_bool; int *pi_int; int64_t *pi_64; vlc_value_t val; @@ -523,20 +524,20 @@ static int Control( access_t *p_access, int i_query, va_list args ) { /* */ case ACCESS_CAN_SEEK: - pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* ); - *pb_bool = VLC_TRUE; + pb_bool = (bool*)va_arg( args, bool* ); + *pb_bool = true; break; case ACCESS_CAN_FASTSEEK: - pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* ); - *pb_bool = VLC_FALSE; + pb_bool = (bool*)va_arg( args, bool* ); + *pb_bool = false; break; case ACCESS_CAN_PAUSE: - pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* ); - *pb_bool = VLC_TRUE; /* FIXME */ + pb_bool = (bool*)va_arg( args, bool* ); + *pb_bool = true; /* FIXME */ break; case ACCESS_CAN_CONTROL_PACE: - pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* ); - *pb_bool = VLC_TRUE; /* FIXME */ + pb_bool = (bool*)va_arg( args, bool* ); + *pb_bool = true; /* FIXME */ break; /* */ @@ -553,17 +554,21 @@ static int Control( access_t *p_access, int i_query, va_list args ) /* */ case ACCESS_SET_PAUSE_STATE: - /* Nothing to do */ + pb_bool = (bool*)va_arg( args, bool* ); + if ( !pb_bool ) + return Seek( p_access, p_access->info.i_pos ); break; case ACCESS_GET_TITLE_INFO: case ACCESS_SET_TITLE: case ACCESS_SET_SEEKPOINT: case ACCESS_SET_PRIVATE_ID_STATE: + case ACCESS_GET_CONTENT_TYPE: + case ACCESS_GET_META: return VLC_EGENERIC; default: - msg_Warn( p_access, "unimplemented query in control" ); + msg_Warn( p_access, "unimplemented query in control: %d", i_query); return VLC_EGENERIC; } @@ -618,7 +623,7 @@ static int ftp_ReadCommand( vlc_object_t *p_access, access_sys_t *p_sys, if( psz_line == NULL || strlen( psz_line ) < 3 ) { msg_Err( p_access, "cannot get answer" ); - if( psz_line ) free( psz_line ); + free( psz_line ); if( pi_answer ) *pi_answer = 500; if( ppsz_answer ) *ppsz_answer = NULL; return -1; @@ -663,7 +668,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, - off_t i_start ) + int64_t i_start ) { char psz_ipv4[16], *psz_ip = p_sys->sz_epsv_ip; int i_answer; @@ -754,7 +759,7 @@ static int ftp_StartStream( vlc_object_t *p_access, access_sys_t *p_sys, p_sys->url.psz_path ) < 0 || ftp_ReadCommand( p_access, p_sys, &i_answer, NULL ) > 2 ) { - msg_Err( p_access, "cannot retreive file" ); + msg_Err( p_access, "cannot retrieve file" ); return VLC_EGENERIC; } @@ -777,11 +782,16 @@ 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; - ftp_ReadCommand( p_access, p_sys, NULL, NULL ); } - ftp_ReadCommand( p_access, p_sys, NULL, NULL ); return VLC_SUCCESS; }