From 6bab1ceeefc73571b3f88b302d8e7ed18dbcfaba Mon Sep 17 00:00:00 2001
From: dev0 <>
Date: Mon, 5 Jun 2017 11:09:52 +0000
Subject: [PATCH] 34_ESPEasy.pm: dual ip stack bugfix

git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@14468 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 FHEM/34_ESPEasy.pm | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/FHEM/34_ESPEasy.pm b/FHEM/34_ESPEasy.pm
index 9a0650536..13cb9ddc8 100644
--- a/FHEM/34_ESPEasy.pm
+++ b/FHEM/34_ESPEasy.pm
@@ -36,7 +36,7 @@ use Color;
 # ------------------------------------------------------------------------------
 # global/default values
 # ------------------------------------------------------------------------------
-my $module_version    = 1.13;       # Version of this module
+my $module_version    = 1.14;       # Version of this module
 my $minEEBuild        = 128;        # informational
 my $minJsonVersion    = 1.02;       # checked in received data
 
@@ -560,7 +560,7 @@ sub ESPEasy_Read($) {
 
   my ($hash) = @_;                             #hash of temporary child instance
   my $name   = $hash->{NAME};
-  my $ipv    = $hash->{PEER} =~ m/:/ ? 6 : 4;
+  my $ipv = $hash->{IPV} ? $hash->{IPV} : ($hash->{PEER} =~ m/:/ ? 6 : 4);
   my $bhash  = $modules{ESPEasy}{defptr}{BRIDGE}{$ipv}; #hash of original instance
   my $bname  = $bhash->{NAME};
   my $btype  = $bhash->{TYPE};
@@ -606,6 +606,15 @@ sub ESPEasy_Read($) {
 
   # mask password in authorization header with ****
   my $logHeader = { %$header };
+
+	# public IPs
+  my $re = "^(127|193.168|172.(1[6-9]|2[0-9]|3[01])|10|169.254)\\.|"
+         . "^(fe[89ab]|::1)";
+  if (!defined $logHeader->{Authorization} && $peer !~ m/$re/) {
+    Log3 $bname, 2, "$btype $name: No basic auth set while using a public IP "
+                  . "address from peer $peer."
+  }
+
   $logHeader->{Authorization} =~ s/Basic\s.*\s/Basic ***** / if defined $logHeader->{Authorization};
   # Dump logHeader
   Log3 $bname, 5, "$btype $name: Received header: ".Dumper($logHeader) if defined $logHeader;