Commit 2d7c79af authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

tcpconnect: follow-up commit after b998d95b 

As I modified conn->bits.tcpconnect to become an array that holds one
bool for each potential connection all uses of that struct field must
index it correctly.
parent 38c5e81a

lib/imap.c

+1 −1
Original line number Diff line number Diff line
@@ -841,7 +841,7 @@ CURLcode imap_perform(struct connectdata *conn, 
    result = imap_easy_statemach(conn);

    *dophase_done = TRUE; /* with the easy interface we are done here */

  }

  *connected = conn->bits.tcpconnect;

  *connected = conn->bits.tcpconnect[FIRSTSOCKET];



  if(*dophase_done)

    DEBUGF(infof(conn->data, "DO phase is complete\n"));

lib/pop3.c

+1 −1
Original line number Diff line number Diff line
@@ -787,7 +787,7 @@ CURLcode pop3_perform(struct connectdata *conn, 
    result = pop3_easy_statemach(conn);

    *dophase_done = TRUE; /* with the easy interface we are done here */

  }

  *connected = conn->bits.tcpconnect;

  *connected = conn->bits.tcpconnect[FIRSTSOCKET];



  if(*dophase_done)

    DEBUGF(infof(conn->data, "DO phase is complete\n"));

lib/smtp.c

+1 −1
Original line number Diff line number Diff line
@@ -1287,7 +1287,7 @@ CURLcode smtp_perform(struct connectdata *conn, 
    result = smtp_easy_statemach(conn);

    *dophase_done = TRUE; /* with the easy interface we are done here */

  }

  *connected = conn->bits.tcpconnect;

  *connected = conn->bits.tcpconnect[FIRSTSOCKET];



  if(*dophase_done)

    DEBUGF(infof(conn->data, "DO phase is complete\n"));

lib/ssh.c

+2 −2
Original line number Diff line number Diff line
@@ -2701,7 +2701,7 @@ CURLcode scp_perform(struct connectdata *conn, 
    result = ssh_easy_statemach(conn, FALSE);

    *dophase_done = TRUE; /* with the easy interface we are done here */

  }

  *connected = conn->bits.tcpconnect;

  *connected = conn->bits.tcpconnect[FIRSTSOCKET];



  if(*dophase_done) {

    DEBUGF(infof(conn->data, "DO phase is complete\n"));
@@ -2908,7 +2908,7 @@ CURLcode sftp_perform(struct connectdata *conn, 
    result = ssh_easy_statemach(conn, FALSE);

    *dophase_done = TRUE; /* with the easy interface we are done here */

  }

  *connected = conn->bits.tcpconnect;

  *connected = conn->bits.tcpconnect[FIRSTSOCKET];



  if(*dophase_done) {

    DEBUGF(infof(conn->data, "DO phase is complete\n"));