/*****************************************************************************
* ftp.c: FTP input module
*****************************************************************************
- * Copyright (C) 2001-2004 VideoLAN
+ * Copyright (C) 2001-2005 VideoLAN
* $Id$
*
- * Authors: Laurent Aimar <fenrir@via.ecp.fr>
+ * Authors: Laurent Aimar <fenrir@via.ecp.fr> - original code
+ * Rémi Denis-Courmont <rem # videolan.org> - EPSV support
*
* 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
#include <vlc/input.h>
#include "network.h"
+#if defined( UNDER_CE )
+# include <winsock.h>
+#elif defined( WIN32 )
+# include <winsock2.h>
+#else
+# include <sys/socket.h>
+#endif
/*****************************************************************************
* Module descriptor
"used for the connection.")
vlc_module_begin();
+ set_shortname( "FTP" );
set_description( _("FTP input") );
set_capability( "access2", 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 );
add_string( "ftp-user", "anonymous", NULL, USER_TEXT, USER_LONGTEXT,
struct access_sys_t
{
- vlc_url_t url;
+ vlc_url_t url;
- int fd_cmd;
- int fd_data;
-
- int64_t i_size;
-
- int64_t i_tell;
-
- vlc_bool_t b_eof;
+ int fd_cmd;
+ int fd_data;
+
+ char *psz_epsv_ip;
};
static int ftp_SendCommand( access_t *, char *, ... );
access_t *p_access = (access_t*)p_this;
access_sys_t *p_sys;
char *psz;
- vlc_value_t val;
int i_answer;
char *psz_arg;
- /* *** allocate access_sys_t *** */
- p_sys = malloc( sizeof( access_sys_t ) );
+ /* Init p_access */
+ p_access->pf_read = Read;
+ p_access->pf_block = NULL;
+ p_access->pf_seek = Seek;
+ p_access->pf_control = Control;
+ p_access->info.i_update = 0;
+ p_access->info.i_size = 0;
+ p_access->info.i_pos = 0;
+ p_access->info.b_eof = VLC_FALSE;
+ p_access->info.i_title = 0;
+ p_access->info.i_seekpoint = 0;
+ p_access->p_sys = p_sys = malloc( sizeof( access_sys_t ) );
memset( p_sys, 0, sizeof( access_sys_t ) );
p_sys->fd_cmd = -1;
p_sys->fd_data = -1;
- p_sys->i_tell = 0;
+ p_sys->psz_epsv_ip = NULL;
/* *** Parse URL and get server addr/port and path *** */
psz = p_access->psz_path;
goto exit_error;
}
- /* set p_access->p_sys */
- p_access->p_sys = p_sys;
-
for( ;; )
{
if( ftp_ReadCommand( p_access, &i_answer, NULL ) != 1 )
msg_Dbg( p_access, "connection accepted (%d)", i_answer );
- var_Create( p_access, "ftp-user", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
- var_Get( p_access, "ftp-user", &val );
- if( ftp_SendCommand( p_access, "USER %s", val.psz_string ) < 0 ||
+ psz = var_CreateGetString( p_access, "ftp-user" );
+ if( ftp_SendCommand( p_access, "USER %s", psz ) < 0 ||
ftp_ReadCommand( p_access, &i_answer, NULL ) < 0 )
{
- if( val.psz_string ) free( val.psz_string );
+ free( psz );
goto exit_error;
}
- if( val.psz_string ) free( val.psz_string );
+ free( psz );
switch( i_answer / 100 )
{
break;
case 3:
msg_Dbg( p_access, "password needed" );
- var_Create( p_access, "ftp-pwd", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
- var_Get( p_access, "ftp-pwd", &val );
- if( ftp_SendCommand( p_access, "PASS %s", val.psz_string ) < 0 ||
+ psz = var_CreateGetString( p_access, "ftp-pwd" );
+ if( ftp_SendCommand( p_access, "PASS %s", psz ) < 0 ||
ftp_ReadCommand( p_access, &i_answer, NULL ) < 0 )
{
- if( val.psz_string ) free( val.psz_string );
+ free( psz );
goto exit_error;
}
- if( val.psz_string ) free( val.psz_string );
+ free( psz );
switch( i_answer / 100 )
{
break;
case 3:
msg_Dbg( p_access, "account needed" );
- var_Create( p_access, "ftp-account",
- VLC_VAR_STRING | VLC_VAR_DOINHERIT );
- var_Get( p_access, "ftp-account", &val );
+ psz = var_CreateGetString( p_access, "ftp-account" );
if( ftp_SendCommand( p_access, "ACCT %s",
- val.psz_string ) < 0 ||
+ psz ) < 0 ||
ftp_ReadCommand( p_access, &i_answer, NULL ) < 0 )
{
- if( val.psz_string ) free( val.psz_string );
+ free( psz );
goto exit_error;
}
- if( val.psz_string ) free( val.psz_string );
+ free( psz );
if( i_answer / 100 != 2 )
{
goto exit_error;
}
+ /* Extended passive mode */
+ if( ftp_SendCommand( p_access, "EPSV ALL" ) < 0 )
+ {
+ msg_Err( p_access, "cannot request extended passive mode" );
+ goto exit_error;
+ }
+
+ if( ftp_ReadCommand( p_access, &i_answer, NULL ) == 2 )
+ {
+ char hostaddr[NI_MAXNUMERICHOST];
+ struct sockaddr_storage addr;
+ socklen_t len = sizeof (addr);
+
+ if( getpeername( p_sys->fd_cmd, (struct sockaddr *)&addr, &len ) )
+ {
+ msg_Err( p_access, "getpeername failed" );
+ goto exit_error;
+ }
+
+ i_answer = vlc_getnameinfo( p_this, (struct sockaddr *)&addr, len,
+ hostaddr, sizeof( hostaddr ), NULL,
+ NI_NUMERICHOST );
+ if( i_answer )
+ {
+ msg_Err( p_access, "getnameinfo failed: %s",
+ vlc_gai_strerror( i_answer ) );
+ goto exit_error;
+ }
+ p_sys->psz_epsv_ip = strdup( hostaddr );
+ }
+ if( p_sys->psz_epsv_ip == NULL )
+ msg_Info( p_access, "FTP Extended passive mode disabled" );
+
/* binary mode */
if( ftp_SendCommand( p_access, "TYPE I" ) < 0 ||
ftp_ReadCommand( p_access, &i_answer, NULL ) != 2 )
{
- msg_Err( p_access, "cannot set binary transfert mode" );
+ msg_Err( p_access, "cannot set binary transfer mode" );
goto exit_error;
}
msg_Err( p_access, "cannot get file size" );
goto exit_error;
}
- p_sys->i_size = atoll( &psz_arg[4] );
+ p_access->info.i_size = atoll( &psz_arg[4] );
free( psz_arg );
- msg_Dbg( p_access, "file size: "I64Fd, p_sys->i_size );
+ msg_Dbg( p_access, "file size: "I64Fd, p_access->info.i_size );
/* Start the 'stream' */
if( ftp_StartStream( p_access, 0 ) < 0 )
/* Update default_pts to a suitable value for ftp access */
var_Create( p_access, "ftp-caching", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
- /* *** set exported functions *** */
- p_access->pf_read = Read;
- p_access->pf_block = NULL;
- p_access->pf_seek = Seek;
- p_access->pf_control = Control;
return VLC_SUCCESS;
exit_error:
ftp_ReadCommand( p_access, NULL, NULL );
}
net_Close( p_sys->fd_cmd );
+ if( p_sys->psz_epsv_ip != NULL )
+ free( p_sys->psz_epsv_ip );
/* free memory */
vlc_UrlClean( &p_sys->url );
*****************************************************************************/
static int Seek( access_t *p_access, int64_t i_pos )
{
- access_sys_t *p_sys = p_access->p_sys;
if( i_pos < 0 )
{
return VLC_EGENERIC;
ftp_StopStream( p_access );
if( ftp_StartStream( p_access, i_pos ) < 0 )
{
- p_sys->b_eof = VLC_TRUE;
+ p_access->info.b_eof = VLC_TRUE;
return VLC_EGENERIC;
}
- p_sys->i_tell = i_pos;
+ p_access->info.b_eof = VLC_FALSE;
+ p_access->info.i_pos = i_pos;
return VLC_SUCCESS;
}
access_sys_t *p_sys = p_access->p_sys;
int i_read;
- if( p_sys->b_eof )
+ if( p_access->info.b_eof )
return 0;
- i_read = net_Read( p_access, p_sys->fd_data, p_buffer, i_len, VLC_FALSE );
+ i_read = net_Read( p_access, p_sys->fd_data, NULL, p_buffer, i_len,
+ VLC_FALSE );
if( i_read == 0 )
- p_sys->b_eof = VLC_TRUE;
+ p_access->info.b_eof = VLC_TRUE;
else if( i_read > 0 )
- p_sys->i_tell += i_read;
+ p_access->info.i_pos += i_read;
return i_read;
}
*****************************************************************************/
static int Control( access_t *p_access, int i_query, va_list args )
{
- access_sys_t *p_sys = p_access->p_sys;
vlc_bool_t *pb_bool;
int *pi_int;
int64_t *pi_64;
pi_int = (int*)va_arg( args, int * );
*pi_int = 0;
break;
- case ACCESS_GET_SIZE:
- pi_64 = (int64_t*)va_arg( args, int64_t * );
- *pi_64 = p_sys->i_size > 0 ? p_sys->i_size : 0;
- break;
- case ACCESS_GET_POS:
- pi_64 = (int64_t*)va_arg( args, int64_t * );
- *pi_64 = p_sys->i_tell;
- break;
- case ACCESS_GET_EOF:
- pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* );
- *pb_bool = p_sys->b_eof;
- break;
case ACCESS_GET_PTS_DELAY:
pi_64 = (int64_t*)va_arg( args, int64_t * );
var_Get( p_access, "ftp-caching", &val );
- *pi_64 = val.i_int * 1000;
+ *pi_64 = (int64_t)var_GetInteger( p_access, "ftp-caching" ) * I64C(1000);
break;
/* */
/* Nothing to do */
break;
+ case ACCESS_GET_TITLE_INFO:
+ case ACCESS_SET_TITLE:
+ case ACCESS_SET_SEEKPOINT:
+ case ACCESS_SET_PRIVATE_ID_STATE:
+ return VLC_EGENERIC;
+
default:
- msg_Err( p_access, "unimplemented query in control" );
+ msg_Warn( p_access, "unimplemented query in control" );
return VLC_EGENERIC;
}
access_sys_t *p_sys = p_access->p_sys;
va_list args;
char *psz_cmd;
- int i_ret;
va_start( args, psz_fmt );
vasprintf( &psz_cmd, psz_fmt, args );
va_end( args );
msg_Dbg( p_access, "ftp_SendCommand:\"%s\"", psz_cmd);
- if( ( i_ret = net_Printf( VLC_OBJECT(p_access), p_sys->fd_cmd,
- "%s", psz_cmd ) ) > 0 )
- {
- i_ret = net_Printf( VLC_OBJECT(p_access), p_sys->fd_cmd, "\n" );
- }
-
- if( i_ret < 0 )
+ if( net_Printf( VLC_OBJECT(p_access), p_sys->fd_cmd, NULL, "%s\r\n",
+ psz_cmd ) < 0 )
{
msg_Err( p_access, "failed to send command" );
return VLC_EGENERIC;
char *psz_line;
int i_answer;
- psz_line = net_Gets( p_access, p_sys->fd_cmd );
+ psz_line = net_Gets( p_access, p_sys->fd_cmd, NULL );
msg_Dbg( p_access, "answer=%s", psz_line );
if( psz_line == NULL || strlen( psz_line ) < 3 )
{
return -1;
}
+ if( psz_line[3] == '-' ) /* Multiple response */
+ {
+ char end[4];
+
+ memcpy( end, psz_line, 3 );
+ end[3] = ' ';
+
+ for( ;; )
+ {
+ char *psz_tmp = net_Gets( p_access, p_sys->fd_cmd, NULL );
+
+ if( psz_tmp == NULL ) /* Error */
+ break;
+
+ if( !strncmp( psz_tmp, end, 4 ) )
+ {
+ free( psz_tmp );
+ break;
+ }
+ free( psz_tmp );
+ }
+ }
+
i_answer = atoi( psz_line );
if( pi_answer ) *pi_answer = i_answer;
{
access_sys_t *p_sys = p_access->p_sys;
- char psz_ip[1000];
+ char psz_ipv4[16], *psz_ip;
int i_answer;
char *psz_arg, *psz_parser;
- int a1,a2,a3,a4;
- int p1,p2;
+ unsigned a1, a2, a3, a4, p1, p2;
int i_port;
- if( ftp_SendCommand( p_access, "PASV" ) < 0 ||
- ftp_ReadCommand( p_access, &i_answer, &psz_arg ) != 2 )
+ if( ( ftp_SendCommand( p_access, p_sys->psz_epsv_ip != NULL
+ ? "EPSV" : "PASV" ) < 0 )
+ || ( ftp_ReadCommand( p_access, &i_answer, &psz_arg ) != 2 ) )
{
- msg_Err( p_access, "cannot set passive transfert mode" );
+ msg_Err( p_access, "cannot set passive mode" );
return VLC_EGENERIC;
}
psz_parser = strchr( psz_arg, '(' );
- if( !psz_parser ||
- sscanf( psz_parser, "(%d,%d,%d,%d,%d,%d", &a1, &a2, &a3,
- &a4, &p1, &p2 ) < 6 )
+ if( psz_parser == NULL )
{
free( psz_arg );
- msg_Err( p_access, "cannot get ip/port for passive transfert mode" );
+ msg_Err( p_access, "cannot parse passive mode response" );
return VLC_EGENERIC;
}
+
+ psz_ip = p_sys->psz_epsv_ip;
+ if( psz_ip != NULL )
+ {
+ char psz_fmt[7] = "(|||%u";
+ psz_fmt[1] = psz_fmt[2] = psz_fmt[3] = psz_parser[1];
+
+ if( sscanf( psz_parser, psz_fmt, &i_port ) < 1 )
+ {
+ free( psz_arg );
+ msg_Err( p_access, "cannot parse passive mode response" );
+ return VLC_EGENERIC;
+ }
+ }
+ else
+ {
+ if( ( sscanf( psz_parser, "(%u,%u,%u,%u,%u,%u", &a1, &a2, &a3, &a4,
+ &p1, &p2 ) < 6 ) || ( a1 > 255 ) || ( a2 > 255 )
+ || ( a3 > 255 ) || ( a4 > 255 ) || ( p1 > 255 ) || ( p2 > 255 ) )
+ {
+ free( psz_arg );
+ msg_Err( p_access, "cannot parse passive mode response" );
+ return VLC_EGENERIC;
+ }
+
+ sprintf( psz_ipv4, "%u.%u.%u.%u", a1, a2, a3, a4 );
+ psz_ip = psz_ipv4;
+ i_port = (p1 << 8) | p2;
+ }
free( psz_arg );
- sprintf( psz_ip, "%d.%d.%d.%d", a1, a2, a3, a4 );
- i_port = p1 * 256 + p2;
msg_Dbg( p_access, "ip:%s port:%d", psz_ip, i_port );
if( ftp_SendCommand( p_access, "TYPE I" ) < 0 ||
ftp_ReadCommand( p_access, &i_answer, NULL ) != 2 )
{
- msg_Err( p_access, "cannot set binary transfert mode" );
+ msg_Err( p_access, "cannot set binary transfer mode" );
return VLC_EGENERIC;
}
projects / vlc / blobdiff