From cd65ecb2e8a6d4c65be9e5f08e36ed4960c3bf0f Mon Sep 17 00:00:00 2001 From: Jiri Hruska Date: Thu, 14 Feb 2013 19:36:43 +0100 Subject: [PATCH] pingpong: Introduce Curl_pp_moredata() A simple function to test whether the PP is not sending and there are still more data in its receiver cache. This will be later utilized to: 1) Change Curl_pp_multi_statemach() and Curl_pp_easy_statemach() to not test socket state and just call user's statemach_act() function when there are more data to process, because otherwise the task would just hang, waiting for more data from the socket. 2) Allow PP users to read multiple responses by looping as long as there are more data available and current phase is not finished. (Currently needed for correct processing of IMAP SELECT responses.) --- lib/pingpong.c | 4 ++++ lib/pingpong.h | 10 ++++++++++ 2 files changed, 14 insertions(+) diff --git a/lib/pingpong.c b/lib/pingpong.c index 4b10e845e..69834da7d 100644 --- a/lib/pingpong.c +++ b/lib/pingpong.c @@ -503,6 +503,10 @@ CURLcode Curl_pp_disconnect(struct pingpong *pp) return CURLE_OK; } +bool Curl_pp_moredata(struct pingpong *pp) +{ + return (!pp->sendleft && pp->cache && pp->nread_resp < pp->cache_size); +} #endif diff --git a/lib/pingpong.h b/lib/pingpong.h index d65671b32..3a87e4041 100644 --- a/lib/pingpong.h +++ b/lib/pingpong.h @@ -130,4 +130,14 @@ CURLcode Curl_pp_disconnect(struct pingpong *pp); int Curl_pp_getsock(struct pingpong *pp, curl_socket_t *socks, int numsocks); + +/*********************************************************************** + * + * Curl_pp_moredata() + * + * Returns whether there are still more data in the cache and so a call + * to Curl_pp_readresp() will not block. + */ +bool Curl_pp_moredata(struct pingpong *pp); + #endif /* HEADER_CURL_PINGPONG_H */