/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
-#include <stdio.h>
-#include <stdlib.h>
#include <assert.h>
#include <vlc_access.h>
vlc_module_begin();
set_shortname( "FTP" );
- set_description( _("FTP input") );
- set_capability( "access2", 0 );
+ 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, 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 );
add_submodule();
set_shortname( "FTP" );
- set_description( _("FTP upload output") );
+ 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 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
int fd_data;
char sz_epsv_ip[NI_MAXNUMERICHOST];
+ bool out;
};
#define GET_OUT_SYS( p_this ) \
((access_sys_t *)(((sout_access_out_t *)(p_this))->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;
}
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;
}
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;
}
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;
}
/* Init p_access */
STANDARD_READ_ACCESS_INIT
p_sys->fd_data = -1;
+ p_sys->out = false;
if( parseURL( &p_sys->url, p_access->psz_path ) )
goto exit_error;
}
p_access->info.i_size = atoll( &psz_arg[4] );
free( psz_arg );
- msg_Dbg( p_access, "file size: "I64Fd, p_access->info.i_size );
+ msg_Dbg( p_access, "file size: %"PRId64, p_access->info.i_size );
/* Start the 'stream' */
if( ftp_StartStream( p_this, p_sys, 0 ) < 0 )
/* Init p_access */
p_sys->fd_data = -1;
+ p_sys->out = true;
- if( parseURL( &p_sys->url, p_access->psz_name ) )
+ if( parseURL( &p_sys->url, p_access->psz_path ) )
goto exit_error;
if( Connect( p_this, p_sys ) )
if( i_pos < 0 )
return VLC_EGENERIC;
- msg_Dbg( p_access, "seeking to "I64Fd, i_pos );
+ msg_Dbg( p_access, "seeking to %"PRId64, i_pos );
ftp_StopStream( (vlc_object_t *)p_access, p_sys );
if( ftp_StartStream( (vlc_object_t *)p_access, p_sys, i_pos ) < 0 )
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;
/*****************************************************************************
* 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;
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,
- 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;
/*****************************************************************************
* 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;
*****************************************************************************/
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;
{
/* */
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;
/* */
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" ) * I64C(1000);
+ *pi_64 = (int64_t)var_GetInteger( p_access, "ftp-caching" ) * INT64_C(1000);
break;
/* */
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;
}
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;
}
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;
if( i_start > 0 )
{
- if( ftp_SendCommand( p_access, p_sys, "REST "I64Fu, i_start ) < 0 ||
+ if( ftp_SendCommand( p_access, p_sys, "REST %"PRIu64, i_start ) < 0 ||
ftp_ReadCommand( p_access, p_sys, &i_answer, NULL ) > 3 )
{
msg_Err( p_access, "cannot set restart offset" );
/* "1xx" message */
if( ftp_SendCommand( p_access, p_sys, "%s %s",
- (p_access->i_object_type == VLC_OBJECT_ACCESS)
- ? "RETR" : "STOR",
+ 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 retreive file" );
+ msg_Err( p_access, "cannot retrieve file" );
return VLC_EGENERIC;
}
- if( p_access->i_object_type == VLC_OBJECT_ACCESS )
- net_StopSend( p_sys->fd_data );
- else
- net_StopRecv( p_sys->fd_data );
+ shutdown( p_sys->fd_data, p_sys->out ? SHUT_RD : SHUT_WR );
return VLC_SUCCESS;
}
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;
}
projects / vlc / blobdiff