Commit 41b02378 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

CONNECT: made generically not per-protocol 

Curl_protocol_connect() now does the tunneling through the HTTP proxy if
requested instead of letting each protocol specific connection function
do it.
parent cabd010d

lib/ftp.c

+0 −27
Original line number Diff line number Diff line
@@ -3197,33 +3197,6 @@ static CURLcode ftp_connect(struct connectdata *conn, 
  pp->endofresp = ftp_endofresp;

  pp->conn = conn;



  if(conn->bits.tunnel_proxy && conn->bits.httpproxy) {

    /* for FTP over HTTP proxy */

    struct HTTP http_proxy;

    struct FTP *ftp_save;



    /* BLOCKING */

    /* We want "seamless" FTP operations through HTTP proxy tunnel */



    /* Curl_proxyCONNECT is based on a pointer to a struct HTTP at the member

     * conn->proto.http; we want FTP through HTTP and we have to change the

     * member temporarily for connecting to the HTTP proxy. After

     * Curl_proxyCONNECT we have to set back the member to the original struct

     * FTP pointer

     */

    ftp_save = data->state.proto.ftp;

    memset(&http_proxy, 0, sizeof(http_proxy));

    data->state.proto.http = &http_proxy;



    result = Curl_proxyCONNECT(conn, FIRSTSOCKET,

                               conn->host.name, conn->remote_port);



    data->state.proto.ftp = ftp_save;



    if(CURLE_OK != result)

      return result;

  }



  if(conn->handler->flags & PROTOPT_SSL) {

    /* BLOCKING */

    result = Curl_ssl_connect(conn, FIRSTSOCKET);

lib/http.c

+1 −18
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms
@@ -1309,27 +1309,10 @@ CURLcode Curl_http_connect(struct connectdata *conn, bool *done) 
     function to make the re-use checks properly be able to check this bit. */

  conn->bits.close = FALSE;



#ifndef CURL_DISABLE_PROXY

  /* If we are not using a proxy and we want a secure connection, perform SSL

   * initialization & connection now.  If using a proxy with https, then we

   * must tell the proxy to CONNECT to the host we want to talk to.  Only

   * after the connect has occurred, can we start talking SSL

   */

  if(conn->bits.tunnel_proxy && conn->bits.httpproxy) {



    /* either SSL over proxy, or explicitly asked for */

    result = Curl_proxyCONNECT(conn, FIRSTSOCKET,

                               conn->host.name,

                               conn->remote_port);

    if(CURLE_OK != result)

      return result;

  }



  if(conn->bits.tunnel_connecting) {

    /* nothing else to do except wait right now - we're not done here. */

    return CURLE_OK;

  }

#endif /* CURL_DISABLE_PROXY */



  if(conn->given->flags & PROTOPT_SSL) {

    /* perform SSL initialization */

lib/imap.c

+1 −28
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms
@@ -721,33 +721,6 @@ static CURLcode imap_connect(struct connectdata *conn, 
  pp->endofresp = imap_endofresp;

  pp->conn = conn;



  if(conn->bits.tunnel_proxy && conn->bits.httpproxy) {

    /* for IMAP over HTTP proxy */

    struct HTTP http_proxy;

    struct FTP *imap_save;



    /* BLOCKING */

    /* We want "seamless" IMAP operations through HTTP proxy tunnel */



    /* Curl_proxyCONNECT is based on a pointer to a struct HTTP at the member

     * conn->proto.http; we want IMAP through HTTP and we have to change the

     * member temporarily for connecting to the HTTP proxy. After

     * Curl_proxyCONNECT we have to set back the member to the original struct

     * IMAP pointer

     */

    imap_save = data->state.proto.imap;

    memset(&http_proxy, 0, sizeof(http_proxy));

    data->state.proto.http = &http_proxy;



    result = Curl_proxyCONNECT(conn, FIRSTSOCKET,

                               conn->host.name, conn->remote_port);



    data->state.proto.imap = imap_save;



    if(CURLE_OK != result)

      return result;

  }



  if((conn->handler->flags & PROTOPT_SSL) &&

     data->state.used_interface != Curl_if_multi) {

    /* BLOCKING */

lib/openldap.c

+0 −27
Original line number Diff line number Diff line
@@ -208,33 +208,6 @@ static CURLcode ldap_connect(struct connectdata *conn, bool *done) 


  ldap_set_option(li->ld, LDAP_OPT_PROTOCOL_VERSION, &proto);



  if(conn->bits.tunnel_proxy && conn->bits.httpproxy) {

    /* for LDAP over HTTP proxy */

    struct HTTP http_proxy;

    ldapconninfo *li_save;

    CURLcode result;



    /* BLOCKING */

    /* We want "seamless" LDAP operations through HTTP proxy tunnel */



    /* Curl_proxyCONNECT is based on a pointer to a struct HTTP at the member

     * conn->proto.http; we want LDAP through HTTP and we have to change the

     * member temporarily for connecting to the HTTP proxy. After

     * Curl_proxyCONNECT we have to set back the member to the original struct

     * LDAP pointer

     */

    li_save = data->state.proto.generic;

    memset(&http_proxy, 0, sizeof(http_proxy));

    data->state.proto.http = &http_proxy;

    result = Curl_proxyCONNECT(conn, FIRSTSOCKET,

                               conn->host.name, conn->remote_port);



    data->state.proto.generic = li_save;



    if(CURLE_OK != result)

      return result;

  }



#ifdef USE_SSL

  if(conn->handler->flags & PROTOPT_SSL) {

    CURLcode res;

lib/pop3.c

+0 −27
Original line number Diff line number Diff line
@@ -670,33 +670,6 @@ static CURLcode pop3_connect(struct connectdata *conn, 
  pp->endofresp = pop3_endofresp;

  pp->conn = conn;



  if(conn->bits.tunnel_proxy && conn->bits.httpproxy) {

    /* for POP3 over HTTP proxy */

    struct HTTP http_proxy;

    struct FTP *pop3_save;



    /* BLOCKING */

    /* We want "seamless" POP3 operations through HTTP proxy tunnel */



    /* Curl_proxyCONNECT is based on a pointer to a struct HTTP at the member

     * conn->proto.http; we want POP3 through HTTP and we have to change the

     * member temporarily for connecting to the HTTP proxy. After

     * Curl_proxyCONNECT we have to set back the member to the original struct

     * POP3 pointer

     */

    pop3_save = data->state.proto.pop3;

    memset(&http_proxy, 0, sizeof(http_proxy));

    data->state.proto.http = &http_proxy;



    result = Curl_proxyCONNECT(conn, FIRSTSOCKET,

                               conn->host.name, conn->remote_port);



    data->state.proto.pop3 = pop3_save;



    if(CURLE_OK != result)

      return result;

  }



  if(conn->handler->flags & PROTOPT_SSL) {

    /* BLOCKING */

    result = Curl_ssl_connect(conn, FIRSTSOCKET);