FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-25 22:09:21 +00:00
Code Issues Releases Wiki Activity

00_FBAHAHTTP.pm: Use different params for InternalTimer (Forum #116573)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@23327 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2020-12-11 17:52:56 +00:00
parent c49c7b2ab9
commit 59c9a7dafb
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
fhem/FHEM/00_FBAHAHTTP.pm
View File

@ -70,6 +70,16 @@ FBAHAHTTP_Delete($)
return $err; return $err;
} }
sub
FBAHAHTTP_err($$)
{
my ($hash, $err) = @_;
$hash->{STATE} = $err;
Log 2, "$hash->{NAME} $err";
$hash->{CmdStack} = ();
return $err;
}
sub sub
FBAHAHTTP_connect($$) FBAHAHTTP_connect($$)
{ {
@ -77,26 +87,20 @@ FBAHAHTTP_connect($$)
my $name = $hash->{NAME}; my $name = $hash->{NAME};
my $dev = $hash->{DEF}; my $dev = $hash->{DEF};
my $dr = sub {
$hash->{STATE} = $_[0];
Log 2, $hash->{STATE};
$hash->{CmdStack} = ();
return $hash->{STATE};
};
my $fb_user = AttrVal($name, "fritzbox-user", ''); my $fb_user = AttrVal($name, "fritzbox-user", '');
return $dr->("MISSING: attr $name fritzbox-user") if(!$fb_user); return FBAHAHTTP_err($hash, "MISSING attr $name fritzbox-user") if(!$fb_user);
my ($err, $fb_pw) = getKeyValue("FBAHAHTTP_PASSWORD_$name"); my ($err, $fb_pw) = getKeyValue("FBAHAHTTP_PASSWORD_$name");
return $dr->("ERROR: $err") if($err); return FBAHAHTTP_err($hash, "ERROR: $err") if($err);
return $dr->("MISSING: set $name password") if(!$fb_pw); return FBAHAHTTP_err($hash, "MISSING: set $name password") if(!$fb_pw);
my $sid = FB_doCheckPW($hash->{DEF}, $fb_user, $fb_pw); my $sid = FB_doCheckPW($hash->{DEF}, $fb_user, $fb_pw);
if(!$sid) { if(!$sid) {
$hash->{NEXT_OPEN} = time()+60; $hash->{NEXT_OPEN} = time()+60;
$readyfnlist{"$name.$dev"} = $hash; $readyfnlist{"$name.$dev"} = $hash;
return $dr->("$name error: cannot get SID, ". return FBAHAHTTP_err($hash, "ERROR: cannot get SID, ".
"check connection/hostname/fritzbox-user/password") "check connection/hostname/fritzbox-user/password");
} }
delete($hash->{RetriedCmd}); delete($hash->{RetriedCmd});
@ -331,7 +335,7 @@ FBAHAHTTP_ProcessStack($)
if($ret eq "") { if($ret eq "") {
if($hash->{RetriedCmd}) { if($hash->{RetriedCmd}) {
Log3 $name, 1, Log3 $name, 1,
"No sensible response for $msg after reconnect, giving up"; "$name: No sensible response for $msg after reconnect, giving up";
$hash->{CmdStack} = (); $hash->{CmdStack} = ();
return; return;
} }
@ -347,7 +351,7 @@ FBAHAHTTP_ProcessStack($)
my $ad = AttrVal($name, "async_delay", 0); my $ad = AttrVal($name, "async_delay", 0);
InternalTimer(gettimeofday()+$ad, sub(){ InternalTimer(gettimeofday()+$ad, sub(){
FBAHAHTTP_ProcessStack($hash); FBAHAHTTP_ProcessStack($hash);
}, $hash); }, {});
} }
} }
}); });
@ -362,11 +366,9 @@ FBAHAHTTP_Write($$$)
return if(IsDisabled($name)); return if(IsDisabled($name));
my $sid = $hash->{".SID"}; if(!$hash->{".SID"}) {
if(!$sid) {
my $ret = FBAHAHTTP_connect($hash, 1); # try to reconnect my $ret = FBAHAHTTP_connect($hash, 1); # try to reconnect
return $ret if($ret); return $ret if($ret);
$sid = $hash->{".SID"};
} }
$fn =~ s/ //g; $fn =~ s/ //g;
push(@{$hash->{CmdStack}}, "ain=$fn&switchcmd=$msg"); push(@{$hash->{CmdStack}}, "ain=$fn&switchcmd=$msg");