summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Krude <johannes@krude.de>2013-01-22 13:06:28 +0100
committerAris Adamantiadis <aris@0xbadc0de.be>2013-10-06 17:48:40 +0200
commitd7ab3d7b3ddf1c25d8286819b7d86ff0683ae444 (patch)
treecf47cae049dd329f5ac0ded83b0bd5e521b6c284
parentf17788adc2ac7c67bf891c55a9114fc469a473aa (diff)
downloadlibssh-d7ab3d7b3ddf1c25d8286819b7d86ff0683ae444.tar.gz
libssh-d7ab3d7b3ddf1c25d8286819b7d86ff0683ae444.tar.xz
libssh-d7ab3d7b3ddf1c25d8286819b7d86ff0683ae444.zip
socket: Call data handler as long as handler takes data.
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
-rw-r--r--src/socket.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/socket.c b/src/socket.c
index 7eb080f9..36424cca 100644
--- a/src/socket.c
+++ b/src/socket.c
@@ -280,10 +280,12 @@ int ssh_socket_pollcallback(struct ssh_poll_handle_struct *p, socket_t fd, int r
/* Bufferize the data and then call the callback */
buffer_add_data(s->in_buffer,buffer,r);
if(s->callbacks && s->callbacks->data){
- r= s->callbacks->data(buffer_get_rest(s->in_buffer),
- buffer_get_rest_len(s->in_buffer),
- s->callbacks->userdata);
- buffer_pass_bytes(s->in_buffer,r);
+ do {
+ r= s->callbacks->data(buffer_get_rest(s->in_buffer),
+ buffer_get_rest_len(s->in_buffer),
+ s->callbacks->userdata);
+ buffer_pass_bytes(s->in_buffer,r);
+ } while (r > 0);
/* p may have been freed, so don't use it
* anymore in this function */
p = NULL;