diff options
author | Max Dymond <max.dymond@metaswitch.com> | 2017-05-31 12:09:56 +0100 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2017-06-30 10:17:27 +0200 |
commit | c75f63d7c432ab42614c05f8a8081edf4beb9ee9 (patch) | |
tree | cebc51907096057746d240271c01b105f269a05d /lib/rtsp.c | |
parent | 192877058e3c50181f3cdc349c17c13b6f9465b9 (diff) | |
download | curl-c75f63d7c432ab42614c05f8a8081edf4beb9ee9.tar.gz |
handler: refactor connection checking
Add a new type of callback to Curl_handler which performs checks on
the connection. Alter RTSP so that it uses this callback to do its
own check on connection health.
Diffstat (limited to 'lib/rtsp.c')
-rw-r--r-- | lib/rtsp.c | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/lib/rtsp.c b/lib/rtsp.c index 1810cdafb..9bd935fd5 100644 --- a/lib/rtsp.c +++ b/lib/rtsp.c @@ -81,6 +81,9 @@ static CURLcode rtsp_rtp_readwrite(struct Curl_easy *data, static CURLcode rtsp_setup_connection(struct connectdata *conn); +bool rtsp_connisdead(struct connectdata *check); +static unsigned int rtsp_conncheck(struct connectdata *check, + unsigned int checks_to_perform); /* this returns the socket to wait for in the DO and DOING state for the multi interface and then we're always _sending_ a request and thus we wait for @@ -117,6 +120,7 @@ const struct Curl_handler Curl_handler_rtsp = { ZERO_NULL, /* perform_getsock */ rtsp_disconnect, /* disconnect */ rtsp_rtp_readwrite, /* readwrite */ + rtsp_conncheck, /* connection_check */ PORT_RTSP, /* defport */ CURLPROTO_RTSP, /* protocol */ PROTOPT_NONE /* flags */ @@ -143,7 +147,7 @@ static CURLcode rtsp_setup_connection(struct connectdata *conn) * Instead, if it is readable, run Curl_connalive() to peek at the socket * and distinguish between closed and data. */ -bool Curl_rtsp_connisdead(struct connectdata *check) +bool rtsp_connisdead(struct connectdata *check) { int sval; bool ret_val = TRUE; @@ -165,6 +169,23 @@ bool Curl_rtsp_connisdead(struct connectdata *check) return ret_val; } +/* + * Function to check on various aspects of a connection. + */ +static unsigned int rtsp_conncheck(struct connectdata *check, + unsigned int checks_to_perform) +{ + unsigned int ret_val = CONNRESULT_NONE; + + if(checks_to_perform & CONNCHECK_ISDEAD) { + if(rtsp_connisdead(check)) + ret_val |= CONNRESULT_DEAD; + } + + return ret_val; +} + + static CURLcode rtsp_connect(struct connectdata *conn, bool *done) { CURLcode httpStatus; |