Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Network
KIO Extras
Commits
98fa19cc
Commit
98fa19cc
authored
Jan 08, 2015
by
Andreas Schneider
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
sftp: Use prefixed function for ssh_channel_poll().
Signed-off-by:
Andreas Schneider
<
asn@cryptomilk.org
>
parent
33266f0a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
sftp/kio_sftp.cpp
sftp/kio_sftp.cpp
+5
-5
No files found.
sftp/kio_sftp.cpp
View file @
98fa19cc
...
...
@@ -929,25 +929,25 @@ void sftpProtocol::special(const QByteArray &) {
return
;
/*
* channel_poll() returns the number of bytes that may be read on the
*
ssh_
channel_poll() returns the number of bytes that may be read on the
* channel. It does so by checking the input buffer and eventually the
* network socket for data to read. If the input buffer is not empty, it
* will not probe the network (and such not read packets nor reply to
* keepalives).
*
* As channel_poll can act on two specific buffers (a channel has two
* As
ssh_
channel_poll can act on two specific buffers (a channel has two
* different stream: stdio and stderr), polling for data on the stderr
* stream has more chance of not being in the problematic case (data left
* in the buffer). Checking the return value (for >0) would be a good idea
* to debug the problem.
*/
rc
=
channel_poll
(
mSftp
->
channel
,
0
);
rc
=
ssh_
channel_poll
(
mSftp
->
channel
,
0
);
if
(
rc
>
0
)
{
rc
=
channel_poll
(
mSftp
->
channel
,
1
);
rc
=
ssh_
channel_poll
(
mSftp
->
channel
,
1
);
}
if
(
rc
<
0
)
{
qCDebug
(
KIO_SMTP_LOG
)
<<
"channel_poll failed: "
<<
ssh_get_error
(
mSession
);
qCDebug
(
KIO_SMTP_LOG
)
<<
"
ssh_
channel_poll failed: "
<<
ssh_get_error
(
mSession
);
}
setTimeoutSpecialCommand
(
KIO_SFTP_SPECIAL_TIMEOUT
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment