-L.NetworkModel.Protocol.extend({
+L.network.Protocol.extend({
protocol: '6in4',
description: L.tr('IPv6-in-IPv4 (RFC4213)'),
tunnel: true,
populateForm: function(section, iface)
{
- var wan = L.NetworkModel.findWAN();
+ var wan = L.network.findWAN();
section.taboption('general', L.cbi.InputValue, 'ipaddr', {
caption: L.tr('Local IPv4 address'),
section.taboption('general', L.cbi.InputValue, 'peeraddr', {
caption: L.tr('Remote IPv4 address'),
- description: L.tr('This is usually the address of the nearest PoP optional by the tunnel broker'),
+ description: L.tr('This is usually the address of the nearest PoP operated by the tunnel broker'),
datatype: 'ip4addr',
optional: false
});
section.taboption('general', L.cbi.InputValue, 'ip6addr', {
caption: L.tr('Local IPv6 address'),
- description: L.tr('This is the local endpoint address assigned by the tunnel broker, it usually ends with :2'),
- datatype: 'ip6addr',
+ description: L.tr('This is the local endpoint address assigned by the tunnel broker'),
+ datatype: 'cidr6',
optional: false
});
section.taboption('general', L.cbi.InputValue, 'username', {
caption: L.tr('HE.net user ID'),
- description: L.tr('This is the 32 byte hex encoded user ID, not the login name'),
- datatype: 'rangelength(32, 32)',
+ description: L.tr('The login name of the HE.net account'),
+ datatype: 'string',
optional: false,
keep: false
}).depends('_update', true);
section.taboption('general', L.cbi.PasswordValue, 'password', {
- caption: L.tr('HE.net password'),
+ caption: L.tr('Password'),
+ description: L.tr('Tunnel update key or HE.net account password'),
optional: false,
keep: false
}).depends('_update', true);
-L.NetworkModel.Protocol.extend({
+L.network.Protocol.extend({
protocol: '6rd',
description: L.tr('IPv6-over-IPv4 (6rd)'),
tunnel: true,
populateForm: function(section, iface)
{
- var wan = L.NetworkModel.findWAN();
+ var wan = L.network.findWAN();
section.taboption('general', L.cbi.InputValue, 'peeraddr', {
caption: L.tr('6RD Gateway'),
-L.NetworkModel.Protocol.extend({
+L.network.Protocol.extend({
protocol: 'dslite',
description: L.tr('Dual-Stack Lite (RFC6333)'),
tunnel: true,
populateForm: function(section, iface)
{
- var wan6 = L.NetworkModel.findWAN6();
+ var wan6 = L.network.findWAN6();
section.taboption('general', L.cbi.InputValue, 'peeraddr', {
caption: L.tr('DS-Lite AFTR address'),
-L.NetworkModel.Protocol.extend({
+L.network.Protocol.extend({
protocol: 'static',
description: L.tr('Static address'),
tunnel: false,
populateForm: function(section, iface)
{
- var device = L.NetworkModel.getDeviceByInterface(iface);
+ var device = L.network.getDeviceByInterface(iface);
section.taboption('general', L.cbi.InputValue, 'ipaddr', {
caption: L.tr('IPv4 address'),