Commit 4b63cbc9 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Check for remote file - Linux support

(cherry picked from commit a427e327)
parent 2a3e46f2
...@@ -47,8 +47,13 @@ ...@@ -47,8 +47,13 @@
#ifdef HAVE_FCNTL_H #ifdef HAVE_FCNTL_H
# include <fcntl.h> # include <fcntl.h>
#endif #endif
#if HAVE_SYS_MOUNT_H #if defined (__linux__)
#include <sys/mount.h> # include <sys/vfs.h>
# include <linux/magic.h>
# define HAVE_FSTATFS 1
#elif defined (HAVE_SYS_MOUNT_H)
# include <sys/mount.h>
# define HAVE_FSTATFS 1
#endif #endif
#if defined( WIN32 ) #if defined( WIN32 )
...@@ -118,6 +123,38 @@ struct access_sys_t ...@@ -118,6 +123,38 @@ struct access_sys_t
bool b_pace_control; bool b_pace_control;
}; };
static bool IsRemote (int fd)
{
#ifdef HAVE_FSTATFS
struct statfs stf;
if (fstatfs (fd, &stf))
return false;
#if defined(MNT_LOCAL)
return !(stf.f_flags & MNT_LOCAL);
#elif defined (__linux__)
switch (stf.f_type)
{
case AFS_SUPER_MAGIC:
case CODA_SUPER_MAGIC:
case NCP_SUPER_MAGIC:
case NFS_SUPER_MAGIC:
case SMB_SUPER_MAGIC:
case 0xFF534D42 /*CIFS_MAGIC_NUMBER*/:
return true;
}
return false;
#endif
#else /* !HAVE_FSTATFS */
return false;
#endif
}
/***************************************************************************** /*****************************************************************************
* Open: open the file * Open: open the file
*****************************************************************************/ *****************************************************************************/
...@@ -174,14 +211,13 @@ static int Open( vlc_object_t *p_this ) ...@@ -174,14 +211,13 @@ static int Open( vlc_object_t *p_this )
# warning File size not known! # warning File size not known!
#endif #endif
#if defined(HAVE_SYS_MOUNT_H) && defined(MNT_LOCAL) if (IsRemote(fd))
struct statfs stat; {
if ((fstatfs (fd, &stat) == 0) && !(stat.f_flags & MNT_LOCAL) ) {
int i_cache = var_GetInteger (p_access, "file-caching") + 700; int i_cache = var_GetInteger (p_access, "file-caching") + 700;
var_SetInteger (p_access, "file-caching", i_cache); var_SetInteger (p_access, "file-caching", i_cache);
msg_Warn (p_access, "Opening non-local file, use more caching: %d", i_cache); msg_Warn (p_access, "Opening remote file, increasing cache: %d",
i_cache);
} }
#endif
p_sys->fd = fd; p_sys->fd = fd;
return VLC_SUCCESS; return VLC_SUCCESS;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment