diff options
Diffstat (limited to 'protocols')
23 files changed, 117 insertions, 2 deletions
diff --git a/protocols/luci-proto-3g/Makefile b/protocols/luci-proto-3g/Makefile index d1d5455dc8..53caa06cae 100644 --- a/protocols/luci-proto-3g/Makefile +++ b/protocols/luci-proto-3g/Makefile @@ -9,6 +9,8 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=Support for 3G LUCI_DEPENDS:=+comgt +PKG_LICENSE:=Apache-2.0 + include ../../luci.mk # call BuildPackage - OpenWrt buildroot signature diff --git a/protocols/luci-proto-autoip/Makefile b/protocols/luci-proto-autoip/Makefile index 1a8181a3e5..87f8dcd532 100644 --- a/protocols/luci-proto-autoip/Makefile +++ b/protocols/luci-proto-autoip/Makefile @@ -9,6 +9,8 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=Support for Avahi IPv4LL configuration LUCI_DEPENDS:=+avahi-autoipd +PKG_LICENSE:=Apache-2.0 + include ../../luci.mk # call BuildPackage - OpenWrt buildroot signature diff --git a/protocols/luci-proto-batman-adv/Makefile b/protocols/luci-proto-batman-adv/Makefile index 9258d7db9e..1e1ab09891 100644 --- a/protocols/luci-proto-batman-adv/Makefile +++ b/protocols/luci-proto-batman-adv/Makefile @@ -9,6 +9,8 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=Support for the batman-adv protocol LUCI_DEPENDS:=+kmod-batman-adv +PKG_LICENSE:=Apache-2.0 + include ../../luci.mk # call BuildPackage - OpenWrt buildroot signature diff --git a/protocols/luci-proto-bonding/Makefile b/protocols/luci-proto-bonding/Makefile index 81988cfa2f..535bf45db0 100644 --- a/protocols/luci-proto-bonding/Makefile +++ b/protocols/luci-proto-bonding/Makefile @@ -11,6 +11,7 @@ LUCI_TITLE:=Support for Link Aggregation (Channel Bonding) LUCI_DEPENDS:=+proto-bonding PKG_MAINTAINER:=Helge Mader <ma@dev.tdt.de> +PKG_LICENSE:=Apache-2.0 include ../../luci.mk diff --git a/protocols/luci-proto-external/Makefile b/protocols/luci-proto-external/Makefile index b9b146d7bd..e67a042cf2 100644 --- a/protocols/luci-proto-external/Makefile +++ b/protocols/luci-proto-external/Makefile @@ -3,6 +3,8 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=Support for externally managed protocol LUCI_DEPENDS:=+external-protocol +PKG_LICENSE:=Apache-2.0 + include ../../luci.mk # call BuildPackage - OpenWrt buildroot signature diff --git a/protocols/luci-proto-gre/Makefile b/protocols/luci-proto-gre/Makefile index 0b0fa541cb..5ee2b97dbe 100644 --- a/protocols/luci-proto-gre/Makefile +++ b/protocols/luci-proto-gre/Makefile @@ -15,6 +15,7 @@ LUCI_TITLE:=Support for GRE tunnels (RFC2784) LUCI_DEPENDS:=+gre PKG_MAINTAINER:=Jan Betik <jan.betik@svine.su> +PKG_LICENSE:=Apache-2.0 include ../../luci.mk diff --git a/protocols/luci-proto-ipip/Makefile b/protocols/luci-proto-ipip/Makefile index 6af85647e5..62a5bed2ff 100644 --- a/protocols/luci-proto-ipip/Makefile +++ b/protocols/luci-proto-ipip/Makefile @@ -10,6 +10,7 @@ LUCI_TITLE:=Support for IPIP tunnels (IPv4-in-IPv4 RFC2003) LUCI_DEPENDS:=+ipip PKG_MAINTAINER:=Roger Pueyo Centelles <roger.pueyo@guifi.net> +PKG_LICENSE:=Apache-2.0 include ../../luci.mk diff --git a/protocols/luci-proto-ipv6/Makefile b/protocols/luci-proto-ipv6/Makefile index b0c8395e86..ac81d2abe0 100644 --- a/protocols/luci-proto-ipv6/Makefile +++ b/protocols/luci-proto-ipv6/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk -LUCI_TITLE:=Support for DHCPv6/6in4/6to4/6rd/DS-Lite +LUCI_TITLE:=Support for DHCPv6/6in4/6to4/6rd/DS-Lite/IPIP6 LUCI_DEPENDS:=@IPV6 PKG_LICENSE:=Apache-2.0 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 new file mode 100644 index 0000000000..6f38317f49 --- /dev/null +++ b/protocols/luci-proto-ipv6/htdocs/luci-static/resources/protocol/ipip6.js @@ -0,0 +1,82 @@ +'use strict'; +'require form'; +'require network'; +'require tools.widgets as widgets'; + +network.registerPatternVirtual(/^ipip6-.+$/); + +return network.registerProtocol('ipip6', { + getI18n: function () { + return _('IPv4 over IPv6 (RFC2473-IPIPv6)'); + }, + + getIfname: function () { + return this._ubus('l3_device') || 'ipip6-%s'.format(this.sid); + }, + + getOpkgPackage: function () { + return 'ds-lite'; + }, + + isFloating: function () { + return true; + }, + + isVirtual: function () { + return true; + }, + + getDevices: function () { + return null; + }, + + containsDevice: function (ifname) { + return (network.getIfnameOf(ifname) == this.getIfname()); + }, + + renderFormOptions: function (s) { + var o; + + o = s.taboption('general', form.Value, 'peeraddr', _('Remote IPv6 address or FQDN')); + o.rmempty = false; + o.datatype = 'or(hostname,ip6addr("nomask"))'; + + o = s.taboption('general', form.Value, 'ip4ifaddr', _('Local IPv4 address')); + o.rmempty = false; + o.datatype = 'ip4addr("nomask")'; + + o = s.taboption('general', form.Value, 'ip6addr', _('Local IPv6 address'), _('Leave empty to use the current WAN address')); + o.datatype = 'ip6addr("nomask")'; + o.load = function (section_id) { + return network.getWAN6Networks().then(L.bind(function (nets) { + if (Array.isArray(nets) && nets.length) + this.placeholder = nets[0].getIP6Addr(); + return form.Value.prototype.load.apply(this, [section_id]); + }, this)); + }; + + o = s.taboption('advanced', widgets.NetworkSelect, 'tunlink', _('Tunnel Link')); + o.nocreate = true; + o.exclude = s.section; + + o = s.taboption('advanced', form.ListValue, 'encaplimit', _('Encapsulation limit')); + o.rmempty = false; + o.default = 'ignore'; + o.datatype = 'or("ignore",range(0,255))'; + o.value('ignore', _('ignore')); + for (var i = 0; i < 256; i++) + o.value(i); + + o = s.taboption('advanced', form.Flag, 'defaultroute', _('Default gateway'), _('If unchecked, no default route is configured')); + o.default = o.enabled; + + o = s.taboption('advanced', form.Value, 'metric', _('Use gateway metric')); + o.placeholder = '0'; + o.datatype = 'uinteger'; + o.depends('defaultroute', '1'); + + o = s.taboption('advanced', form.Value, 'mtu', _('Use MTU on tunnel interface')); + o.placeholder = '1280'; + o.datatype = 'max(9200)'; + } +}); diff --git a/protocols/luci-proto-mbim/Makefile b/protocols/luci-proto-mbim/Makefile index edcc9ee5ab..3716f4b7b0 100644 --- a/protocols/luci-proto-mbim/Makefile +++ b/protocols/luci-proto-mbim/Makefile @@ -9,6 +9,8 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=Support for MBIM LUCI_DEPENDS:=+umbim +PKG_LICENSE:=Apache-2.0 + include ../../luci.mk # call BuildPackage - OpenWrt buildroot signature diff --git a/protocols/luci-proto-modemmanager/Makefile b/protocols/luci-proto-modemmanager/Makefile index c2718dd0ae..d45954a90d 100644 --- a/protocols/luci-proto-modemmanager/Makefile +++ b/protocols/luci-proto-modemmanager/Makefile @@ -9,6 +9,8 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=Support for ModemManager LUCI_DEPENDS:=+modemmanager +PKG_LICENSE:=Apache-2.0 + include ../../luci.mk # call BuildPackage - OpenWrt buildroot signature diff --git a/protocols/luci-proto-ncm/Makefile b/protocols/luci-proto-ncm/Makefile index 5fd9c9a266..063b934e74 100644 --- a/protocols/luci-proto-ncm/Makefile +++ b/protocols/luci-proto-ncm/Makefile @@ -9,6 +9,8 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=Support for NCM LUCI_DEPENDS:=+comgt-ncm +PKG_LICENSE:=Apache-2.0 + include ../../luci.mk # call BuildPackage - OpenWrt buildroot signature diff --git a/protocols/luci-proto-nebula/Makefile b/protocols/luci-proto-nebula/Makefile index 7b29b54b6d..9395f5811c 100644 --- a/protocols/luci-proto-nebula/Makefile +++ b/protocols/luci-proto-nebula/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_LICENSE:=GPL-3.0-or-later PKG_MAINTAINER:=Stan Grishin <stangri@melmac.ca> -PKG_VERSION:=1.6.1-1 +PKG_VERSION:=1.8.2-r2 LUCI_TITLE:=Support for Nebula LUCI_DESCRIPTION:=Provides Web UI for Nebula protocol/interface. diff --git a/protocols/luci-proto-openconnect/Makefile b/protocols/luci-proto-openconnect/Makefile index 9f12bcdedf..1b9232baa8 100644 --- a/protocols/luci-proto-openconnect/Makefile +++ b/protocols/luci-proto-openconnect/Makefile @@ -9,6 +9,8 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=Support for OpenConnect VPN LUCI_DEPENDS:=+openconnect +luci-lua-runtime +PKG_LICENSE:=Apache-2.0 + include ../../luci.mk # call BuildPackage - OpenWrt buildroot signature diff --git a/protocols/luci-proto-openfortivpn/Makefile b/protocols/luci-proto-openfortivpn/Makefile index fbdad18b3b..8bcdd5dd62 100644 --- a/protocols/luci-proto-openfortivpn/Makefile +++ b/protocols/luci-proto-openfortivpn/Makefile @@ -9,6 +9,8 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=Support for OpenFortivpn LUCI_DEPENDS:=+openfortivpn +luci-lua-runtime +PKG_LICENSE:=Apache-2.0 + include ../../luci.mk # call BuildPackage - OpenWrt buildroot signature diff --git a/protocols/luci-proto-qmi/Makefile b/protocols/luci-proto-qmi/Makefile index 8b2b5e37eb..07793a377d 100644 --- a/protocols/luci-proto-qmi/Makefile +++ b/protocols/luci-proto-qmi/Makefile @@ -9,6 +9,8 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=Support for QMI LUCI_DEPENDS:=+uqmi +PKG_LICENSE:=Apache-2.0 + include ../../luci.mk # call BuildPackage - OpenWrt buildroot signature diff --git a/protocols/luci-proto-relay/Makefile b/protocols/luci-proto-relay/Makefile index d9c04f76a8..b543f85c47 100644 --- a/protocols/luci-proto-relay/Makefile +++ b/protocols/luci-proto-relay/Makefile @@ -9,6 +9,8 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=Support for relayd pseudo bridges LUCI_DEPENDS:=+relayd +PKG_LICENSE:=Apache-2.0 + include ../../luci.mk # call BuildPackage - OpenWrt buildroot signature diff --git a/protocols/luci-proto-sstp/Makefile b/protocols/luci-proto-sstp/Makefile index afb4e1a379..cb552851b2 100644 --- a/protocols/luci-proto-sstp/Makefile +++ b/protocols/luci-proto-sstp/Makefile @@ -10,6 +10,8 @@ LUCI_TITLE:=Support for SSTP LUCI_DEPENDS:=+sstp-client LUCI_PKGARCH:=all +PKG_LICENSE:=Apache-2.0 + include ../../luci.mk # call BuildPackage - OpenWrt buildroot signature diff --git a/protocols/luci-proto-unet/Makefile b/protocols/luci-proto-unet/Makefile index 8cf94b309d..b905d81439 100644 --- a/protocols/luci-proto-unet/Makefile +++ b/protocols/luci-proto-unet/Makefile @@ -10,6 +10,8 @@ LUCI_TITLE:=Support for unetd VPN LUCI_DEPENDS:=+unetd +unet-cli LUCI_PKGARCH:=all +PKG_LICENSE:=Apache-2.0 + include ../../luci.mk # call BuildPackage - OpenWrt buildroot signature diff --git a/protocols/luci-proto-vti/Makefile b/protocols/luci-proto-vti/Makefile index 6520eab48b..9ea70b8e68 100644 --- a/protocols/luci-proto-vti/Makefile +++ b/protocols/luci-proto-vti/Makefile @@ -8,6 +8,7 @@ LUCI_TITLE:=Support for VTI interfaces LUCI_DEPENDS:=+vti PKG_MAINTAINER:=Jaymin Patel <jem.patel@gmail.com> +PKG_LICENSE:=Apache-2.0 include ../../luci.mk diff --git a/protocols/luci-proto-vxlan/Makefile b/protocols/luci-proto-vxlan/Makefile index d6b2e6faaa..1b9cb45c83 100644 --- a/protocols/luci-proto-vxlan/Makefile +++ b/protocols/luci-proto-vxlan/Makefile @@ -10,6 +10,7 @@ LUCI_TITLE:=Support for Virtual eXtensible Local Area Network (VXLAN, RFC7348) LUCI_DEPENDS:=+vxlan PKG_MAINTAINER:=Wojciech Jowsa <wojciech.jowsa@gmail.com> +PKG_LICENSE:=Apache-2.0 include ../../luci.mk diff --git a/protocols/luci-proto-wireguard/Makefile b/protocols/luci-proto-wireguard/Makefile index 12137fb19b..a39e9a78d8 100644 --- a/protocols/luci-proto-wireguard/Makefile +++ b/protocols/luci-proto-wireguard/Makefile @@ -11,6 +11,7 @@ LUCI_DEPENDS:=+wireguard-tools +ucode LUCI_PKGARCH:=all PKG_PROVIDES:=luci-app-wireguard +PKG_LICENSE:=Apache-2.0 include ../../luci.mk diff --git a/protocols/luci-proto-xfrm/Makefile b/protocols/luci-proto-xfrm/Makefile index e59818e417..5e602e152a 100644 --- a/protocols/luci-proto-xfrm/Makefile +++ b/protocols/luci-proto-xfrm/Makefile @@ -8,6 +8,7 @@ LUCI_TITLE:=Support for XFRM interfaces LUCI_DEPENDS:=+xfrm PKG_MAINTAINER:=Glen Huang <heyhgl@gmail.com> +PKG_LICENSE:=Apache-2.0 include ../../luci.mk |