Changeset e45c692c9be3706dbaee7f84a294a943b05c6962

Timestamp:

09/09/06 11:53:34 (2 years ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1157795614 +0000

git-parent:

[4a0c164d8c02d3ed72dd78631ba1ea050f9bcd03]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1157795614 +0000

Message:

Untested FTP access output (closes #605)

Files:

• modules/access/ftp.c (modified) (27 diffs)

modules/access/ftp.c

@@ -28 +28 @@
- *****************************************************************************/
-#include <stdlib.h>
+#include <assert.h>
-
-#include <vlc/vlc.h>
@@ -35 +36 @@
-#include "network.h"
-#include "vlc_url.h"
+#include "stream_output.h"
-
-/*****************************************************************************
- * Module descriptor
- *****************************************************************************/
-
-
+
+
+
+
-
-#define CACHING_TEXT N_("Caching value in ms")
@@ -71 +75 @@
-                ACCOUNT_LONGTEXT, VLC_FALSE );
-    add_shortcut( "ftp" );
-
+
+
+
+
+
+
+
+
+
+
-vlc_module_end();
-
@@ -78 +91 @@
- *****************************************************************************/
-static int Read( access_t *, uint8_t *, int );
+static int 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 Control( access_t *, int, va_list );
-
@@ -90 +105 @@
-    char       sz_epsv_ip[NI_MAXNUMERICHOST];
-};
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-    char *psz;
-
-    /* *** Open a TCP connection with server *** */
-p_sys->fd_cmd = f
-
+int fd = p_sys->fd_cm
+       
-    if( fd == -1 )
-    {
@@ -112 +129 @@
-    }
-
-
+p_sys, 
-
-    if( i_answer / 100 != 2 )
@@ -129 +146 @@
-        psz = var_CreateGetString( p_access, "ftp-user" );
-
-
-
+p_sys, 
+p_sys, 
-    {
-        free( psz );
@@ -149 +166 @@
-                psz = var_CreateGetString( p_access, "ftp-pwd" );
-
-
-
+p_sys, 
+p_sys, 
-            {
-                free( psz );
@@ -165 +182 @@
-                    msg_Dbg( p_access, "account needed" );
-                    psz = var_CreateGetString( p_access, "ftp-account" );
-
+p_sys, 
-                                         psz ) < 0 ||
-
+p_sys, 
-                    {
-                        free( psz );
@@ -204 +221 @@
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-    /* Extended passive mode */
-
+p_sys, 
-    {
-        msg_Err( p_access, "cannot request extended passive mode" );
-
-
-
-
+
+
+
+
+
-    {
-        if( net_GetPeerAddress( p_sys->fd_cmd, p_sys->sz_epsv_ip, NULL ) )
-
+
+
+
+
-    }
-    else
@@ -267 +249 @@
-         * the initial connection.
-         */
+        msg_Info( p_access, "FTP Extended passive mode disabled" );
-        net_Close( p_sys->fd_cmd );
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-    {
-        msg_Err( p_access, "cannot set binary transfer mode" );
+        net_Close( p_sys->fd_cmd );
+        return -1;
+    }
+
+    return 0;
+}
+
+
+static int parseURL( vlc_url_t *url, const char *path )
+{
+    if( path == NULL )
+        return -1;
+
+    /* *** Parse URL and get server addr/port and path *** */
+    while( *path == '/' )
+        path++;
+
+    vlc_UrlParse( url, path, 0 );
+
+    if( url->psz_host == NULL || *url->psz_host == '\0' )
+        return -1;
+
+    if( url->i_port <= 0 )
+        url->i_port = IPPORT_FTP; /* default port */
+
+    /* FTP URLs are relative to user's default directory (RFC1738)
+    For absolute path use ftp://foo.bar//usr/local/etc/filename */
+
+    if( *url->psz_path == '/' )
+        url->psz_path++;
+
+    return 0;
+}
+
+
+/****************************************************************************
+ * Open: connect to ftp server and ask for file
+ ****************************************************************************/
+static int InOpen( vlc_object_t *p_this )
+{
+    access_t     *p_access = (access_t*)p_this;
+    access_sys_t *p_sys;
+    char         *psz_arg;
+
+    /* Init p_access */
+    STANDARD_READ_ACCESS_INIT
+    p_sys->fd_data = -1;
+
+    if( parseURL( &p_sys->url, p_access->psz_path ) )
-        goto exit_error;
-
+
+
+
-
-    /* get size */
-acces
-access, &i_answer
+this, p_sy
+this, p_sys, NULL
-    {
-        msg_Err( p_access, "cannot get file size" );
+        net_Close( p_sys->fd_cmd );
-        goto exit_error;
-    }
@@ -297 +331 @@
-
-    /* Start the 'stream' */
-acces
+this, p_sy
-    {
-        msg_Err( p_access, "cannot retrieve file" );
+        net_Close( p_sys->fd_cmd );
-        goto exit_error;
-    }
@@ -309 +344 @@
-
-exit_error:
-    if( p_sys->fd_cmd != -1 )
-        net_Close( p_sys->fd_cmd );
-    vlc_UrlClean( &p_sys->url );
-    free( p_sys );
@@ -316 +349 @@
-}
-
+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 )
+        return VLC_ENOMEM;
+    memset( p_sys, 0, sizeof( *p_sys ) );
+
+    /* Init p_access */
+    p_sys->fd_data = -1;
+
+    if( parseURL( &p_sys->url, p_access->psz_name ) )
+        goto exit_error;
+
+    if( Connect( p_this, p_sys ) )
+        goto exit_error;
+
+    /* Start the 'stream' */
+    if( ftp_StartStream( p_this, p_sys, 0 ) < 0 )
+    {
+        msg_Err( p_access, "cannot store file" );
+        net_Close( p_sys->fd_cmd );
+        goto exit_error;
+    }
+
+    p_access->pf_seek = OutSeek;
+    p_access->pf_write = Write;
+
+    return VLC_SUCCESS;
+
+exit_error:
+        vlc_UrlClean( &p_sys->url );
+    free( p_sys );
+    return VLC_EGENERIC;
+}
+
-/*****************************************************************************
- * Close: free unused data structures
- *****************************************************************************/
-
-
-
-
-
+
+
-    msg_Dbg( p_access, "stopping stream" );
-
-
-
+, p_sys
+
+p_sys, 
-    {
-        msg_Warn( p_access, "cannot quit" );
@@ -333 +401 @@
-    else
-    {
-
+p_sys, 
-    }
-    net_Close( p_sys->fd_cmd );
@@ -342 +410 @@
-}
-
+static void InClose( vlc_object_t *p_this )
+{
+    Close( p_this, ((access_t *)p_this)->p_sys);
+}
+
+static void OutClose( vlc_object_t *p_this )
+{
+    Close( p_this, GET_OUT_SYS(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 )
+{
+    if( i_pos < 0 )
+        return VLC_EGENERIC;
+
+    msg_Dbg( p_access, "seeking to "I64Fd, i_pos );
+
+    ftp_StopStream( (vlc_object_t *)p_access, p_sys );
+    if( ftp_StartStream( (vlc_object_t *)p_access, p_sys, i_pos ) < 0 )
+        return VLC_EGENERIC;
+
+    return VLC_SUCCESS;
+}
+
-static int Seek( access_t *p_access, int64_t i_pos )
-{
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-    p_access->info.b_eof = VLC_FALSE;
@@ -366 +450 @@
-}
-
+static int OutSeek( sout_access_out_t *p_access, off_t i_pos )
+{
+    return _Seek( (vlc_object_t *)p_access, GET_OUT_SYS( p_access ), i_pos);
+}
+
-/*****************************************************************************
- * Read:
@@ -373 +462 @@
-    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 );
-
-    if( p_access->info.b_eof )
@@ -388 +480 @@
-
-/*****************************************************************************
+ * Write:
+ *****************************************************************************/
+static int 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;
+
+    assert( p_sys->fd_data != -1 );
+
+    while( p_buffer != NULL )
+    {
+        block_t *p_next = p_buffer->p_next;;
+
+        i_write += net_Write( p_access, p_sys->fd_data, NULL,
+                              p_buffer->p_buffer, p_buffer->i_buffer );
+        block_Release( p_buffer );
+
+        p_buffer = p_next;
+    }
+
+    return i_write;
+}
+
+/*****************************************************************************
- * Control:
- *****************************************************************************/
@@ -451 +567 @@
- * ftp_*:
- *****************************************************************************/
-access_t *p_access, char *psz_fmt, ... )
-
-
+vlc_object_t *p_access, access_sys_t *p_sys,
+
+
-    va_list      args;
-    char         *psz_cmd;
@@ -486 +602 @@
- These strings are not part of the requests, except in the case \377\377,
- where the request contains one \377. */
-access_t *p_acces
+vlc_object_t *p_access, access_sys_t *p_sy
-                            int *pi_answer, char **ppsz_answer )
-{
-    access_sys_t *p_sys = p_access->p_sys;
-    char         *psz_line;
-    int          i_answer;
@@ -541 +656 @@
-}
-
-
-
-
-
-
+
+
+
+
-    int  i_answer;
-    char *psz_arg, *psz_parser;
-    int  i_port;
-
-psz_ip = p_sys->sz_epsv_ip
-
-
-
+assert( p_sys->fd_data == -1 )
+
+p_sys, 
+p_sys, 
-    {
-        msg_Err( p_access, "cannot set passive mode" );
@@ -600 +714 @@
-    msg_Dbg( p_access, "ip:%s port:%d", psz_ip, i_port );
-
-
-
+p_sys, 
+p_sys, 
-    {
-        msg_Err( p_access, "cannot set binary transfer mode" );
@@ -609 +723 @@
-    if( i_start > 0 )
-    {
-
-
+p_sys, 
+p_sys, 
-        {
-poin
+offse
-            return VLC_EGENERIC;
-        }
@@ -628 +742 @@
-
-    /* "1xx" message */
-
-
+
+
+
+
+
-    {
-        msg_Err( p_access, "cannot retreive file" );
@@ -637 +754 @@
-}
-
-
-
-
-
-
-
-
+
+
+
-    {
-        msg_Warn( p_access, "cannot abort file" );
@@ -651 +764 @@
-        return VLC_EGENERIC;
-    }
-
+
+
-    {
-        net_Close( p_sys->fd_data );
-        p_sys->fd_data = -1;
-&i_answer
-
-&i_answer
+p_sys, NULL
+
+p_sys, NULL
-
-    return VLC_SUCCESS;
-}
-