2
0
mirror of https://github.com/ACSPRI/queXS synced 2024-04-02 12:12:16 +00:00

SIP and IAX channels work (specify in operator setup)

This commit is contained in:
azammitdcarf
2010-01-11 03:51:46 +00:00
parent 2288dc8134
commit 18dbb16138

View File

@@ -72,17 +72,17 @@ class voip {
$chans = array(); $chans = array();
foreach ($c as $s) foreach ($c as $s)
{ {
if(eregi("Event: Status.*Channel: SIP/([0-9a-zA-Z-]+).*BridgedChannel: ([/0-9a-zA-Z-]+)",$s,$regs)) if(eregi("Event: Status.*Channel: ((SIP/|IAX2/)[0-9a-zA-Z-]+).*BridgedChannel: ([/0-9a-zA-Z-]+)",$s,$regs))
{ {
//print T_("Channel: SIP/") . $regs[1] . " BridgedChannel " . $regs[2] . "\n"; //print T_("Channel: SIP/") . $regs[1] . " BridgedChannel " . $regs[2] . "\n";
$chan = substr($regs[1],0,4); $chan = substr($regs[1],0,4);
$chans[$chan] = array("SIP/" . $regs[1],$regs[2]); $chans[$chan] = array($regs[1],$regs[2]);
} }
else if(eregi("Event: Status.*Channel: SIP/([0-9a-zA-Z-]+).*",$s,$regs)) else if(eregi("Event: Status.*Channel: ((SIP/|IAX2/)[0-9a-zA-Z-]+).*",$s,$regs))
{ {
//print T_("Channel: ") . $regs[1] . "\n"; //print T_("Channel: ") . $regs[1] . "\n";
$chan = substr($regs[1],0,4); $chan = substr($regs[1],0,4);
$chans[$chan] = array("SIP/".$regs[1],false); $chans[$chan] = array($regs[1],false);
} }
} }
return $chans; return $chans;
@@ -155,7 +155,7 @@ class voip {
*/ */
function dial($ext,$number) function dial($ext,$number)
{ {
$r = $this->query("Action: Originate\r\nChannel: SIP/$ext\r\nExten: $number\r\nPriority: 1\r\nCallerid: $ext\r\n\r\n","Response"); $r = $this->query("Action: Originate\r\nChannel: $ext\r\nExten: $number\r\nPriority: 1\r\nCallerid: $ext\r\n\r\n","Response");
} }
@@ -224,6 +224,10 @@ class voip {
{ {
if($ext) if($ext)
{ {
$exts = explode('/', $ext, 2);
if (isset($exts[1]))
$ext = $exts[1];
$ret = $this->query("Action: ExtensionState\r\nContext: default\r\nExten: $ext\r\nActionID: 1\r\n\r\n","Status:"); $ret = $this->query("Action: ExtensionState\r\nContext: default\r\nExten: $ext\r\nActionID: 1\r\n\r\n","Status:");
if(eregi("Status: ([0-9]+)",$ret,$regs)) if(eregi("Status: ([0-9]+)",$ret,$regs))
{ {
@@ -432,7 +436,7 @@ class voipWatch extends voip {
/** /**
* The call is ringing * The call is ringing
*/ */
if (eregi("Event: Dial.*SubEvent: Begin.*Channel: SIP/([0-9]+)",$line,$regs)) if (eregi("Event: Dial.*SubEvent: Begin.*Channel: ((SIP/|IAX2/)[0-9]+)",$line,$regs))
{ {
$call_id = $this->getCallId($regs[1]); $call_id = $this->getCallId($regs[1]);
if ($call_id != 0) if ($call_id != 0)
@@ -444,7 +448,7 @@ class voipWatch extends voip {
/** /**
* The call has been answered * The call has been answered
*/ */
else if (eregi("Event: Bridge.*Channel1: SIP/([0-9]+)",$line,$regs)) else if (eregi("Event: Bridge.*Channel1: ((SIP/|IAX2/)[0-9]+)",$line,$regs))
{ {
$call_id = $this->getCallId($regs[1]); $call_id = $this->getCallId($regs[1]);
if ($call_id != 0) if ($call_id != 0)
@@ -456,7 +460,7 @@ class voipWatch extends voip {
/** /**
* The call has been hung up * The call has been hung up
*/ */
else if (eregi("Event: Hangup.*Channel: SIP/([0-9]+)",$line,$regs)) else if (eregi("Event: Hangup.*Channel: ((SIP/|IAX2/)[0-9]+)",$line,$regs))
{ {
$call_id = $this->getCallId($regs[1]); $call_id = $this->getCallId($regs[1]);
if ($call_id != 0) if ($call_id != 0)