Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-01 20:20:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

upgraded OWNet.lib, react on owserver read failure with OWServer DISCONNECTED

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@2745 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
borisneubert 2013-02-16 16:58:35 +00:00
parent 6e27c66db4
commit b02d7521c7
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
FHEM/10_OWServer.pm
View File

@ -271,12 +271,16 @@ OWServer_Read($@)
close WRITER;
chomp(my $ret= <READER>);
close READER;
return $ret;
} else {
my $ret= $hash->{fhem}{owserver}->read($path);
$ret =~ s/^\s+//g if(defined($ret));
return $ret;
}
if(!defined($ret)) {
delete($hash->{fhem}{owserver});
readingsSingleUpdate($hash,"state","DISCONNECTED",1);
}
return $ret;
}
#####################################

10
FHEM/lib/OWNet.pm
View File

@ -1,7 +1,7 @@
package OWNet ;
# OWNet module for perl
# $Id: OWNet.pm,v 1.23 2012/07/17 01:54:09 alfille Exp $
# $Id: OWNet.pm,v 1.24 2013/02/02 11:41:28 alfille Exp $
#
# Paul H Alfille -- copyright 2007
# Part of the OWFS suite:
@ -204,7 +204,7 @@ my $PERSISTENCE_BIT = 0x04 ;
my $DEFAULT_SG = 0x100 + 0x2 + 0x8 ;
my $DEFAULT_BLOCK_LENGTH = 33000 ;
our $VERSION=(split(/ /,q[$Revision: 1.23 $]))[1] ;
our $VERSION=(split(/ /,q[$Revision: 1.24 $]))[1] ;
sub _new($$) {
my ($self,$addr) = @_ ;
@ -346,8 +346,8 @@ sub _BonjourLookup($) {
$self->{SOCK} = undef ;
return ;
} ;
$self->{ADDR} = $self->{SOCK}->peeraddr ;
$self->{PORT} = $self->{SOCK}->peerport ;
$self->{ADDR} = $self->{SOCK}->peeraddr || return ;
$self->{PORT} = $self->{SOCK}->peerport || return ;
return 1 ;
}
@ -378,7 +378,7 @@ sub _FromServerBinaryParse($$) {
my $length_wanted = shift ;
return '' if $length_wanted == 0 ;
my $fileno = $self->{SOCK}->fileno ;
my $fileno = $self->{SOCK}->fileno or return undef ;
my $selectreadbits = '' ;
vec($selectreadbits,$fileno,1) = 1 ;