Commit f0612f16 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

RTSP: convert protocol-specific checks to generic 

Add a 'readwrite' function to the protocol handler struct and use that
for the extra readwrite functionality RTSP needs.
parent e34131db

lib/curl_rtmp.c

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

  ZERO_NULL,                            /* perform_getsock */

  rtmp_disconnect,                      /* disconnect */

  ZERO_NULL,                            /* readwrite */

  PORT_RTMP,                            /* defport */

  CURLPROTO_RTMP,                       /* protocol */

  PROTOPT_NONE                          /* flags*/
@@ -91,6 +92,7 @@ const struct Curl_handler Curl_handler_rtmpt = { 
  ZERO_NULL,                            /* doing_getsock */

  ZERO_NULL,                            /* perform_getsock */

  rtmp_disconnect,                      /* disconnect */

  ZERO_NULL,                            /* readwrite */

  PORT_RTMPT,                           /* defport */

  CURLPROTO_RTMPT,                      /* protocol */

  PROTOPT_NONE                          /* flags*/
@@ -109,6 +111,7 @@ const struct Curl_handler Curl_handler_rtmpe = { 
  ZERO_NULL,                            /* doing_getsock */

  ZERO_NULL,                            /* perform_getsock */

  rtmp_disconnect,                      /* disconnect */

  ZERO_NULL,                            /* readwrite */

  PORT_RTMP,                            /* defport */

  CURLPROTO_RTMPE,                      /* protocol */

  PROTOPT_NONE                          /* flags*/
@@ -127,6 +130,7 @@ const struct Curl_handler Curl_handler_rtmpte = { 
  ZERO_NULL,                            /* doing_getsock */

  ZERO_NULL,                            /* perform_getsock */

  rtmp_disconnect,                      /* disconnect */

  ZERO_NULL,                            /* readwrite */

  PORT_RTMPT,                           /* defport */

  CURLPROTO_RTMPTE,                     /* protocol */

  PROTOPT_NONE                          /* flags*/
@@ -145,10 +149,12 @@ const struct Curl_handler Curl_handler_rtmps = { 
  ZERO_NULL,                            /* doing_getsock */

  ZERO_NULL,                            /* perform_getsock */

  rtmp_disconnect,                      /* disconnect */

  ZERO_NULL,                            /* readwrite */

  PORT_RTMPS,                           /* defport */

  CURLPROTO_RTMPS,                      /* protocol */

  PROTOPT_NONE                          /* flags*/

};



const struct Curl_handler Curl_handler_rtmpts = {

  "RTMPTS",                             /* scheme */

  rtmp_setup,                           /* setup_connection */
@@ -162,6 +168,7 @@ const struct Curl_handler Curl_handler_rtmpts = { 
  ZERO_NULL,                            /* doing_getsock */

  ZERO_NULL,                            /* perform_getsock */

  rtmp_disconnect,                      /* disconnect */

  ZERO_NULL,                            /* readwrite */

  PORT_RTMPS,                           /* defport */

  CURLPROTO_RTMPTS,                     /* protocol */

  PROTOPT_NONE                          /* flags*/

lib/dict.c

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

  ZERO_NULL,                            /* perform_getsock */

  ZERO_NULL,                            /* disconnect */

  ZERO_NULL,                            /* readwrite */

  PORT_DICT,                            /* defport */

  CURLPROTO_DICT,                       /* protocol */

  PROTOPT_NONE                          /* flags */

lib/file.c

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

  ZERO_NULL,                            /* perform_getsock */

  ZERO_NULL,                            /* disconnect */

  ZERO_NULL,                            /* readwrite */

  0,                                    /* defport */

  CURLPROTO_FILE,                       /* protocol */

  PROTOPT_NONETWORK                     /* flags */

lib/ftp.c

+4 −0
Original line number Diff line number Diff line
@@ -178,6 +178,7 @@ const struct Curl_handler Curl_handler_ftp = { 
  ftp_getsock,                     /* doing_getsock */

  ZERO_NULL,                       /* perform_getsock */

  ftp_disconnect,                  /* disconnect */

  ZERO_NULL,                       /* readwrite */

  PORT_FTP,                        /* defport */

  CURLPROTO_FTP,                   /* protocol */

  PROTOPT_DUAL | PROTOPT_CLOSEACTION /* flags */
@@ -202,6 +203,7 @@ const struct Curl_handler Curl_handler_ftps = { 
  ftp_getsock,                     /* doing_getsock */

  ZERO_NULL,                       /* perform_getsock */

  ftp_disconnect,                  /* disconnect */

  ZERO_NULL,                       /* readwrite */

  PORT_FTPS,                       /* defport */

  CURLPROTO_FTP | CURLPROTO_FTPS,  /* protocol */

  PROTOPT_SSL | PROTOPT_DUAL | PROTOPT_CLOSEACTION /* flags */
@@ -226,6 +228,7 @@ static const struct Curl_handler Curl_handler_ftp_proxy = { 
  ZERO_NULL,                            /* doing_getsock */

  ZERO_NULL,                            /* perform_getsock */

  ZERO_NULL,                            /* disconnect */

  ZERO_NULL,                            /* readwrite */

  PORT_FTP,                             /* defport */

  CURLPROTO_HTTP,                       /* protocol */

  PROTOPT_NONE                          /* flags */
@@ -250,6 +253,7 @@ static const struct Curl_handler Curl_handler_ftps_proxy = { 
  ZERO_NULL,                            /* doing_getsock */

  ZERO_NULL,                            /* perform_getsock */

  ZERO_NULL,                            /* disconnect */

  ZERO_NULL,                            /* readwrite */

  PORT_FTPS,                            /* defport */

  CURLPROTO_HTTP,                       /* protocol */

  PROTOPT_NONE                          /* flags */

lib/gopher.c

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

  ZERO_NULL,                            /* perform_getsock */

  ZERO_NULL,                            /* disconnect */

  ZERO_NULL,                            /* readwrite */

  PORT_GOPHER,                          /* defport */

  CURLPROTO_GOPHER,                     /* protocol */

  PROTOPT_NONE                          /* flags */