summaryrefslogtreecommitdiffhomepage
path: root/protocols/luci-proto-modemmanager/htdocs/luci-static/resources/protocol
diff options
context:
space:
mode:
Diffstat (limited to 'protocols/luci-proto-modemmanager/htdocs/luci-static/resources/protocol')
-rw-r--r--protocols/luci-proto-modemmanager/htdocs/luci-static/resources/protocol/modemmanager.js113
1 files changed, 68 insertions, 45 deletions
diff --git a/protocols/luci-proto-modemmanager/htdocs/luci-static/resources/protocol/modemmanager.js b/protocols/luci-proto-modemmanager/htdocs/luci-static/resources/protocol/modemmanager.js
index ad8cc1484a..b13dd310c7 100644
--- a/protocols/luci-proto-modemmanager/htdocs/luci-static/resources/protocol/modemmanager.js
+++ b/protocols/luci-proto-modemmanager/htdocs/luci-static/resources/protocol/modemmanager.js
@@ -2,50 +2,19 @@
'require fs';
'require form';
'require network';
-
-function getModemList() {
- return fs.exec_direct('/usr/bin/mmcli', [ '-L' ]).then(function(res) {
- var lines = (res || '').split(/\n/),
- tasks = [];
-
- for (var i = 0; i < lines.length; i++) {
- var m = lines[i].match(/\/Modem\/(\d+)/);
- if (m)
- tasks.push(fs.exec_direct('/usr/bin/mmcli', [ '-m', m[1] ]));
- }
-
- return Promise.all(tasks).then(function(res) {
- var modems = [];
-
- for (var i = 0; i < res.length; i++) {
- var man = res[i].match(/manufacturer: ([^\n]+)/),
- mod = res[i].match(/model: ([^\n]+)/),
- dev = res[i].match(/device: ([^\n]+)/);
-
- if (dev) {
- modems.push({
- device: dev[1].trim(),
- manufacturer: (man ? man[1].trim() : '') || '?',
- model: (mod ? mod[1].trim() : '') || dev[1].trim()
- });
- }
- }
-
- return modems;
- });
- });
-}
+'require modemmanager_helper as helper';
network.registerPatternVirtual(/^mobiledata-.+$/);
network.registerErrorCode('MM_CONNECT_FAILED', _('Connection attempt failed.'));
-network.registerErrorCode('MM_DISCONNECT_IN_PROGRESS', _('Modem disconnection in progress. Please wait.'));
network.registerErrorCode('MM_CONNECT_IN_PROGRESS', _('Modem connection in progress. Please wait. This process will timeout after 2 minutes.'));
-network.registerErrorCode('MM_TEARDOWN_IN_PROGRESS', _('Modem bearer teardown in progress.'));
-network.registerErrorCode('MM_MODEM_DISABLED', _('Modem is disabled.'));
network.registerErrorCode('DEVICE_NOT_MANAGED', _('Device not managed by ModemManager.'));
network.registerErrorCode('INVALID_BEARER_LIST', _('Invalid bearer list. Possibly too many bearers created. This protocol supports one and only one bearer.'));
network.registerErrorCode('UNKNOWN_METHOD', _('Unknown and unsupported connection method.'));
network.registerErrorCode('DISCONNECT_FAILED', _('Disconnection attempt failed.'));
+network.registerErrorCode('MM_INVALID_ALLOWED_MODES_LIST', _('Unable to set allowed mode list.'));
+network.registerErrorCode('MM_NO_PREFERRED_MODE_CONFIGURED', _('No preferred mode configuration found.'));
+network.registerErrorCode('MM_NO_ALLOWED_MODE_CONFIGURED', _('No allowed mode configuration found.'));
+network.registerErrorCode('MM_FAILED_SETTING_PREFERRED_MODE', _('Unable to set preferred mode.'));
return network.registerProtocol('modemmanager', {
getI18n: function() {
@@ -79,19 +48,33 @@ return network.registerProtocol('modemmanager', {
renderFormOptions: function(s) {
var dev = this.getL3Device() || this.getDevice(), o;
- o = s.taboption('general', form.ListValue, 'device', _('Modem device'));
+ o = s.taboption('general', form.ListValue, '_modem_device', _('Modem device'));
+ o.ucioption = 'device';
o.rmempty = false;
o.load = function(section_id) {
- return getModemList().then(L.bind(function(devices) {
- for (var i = 0; i < devices.length; i++)
- this.value(devices[i].device,
- '%s - %s'.format(devices[i].manufacturer, devices[i].model));
+ return helper.getModems().then(L.bind(function(devices) {
+ for (var i = 0; i < devices.length; i++) {
+ var generic = devices[i].modem.generic;
+ this.value(generic.device,
+ '%s - %s'.format(generic.manufacturer, generic.model));
+ }
return form.Value.prototype.load.apply(this, [section_id]);
}, this));
};
- s.taboption('general', form.Value, 'apn', _('APN'));
- s.taboption('general', form.Value, 'pincode', _('PIN'));
+ o = s.taboption('general', form.Value, 'apn', _('APN'));
+ o.validate = function(section_id, value) {
+ if (value == null || value == '')
+ return true;
+
+ if (!/^[a-zA-Z0-9\-.]*[a-zA-Z0-9]$/.test(value))
+ return _('Invalid APN provided');
+
+ return true;
+ };
+
+ o = s.taboption('general', form.Value, 'pincode', _('PIN'));
+ o.datatype = 'and(uinteger,minlength(4),maxlength(8))';
o = s.taboption('general', form.ListValue, 'auth', _('Authentication Type'));
o.value('both', _('PAP/CHAP (both)'));
@@ -100,6 +83,45 @@ return network.registerProtocol('modemmanager', {
o.value('none', _('None'));
o.default = 'none';
+ o = s.taboption('general', form.ListValue, 'allowedmode', _('Allowed network technology'),
+ _('Setting the allowed network technology.'));
+ o.value('2g');
+ o.value('3g');
+ o.value('3g|2g');
+ o.value('4g');
+ o.value('4g|2g');
+ o.value('4g|3g');
+ o.value('4g|3g|2g');
+ o.value('5g');
+ o.value('5g|2g');
+ o.value('5g|3g');
+ o.value('5g|3g|2g');
+ o.value('5g|4g');
+ o.value('5g|4g|2g');
+ o.value('5g|4g|3g');
+ o.value('5g|4g|3g|2g');
+ o.value('',_('any'));
+ o.default = '';
+
+ o = s.taboption('general', form.ListValue, 'preferredmode', _('Preferred network technology'),
+ _('Setting the preferred network technology.'));
+ o.value('2g');
+ o.value('3g');
+ o.value('4g');
+ o.value('5g');
+ o.value('none', _('None'));
+ o.depends('allowedmode','3g|2g');
+ o.depends('allowedmode','4g|2g');
+ o.depends('allowedmode','4g|3g');
+ o.depends('allowedmode','4g|3g|2g');
+ o.depends('allowedmode','5g|2g');
+ o.depends('allowedmode','5g|3g');
+ o.depends('allowedmode','5g|3g|2g');
+ o.depends('allowedmode','5g|4g');
+ o.depends('allowedmode','5g|4g|2g');
+ o.depends('allowedmode','5g|4g|3g');
+ o.depends('allowedmode','5g|4g|3g|2g');
+
o = s.taboption('general', form.Value, 'username', _('PAP/CHAP username'));
o.depends('auth', 'pap');
o.depends('auth', 'chap');
@@ -117,11 +139,12 @@ return network.registerProtocol('modemmanager', {
o.value('ipv6', _('IPv6 only'));
o.default = 'ipv4v6';
- s.taboption('general', form.Value, 'signalrate', _('Signal refresh rate'));
-
o = s.taboption('advanced', form.Value, 'mtu', _('Override MTU'));
o.placeholder = dev ? (dev.getMTU() || '1500') : '1500';
o.datatype = 'max(9200)';
+
+ o = s.taboption('general', form.Value, 'signalrate', _('Signal Refresh Rate'), _("In seconds"));
+ o.datatype = 'uinteger';
s.taboption('general', form.Value, 'metric', _('Gateway metric'));
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-26 20:05:15 +0000