2009/12/13 試験ソース更新

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

diff --git a/l7directord/t/01_main.t b/l7directord/t/01_main.t
index 47e609c..89f9799 100644 (file)
--- a/l7directord/t/01_main.t
+++ b/l7directord/t/01_main.t
@@ -264,8 +264,8 @@ SKIP: {
     skip 'cannot make ./l7vsadm', 2 if ($fail);
     test_argv('ARGV="stop"', 2, qw(stop));
 ##    is $main::PROC_ENV{l7vsadm}, abs_path('./l7vsadm'), 'search l7vsadm(1)';
-    ### Test Enviroment"/home/megu/sikenyou/l7directord/l7vsadm"
-    is '/home/megu/sikenyou/l7directord/l7vsadm', abs_path('./l7vsadm'), 'search l7vsadm(1)';
+    ### Test Enviroment"/home/megu/svnsource/l7vsd-3.x-ramiel/l7directord/l7vsadm"
+    is '/home/megu/svnsource/l7vsd-3.x-ramiel/l7directord/l7vsadm', abs_path('./l7vsadm'), 'search l7vsadm(1)';
     if ($made) { unlink './l7vsadm'; }
 }
 

diff --git a/l7directord/t/07_parse_address.t b/l7directord/t/07_parse_address.t
index 6d624ea..8488e95 100644 (file)
--- a/l7directord/t/07_parse_address.t
+++ b/l7directord/t/07_parse_address.t
@@ -5,7 +5,7 @@ use lib qw(t/lib lib);
 use subs qw(print);
 use Cwd;    
 use L7lib;  
-use Test::More tests => 57;
+use Test::More tests => 59;
 use Socket;
 use Socket6;
             

diff --git a/l7directord/t/09_l7vsadm.t b/l7directord/t/09_l7vsadm.t
index e213b3d..056fa18 100644 (file)
--- a/l7directord/t/09_l7vsadm.t
+++ b/l7directord/t/09_l7vsadm.t
@@ -5,7 +5,7 @@ use lib qw(t/lib lib);
 use subs qw(print);
 use Cwd;
 use L7lib;
-use Test::More tests => 16;
+use Test::More tests => 22;
 use Socket;
 use Socket6;
 

diff --git a/l7directord/t/24_connect.t b/l7directord/t/24_connect.t
index fe1654e..0c03a3d 100644 (file)
--- a/l7directord/t/24_connect.t
+++ b/l7directord/t/24_connect.t
@@ -5,7 +5,7 @@ use lib qw(t/lib lib);
 use subs qw(print);
 use Cwd;
 use L7lib;
-use Test::More tests => 8;
+use Test::More tests => 9;
 use IO::Socket::INET6;
 
 L7lib::chdir();
@@ -109,7 +109,7 @@ TODO: {
 SKIP: {
     my $port = 63334;
     my $sock = create_sock6($port);
-    skip 'cannot create socket', 1 if !$sock;
+    skip 'cannot create socket!!!!', 1 if !$sock;
     set_default();
     my $v = { checktimeout => 3, protocol => 'tcp' };
     my $r = { server => {ip => '::1', port => $port }, fail_counts => 0 };

diff --git a/l7directord/t/25_sip.t b/l7directord/t/25_sip.t
index 68bea39..de4642d 100644 (file)
--- a/l7directord/t/25_sip.t
+++ b/l7directord/t/25_sip.t
@@ -5,8 +5,10 @@ use lib qw(t/lib lib);
 use subs qw(print);
 use Cwd;
 use L7lib;
-use Test::More tests => 8;
-use IO::Socket::INET;
+use Test::More tests => 12;
+use Socket;
+use Socket6;
+use IO::Socket::INET6;
 
 L7lib::chdir();
 L7lib::comment_out();
@@ -117,6 +119,54 @@ TODO: {
     my $got = check_sip($v, $r);
     is $got, $main::SERVICE_DOWN, 'check_sip - connect error (udp)';
 }
+#### IPv6
+SKIP: {
+    my $port = 63334;
+    my $sock = create_sock6($port);
+    skip 'cannot create socket6', 1 if !$sock;
+    my $pid = prepare_child($sock, ["SIP/2.0 200 OK\n"]);
+    set_default();
+    my $v = { negotiatetimeout => 3, protocol => 'tcp', login => 'carol@chicago.com' };
+    my $r = { server => {ip => '[::1]', port => $port }, fail_counts => 0 };
+    my $got = check_sip($v, $r);
+    is $got, $main::SERVICE_UP, 'check_sip IPv6 - response ok';
+    close_child($pid);
+    close $sock;
+}
+SKIP: {
+    my $port = 63334;
+    my $sock = create_sock6($port);
+    skip 'cannot create socket6', 1 if !$sock;
+    my $pid = prepare_child($sock, ["SIP/2.0 200 OK\n"]);
+    set_default();
+    my $v = { negotiatetimeout => 3, protocol => 'tcp', checkport => $port, login => 'carol@chicago.com' };
+    my $r = { server => {ip => '[::1]', port => 10000 }, fail_counts => 0 };
+    my $got = check_sip($v, $r);
+    is $got, $main::SERVICE_UP, 'check_sip - checkport response ok';
+    close_child($pid);
+    close $sock;
+}
+SKIP: {
+    my $port = 63334;
+    my $sock = create_sock6($port);
+    skip 'cannot create socket6', 1 if !$sock;
+    my $pid = prepare_child($sock, ["SIP/2.0 200 OK\n"], 2);
+    set_default();
+    my $v = { negotiatetimeout => 1, protocol => 'tcp', login => 'carol@chicago.com' };
+    my $r = { server => {ip => '[::1]', port => $port } , fail_counts => 0 };
+    my $got = check_sip($v, $r);
+    is $got, $main::SERVICE_DOWN, 'check_sip - timeout';
+    close_child($pid);
+    close $sock;
+}
+{
+    my $port = 63334;
+    set_default();
+    my $v = { negotiatetimeout => 1, checkport => $port, protocol => 'tcp', login => 'carol@chicago.com' };
+    my $r = { server => {ip => '[::1]', port => 10000 }, fail_counts => 0 };
+    my $got = check_sip($v, $r);
+    is $got, $main::SERVICE_DOWN, 'check_sip - connect error';
+}
 # test end
 #...............................................
 
@@ -126,7 +176,7 @@ sub create_sock {
     my $port = shift;
     my $proto = shift || 'tcp';
     if ($proto eq 'tcp') {
-        my $sock = IO::Socket::INET->new(
+        my $sock = IO::Socket::INET6->new(
             Listen => 5,
             LocalAddr => 'localhost',
             LocalPort => $port,
@@ -135,7 +185,7 @@ sub create_sock {
         return $sock;
     }
     else {
-        my $sock = IO::Socket::INET->new(
+        my $sock = IO::Socket::INET6->new(
             LocalAddr => 'localhost',
             LocalPort => $port,
             ReuseAddr => 1,
@@ -143,6 +193,28 @@ sub create_sock {
         return $sock;
     }
 }
+sub create_sock6 {
+    my $port = shift;
+    my $proto = shift || 'tcp';
+    if ($proto eq 'tcp') {
+        my $sock = IO::Socket::INET6->new(
+            Listen => 5,
+            LocalAddr => 'localhost6',
+            LocalPort => $port,
+            ReuseAddr => 1,
+            Proto => $proto);
+        return $sock;
+    }
+    else {
+        my $sock = IO::Socket::INET6->new(
+            LocalAddr => 'localhost6',
+            LocalPort => $port,
+            ReuseAddr => 1,
+            Proto => $proto);
+        return $sock;
+    }
+}
+
 sub prepare_child {
     my $sock = shift;
     my $res = shift;
@@ -161,11 +233,21 @@ sub prepare_child {
             exit;
         } else {
             my $req;
+            my $ip1;
+            my $port1;
             recv $sock, $req, 1500, 0;
-            $req =~ /^Via.+(\d+\.\d+\.\d+\.\d+):(\d+)/;
+            if($req =~ /^Via.+(\d+\.\d+\.\d+\.\d+):(\d+)/){
+                $ip1 = $1;
+                $port1 = $2;
+            }
+            else {
+                $req =~ /^Via\s*:(\[(0-9a-zA-Z:_-)\]):(\d+)/;
+                $ip1 = $1;
+                $port1 = $2;
+            }
             my $ret_sock = IO::Socket::INET->new(
-                PeerAddr => $1,
-                PeerPort => $2,
+                PeerAddr => $ip1,
+                PeerPort => $port1,
                 Proto => 'udp',
             );
             if ($sleep) { sleep $sleep; }

diff --git a/l7directord/t/26_ftp.t b/l7directord/t/26_ftp.t
index d890174..0c85ad2 100644 (file)
--- a/l7directord/t/26_ftp.t
+++ b/l7directord/t/26_ftp.t
@@ -254,7 +254,7 @@ SKIP: {
 ########################################################################
 #### IPv6 Test
 SKIP: {
-    my $port = 63334;
+    my $port = 63335;
     my $sock = create_sock6($port);
     skip 'cannot create socket', 1 if !$sock;
     my $pid = prepare_child($sock, [
@@ -266,14 +266,14 @@ 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 => '::1', port => $port }, fail_counts => 0 };
     my $got = check_ftp($v, $r);
     is $got, $main::SERVICE_UP, 'check_ftp - login ok';
     close_child($pid);
     close $sock;
 }
 SKIP: {
-    my $port = 63334;
+    my $port = 63335;
     my $sock = create_sock6($port);
     skip 'cannot create socket', 1 if !$sock;
     my $pid = prepare_child($sock, [
@@ -292,7 +292,7 @@ SKIP: {
     close $sock;
 }
 SKIP: {
-    my $port = 63334;
+    my $port = 63335;
     my $sock = create_sock6($port);
     skip 'cannot create socket', 1 if !$sock;
     my $pid = prepare_child($sock, [
@@ -311,7 +311,7 @@ SKIP: {
     close $sock;
 }
 SKIP: {
-    my $port = 63334;
+    my $port = 63335;
     my $sock = create_sock6($port);
     my $dataport = 53332;
     my $datasock = create_sock6($dataport);
@@ -331,7 +331,7 @@ SKIP: {
     close $sock;
 }
 SKIP: {
-    my $port = 63334;
+    my $port = 63335;
     my $sock = create_sock6($port);
     skip 'cannot create socket', 1 if !$sock;
     my $pid = prepare_child($sock, [
@@ -350,7 +350,7 @@ SKIP: {
     close $sock;
 }
 SKIP: {
-    my $port = 63334;
+    my $port = 63335;
     my $sock = create_sock6($port);
     my $dataport = 53334;
     my $datasock = create_sock6($dataport);
@@ -378,7 +378,7 @@ SKIP: {
     close $sock;
 }
 SKIP: {
-    my $port = 63334;
+    my $port = 63336;
     my $sock = create_sock6($port);
     my $dataport = 53335;
     my $datasock = create_sock6($dataport);
@@ -406,7 +406,7 @@ SKIP: {
     close $sock;
 }
 SKIP: {
-    my $port = 63334;
+    my $port = 63335;
     my $sock = create_sock6($port);
     my $dataport = 53334;
     my $datasock = create_sock6($dataport);
@@ -434,7 +434,7 @@ SKIP: {
     close $sock;
 }
 SKIP: {
-    my $port = 63334;
+    my $port = 63336;
     my $sock = create_sock6($port);
     my $dataport = 53334;
     my $datasock = create_sock6($dataport);
@@ -476,17 +476,38 @@ sub create_sock {
         Proto => 'tcp');
     return $sock;
 }
-
 sub create_sock6 {
     my $port = shift;
-    my $sock = IO::Socket::INET6->new(
-        Listen => 5,
-        LocalAddr => '::1',
-        LocalPort => $port,
-        ReuseAddr => 1,
-        Proto => 'tcp');
-    return $sock;
+    my $proto = shift || 'tcp';
+    if ($proto eq 'tcp') {
+        my $sock = IO::Socket::INET6->new(
+            Listen => 5,
+            LocalAddr => '::1',
+            LocalPort => $port,
+            ReuseAddr => 1,
+            Proto => $proto);
+        return $sock;
+    }
+    else {
+        my $sock = IO::Socket::INET6->new(
+            LocalAddr => '::1',
+            LocalPort => $port,
+            ReuseAddr => 1,
+            Proto => $proto);
+        return $sock;
+    }
 }
+##
+##sub create_sock6 {
+##    my $port = shift;
+##    my $sock = IO::Socket::INET6->new(
+##        Listen => 5,
+##        LocalAddr => '::1',
+##        LocalPort => $port,
+##        ReuseAddr => 1,
+##        Proto => 'tcp');
+##    return $sock;
+##}
 sub prepare_child {
     my $sock = shift;
     my $res = shift;