From ee37236655afd507e040dd29bef8ee6954b38f27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Schr=C3=B6der?= Date: Thu, 21 May 2015 12:30:49 +0200 Subject: [PATCH] Moved voice client stuff to voice client --- luciexpress/htdocs/js/uci.js | 109 ------------ luciexpress/htdocs/plugins/phone/phone.js | 194 ++++++++++++++-------- 2 files changed, 125 insertions(+), 178 deletions(-) diff --git a/luciexpress/htdocs/js/uci.js b/luciexpress/htdocs/js/uci.js index 330a35f75..de6e17218 100644 --- a/luciexpress/htdocs/js/uci.js +++ b/luciexpress/htdocs/js/uci.js @@ -174,115 +174,6 @@ "fw_upload_path": { dvalue: "", type: String, required: false} } }, - "voice_client": { - "brcm_line": { - "extension": { dvalue: "0000", type: String}, - "sip_account": { dvalue: "-", type: String}, - "noise": { dvalue: 0, type: Number }, - "vad": { dvalue: 0, type: Number }, - "txgain": { dvalue: 0, type: Number }, - "rxgain": { dvalue: 0, type: Number }, - "echo_cancel": { dvalue: true, type: Boolean }, - "callwaiting": { dvalue: false, type: Boolean }, - "clir": { dvalue: false, type: Boolean }, - "name": { dvalue: "", type: String} - }, - "dialplan": { - "custom_outgoing_enabled": { dvalue: false, type: Boolean }, - "custom_incoming_enabled": { dvalue: false, type: Boolean }, - "custom_hangup_enabled": { dvalue: false, type: Boolean }, - "all_ports_extension": { dvalue: "#123456", type: String}, - "test_audio_extension": { dvalue: "#123457", type: String}, - "test_echo_extension": { dvalue: "#123458", type: String}, - "record_message_extension": { dvalue: "#999999", type: String} - }, - "sip_advanced": { - "rtpstart": { dvalue: 10000, type: Number }, - "rtpend": { dvalue: 20000, type: Number }, - "dtmfmode": { dvalue: "rfc2833", type: String}, - "remotehold": { dvalue: "yes", type: String}, - "contact_line_suffix": { dvalue: 1, type: Number }, - "registertimeoutbackoff": { dvalue: 512, type: Number }, - "registerattemptsbackoff": { dvalue: 0, type: Number }, - "register403timeout": { dvalue: 0, type: Number }, - "register503timeout": { dvalue: 0, type: Number }, - "registertimeoutguardsecs": { dvalue: 15, type: Number }, - "registertimeoutguardlimit": { dvalue: 30, type: Number }, - "registertimeoutguardpct": { dvalue: "0.2", type: String}, - "defaultexpiry": { dvalue: 300, type: Number }, - "tls_version": { dvalue: "tlsv1", type: String}, - "tls_cipher": { dvalue: "'DES-CBC3-SHA", type: String}, - "dnsmgr": { dvalue: "no", type: String}, - "dnsmgr_refresh_interval": { dvalue: 300, type: Number }, - "srvlookup": { dvalue: "yes", type: String} - }, - "brcm_advanced": { - "country": { dvalue: "SWE", type: String}, - "jbenable": { dvalue: "yes", type: String}, - "jbforce": { dvalue: "no", type: String}, - "jbmaxsize": { dvalue: 500, type: Number }, - "jbimpl": { dvalue: "adaptive", type: String}, - "genericplc": { dvalue: "yes", type: String}, - "dialoutmsec": { dvalue: 4000, type: Number }, - "cw_enable": { dvalue: "yes", type: String} - }, - "features": { - "cbbs_enabled": { dvalue: true, type: Boolean }, - "callforward_enabled": { dvalue: true, type: Boolean }, - "redial_enabled": { dvalue: true, type: Boolean }, - "callreturn_enabled": { dvalue: true, type: Boolean }, - "advanced_register_settings": { dvalue: true, type: Boolean }, - }, - "sip_service_provider": { - "name": { dvalue: "", type: String}, - "enabled": { dvalue: true, type: Boolean }, - "codec0": { dvalue: "alaw", type: String}, - "codec1": { dvalue: "ulaw", type: String}, - "codec2": { dvalue: "g729", type: String}, - "codec3": { dvalue: "g726", type: String}, - "autoframing": { dvalue: 1, type: Number }, - "call_lines": { dvalue: 0, type: Number }, - "cfim_on": { dvalue: "*21*", type: String}, - "cfim_off": { dvalue: "#21#", type: String}, - "cfbs_on": { dvalue: "*61*", type: String}, - "cfbs_off": { dvalue: "#61#", type: String}, - "call_return": { dvalue: "*69", type: String}, - "redial": { dvalue: "*66", type: String}, - "is_fax": { dvalue: 0, type: Number }, - "transport": { dvalue: "udp", type: String}, - "priority_ulaw": { dvalue: 2, type: Number }, - "priority_alaw": { dvalue: 1, type: Number }, - "priority_g729": { dvalue: 3, type: Number }, - "priority_g723": { dvalue: 1, type: Number }, - "priority_g726": { dvalue: 4, type: Number }, - "call_filter": { dvalue: "call_filter0", type: String} - }, - "log": { - "console": { dvalue: "notice,warning,error", type: String }, - "messages": { dvalue: "error", type: String }, - "syslog_facility": { dvalue: "local0", type: String } - }, - "speed_dial": { - "tone": { dvalue: 1, type: Number }, - "number": { dvalue: "", type: String } - - }, - "call_filter": { - "name": { dvalue: "Default", type: String } - "block_foreign": { dvalue: false, type: Boolean }, - "block_special_rate": { dvalue: false, type: Boolean } - }, - "call_filter_rule_outgoing": { - "owner": { dvalue: "call_filter0", type: String } - "enabled": { dvalue: false, type: Boolean }, - "extension": { dvalue: "321#", type: String } - }, - "call_filter_rule_incoming": { - "owner": { dvalue: "call_filter0", type: String } - "enabled": { dvalue: false, type: Boolean }, - "extension": { dvalue: "123#", type: String } - } - }, //"ddns": { // "interface": { dvalue: "", type: String }, // "enabled": { dvalue: 0, type: Number }, diff --git a/luciexpress/htdocs/plugins/phone/phone.js b/luciexpress/htdocs/plugins/phone/phone.js index 6a3c38fc6..b17c666fa 100644 --- a/luciexpress/htdocs/plugins/phone/phone.js +++ b/luciexpress/htdocs/plugins/phone/phone.js @@ -28,73 +28,129 @@ JUCI.app.config(function($stateProvider) { $juci.redirect("phone-call-log"); }, }); - - // add the uci classes for voice client - UCI.$registerConfig("voice_client"); - UCI.voice_client.$registerSectionType("brcm_line", { - "extension": { dvalue: '', type: String }, - "sip_account": { dvalue: '', type: String }, - "noise": { dvalue: false, type: Boolean }, - "vad": { dvalue: false, type: Boolean }, - "txgain": { dvalue: false, type: Boolean }, - "rxgain": { dvalue: false, type: Boolean }, - "echo_cancel": { dvalue: true, type: Boolean }, - "callwaiting": { dvalue: false, type: Boolean }, - "clir": { dvalue: false, type: Boolean }, - "name": { dvalue: '', type: String }, - "instance": { dvalue: '', type: String } - }); - UCI.voice_client.$registerSectionType("sip_service_provider", { - "name": { dvalue: "", type: String }, - "codec0": { dvalue: "alaw", type: String }, - "codec1": { dvalue: "ulaw", type: String }, - "codec2": { dvalue: "g729", type: String }, - "codec3": { dvalue: "g726", type: String }, - "autoframing": { dvalue: false, type: Boolean }, - "cfim_on": { dvalue: "*21*", type: String }, - "cfim_off": { dvalue: "#21#", type: String }, - "cfbs_on": { dvalue: "*61*", type: String }, - "cfbs_off": { dvalue: "#61#", type: String }, - "call_return": { dvalue: "*69", type: String }, - "redial": { dvalue: "*66", type: String }, - "is_fax": { dvalue: false, type: Boolean }, - "transport": { dvalue: "udp", type: String }, - "priority_ulaw": { dvalue: 0, type: Number }, - "priority_alaw": { dvalue: 0, type: Number }, - "priority_g729": { dvalue: 0, type: Number }, - "priority_g723": { dvalue: 0, type: Number }, - "priority_g726": { dvalue: 0, type: Number }, - "enabled": { dvalue: true, type: Boolean }, - "target": { dvalue: "direct", type: String }, - "call_lines": { dvalue: "BRCM/4", type: String }, - "mailbox": { dvalue: "", type: String }, - "call_filter": { dvalue: "", type: String }, - "domain": { dvalue: "", type: String }, - "user": { dvalue: "", type: String }, - "authuser": { dvalue: "", type: String }, - "displayname": { dvalue: "", type: String }, - "ptime_ulaw": { dvalue: 20, type: Number }, - "ptime_g726": { dvalue: 20, type: Number }, - "ptime_g729": { dvalue: 20, type: Number }, - "ptime_alaw": { dvalue: 20, type: Number }, - "host": { dvalue: "", type: String }, - "outboundproxy": { dvalue: "", type: String } - }); - UCI.voice_client.$registerSectionType("call_filter", { - "name": { dvalue: "", type: String }, - "block_outgoing": { dvalue: true, type: Boolean }, - "block_incoming": { dvalue: true, type: Boolean }, - "block_foreign": { dvalue: true, type: Boolean }, // outgoing foreign - "block_special_rate": { dvalue: false, type: Boolean } // outgoing special rate - }); - UCI.voice_client.$registerSectionType("call_filter_rule_outgoing", { - "owner": { dvalue: "", type: String }, - "enabled": { dvalue: true, type: Boolean }, - "extension": { dvalue: "", type: String } - }); - UCI.voice_client.$registerSectionType("call_filter_rule_incoming", { - "owner": { dvalue: "", type: String }, - "enabled": { dvalue: true, type: Boolean }, - "extension": { dvalue: "", type: String } - }); +}); + +// add the uci classes for voice client +UCI.$registerConfig("voice_client"); +UCI.voice_client.$registerSectionType("brcm_line", { + "extension": { dvalue: '', type: String }, + "sip_account": { dvalue: '', type: String }, + "noise": { dvalue: false, type: Boolean }, + "vad": { dvalue: false, type: Boolean }, + "txgain": { dvalue: false, type: Boolean }, + "rxgain": { dvalue: false, type: Boolean }, + "echo_cancel": { dvalue: true, type: Boolean }, + "callwaiting": { dvalue: false, type: Boolean }, + "clir": { dvalue: false, type: Boolean }, + "name": { dvalue: '', type: String }, + "instance": { dvalue: '', type: String } +}); +UCI.voice_client.$registerSectionType("sip_service_provider", { + "name": { dvalue: "", type: String }, + "codec0": { dvalue: "alaw", type: String }, + "codec1": { dvalue: "ulaw", type: String }, + "codec2": { dvalue: "g729", type: String }, + "codec3": { dvalue: "g726", type: String }, + "autoframing": { dvalue: false, type: Boolean }, + "cfim_on": { dvalue: "*21*", type: String }, + "cfim_off": { dvalue: "#21#", type: String }, + "cfbs_on": { dvalue: "*61*", type: String }, + "cfbs_off": { dvalue: "#61#", type: String }, + "call_return": { dvalue: "*69", type: String }, + "redial": { dvalue: "*66", type: String }, + "is_fax": { dvalue: false, type: Boolean }, + "transport": { dvalue: "udp", type: String }, + "priority_ulaw": { dvalue: 0, type: Number }, + "priority_alaw": { dvalue: 0, type: Number }, + "priority_g729": { dvalue: 0, type: Number }, + "priority_g723": { dvalue: 0, type: Number }, + "priority_g726": { dvalue: 0, type: Number }, + "enabled": { dvalue: true, type: Boolean }, + "target": { dvalue: "direct", type: String }, + "call_lines": { dvalue: "BRCM/4", type: String }, + "mailbox": { dvalue: "", type: String }, + "call_filter": { dvalue: "", type: String }, + "domain": { dvalue: "", type: String }, + "user": { dvalue: "", type: String }, + "authuser": { dvalue: "", type: String }, + "displayname": { dvalue: "", type: String }, + "ptime_ulaw": { dvalue: 20, type: Number }, + "ptime_g726": { dvalue: 20, type: Number }, + "ptime_g729": { dvalue: 20, type: Number }, + "ptime_alaw": { dvalue: 20, type: Number }, + "host": { dvalue: "", type: String }, + "outboundproxy": { dvalue: "", type: String } +}); +UCI.voice_client.$registerSectionType("call_filter", { + "name": { dvalue: "", type: String }, + "block_outgoing": { dvalue: true, type: Boolean }, + "block_incoming": { dvalue: true, type: Boolean }, + "block_foreign": { dvalue: true, type: Boolean }, // outgoing foreign + "block_special_rate": { dvalue: false, type: Boolean } // outgoing special rate +}); +UCI.voice_client.$registerSectionType("call_filter_rule_outgoing", { + "owner": { dvalue: "", type: String }, + "enabled": { dvalue: true, type: Boolean }, + "extension": { dvalue: "", type: String } +}); +UCI.voice_client.$registerSectionType("call_filter_rule_incoming", { + "owner": { dvalue: "", type: String }, + "enabled": { dvalue: true, type: Boolean }, + "extension": { dvalue: "", type: String } +}); + +UCI.voice_client.$registerSectionType("dialplan": { + "custom_outgoing_enabled": { dvalue: false, type: Boolean }, + "custom_incoming_enabled": { dvalue: false, type: Boolean }, + "custom_hangup_enabled": { dvalue: false, type: Boolean }, + "all_ports_extension": { dvalue: "#123456", type: String}, + "test_audio_extension": { dvalue: "#123457", type: String}, + "test_echo_extension": { dvalue: "#123458", type: String}, + "record_message_extension": { dvalue: "#999999", type: String} +}); +UCI.voice_client.$registerSectionType("sip_advanced": { + "rtpstart": { dvalue: 10000, type: Number }, + "rtpend": { dvalue: 20000, type: Number }, + "dtmfmode": { dvalue: "rfc2833", type: String}, + "remotehold": { dvalue: "yes", type: String}, + "contact_line_suffix": { dvalue: 1, type: Number }, + "registertimeoutbackoff": { dvalue: 512, type: Number }, + "registerattemptsbackoff": { dvalue: 0, type: Number }, + "register403timeout": { dvalue: 0, type: Number }, + "register503timeout": { dvalue: 0, type: Number }, + "registertimeoutguardsecs": { dvalue: 15, type: Number }, + "registertimeoutguardlimit": { dvalue: 30, type: Number }, + "registertimeoutguardpct": { dvalue: "0.2", type: String}, + "defaultexpiry": { dvalue: 300, type: Number }, + "tls_version": { dvalue: "tlsv1", type: String}, + "tls_cipher": { dvalue: "'DES-CBC3-SHA", type: String}, + "dnsmgr": { dvalue: "no", type: String}, + "dnsmgr_refresh_interval": { dvalue: 300, type: Number }, + "srvlookup": { dvalue: "yes", type: String} +}); +UCI.voice_client.$registerSectionType("brcm_advanced": { + "country": { dvalue: "SWE", type: String}, + "jbenable": { dvalue: "yes", type: String}, + "jbforce": { dvalue: "no", type: String}, + "jbmaxsize": { dvalue: 500, type: Number }, + "jbimpl": { dvalue: "adaptive", type: String}, + "genericplc": { dvalue: "yes", type: String}, + "dialoutmsec": { dvalue: 4000, type: Number }, + "cw_enable": { dvalue: "yes", type: String} +}); +UCI.voice_client.$registerSectionType("features": { + "cbbs_enabled": { dvalue: true, type: Boolean }, + "callforward_enabled": { dvalue: true, type: Boolean }, + "redial_enabled": { dvalue: true, type: Boolean }, + "callreturn_enabled": { dvalue: true, type: Boolean }, + "advanced_register_settings": { dvalue: true, type: Boolean }, +}); +UCI.voice_client.$registerSectionType("log": { + "console": { dvalue: "notice,warning,error", type: String }, + "messages": { dvalue: "error", type: String }, + "syslog_facility": { dvalue: "local0", type: String } +}); +UCI.voice_client.$registerSectionType("speed_dial": { + "tone": { dvalue: 1, type: Number }, + "number": { dvalue: "", type: String } });