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

Added test 564 as DISABLED. It is for testing FTP over a SOCK4 proxy using 

the multi interface, which currently doesn't work because of how the data
connection is not waiting for connect before it tries to do proxy magic.
parent 1f340a26

tests/data/DISABLED

+1 −1
Original line number Diff line number Diff line
@@ -4,4 +4,4 @@ 
# per line.

# Lines starting with '#' letters are treated as comments.

563

564

tests/data/Makefile.am

+2 −1
Original line number Diff line number Diff line
@@ -61,7 +61,8 @@ EXTRA_DIST = test1 test108 test117 test127 test20 test27 test34 test46 \ 
 test1080 test1081 test1082 test1083 test1084 test1085 test633 test634     \

 test635 test636 test637 test558 test559 test1086 test1087 test1088        \

 test1089 test1090 test1091 test1092 test1093 test1094 test1095 test1096   \

 test1097 test560 test561 test1098 test1099 test562 test563 test1100

 test1097 test560 test561 test1098 test1099 test562 test563 test1100       \

 test564



filecheck:

	@mkdir test-place; \

tests/data/test564

0 → 100644
+66 −0
Original line number Diff line number Diff line 
<testcase>

<info>

<keywords>

FTP

PASV

RETR

multi

SOCKS4

</keywords>

</info>

# Server-side

<reply>

<data>

data

    to

      see

that FTP

works

  so does it?

</data>



</reply>



# Client-side

<client>

<server>

ftp

socks4

</server>

<tool>

lib564

</tool>

 <name>

FTP RETR a file over a SOCKS proxy using the multi interface

 </name>

<command>

ftp://%HOSTIP:%FTPPORT/path/564 %HOSTIP:%SOCKSPORT

</command>

</client>



# Verify data after the test has been "shot"

<verify>

<protocol>

USER anonymous

PASS ftp@example.com

PWD

CWD path

EPSV

TYPE I

SIZE 546

RETR 546

EPSV

SIZE 546

RETR 546

QUIT

</protocol>

<stdout>

data

    to

      see

that FTP

works

  so does it?

</stdout>

</verify>

</testcase>

tests/libtest/Makefile.inc

+3 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ noinst_PROGRAMS = lib500 lib501 lib502 lib503 lib504 lib505 lib506 \ 
  lib517 lib518 lib519 lib520 lib521 lib523 lib524 lib525 lib526 lib527	\

  lib529 lib530 lib532 lib533 lib536 lib537 lib540 lib541 lib542 lib543 \

  lib544 lib545 lib547 lib548 lib549 lib552 lib553 lib554 lib555 lib556 \

  lib539 lib557 lib558 lib559 lib560 lib562

  lib539 lib557 lib558 lib559 lib560 lib562 lib564





lib500_SOURCES = lib500.c $(SUPPORTFILES)
@@ -125,3 +125,5 @@ lib559_CFLAGS = -DLIB559 
lib560_SOURCES = lib560.c $(SUPPORTFILES)



lib562_SOURCES = lib562.c $(SUPPORTFILES)



lib564_SOURCES = lib564.c $(SUPPORTFILES) $(TESTUTIL)

tests/libtest/lib564.c

0 → 100644
+144 −0
Original line number Diff line number Diff line 
/*****************************************************************************

 *                                  _   _ ____  _

 *  Project                     ___| | | |  _ \| |

 *                             / __| | | | |_) | |

 *                            | (__| |_| |  _ <| |___

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

 *

 * $Id$

 */



/* used for test case 533, 534 and 535 */



#include "test.h"



#include <sys/types.h>

#include <sys/stat.h>

#include <fcntl.h>



#include "testutil.h"

#include "memdebug.h"



#define MAIN_LOOP_HANG_TIMEOUT     90 * 1000

#define MULTI_PERFORM_HANG_TIMEOUT 60 * 1000



int test(char *URL)

{

  int res = 0;

  CURL *curl;

  int running;

  char done=FALSE;

  CURLM *m;

  int current=0;

  struct timeval ml_start;

  struct timeval mp_start;

  char ml_timedout = FALSE;

  char mp_timedout = FALSE;



  if (curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK) {

    fprintf(stderr, "curl_global_init() failed\n");

    return TEST_ERR_MAJOR_BAD;

  }



  if ((curl = curl_easy_init()) == NULL) {

    fprintf(stderr, "curl_easy_init() failed\n");

    curl_global_cleanup();

    return TEST_ERR_MAJOR_BAD;

  }



  curl_easy_setopt(curl, CURLOPT_URL, URL);

  curl_easy_setopt(curl, CURLOPT_VERBOSE, 1);

  curl_easy_setopt(curl, CURLOPT_PROXY, libtest_arg2);

  curl_easy_setopt(curl, CURLOPT_PROXYTYPE, CURLPROXY_SOCKS4);



  if ((m = curl_multi_init()) == NULL) {

    fprintf(stderr, "curl_multi_init() failed\n");

    curl_easy_cleanup(curl);

    curl_global_cleanup();

    return TEST_ERR_MAJOR_BAD;

  }



  if ((res = (int)curl_multi_add_handle(m, curl)) != CURLM_OK) {

    fprintf(stderr, "curl_multi_add_handle() failed, "

            "with code %d\n", res);

    curl_multi_cleanup(m);

    curl_easy_cleanup(curl);

    curl_global_cleanup();

    return TEST_ERR_MAJOR_BAD;

  }



  ml_timedout = FALSE;

  ml_start = tutil_tvnow();



  fprintf(stderr, "Start at URL 0\n");



  while (!done) {

    fd_set rd, wr, exc;

    int max_fd;

    struct timeval interval;



    interval.tv_sec = 1;

    interval.tv_usec = 0;



    if (tutil_tvdiff(tutil_tvnow(), ml_start) >

        MAIN_LOOP_HANG_TIMEOUT) {

      ml_timedout = TRUE;

      break;

    }

    mp_timedout = FALSE;

    mp_start = tutil_tvnow();



    while (res == CURLM_CALL_MULTI_PERFORM) {

      res = (int)curl_multi_perform(m, &running);

      if (tutil_tvdiff(tutil_tvnow(), mp_start) >

          MULTI_PERFORM_HANG_TIMEOUT) {

        mp_timedout = TRUE;

        break;

      }

      if (running <= 0) {

        done = TRUE; /* bail out */

        break;

      }

    }

    if (mp_timedout || done)

      break;



    if (res != CURLM_OK) {

      fprintf(stderr, "not okay???\n");

      break;

    }



    FD_ZERO(&rd);

    FD_ZERO(&wr);

    FD_ZERO(&exc);

    max_fd = 0;



    if (curl_multi_fdset(m, &rd, &wr, &exc, &max_fd) != CURLM_OK) {

      fprintf(stderr, "unexpected failured of fdset.\n");

      res = 189;

      break;

    }



    if (select_test(max_fd+1, &rd, &wr, &exc, &interval) == -1) {

      fprintf(stderr, "bad select??\n");

      res = 195;

      break;

    }



    res = CURLM_CALL_MULTI_PERFORM;

  }



  if (ml_timedout || mp_timedout) {

    if (ml_timedout) fprintf(stderr, "ml_timedout\n");

    if (mp_timedout) fprintf(stderr, "mp_timedout\n");

    fprintf(stderr, "ABORTING TEST, since it seems "

            "that it would have run forever.\n");

    res = TEST_ERR_RUNS_FOREVER;

  }



  curl_easy_cleanup(curl);

  curl_multi_cleanup(m);

  curl_global_cleanup();



  return res;

}