The SIP, DNS and Radius checks were previously using checktimeout,
but they should use negotiatetimeout as they are negotiate checks,
albeit UDP rather than TCP ones.
Signed-off-by: Simon Horman <[EMAIL PROTECTED]>
Index: heartbeat/ldirectord/ldirectord.in
===================================================================
--- heartbeat.orig/ldirectord/ldirectord.in 2007-07-04 13:58:54.000000000
+0900
+++ heartbeat/ldirectord/ldirectord.in 2007-07-04 14:03:05.000000000 +0900
@@ -2422,7 +2422,7 @@ sub check_radius
&ld_debug(2, "Starting Radius");
$radius = new Authen::Radius(Host => "$$r{server}:$port",
Secret=>$$v{secret},
- TimeOut=>$$v{checktimeout},
+ TimeOut=>$$v{negotiatetimeout},
Errmode=>'die');
$result = $radius->check_pwd($$v{login}, $$v{passwd});
&ld_debug(2, "Finished Radius");
@@ -2548,7 +2548,7 @@ sub check_sip
local $SIG{'__DIE__'} = "DEFAULT";
local $SIG{'ALRM'} = sub { die "Timeout Alarm" };
&ld_debug(4, "Timeout is $$v{checktimeout}");
- alarm $$v{checktimeout};
+ alarm $$v{negotiatetimeout};
my $sock = &ld_open_socket($$r{server}, $sip_d_port,
$$v{protocol});
@@ -2697,7 +2697,7 @@ sub check_dns
eval {
local $SIG{'__DIE__'} = "DEFAULT";
local $SIG{'ALRM'} = sub { die "timeout\n"; };
- alarm($$v{checktimeout});
+ alarm($$v{negotiatetimeout});
$res->nameservers($$r{server});
if ($$v{"protocol"} eq "tcp") {
$res->usevc(1);
--
--
Horms
H: http://www.vergenet.net/~horms/
W: http://www.valinux.co.jp/en/
_______________________________________________________
Linux-HA-Dev: [email protected]
http://lists.linux-ha.org/mailman/listinfo/linux-ha-dev
Home Page: http://linux-ha.org/
