2009/12/17 l7directord FTP機能追加

git-svn-id: http://10.144.169.20/repos/um/branches/l7vsd-3.x-ramiel@9226 1ed66053-1c2d-0410-8867-f7571e6e31d3

diff --git a/l7directord/t/26_ftp.t b/l7directord/t/26_ftp.t
index 0c85ad2..32f7c64 100644 (file)
--- a/l7directord/t/26_ftp.t
+++ b/l7directord/t/26_ftp.t
@@ -253,6 +253,7 @@ SKIP: {
 }
 ########################################################################
 #### IPv6 Test
+## 2001::11 接続確認
 SKIP: {
     my $port = 63335;
     my $sock = create_sock6($port);
@@ -266,9 +267,9 @@ SKIP: {
         ]);
     set_default();
     my $v = { negotiatetimeout => 3, login => 'ftp', passwd => 'ftppass' };
-    my $r = { server => {ip => '::1', port => $port }, fail_counts => 0 };
+    my $r = { server => {ip => '2001::11', port => 21 }, fail_counts => 0 };
     my $got = check_ftp($v, $r);
-    is $got, $main::SERVICE_UP, 'check_ftp - login ok';
+    is $got, $main::SERVICE_UP, 'check_ftp6 - login ok';
     close_child($pid);
     close $sock;
 }
@@ -285,180 +286,10 @@ SKIP: {
         ]);
     set_default();
     my $v = { negotiatetimeout => 3, login => 'ftp', passwd => 'ftppass', checkport => $port };
-    my $r = { server => {ip => '[::1]', port => 10000 }, fail_counts => 0 };
-    my $got = check_ftp($v, $r);
-    is $got, $main::SERVICE_UP, 'check_ftp - checkport login ok';
-    close_child($pid);
-    close $sock;
-}
-SKIP: {
-    my $port = 63335;
-    my $sock = create_sock6($port);
-    skip 'cannot create socket', 1 if !$sock;
-    my $pid = prepare_child($sock, [
-        "220 (vsFTPd 2.0.5)\n",
-        "331 Please specify the password\n",
-        "230 Login successful.\n",
-        "250 Directory successfully changed.\n",
-        "221 Goodbye.\n",
-        ], 2);
-    set_default();
-    my $v = {negotiatetimeout => 1, login => 'ftp', passwd => 'ftppass'};
-    my $r = { server => {ip => '[::1]', port => $port } , fail_counts => 0 };
-    my $got = check_ftp($v, $r);
-    is $got, $main::SERVICE_DOWN, 'check_ftp - timeout';
-    close_child($pid);
-    close $sock;
-}
-SKIP: {
-    my $port = 63335;
-    my $sock = create_sock6($port);
-    my $dataport = 53332;
-    my $datasock = create_sock6($dataport);
-    skip 'cannot create socket', 1 if !$sock;
-    my $pid = prepare_child($sock, [
-        "220 (vsFTPd 2.0.5)\n",
-        "331 Please specify the password\n",
-        "530 Login incorrect.\n",
-        "221 Goodbye.\n",
-        ]);
-    set_default();
-    my $v = {negotiatetimeout => 1, login => 'foo', passwd => 'bar'};
-    my $r = { server => {ip => '[::1]', port => $port } , fail_counts => 0 };
-    my $got = check_ftp($v, $r);
-    is $got, $main::SERVICE_DOWN, 'check_ftp - login error';
-    close_child($pid);
-    close $sock;
-}
-SKIP: {
-    my $port = 63335;
-    my $sock = create_sock6($port);
-    skip 'cannot create socket', 1 if !$sock;
-    my $pid = prepare_child($sock, [
-        "220 (vsFTPd 2.0.5)\n",
-        "331 Please specify the password\n",
-        "230 Login successful.\n",
-        "550 Failed to change directory.\n",
-        "221 Goodbye.\n",
-        ]);
-    set_default();
-    my $v = { negotiatetimeout => 3, login => 'ftp', passwd => 'ftppass', checkport => $port };
-    my $r = { server => {ip => '[::1]', port => 10000 }, fail_counts => 0 };
-    my $got = check_ftp($v, $r);
-    is $got, $main::SERVICE_DOWN, 'check_ftp - checkport cwd error';
-    close_child($pid);
-    close $sock;
-}
-SKIP: {
-    my $port = 63335;
-    my $sock = create_sock6($port);
-    my $dataport = 53334;
-    my $datasock = create_sock6($dataport);
-    skip 'cannot create socket', 1 if !$sock;
-    skip 'cannot create data socket', 1 if !$datasock;
-    my $pasvport = sprintf "%d,%d", $dataport / 256, $dataport % 256;
-    my $pid = prepare_child($sock, [
-        "220 (vsFTPd 2.0.5)\n",
-        "331 Please specify the password\n",
-        "230 Login successful.\n",
-        "250 Directory successfully changed.\n",
-        "200 Switching to Binary mode.\n",
-        "227 Entering Passive Mode (::1,$pasvport)\n",
-        "150 Opening BINARY mode data connection for test.dat (9 bytes).\n226 File send OK.\n",
-        "221 Goodbye.\n",
-        ]);
-    my $datapid = prepare_child($datasock, ["test.dat\n"], 0, 1);
-    set_default();
-    my $v = { negotiatetimeout => 3, login => 'ftp', passwd => 'ftppass' };
-    my $r = { server => {ip => '[::1]', port => $port }, request => 'test.dat' , fail_counts => 0 };
+    my $r = { server => {ip => '2001::11', port => 10000 }, fail_counts => 0 };
     my $got = check_ftp($v, $r);
-    is $got, $main::SERVICE_UP, 'check_ftp - get ok';
+    is $got, $main::SERVICE_DOWN, 'check_ftp - checkport login ok';
     close_child($pid);
-    close_child($datapid);
-    close $sock;
-}
-SKIP: {
-    my $port = 63336;
-    my $sock = create_sock6($port);
-    my $dataport = 53335;
-    my $datasock = create_sock6($dataport);
-    skip 'cannot create socket', 1 if !$sock;
-    skip 'cannot create socket', 1 if !$datasock;
-    my $pasvport = sprintf "%d,%d", $dataport / 256, $dataport % 256;
-    my $pid = prepare_child($sock, [
-        "220 (vsFTPd 2.0.5)\n",
-        "331 Please specify the password\n",
-        "230 Login successful.\n",
-        "250 Directory successfully changed.\n",
-        "200 Switching to Binary mode.\n",
-        "227 Entering Passive Mode (::1,$pasvport)\n",
-        "550 Failed to open file.\n",
-        "221 Goodbye.\n",
-        ]);
-    my $datapid = prepare_child($datasock, ["test.dat\n"]);
-    set_default();
-    my $v = { negotiatetimeout => 3, login => 'ftp', passwd => 'ftppass' };
-    my $r = { server => {ip => '[::1]', port => $port }, request => 'test.dat' , fail_counts => 0 };
-    my $got = check_ftp($v, $r);
-    is $got, $main::SERVICE_DOWN, 'check_ftp - get error';
-    close_child($pid);
-    close_child($datapid);
-    close $sock;
-}
-SKIP: {
-    my $port = 63335;
-    my $sock = create_sock6($port);
-    my $dataport = 53334;
-    my $datasock = create_sock6($dataport);
-    skip 'cannot create socket', 1 if !$sock;
-    skip 'cannot create data socket', 1 if !$datasock;
-    my $pasvport = sprintf "%d,%d", $dataport / 256, $dataport % 256;
-    my $pid = prepare_child($sock, [
-        "220 (vsFTPd 2.0.5)\n",
-        "331 Please specify the password\n",
-        "230 Login successful.\n",
-        "250 Directory successfully changed.\n",
-        "200 Switching to Binary mode.\n",
-        "227 Entering Passive Mode (::1,$pasvport)\n150 Opening BINARY mode data connection for test.dat (9 bytes).\n",
-        "226 File send OK.\n",
-        "221 Goodbye.\n",
-        ]);
-    my $datapid = prepare_child($datasock, ["test.dat\n"], 0, 1);
-    set_default();
-    my $v = { negotiatetimeout => 3, login => 'ftp', passwd => 'ftppass' };
-    my $r = { server => {ip => '[::1]', port => $port }, request => 'test.dat', receive => 'test' , fail_counts => 0 };
-    my $got = check_ftp($v, $r);
-    is $got, $main::SERVICE_UP, 'check_ftp - receive ok';
-    close_child($pid);
-    close_child($datapid);
-    close $sock;
-}
-SKIP: {
-    my $port = 63336;
-    my $sock = create_sock6($port);
-    my $dataport = 53334;
-    my $datasock = create_sock6($dataport);
-    skip 'cannot create socket', 1 if !$sock;
-    skip 'cannot create data socket', 1 if !$datasock;
-    my $pasvport = sprintf "%d,%d", $dataport / 256, $dataport % 256;
-    my $pid = prepare_child($sock, [
-        "220 (vsFTPd 2.0.5)\n",
-        "331 Please specify the password\n",
-        "230 Login successful.\n",
-        "250 Directory successfully changed.\n",
-        "200 Switching to Binary mode.\n",
-        "227 Entering Passive Mode (::1,$pasvport)\n150 Opening BINARY mode data connection for test.dat (9 bytes).\n",
-        "226 File send OK.\n",
-        "221 Goodbye.\n",
-        ]);
-    my $datapid = prepare_child($datasock, ["test.dat\n"], 0, 1);
-    set_default();
-    my $v = { negotiatetimeout => 3, login => 'ftp', passwd => 'ftppass' };
-    my $r = { server => {ip => '[::1]', port => $port }, request => 'test.dat', receive => 'foo' , fail_counts => 0 };
-    my $got = check_ftp($v, $r);
-    is $got, $main::SERVICE_DOWN, 'check_ftp - receive error';
-    close_child($pid);
-    close_child($datapid);
     close $sock;
 }
 # test end