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

ftp: in passive data connect wait for happy eyeballs sockets 

When doing passive FTP, the multi state function needs to extract and
use the happy eyeballs sockets to wait for to check for completion!

Bug: http://curl.haxx.se/mail/lib-2014-02/0135.html (ruined)
Reported-by: Alan
parent 97f214d0

lib/ftp.c

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

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

 *

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

 * Copyright (C) 1998 - 2014, 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
@@ -877,13 +877,30 @@ static int ftp_domore_getsock(struct connectdata *conn, curl_socket_t *socks, 
   */



  if(FTP_STOP == ftpc->state) {

    int bits = GETSOCK_READSOCK(0);



    /* if stopped and still in this state, then we're also waiting for a

       connect on the secondary connection */

    socks[0] = conn->sock[FIRSTSOCKET];



    if(!conn->data->set.ftp_use_port) {

      int s;

      int i;

      /* PORT is used to tell the server to connect to us, and during that we

         don't do happy eyeballs, but we do if we connect to the server */

      for(s=1, i=0; i<2; i++) {

        if(conn->tempsock[i] != CURL_SOCKET_BAD) {

          socks[s] = conn->tempsock[i];

          bits |= GETSOCK_WRITESOCK(s++);

        }

      }

    }

    else {

      socks[1] = conn->sock[SECONDARYSOCKET];

      bits |= GETSOCK_WRITESOCK(1);

    }



    return GETSOCK_READSOCK(FIRSTSOCKET) |

      GETSOCK_WRITESOCK(SECONDARYSOCKET);

    return bits;

  }

  else

    return Curl_pp_getsock(&conn->proto.ftpc.pp, socks, numsocks);