virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

lavf/libssh: factorize create_sftp_session function

Browse Source 
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
This commit is contained in:
Lukasz Marek 2014-01-22 00:00:21 +01:00
parent 77fadab1be
commit 7fb5f55e1e
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libavformat/libssh.c
View File

@ -108,6 +108,21 @@ static av_cold int libssh_authentication(LIBSSHContext *libssh, const char *user
return 0; return 0;
} }
static av_cold int libssh_create_sftp_session(LIBSSHContext *libssh)
{
if (!(libssh->sftp = sftp_new(libssh->session))) {
av_log(libssh, AV_LOG_ERROR, "SFTP session creation failed: %s\n", ssh_get_error(libssh->session));
return AVERROR(ENOMEM);
}
if (sftp_init(libssh->sftp) != SSH_OK) {
av_log(libssh, AV_LOG_ERROR, "Error initializing sftp session: %s\n", ssh_get_error(libssh->session));
return AVERROR(EIO);
}
return 0;
}
static av_cold int libssh_open_file(LIBSSHContext *libssh, int flags, const char *file) static av_cold int libssh_open_file(LIBSSHContext *libssh, int flags, const char *file)
{ {
int access; int access;
@ -186,17 +201,8 @@ static int libssh_open(URLContext *h, const char *url, int flags)
if ((ret = libssh_authentication(s, user, pass)) < 0) if ((ret = libssh_authentication(s, user, pass)) < 0)
goto fail; goto fail;
if (!(s->sftp = sftp_new(s->session))) { if ((ret = libssh_create_sftp_session(s)) < 0)
av_log(h, AV_LOG_ERROR, "SFTP session creation failed: %s\n", ssh_get_error(s->session));
ret = AVERROR(ENOMEM);
goto fail; goto fail;
}
if (sftp_init(s->sftp) != SSH_OK) {
av_log(h, AV_LOG_ERROR, "Error initializing sftp session: %s\n", ssh_get_error(s->session));
ret = AVERROR(EIO);
goto fail;
}
if ((ret = libssh_open_file(s, flags, path)) < 0) if ((ret = libssh_open_file(s, flags, path)) < 0)
goto fail; goto fail;