dbxe/fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Event socket bug fix and more docs (#6823)

Browse Source 
* Add documentation to methods. Use is_resource for added type detection

* Allow connect to specify timeout in microseconds with default 30,000

* Update calling mechanism for event sockets

* Update project for new singleton event sockets

* remove unused variable

* catch errors on closing the socket
This commit is contained in:
frytimo
2023-12-02 17:16:18 -07:00
committed by GitHub
parent 44567f7a05
commit 3a4c2f72e2
74 changed files with 1620 additions and 1533 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/switch/resources/classes/presence.php
+2 -8
View File
@@ -36,10 +36,7 @@ if (!class_exists('presence')) {
* @var string $presence_id
*/
public function active($presence_id) {
$fp = event_socket_create();
$cmd = 'show calls as json';
$json = event_socket_request($fp, 'api '.$cmd);
unset($fp);
$json = event_socket::api('show calls as json');
$call_array = json_decode($json, true);
if (isset($call_array['rows'])) {
$x = 0;
@@ -65,10 +62,7 @@ if (!class_exists('presence')) {
* show presence
*/
public function show() {
$fp = event_socket_create();
$cmd = 'show calls as json';
$json = event_socket_request($fp, 'api '.$cmd);
unset($fp);
$json = event_socket::api('show calls as json');
$call_array = json_decode($json, true);
if (isset($call_array['rows'])) {
$x = 0;
app/switch/resources/conf/autoload_configs/event_socket.conf.xml
+1 -1
View File
@@ -1,7 +1,7 @@
<configuration name="event_socket.conf" description="Socket Client">
<settings>
<param name="nat-map" value="false"/>
<param name="listen-ip" value="127.0.0.1"/>
<param name="listen-ip" value="0.0.0.0"/>
<param name="listen-port" value="8021"/>
<param name="password" value="ClueCon"/>
<!--<param name="apply-inbound-acl" value="lan"/>-->
app/switch/resources/dashboard/switch_status.php
+7 -7
View File
@@ -26,19 +26,19 @@
$row_style["1"] = "row_style1";
//connect to event socket
$fp = event_socket_create();
$esl = event_socket::create();
//switch version
if (permission_exists('switch_version') && $fp) {
$switch_version = event_socket_request($fp, 'api version');
if (permission_exists('switch_version') && $esl->is_connected()) {
$switch_version = event_socket::api('version');
preg_match("/FreeSWITCH Version (\d+\.\d+\.\d+(?:\.\d+)?).*\(.*?(\d+\w+)\s*\)/", $switch_version, $matches);
$switch_version = $matches[1];
$switch_bits = $matches[2];
}
//switch uptime
if (permission_exists('switch_uptime') && $fp) {
$tmp = event_socket_request($fp, 'api status');
if (permission_exists('switch_uptime') && $esl->is_connected()) {
$tmp = event_socket::api('status');
$tmp = explode("\n", $tmp);
$tmp = $tmp[0];
$tmp = explode(' ', $tmp);
@@ -55,8 +55,8 @@
//channel count
$channels = '';
$tr_link_channels = '';
if (permission_exists('switch_channels') && $fp) {
$tmp = event_socket_request($fp, 'api status');
if (permission_exists('switch_channels') && $esl->is_connected()) {
$tmp = event_socket::api('status');
$matches = Array();
preg_match("/(\d+)\s+session\(s\)\s+\-\speak/", $tmp, $matches);
$channels = $matches[1] ? $matches[1] : 0;