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

shutdown write channel + add read timeout

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@1418 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2012-04-06 09:00:16 +00:00
parent 326cd00c6a
commit a8575716c9
1 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
FHEM/99_updatefhem.pm
View File

@ -7,6 +7,7 @@ use IO::Socket;
sub CommandUpdatefhem($$);
sub CommandCULflash($$);
sub GetHttpFile($$@);
my $server = "fhem.de:80";
my $sdir = "/fhemupdate";
@ -89,7 +90,7 @@ CommandUpdatefhem($$)
if($f eq "fhem.pl") {
$ret .= "updated fhem.pl, 'shutdown restart' is required\n";
$newfhem = 1;
$localfile = $0;
$localfile = $0 if(! -d "FHEM.X");
$remfile = "$f.txt";
}
@ -105,7 +106,8 @@ CommandUpdatefhem($$)
"filetimes.txt entry ($l2)" if($l1 ne $l2);
open(FH,">$localfile") || return "Can't write $localfile";
print FH $content;
close(FH)
close(FH);
Log 1, "updated $remfile";
}
return "Can't write $moddir/$ftime" if(!open(FH, ">$moddir/$ftime"));
@ -127,8 +129,7 @@ sub
CommandCULflash($$)
{
my ($cl, $param) = @_;
my $moddir = "$attr{global}{modpath}/FHEM";
#my $moddir = "XXX";
my $moddir = (-d "FHEM.X" ? "FHEM.X" : "$attr{global}{modpath}/FHEM");
my %ctypes = (
CUL_V2 => "at90usb162",
@ -187,9 +188,10 @@ CommandCULflash($$)
}
sub
GetHttpFile($$)
GetHttpFile($$@)
{
my ($host, $filename) = @_;
my ($host, $filename, $timeout) = @_;
$timeout = 2.0 if(!defined($timeout));
$filename =~ s/%/%25/g;
my $conn = IO::Socket::INET->new(PeerAddr => $host);
@ -200,14 +202,26 @@ GetHttpFile($$)
$host =~ s/:.*//;
my $req = "GET $filename HTTP/1.0\r\nHost: $host\r\n\r\n\r\n";
syswrite $conn, $req;
shutdown $conn, 1; # stopped writing data
my ($buf, $ret);
# Note: should add a timeout
while(sysread($conn,$buf,65536) > 0) {
$conn->timeout($timeout);
for(;;) {
my ($rout, $rin) = ('', '');
vec($rin, $conn->fileno(), 1) = 1;
my $nfound = select($rout=$rin, undef, undef, $timeout);
if($nfound <= 0) {
Log 1, "GetHttpFile: Select timeout/error: $!";
return undef;
}
my $len = sysread($conn,$buf,65536);
last if(!defined($len) || $len <= 0);
$ret .= $buf;
}
$ret=~ s/(.*?)\r\n\r\n//s; # Not greedy: switch off the header.
Log 1, "Got http://$host$filename, length: ".length($ret);
Log 4, "Got http://$host$filename, length: ".length($ret);
return $ret;
}