FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-02-01 01:09:47 +00:00
Code Issues Releases Wiki Activity

00_MQTT2_CLIENT.pm: landroid worx / AWS-IOT stuff (Forum #111959)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@27382 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2023-04-01 20:10:06 +00:00
parent 68bd6847a1
commit 4a9a958bd4
2 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
fhem/FHEM/00_MQTT2_CLIENT.pm
View File

@ -40,6 +40,7 @@ MQTT2_CLIENT_Initialize($)
clientId clientId
clientOrder clientOrder
connectTimeout connectTimeout
connectFn
disable:1,0 disable:1,0
disabledForIntervals disabledForIntervals
disconnectAfter disconnectAfter
@ -97,7 +98,17 @@ MQTT2_CLIENT_Define($$)
$hash->{connecting} = 1; $hash->{connecting} = 1;
$hash->{nrConnects} = 0; $hash->{nrConnects} = 0;
InternalTimer(1, "MQTT2_CLIENT_connect", $hash, 0); # need attributes InternalTimer(1, sub($){
my $cfn = AttrVal($hash->{NAME}, "connectFn", undef);
if($cfn) {
my %specials= ("%NAME" => $hash->{NAME});
$cfn = EvalSpecials($cfn, %specials);
AnalyzeCommand(undef, $cfn); # $cfn calls connect
} else {
MQTT2_CLIENT_connect($hash);
}
}, $hash, 0);
return undef; return undef;
} }
@ -136,6 +147,8 @@ MQTT2_CLIENT_doinit($)
if($hash->{connecting} == 1) { if($hash->{connecting} == 1) {
my $usr = AttrVal($name, "username", ""); my $usr = AttrVal($name, "username", "");
my ($err, $pwd) = getKeyValue($name); my ($err, $pwd) = getKeyValue($name);
$usr = $hash->{".usr"} if($hash->{".usr"}); # AWS/WORX
$pwd = $hash->{".pwd"} if($hash->{".pwd"});
$pwd = undef if($usr eq ""); $pwd = undef if($usr eq "");
if($err) { if($err) {
Log 1, "ERROR: $err"; Log 1, "ERROR: $err";
@ -876,6 +889,14 @@ MQTT2_CLIENT_feedTheList($$$)
Note: Changing the attribute affects _all_ MQTT2_CLIENT instances. Note: Changing the attribute affects _all_ MQTT2_CLIENT instances.
</li></br> </li></br>
<a id="MQTT2_CLIENT-attr-connectFn"></a>
<li>connectFn {...}<br>
if set, do not connect immediately, but evaluate the argument, which in
turn has to call the connect function via fhem("set NAME connect") or
MQTT2_CLIENT_connect(...).<br>
Needed by AWS-IOT connect with custom auth.
</li></br>
<a id="MQTT2_CLIENT-attr-connectTimeout"></a> <a id="MQTT2_CLIENT-attr-connectTimeout"></a>
<li>connectTimeout &lt;seconds&gt;<br> <li>connectTimeout &lt;seconds&gt;<br>
change the HTTP connect timeout, default is 4 seconds. This seems to be change the HTTP connect timeout, default is 4 seconds. This seems to be

8
fhem/FHEM/HttpUtils.pm
View File

@ -557,6 +557,14 @@ HttpUtils_Connect2NonblockingSSL($$)
} }
$hash->{hu_sslAdded} = $hash->{keepalive} ? 1 : 2; $hash->{hu_sslAdded} = $hash->{keepalive} ? 1 : 2;
Log 4, "alpn_selected:".$hash->{conn}->alpn_selected()
if($par->{SSL_alpn_protocols} &&
$hash->{conn}->can('alpn_selected'));
Log 4, "next_proto_negotiated:".$hash->{conn}->next_proto_negotiated()
if($par->{SSL_npn_protocols} &&
$hash->{conn}->can('next_proto_negotiated'));
return HttpUtils_Connect2($hash); # Continue with HTML-Processing return HttpUtils_Connect2($hash); # Continue with HTML-Processing
}; };