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

96_SIP: add FIFO for set call (Forum #608089)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@13738 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
Wzut 2017-03-19 18:28:40 +00:00
parent 9b3cd91dd5
commit 2578c14a7a
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
fhem/FHEM/96_SIP.pm
View File

@ -53,8 +53,9 @@ use Net::Domain qw( hostfqdn );
use Blocking; # http://www.fhemwiki.de/wiki/Blocking_Call use Blocking; # http://www.fhemwiki.de/wiki/Blocking_Call
#use Data::Dumper; #use Data::Dumper;
my $sip_version ="V1.44 / 18.03.17"; my $sip_version ="V1.45 / 19.03.17";
my $ua; # SIP user agent my $ua; # SIP user agent
my @fifo;
my %sets = ( my %sets = (
"call" => "", "call" => "",
@ -492,6 +493,13 @@ sub SIP_CALLDone($)
readingsEndUpdate($hash, 1); readingsEndUpdate($hash, 1);
} }
my $call = shift @fifo;
if ($call)
{
my @a = split(" ",$call);
SIP_Set($hash,@a);
}
return undef; return undef;
} }
@ -503,7 +511,7 @@ sub SIP_Set($@)
{ {
my ($hash, @a) = @_; my ($hash, @a) = @_;
my $name = $hash->{NAME}; my $name = $hash->{NAME};
my $cmd = $a[1]; my $cmd = (defined($a[1])) ? $a[1] : "??";
my $subcmd; my $subcmd;
return join(" ", sort keys %sets) if ($cmd eq "?"); return join(" ", sort keys %sets) if ($cmd eq "?");
@ -524,10 +532,18 @@ sub SIP_Set($@)
my $nr = (defined($a[2])) ? $a[2] : ""; my $nr = (defined($a[2])) ? $a[2] : "";
my $ringtime = (defined($a[3])) ? $a[3] : 30; my $ringtime = (defined($a[3])) ? $a[3] : 30;
my $msg = (defined($a[4])) ? $a[4] : AttrVal($name, "sip_audiofile_call", ""); my $msg = (defined($a[4])) ? $a[4] : AttrVal($name, "sip_audiofile_call", "");
return "there is already a call activ with pid ".$hash->{CPID} if exists($hash->{CPID});
return "missing call number" if (!$nr); return "missing call number" if (!$nr);
return "invalid max time : $ringtime" unless $ringtime =~ m/^\d+$/; return "invalid max time : $ringtime" unless $ringtime =~ m/^\d+$/;
if (exists($hash->{CPID}))
{
my $call = join(" ",@a);
push (@fifo,$call);
Log3 $name ,4,"$name, add $call to fifo";
return undef;
#return "there is already a call activ with pid ".$hash->{CPID};
}
if ($msg) if ($msg)
{ {
#Log3 $name, 4, $name.", sending $msg to $nr, ringtime: $ringtime"; #Log3 $name, 4, $name.", sending $msg to $nr, ringtime: $ringtime";
@ -696,6 +712,8 @@ sub SIP_ListenStart($)
return unless(defined($name)); return unless(defined($name));
my $logname = $name."[".$$."]"; my $logname = $name."[".$$."]";
my $hash = $defs{$name}; # $hash / $name gueltig in diesem Block my $hash = $defs{$name}; # $hash / $name gueltig in diesem Block
my $parent = getppid();
Log3 $name,3,"$logname, my parent is $parent";
$hash->{telnetPort} = undef; $hash->{telnetPort} = undef;
my $dtmfloop; # Ende-Flag für die DTMF-Schleife my $dtmfloop; # Ende-Flag für die DTMF-Schleife
@ -851,7 +869,6 @@ sub SIP_ListenStart($)
{ {
my ($event) = @_; my ($event) = @_;
Log3 $name, 5, "$logname, SIP_bye : $event"; Log3 $name, 5, "$logname, SIP_bye : $event";
#print Dumper($event);
SIP_telnet($hash, "set $name caller none\nset $name caller_state hangup\nexit\n") ; SIP_telnet($hash, "set $name caller none\nset $name caller_state hangup\nexit\n") ;
$byebye = 1; $byebye = 1;
return 1; return 1;