luci-base, luci-proto-*: rename getOpkgPackage -> getPackageName

Signed-off-by: Paul Donald <newtwen+github@gmail.com>
2025-03-14 11:17:23 +00:00 · 2024-12-15 20:11:23 +01:00
parent 500ce17e7a
commit 8d13ea410d
44 changed files with 48 additions and 46 deletions
--- a/modules/luci-base/htdocs/luci-static/resources/network.js
+++ b/modules/luci-base/htdocs/luci-static/resources/network.js
@ -2452,17 +2452,19 @@ Protocol = baseclass.extend(/** @lends LuCI.network.Protocol.prototype */ {
 	},

 	/**
-	 * Get the name of the opkg package providing the protocol functionality.
+	 * Gets the name of the package providing the protocol functionality. The
+	 * package is available via the system default package manager. This is used
+	 * when a config refers to a protocol handler which is not yet installed.
 	 *
 	 * This function should be overwritten by protocol specific subclasses.
 	 *
 	 * @abstract
 	 *
 	 * @returns {string}
-	 * Returns the name of the opkg package required for the protocol to
+	 * Returns the name of the package to download, required for the protocol to
 	 * function, e.g. `odhcp6c` for the `dhcpv6` protocol.
 	 */
-	getOpkgPackage: function() {
+	getPackageName: function() {
 		return null;
 	},

--- a/protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js
+++ b/protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js
@ -47,7 +47,7 @@ return network.registerProtocol('3g', {
 		return this._ubus('l3_device') || '3g-%s'.format(this.sid);
 	},

-	getOpkgPackage: function() {
+	getPackageName: function() {
 		return 'comgt';
 	},

--- a/protocols/luci-proto-autoip/htdocs/luci-static/resources/protocol/autoip.js
+++ b/protocols/luci-proto-autoip/htdocs/luci-static/resources/protocol/autoip.js
@ -6,7 +6,7 @@ return network.registerProtocol('autoip', {
 		return _('Avahi IPv4LL');
 	},

-	getOpkgPackage: function() {
+	getPackageName: function() {
 		return 'avahi-autoipd';
 	},

--- a/protocols/luci-proto-batman-adv/htdocs/luci-static/resources/protocol/batadv.js
+++ b/protocols/luci-proto-batman-adv/htdocs/luci-static/resources/protocol/batadv.js
@ -14,7 +14,7 @@ return network.registerProtocol('batadv', {
 		return this._ubus('l3_device') || this.sid;
 	},

-	getOpkgPackage: function() {
+	getPackageName: function() {
 		return 'kmod-batman-adv';
 	},

--- a/protocols/luci-proto-batman-adv/htdocs/luci-static/resources/protocol/batadv_hardif.js
+++ b/protocols/luci-proto-batman-adv/htdocs/luci-static/resources/protocol/batadv_hardif.js
@ -14,7 +14,7 @@ return network.registerProtocol('batadv_hardif', {
 		return this._ubus('l3_device') || this.sid;
 	},
 	
-	getOpkgPackage: function() {
+	getPackageName: function() {
 		return 'kmod-batman-adv';
 	},
 	
--- a/protocols/luci-proto-bonding/htdocs/luci-static/resources/protocol/bonding.js
+++ b/protocols/luci-proto-bonding/htdocs/luci-static/resources/protocol/bonding.js
@ -132,7 +132,7 @@ return network.registerProtocol('bonding', {
 		return null;
 	},

-	getOpkgPackage: function() {
+	getPackageName: function() {
 		return 'bonding';
 	},

--- a/protocols/luci-proto-external/htdocs/luci-static/resources/protocol/external.js
+++ b/protocols/luci-proto-external/htdocs/luci-static/resources/protocol/external.js
@ -7,7 +7,7 @@ return network.registerProtocol('external', {
 		return _('Externally managed interface');
 	},

-	getOpkgPackage: function() {
+	getPackageName: function() {
 		return "external-protocol";
 	},

--- a/protocols/luci-proto-gre/htdocs/luci-static/resources/protocol/gre.js
+++ b/protocols/luci-proto-gre/htdocs/luci-static/resources/protocol/gre.js
@ -14,7 +14,7 @@ return network.registerProtocol('gre', {
 		return this._ubus('l3_device') || 'gre4-%s'.format(this.sid);
 	},

-	getOpkgPackage: function() {
+	getPackageName: function() {
 		return 'gre';
 	},

--- a/protocols/luci-proto-gre/htdocs/luci-static/resources/protocol/gretap.js
+++ b/protocols/luci-proto-gre/htdocs/luci-static/resources/protocol/gretap.js
@ -14,7 +14,7 @@ return network.registerProtocol('gretap', {
 		return this._ubus('l3_device') || 'gre4t-%s'.format(this.sid);
 	},

-	getOpkgPackage: function() {
+	getPackageName: function() {
 		return 'gre';
 	},

--- a/protocols/luci-proto-gre/htdocs/luci-static/resources/protocol/grev6.js
+++ b/protocols/luci-proto-gre/htdocs/luci-static/resources/protocol/grev6.js
@ -14,7 +14,7 @@ return network.registerProtocol('grev6', {
 		return this._ubus('l3_device') || 'gre6-%s'.format(this.sid);
 	},

-	getOpkgPackage: function() {
+	getPackageName: function() {
 		return 'gre';
 	},

--- a/protocols/luci-proto-gre/htdocs/luci-static/resources/protocol/grev6tap.js
+++ b/protocols/luci-proto-gre/htdocs/luci-static/resources/protocol/grev6tap.js
@ -14,7 +14,7 @@ return network.registerProtocol('grev6tap', {
 		return this._ubus('l3_device') || 'gre6t-%s'.format(this.sid);
 	},

-	getOpkgPackage: function() {
+	getPackageName: function() {
 		return 'gre';
 	},

--- a/protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js
+++ b/protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js
@ -7,7 +7,7 @@ return network.registerProtocol('hnet', {
 		return _('Automatic Homenet (HNCP)');
 	},

-	getOpkgPackage: function() {
+	getPackageName: function() {
 		return 'hnet-full';
 	},

--- a/protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js
+++ b/protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js
@ -14,7 +14,7 @@ return network.registerProtocol('ipip', {
 		return this._ubus('l3_device') || 'ipip-%s'.format(this.sid);
 	},

-	getOpkgPackage: function() {
+	getPackageName: function() {
 		return 'ipip';
 	},

--- a/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js
+++ b/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js
@ -15,7 +15,7 @@ return network.registerProtocol('464xlat', {
 		return this._ubus('l3_device') || '464-%s'.format(this.sid);
 	},

-	getOpkgPackage: function() {
+	getPackageName: function() {
 		return '464xlat';
 	},

--- a/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js
+++ b/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js
@ -14,7 +14,7 @@ return network.registerProtocol('6in4', {
 		return this._ubus('l3_device') || '6in4-%s'.format(this.sid);
 	},

-	getOpkgPackage: function() {
+	getPackageName: function() {
 		return '6in4';
 	},

--- a/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js
+++ b/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js
@ -13,7 +13,7 @@ return network.registerProtocol('6rd', {
 		return this._ubus('l3_device') || '6rd-%s'.format(this.sid);
 	},

-	getOpkgPackage: function() {
+	getPackageName: function() {
 		return '6rd';
 	},

--- a/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js
+++ b/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js
@ -13,7 +13,7 @@ return network.registerProtocol('6to4', {
 		return this._ubus('l3_device') || '6to4-%s'.format(this.sid);
 	},

-	getOpkgPackage: function() {
+	getPackageName: function() {
 		return '6rd';
 	},

--- a/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js
+++ b/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js
@ -7,7 +7,7 @@ return network.registerProtocol('dhcpv6', {
 		return _('DHCPv6 client');
 	},

-	getOpkgPackage: function() {
+	getPackageName: function() {
 		return 'odhcp6c';
 	},

--- a/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js
+++ b/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js
@ -15,7 +15,7 @@ return network.registerProtocol('dslite', {
 		return this._ubus('l3_device') || 'ds-%s'.format(this.sid);
 	},

-	getOpkgPackage: function() {
+	getPackageName: function() {
 		return 'ds-lite';
 	},

--- a/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/ipip6.js
+++ b/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/ipip6.js
@ -14,7 +14,7 @@ return network.registerProtocol('ipip6', {
 		return this._ubus('l3_device') || 'ipip6-%s'.format(this.sid);
 	},

-	getOpkgPackage: function () {
+	getPackageName: function () {
 		return 'ds-lite';
 	},

--- a/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js
+++ b/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js
@ -17,7 +17,7 @@ return network.registerProtocol('map', {
 		return this._ubus('l3_device') || 'map-%s'.format(this.sid);
 	},

-	getOpkgPackage: function() {
+	getPackageName: function() {
 		return 'map-t';
 	},

--- a/protocols/luci-proto-mbim/htdocs/luci-static/resources/protocol/mbim.js
+++ b/protocols/luci-proto-mbim/htdocs/luci-static/resources/protocol/mbim.js
@ -28,7 +28,7 @@ return network.registerProtocol('mbim', {
 		return this._ubus('l3_device') || 'mbim-%s'.format(this.sid);
 	},

-	getOpkgPackage: function() {
+	getPackageName: function() {
 		return 'umbim';
 	},

--- a/protocols/luci-proto-modemmanager/htdocs/luci-static/resources/protocol/modemmanager.js
+++ b/protocols/luci-proto-modemmanager/htdocs/luci-static/resources/protocol/modemmanager.js
@ -25,7 +25,7 @@ return network.registerProtocol('modemmanager', {
 		return this._ubus('l3_device') || 'modemmanager-%s'.format(this.sid);
 	},

-	getOpkgPackage: function() {
+	getPackageName: function() {
 		return 'modemmanager';
 	},

--- a/protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js
+++ b/protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js
@ -39,7 +39,7 @@ return network.registerProtocol('ncm', {
 		return this._ubus('l3_device') || 'wan';
 	},

-	getOpkgPackage: function() {
+	getPackageName: function() {
 		return 'comgt-ncm';
 	},

--- a/protocols/luci-proto-nebula/htdocs/luci-static/resources/protocol/nebula.js
+++ b/protocols/luci-proto-nebula/htdocs/luci-static/resources/protocol/nebula.js
@ -14,7 +14,7 @@ return network.registerProtocol('nebula', {
 		return this._ubus('l3_device') || this.sid;
 	},

-	getOpkgPackage: function () {
+	getPackageName: function () {
 		return 'nebula';
 	},

--- a/protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js
+++ b/protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js
@ -69,7 +69,7 @@ return network.registerProtocol('openconnect', {
 		return this._ubus('l3_device') || 'vpn-%s'.format(this.sid);
 	},

-	getOpkgPackage: function() {
+	getPackageName: function() {
 		return 'openconnect';
 	},

--- a/protocols/luci-proto-openfortivpn/htdocs/luci-static/resources/protocol/openfortivpn.js
+++ b/protocols/luci-proto-openfortivpn/htdocs/luci-static/resources/protocol/openfortivpn.js
@ -67,7 +67,7 @@ return network.registerProtocol('openfortivpn', {
 		return this._ubus('l3_device') || 'vpn-%s'.format(this.sid);
 	},

-	getOpkgPackage: function() {
+	getPackageName: function() {
 		return 'openfortivpn';
 	},

--- a/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js
+++ b/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js
@ -14,7 +14,7 @@ return network.registerProtocol('l2tp', {
 		return this._ubus('l3_device') || 'l2tp-%s'.format(this.sid);
 	},

-	getOpkgPackage: function() {
+	getPackageName: function() {
 		return 'xl2tpd';
 	},

--- a/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js
+++ b/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js
@ -47,7 +47,7 @@ return network.registerProtocol('ppp', {
 		return this._ubus('l3_device') || 'ppp-%s'.format(this.sid);
 	},

-	getOpkgPackage: function() {
+	getPackageName: function() {
 		return 'ppp';
 	},

--- a/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js
+++ b/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js
@ -32,7 +32,7 @@ return network.registerProtocol('pppoa', {
 		return this._ubus('l3_device') || 'pppoa-%s'.format(this.sid);
 	},

-	getOpkgPackage: function() {
+	getPackageName: function() {
 		return 'ppp-mod-pppoa';
 	},

--- a/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js
+++ b/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js
@ -32,7 +32,7 @@ return network.registerProtocol('pppoe', {
 		return this._ubus('l3_device') || 'pppoe-%s'.format(this.sid);
 	},

-	getOpkgPackage: function() {
+	getPackageName: function() {
 		return 'ppp-mod-pppoe';
 	},

--- a/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js
+++ b/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js
@ -32,7 +32,7 @@ return network.registerProtocol('pptp', {
 		return this._ubus('l3_device') || 'pptp-%s'.format(this.sid);
 	},

-	getOpkgPackage: function() {
+	getPackageName: function() {
 		return 'ppp-mod-pptp';
 	},

--- a/protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js
+++ b/protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js
@ -32,7 +32,7 @@ return network.registerProtocol('pppossh', {
 		return this._ubus('l3_device') || 'pppossh-%s'.format(this.sid);
 	},

-	getOpkgPackage: function() {
+	getPackageName: function() {
 		return 'pppossh';
 	},

--- a/protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js
+++ b/protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js
@ -31,7 +31,7 @@ return network.registerProtocol('qmi', {
 		return this._ubus('l3_device') || 'qmi-%s'.format(this.sid);
 	},

-	getOpkgPackage: function() {
+	getPackageName: function() {
 		return 'uqmi';
 	},

--- a/protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js
+++ b/protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js
@ -68,7 +68,7 @@ return network.registerProtocol('relay', {
 		return 'relay-%s'.format(this.sid);
 	},

-	getOpkgPackage: function() {
+	getPackageName: function() {
 		return 'relayd';
 	},

--- a/protocols/luci-proto-sstp/htdocs/luci-static/resources/protocol/sstp.js
+++ b/protocols/luci-proto-sstp/htdocs/luci-static/resources/protocol/sstp.js
@ -13,7 +13,7 @@ return network.registerProtocol('sstp', {
 		return this._ubus('l3_device') || 'sstp-%s'.format(this.sid);
 	},

-	getOpkgPackage: function() {
+	getPackageName: function() {
 		return 'sstp-client';
 	},

--- a/protocols/luci-proto-unet/htdocs/luci-static/resources/protocol/unet.js
+++ b/protocols/luci-proto-unet/htdocs/luci-static/resources/protocol/unet.js
@ -12,7 +12,7 @@ return network.registerProtocol('unet', {
 		return this._ubus('l3_device') || this.sid;
 	},

-	getOpkgPackage: function() {
+	getPackageName: function() {
 		return 'unetd';
 	},

--- a/protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js
+++ b/protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js
@ -13,7 +13,7 @@ return network.registerProtocol('vpnc', {
 		return this._ubus('l3_device') || 'vpn-%s'.format(this.sid);
 	},

-	getOpkgPackage: function() {
+	getPackageName: function() {
 		return 'vpnc';
 	},

--- a/protocols/luci-proto-vti/htdocs/luci-static/resources/protocol/vti.js
+++ b/protocols/luci-proto-vti/htdocs/luci-static/resources/protocol/vti.js
@ -14,7 +14,7 @@ return network.registerProtocol('vti', {
 		return this._ubus('l3_device') || 'vti-%s'.format(this.sid);
 	},

-	getOpkgPackage: function() {
+	getPackageName: function() {
 		return 'vti';
 	},

--- a/protocols/luci-proto-vxlan/htdocs/luci-static/resources/protocol/vxlan.js
+++ b/protocols/luci-proto-vxlan/htdocs/luci-static/resources/protocol/vxlan.js
@ -15,7 +15,7 @@ return network.registerProtocol('vxlan', {
 		return this._ubus('l3_device') || 'vxlan-%s'.format(this.sid);
 	},

-	getOpkgPackage: function() {
+	getPackageName: function() {
 		return 'vxlan';
 	},

--- a/protocols/luci-proto-vxlan/htdocs/luci-static/resources/protocol/vxlan6.js
+++ b/protocols/luci-proto-vxlan/htdocs/luci-static/resources/protocol/vxlan6.js
@ -15,7 +15,7 @@ return network.registerProtocol('vxlan6', {
 		return this._ubus('l3_device') || 'vxlan-%s'.format(this.sid);
 	},

-	getOpkgPackage: function() {
+	getPackageName: function() {
 		return 'vxlan';
 	},

--- a/protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js
+++ b/protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js
@ -109,7 +109,7 @@ return network.registerProtocol('wireguard', {
 		return this._ubus('l3_device') || this.sid;
 	},

-	getOpkgPackage: function() {
+	getPackageName: function() {
 		return 'wireguard-tools';
 	},

--- a/protocols/luci-proto-xfrm/htdocs/luci-static/resources/protocol/xfrm.js
+++ b/protocols/luci-proto-xfrm/htdocs/luci-static/resources/protocol/xfrm.js
@ -13,7 +13,7 @@ return network.registerProtocol('xfrm', {
 		return this._ubus('l3_device') || this.sid;
 	},

-	getOpkgPackage: function() {
+	getPackageName: function() {
 		return 'xfrm';
 	},

--- a/protocols/luci-proto-yggdrasil/htdocs/luci-static/resources/protocol/yggdrasil.js
+++ b/protocols/luci-proto-yggdrasil/htdocs/luci-static/resources/protocol/yggdrasil.js
@ -210,7 +210,7 @@ return network.registerProtocol('yggdrasil',
 		getType: function() {
 			return "tunnel";
 		},
-		getOpkgPackage: function() {
+		getPackageName: function() {
 			return 'yggdrasil';
 		},
 		isFloating: function() {