Commit c75f63d7 authored by Max Dymond's avatar Max Dymond Committed by Daniel Stenberg
Browse files

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.
parent 19287705

lib/curl_rtmp.c

+6 −0
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ const struct Curl_handler Curl_handler_rtmp = { 
  ZERO_NULL,                            /* perform_getsock */

  rtmp_disconnect,                      /* disconnect */

  ZERO_NULL,                            /* readwrite */

  ZERO_NULL,                            /* connection_check */

  PORT_RTMP,                            /* defport */

  CURLPROTO_RTMP,                       /* protocol */

  PROTOPT_NONE                          /* flags*/
@@ -94,6 +95,7 @@ const struct Curl_handler Curl_handler_rtmpt = { 
  ZERO_NULL,                            /* perform_getsock */

  rtmp_disconnect,                      /* disconnect */

  ZERO_NULL,                            /* readwrite */

  ZERO_NULL,                            /* connection_check */

  PORT_RTMPT,                           /* defport */

  CURLPROTO_RTMPT,                      /* protocol */

  PROTOPT_NONE                          /* flags*/
@@ -114,6 +116,7 @@ const struct Curl_handler Curl_handler_rtmpe = { 
  ZERO_NULL,                            /* perform_getsock */

  rtmp_disconnect,                      /* disconnect */

  ZERO_NULL,                            /* readwrite */

  ZERO_NULL,                            /* connection_check */

  PORT_RTMP,                            /* defport */

  CURLPROTO_RTMPE,                      /* protocol */

  PROTOPT_NONE                          /* flags*/
@@ -134,6 +137,7 @@ const struct Curl_handler Curl_handler_rtmpte = { 
  ZERO_NULL,                            /* perform_getsock */

  rtmp_disconnect,                      /* disconnect */

  ZERO_NULL,                            /* readwrite */

  ZERO_NULL,                            /* connection_check */

  PORT_RTMPT,                           /* defport */

  CURLPROTO_RTMPTE,                     /* protocol */

  PROTOPT_NONE                          /* flags*/
@@ -154,6 +158,7 @@ const struct Curl_handler Curl_handler_rtmps = { 
  ZERO_NULL,                            /* perform_getsock */

  rtmp_disconnect,                      /* disconnect */

  ZERO_NULL,                            /* readwrite */

  ZERO_NULL,                            /* connection_check */

  PORT_RTMPS,                           /* defport */

  CURLPROTO_RTMPS,                      /* protocol */

  PROTOPT_NONE                          /* flags*/
@@ -174,6 +179,7 @@ const struct Curl_handler Curl_handler_rtmpts = { 
  ZERO_NULL,                            /* perform_getsock */

  rtmp_disconnect,                      /* disconnect */

  ZERO_NULL,                            /* readwrite */

  ZERO_NULL,                            /* connection_check */

  PORT_RTMPS,                           /* defport */

  CURLPROTO_RTMPTS,                     /* protocol */

  PROTOPT_NONE                          /* flags*/

lib/dict.c

+1 −0
Original line number Diff line number Diff line
@@ -85,6 +85,7 @@ const struct Curl_handler Curl_handler_dict = { 
  ZERO_NULL,                            /* perform_getsock */

  ZERO_NULL,                            /* disconnect */

  ZERO_NULL,                            /* readwrite */

  ZERO_NULL,                            /* connection_check */

  PORT_DICT,                            /* defport */

  CURLPROTO_DICT,                       /* protocol */

  PROTOPT_NONE | PROTOPT_NOURLQUERY      /* flags */

lib/file.c

+1 −0
Original line number Diff line number Diff line
@@ -108,6 +108,7 @@ const struct Curl_handler Curl_handler_file = { 
  ZERO_NULL,                            /* perform_getsock */

  file_disconnect,                      /* disconnect */

  ZERO_NULL,                            /* readwrite */

  ZERO_NULL,                            /* connection_check */

  0,                                    /* defport */

  CURLPROTO_FILE,                       /* protocol */

  PROTOPT_NONETWORK | PROTOPT_NOURLQUERY /* flags */

lib/ftp.c

+2 −0
Original line number Diff line number Diff line
@@ -178,6 +178,7 @@ const struct Curl_handler Curl_handler_ftp = { 
  ZERO_NULL,                       /* perform_getsock */

  ftp_disconnect,                  /* disconnect */

  ZERO_NULL,                       /* readwrite */

  ZERO_NULL,                       /* connection_check */

  PORT_FTP,                        /* defport */

  CURLPROTO_FTP,                   /* protocol */

  PROTOPT_DUAL | PROTOPT_CLOSEACTION | PROTOPT_NEEDSPWD |
@@ -205,6 +206,7 @@ const struct Curl_handler Curl_handler_ftps = { 
  ZERO_NULL,                       /* perform_getsock */

  ftp_disconnect,                  /* disconnect */

  ZERO_NULL,                       /* readwrite */

  ZERO_NULL,                       /* connection_check */

  PORT_FTPS,                       /* defport */

  CURLPROTO_FTPS,                  /* protocol */

  PROTOPT_SSL | PROTOPT_DUAL | PROTOPT_CLOSEACTION |

lib/gopher.c

+1 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ const struct Curl_handler Curl_handler_gopher = { 
  ZERO_NULL,                            /* perform_getsock */

  ZERO_NULL,                            /* disconnect */

  ZERO_NULL,                            /* readwrite */

  ZERO_NULL,                            /* connection_check */

  PORT_GOPHER,                          /* defport */

  CURLPROTO_GOPHER,                     /* protocol */

  PROTOPT_NONE                          /* flags */