ChrisChrome/sccp_manager
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Update save SIP device

Browse source 
Fail if no valid FreePbx sip bindings available

Fix SIP display issue

Correct line protocol selection
This commit is contained in:
stevenA 2022-01-02 13:06:41 +01:00
parent 21f9123ece
commit 198b3fffa8
5 changed files with 27 additions and 87 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Sccp_manager.class.php
View file

@ -878,10 +878,10 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO {
switch ($tmp_line[0]) { switch ($tmp_line[0]) {
case 'line': case 'line':
$dev_line_data = $this->sipconfigs->get_db_sip_TableData('DeviceById', array('id' => $tmp_line[1])); $dev_line_data = $this->sipconfigs->get_db_sip_TableData('DeviceById', array('id' => $tmp_line[1]));
$f_linetype = ($dev_line_data['dial'] == 'PJSIP') ? 'pjsip' : 'sip'; $f_linetype = (explode("/",$dev_line_data['dial'])[0] == 'PJSIP') ? 'pjsip' : 'sip';
$dev_line_data['sbind'] = $tmp_bind[$f_linetype]; $dev_line_data['sbind'] = $tmp_bind[$f_linetype];
if ((!$this->array_key_exists_recursive('udp', $tmp_bind[$f_linetype])) && (!$this->array_key_exists_recursive('tcp', $tmp_bind[$f_linetype]))) { if ((!$this->array_key_exists_recursive('udp', $tmp_bind[$f_linetype])) && (!$this->array_key_exists_recursive('tcp', $tmp_bind[$f_linetype]))) {
print_r("Wrong sip server Config ! Not enabled UDP or TCP protocol"); print_r("SIP server configuration error ! Neither UDP nor TCP protocol enabled");
die(); die();
return -1; return -1;
} }

102
sccpManClasses/sipconfigs.class.php
View file

@ -65,99 +65,41 @@ class sipconfigs
public function getSipConfig() public function getSipConfig()
{ {
// Only called from sccp_manager class when saving SIP device
$result = array(); $result = array();
// $def_sip_proto = 'sip';
// $def_proto = 'tcp';
// $supp_proto = '';
// $result['sipport'] = \FreePBX::Sipsettings()->getConfig('bindport');
// $result['tlsport'] = \FreePBX::Sipsettings()->getConfig('tlsbindport');
// $tmp_sipsetigs = \FreePBX::Sipsettings()->getChanSipSettings();
$tmp_binds = \FreePBX::Sipsettings()->getBinds(); $tmp_binds = \FreePBX::Sipsettings()->getBinds();
$if_list = $this->paren_class ->getIpInformation('ip4'); $if_list = $this->paren_class ->getIpInformation('ip4');
if (!is_array($tmp_binds)) {
/* // FreePBX has no sip bindings.
$tmp_bind_ip = !empty($tmp_sipsetigs['externhost_val']) ? $tmp_sipsetigs['externhost_val'] : ''; die_freepbx(_("SIP server configuration error ! No SIP protocols enabled"));
$tmp_bind_ip = !empty($tmp_sipsetigs['externip_val']) ? $tmp_sipsetigs['externip_val'] : $tmp_bind_ip; }
$tmp_bind_ip = !empty($tmp_sipsetigs['bindaddr']) ? $tmp_sipsetigs['bindaddr'] : $tmp_bind_ip; foreach ($tmp_binds as $fpbx_protocol => $fpbx_bind) {
*/ foreach ($fpbx_bind as $protocol_ip => $protocol_port_arr) {
$tmp_binds = is_array($tmp_binds) ? $tmp_binds: array(); if (empty($protocol_port_arr)) {
$result = array();
foreach ($tmp_binds as $f_protocol => $f_bind) {
foreach ($f_bind as $f_ip => $f_port) {
if (($f_ip == '0.0.0.0') || ($f_ip == '[::]')) {
foreach ($if_list as $f_if => $f_data) {
if ($f_data['ip'] == "127.0.0.1") {
continue; continue;
} }
if (empty($result[$f_protocol][$f_data['ip']])) { if (($protocol_ip == '0.0.0.0') || ($protocol_ip == '[::]')) {
$result[$f_protocol][$f_data['ip']]= $f_port; foreach ($if_list as $if_type => $if_data) {
} else { if ($if_data['ip'] == "127.0.0.1") {
$result[$f_protocol][$f_data['ip']]= array_merge($result[$f_protocol][$f_data['ip']],$f_port);
}
$result[$f_protocol][$f_data['ip']]['ip']=$f_data['ip'];
}
} else {
$result[$f_protocol][$f_ip]=$f_port;
$result[$f_protocol][$f_ip]['ip']=$f_ip;
}
}
}
return $result;
/*
// $result['sipbind'] = $tmp_bind_ip;
if (empty($tmp_sip_binds[$def_sip_proto])){
$def_proto = 'pjsip';
}
return $result;
foreach ($tmp_sip_binds[$def_sip_proto] as $key => $value) {
if (empty($value[$def_proto])) {
$def_proto = 'udp';
$supp_proto = 'udp';
} else {
$supp_proto = !empty($value['udp']) ? 'tcp;udp' : 'tcp';
}
if (empty($def_key)) {
$def_key = $key;
}
if ($key != '0.0.0.0') {
$tmp_bind_ip = $key;
}
$result['sipbindport'] = $value[$def_proto];
}
$result['sipbind'] = $tmp_bind_ip;
$result['sipsuportproto'] = $supp_proto;
$binds= array();
$driver = \FreePBX::Config()->get_conf_setting('ASTSIPDRIVER');
if ($driver == "both" || $driver == "chan_pjsip") {
$b = \FreePBX::Sipsettings()->getConfig("binds");
$b = is_array($b) ? $b : array();
foreach($b as $protocol => $bind) {
foreach($bind as $ip => $state) {
if($state != "on") {
continue; continue;
} }
$p = \FreePBX::Sipsettings()->getConfig($protocol."port-".$ip); if (empty($result[$fpbx_protocol][$if_data['ip']])) {
$result['nb3'.$protocol] = $p; $result[$fpbx_protocol][$if_data['ip']]= $protocol_port_arr;
if ($flatten) {
$binds['pjsip']['[::]'][$protocol] = $p;
} else { } else {
$binds['pjsip'][$ip][$protocol] = $p; $result[$fpbx_protocol][$if_data['ip']]= array_merge($result[$fpbx_protocol][$if_data['ip']],$protocol_port_arr);
}
} }
$result[$fpbx_protocol][$if_data['ip']]['ip']=$if_data['ip'];
} }
} else { } else {
$binds['pjsip'] = array("0.0.0.0" => array()); $result[$fpbx_protocol][$fpbx_ip]=$fpbx_port_arr;
$result[$fpbx_protocol][$fpbx_ip]['ip']=$fpbx_ip;
}
}
}
if (empty($result)) {
die_freepbx(_("SIP server configuration error ! No SIP protocols enabled"));
} }
$result['nd'] = $driver;
$result['nb'] = $binds;
$result['nb2'] = $b;
return $result; return $result;
*
*/
} }
} }

1
sccpManClasses/xmlinterface.class.php
View file

@ -486,7 +486,6 @@ class xmlinterface
$xml_template = $data_path . '/templates/SEP0000000000.cnf.xml_79df_sip_template'; $xml_template = $data_path . '/templates/SEP0000000000.cnf.xml_79df_sip_template';
} }
$xml_name = $store_path . '/' . $dev_id . '.cnf.xml'; $xml_name = $store_path . '/' . $dev_id . '.cnf.xml';
//$sip_bind = $this->get_server_sip_bind($data_values);
$sip_bind = $data_values['sbind']; $sip_bind = $data_values['sbind'];
$bind_proto = 'tcp'; $bind_proto = 'tcp';
$bind_ip_def = ''; $bind_ip_def = '';

1
sccpManTraits/ajaxHelper.php
View file

@ -649,7 +649,6 @@ trait ajaxHelper {
$hdr_prefix = 'sccp_hw_'; $hdr_prefix = 'sccp_hw_';
$hdr_arprefix = 'sccp_hw-ar_'; $hdr_arprefix = 'sccp_hw-ar_';
$hdr_vendPrefix = 'vendorconfig_'; $hdr_vendPrefix = 'vendorconfig_';
$save_buttons = array(); $save_buttons = array();
$save_settings = array(); $save_settings = array();
$save_codec = array(); $save_codec = array();

4
views/hardware.sphone.php
View file

@ -29,8 +29,8 @@
<thead> <thead>
<tr> <tr>
<th data-checkbox="true"></th> <th data-checkbox="true"></th>
<th data-sortable="true" data-field="mac"><?php echo _('Device ID') ?></th> <th data-sortable="true" data-field="name"><?php echo _('Device ID') ?></th>
<th data-sortable="true" data-field="description"><?php echo _('Device Descriptions') ?></th> <th data-sortable="true" data-field="description"><?php echo _('Device Description') ?></th>
<th data-sortable="true" data-formatter="DispayTypeFormatter" data-field="type"><?php echo _('Device type') ?></th> <th data-sortable="true" data-formatter="DispayTypeFormatter" data-field="type"><?php echo _('Device type') ?></th>
<th data-sortable="true" data-field="button" data-formatter="LineFormatter"><?php echo _('Line') ?></th> <th data-sortable="true" data-field="button" data-formatter="LineFormatter"><?php echo _('Line') ?></th>
<th data-sortable="true" data-field="status"><?php echo _('Status') ?></th> <th data-sortable="true" data-field="status"><?php echo _('Status') ?></th>