From 8d13ea410dcdfbca28fcd6099ce9acb641ac898c Mon Sep 17 00:00:00 2001 From: Paul Donald Date: Sun, 15 Dec 2024 20:11:23 +0100 Subject: [PATCH] luci-base, luci-proto-*: rename getOpkgPackage -> getPackageName Signed-off-by: Paul Donald --- modules/luci-base/htdocs/luci-static/resources/network.js | 8 +++++--- .../htdocs/luci-static/resources/protocol/3g.js | 2 +- .../htdocs/luci-static/resources/protocol/autoip.js | 2 +- .../htdocs/luci-static/resources/protocol/batadv.js | 2 +- .../luci-static/resources/protocol/batadv_hardif.js | 2 +- .../htdocs/luci-static/resources/protocol/bonding.js | 2 +- .../htdocs/luci-static/resources/protocol/external.js | 2 +- .../htdocs/luci-static/resources/protocol/gre.js | 2 +- .../htdocs/luci-static/resources/protocol/gretap.js | 2 +- .../htdocs/luci-static/resources/protocol/grev6.js | 2 +- .../htdocs/luci-static/resources/protocol/grev6tap.js | 2 +- .../htdocs/luci-static/resources/protocol/hnet.js | 2 +- .../htdocs/luci-static/resources/protocol/ipip.js | 2 +- .../htdocs/luci-static/resources/protocol/464xlat.js | 2 +- .../htdocs/luci-static/resources/protocol/6in4.js | 2 +- .../htdocs/luci-static/resources/protocol/6rd.js | 2 +- .../htdocs/luci-static/resources/protocol/6to4.js | 2 +- .../htdocs/luci-static/resources/protocol/dhcpv6.js | 2 +- .../htdocs/luci-static/resources/protocol/dslite.js | 2 +- .../htdocs/luci-static/resources/protocol/ipip6.js | 2 +- .../htdocs/luci-static/resources/protocol/map.js | 2 +- .../htdocs/luci-static/resources/protocol/mbim.js | 2 +- .../htdocs/luci-static/resources/protocol/modemmanager.js | 2 +- .../htdocs/luci-static/resources/protocol/ncm.js | 2 +- .../htdocs/luci-static/resources/protocol/nebula.js | 2 +- .../htdocs/luci-static/resources/protocol/openconnect.js | 2 +- .../htdocs/luci-static/resources/protocol/openfortivpn.js | 2 +- .../htdocs/luci-static/resources/protocol/l2tp.js | 2 +- .../htdocs/luci-static/resources/protocol/ppp.js | 2 +- .../htdocs/luci-static/resources/protocol/pppoa.js | 2 +- .../htdocs/luci-static/resources/protocol/pppoe.js | 2 +- .../htdocs/luci-static/resources/protocol/pptp.js | 2 +- .../htdocs/luci-static/resources/protocol/pppossh.js | 2 +- .../htdocs/luci-static/resources/protocol/qmi.js | 2 +- .../htdocs/luci-static/resources/protocol/relay.js | 2 +- .../htdocs/luci-static/resources/protocol/sstp.js | 2 +- .../htdocs/luci-static/resources/protocol/unet.js | 2 +- .../htdocs/luci-static/resources/protocol/vpnc.js | 2 +- .../htdocs/luci-static/resources/protocol/vti.js | 2 +- .../htdocs/luci-static/resources/protocol/vxlan.js | 2 +- .../htdocs/luci-static/resources/protocol/vxlan6.js | 2 +- .../htdocs/luci-static/resources/protocol/wireguard.js | 2 +- .../htdocs/luci-static/resources/protocol/xfrm.js | 2 +- .../htdocs/luci-static/resources/protocol/yggdrasil.js | 2 +- 44 files changed, 48 insertions(+), 46 deletions(-) diff --git a/modules/luci-base/htdocs/luci-static/resources/network.js b/modules/luci-base/htdocs/luci-static/resources/network.js index d9a0ef24c0..5f77d8354a 100644 --- 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; }, diff --git a/protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js b/protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js index 1e0cb6ba33..fe3239f9dc 100644 --- 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'; }, diff --git a/protocols/luci-proto-autoip/htdocs/luci-static/resources/protocol/autoip.js b/protocols/luci-proto-autoip/htdocs/luci-static/resources/protocol/autoip.js index 5c8ead45d6..b9b16da1e3 100644 --- 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'; }, diff --git 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 index 2e90e41cfa..53331b2ee8 100644 --- 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'; }, diff --git 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 index b8b1263b97..40a5b5f553 100644 --- 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'; }, diff --git a/protocols/luci-proto-bonding/htdocs/luci-static/resources/protocol/bonding.js b/protocols/luci-proto-bonding/htdocs/luci-static/resources/protocol/bonding.js index 5309931a2a..3eb62f4144 100644 --- 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'; }, diff --git a/protocols/luci-proto-external/htdocs/luci-static/resources/protocol/external.js b/protocols/luci-proto-external/htdocs/luci-static/resources/protocol/external.js index 06bd5f3f66..b76fad21d4 100644 --- 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"; }, diff --git a/protocols/luci-proto-gre/htdocs/luci-static/resources/protocol/gre.js b/protocols/luci-proto-gre/htdocs/luci-static/resources/protocol/gre.js index 91837b29c3..9452f68ed2 100644 --- 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'; }, diff --git a/protocols/luci-proto-gre/htdocs/luci-static/resources/protocol/gretap.js b/protocols/luci-proto-gre/htdocs/luci-static/resources/protocol/gretap.js index e1e9c8c39c..beebd77fbb 100644 --- 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'; }, diff --git a/protocols/luci-proto-gre/htdocs/luci-static/resources/protocol/grev6.js b/protocols/luci-proto-gre/htdocs/luci-static/resources/protocol/grev6.js index 97b84754ff..fdfeb6e3f1 100644 --- 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'; }, diff --git a/protocols/luci-proto-gre/htdocs/luci-static/resources/protocol/grev6tap.js b/protocols/luci-proto-gre/htdocs/luci-static/resources/protocol/grev6tap.js index 6203f83557..cd0564267f 100644 --- 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'; }, diff --git a/protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js b/protocols/luci-proto-hnet/htdocs/luci-static/resources/protocol/hnet.js index 5762ab7bf2..5161260a42 100644 --- 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'; }, diff --git a/protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js b/protocols/luci-proto-ipip/htdocs/luci-static/resources/protocol/ipip.js index 44a0e20ac6..1ce97f0864 100644 --- 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'; }, diff --git a/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js b/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/464xlat.js index 9cfdadd9a6..3f1fc6b0ac 100644 --- 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'; }, diff --git a/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js b/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6in4.js index 92540570ef..aa509a13f8 100644 --- 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'; }, diff --git a/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js b/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6rd.js index 415c3a89e7..db27b4e2d6 100644 --- 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'; }, diff --git a/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js b/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/6to4.js index f572562332..d479bfc658 100644 --- 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'; }, diff --git a/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js b/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dhcpv6.js index 3984ce1334..ed2d399900 100644 --- 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'; }, diff --git a/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js b/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/dslite.js index 5981973e31..cd7d548e00 100644 --- 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'; }, diff --git a/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/ipip6.js b/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/ipip6.js index 6f38317f49..11ca875190 100644 --- 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'; }, diff --git a/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js b/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/map.js index 82e0169210..471608b5ae 100644 --- 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'; }, diff --git a/protocols/luci-proto-mbim/htdocs/luci-static/resources/protocol/mbim.js b/protocols/luci-proto-mbim/htdocs/luci-static/resources/protocol/mbim.js index f6f548cc65..82472a3459 100644 --- 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'; }, 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 9a311e42ec..6db25631b4 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 @@ -25,7 +25,7 @@ return network.registerProtocol('modemmanager', { return this._ubus('l3_device') || 'modemmanager-%s'.format(this.sid); }, - getOpkgPackage: function() { + getPackageName: function() { return 'modemmanager'; }, diff --git a/protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js b/protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js index 28d65fceb1..42891853a0 100644 --- 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'; }, diff --git a/protocols/luci-proto-nebula/htdocs/luci-static/resources/protocol/nebula.js b/protocols/luci-proto-nebula/htdocs/luci-static/resources/protocol/nebula.js index 409416dd49..9ee863629c 100644 --- 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'; }, diff --git a/protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js b/protocols/luci-proto-openconnect/htdocs/luci-static/resources/protocol/openconnect.js index f9c1af6cd5..05c559ce84 100644 --- 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'; }, diff --git a/protocols/luci-proto-openfortivpn/htdocs/luci-static/resources/protocol/openfortivpn.js b/protocols/luci-proto-openfortivpn/htdocs/luci-static/resources/protocol/openfortivpn.js index 530eeea4ff..ae26aaa569 100644 --- 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'; }, diff --git a/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js b/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js index 59eb0b8be3..e1af7ca1f5 100644 --- 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'; }, diff --git a/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js b/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js index c7f7103125..626d5e2a5d 100644 --- 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'; }, diff --git a/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js b/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js index b1f945caf9..a65ae310e8 100644 --- 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'; }, diff --git a/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js b/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js index d028a18a87..12dec9b9c8 100644 --- 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'; }, diff --git a/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js b/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js index 3ee6e69cb1..7ed2dc5506 100644 --- 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'; }, diff --git a/protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js b/protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js index bc1345ee3e..cb6f8265b1 100644 --- 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'; }, diff --git a/protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js b/protocols/luci-proto-qmi/htdocs/luci-static/resources/protocol/qmi.js index 1963bc0412..607c97b181 100644 --- 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'; }, diff --git a/protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js b/protocols/luci-proto-relay/htdocs/luci-static/resources/protocol/relay.js index b3082276b1..174142f18b 100644 --- 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'; }, diff --git a/protocols/luci-proto-sstp/htdocs/luci-static/resources/protocol/sstp.js b/protocols/luci-proto-sstp/htdocs/luci-static/resources/protocol/sstp.js index f58f553c36..f4e0801695 100644 --- 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'; }, diff --git a/protocols/luci-proto-unet/htdocs/luci-static/resources/protocol/unet.js b/protocols/luci-proto-unet/htdocs/luci-static/resources/protocol/unet.js index ea9d9c50e2..49a372368f 100644 --- 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'; }, diff --git a/protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js b/protocols/luci-proto-vpnc/htdocs/luci-static/resources/protocol/vpnc.js index bec6c7ffa2..bf6e7d1499 100644 --- 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'; }, diff --git a/protocols/luci-proto-vti/htdocs/luci-static/resources/protocol/vti.js b/protocols/luci-proto-vti/htdocs/luci-static/resources/protocol/vti.js index bbf037230a..c53e8d4823 100644 --- 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'; }, diff --git a/protocols/luci-proto-vxlan/htdocs/luci-static/resources/protocol/vxlan.js b/protocols/luci-proto-vxlan/htdocs/luci-static/resources/protocol/vxlan.js index d5f0ac9c12..4ae209f2a6 100644 --- 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'; }, diff --git a/protocols/luci-proto-vxlan/htdocs/luci-static/resources/protocol/vxlan6.js b/protocols/luci-proto-vxlan/htdocs/luci-static/resources/protocol/vxlan6.js index 3bf6a50c6a..3c46666299 100644 --- 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'; }, diff --git a/protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js b/protocols/luci-proto-wireguard/htdocs/luci-static/resources/protocol/wireguard.js index a3ce76c96c..40efd1c45d 100644 --- 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'; }, diff --git a/protocols/luci-proto-xfrm/htdocs/luci-static/resources/protocol/xfrm.js b/protocols/luci-proto-xfrm/htdocs/luci-static/resources/protocol/xfrm.js index 8be3b54783..8003686cba 100644 --- 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'; }, diff --git a/protocols/luci-proto-yggdrasil/htdocs/luci-static/resources/protocol/yggdrasil.js b/protocols/luci-proto-yggdrasil/htdocs/luci-static/resources/protocol/yggdrasil.js index f216f8b16f..31dc173ba3 100644 --- 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() { -- 2.30.2