mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-04-23 18:48:49 -05:00
Code Issues Packages Projects Releases Wiki Activity

IPv6 multiple default gateway support by Berware

Browse Source
This commit is contained in:
Eric Schultz
2017-04-01 20:57:04 -05:00
parent f3a5486a9d
commit 2753bfb172
3 changed files with 150 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/dynamix/Eth0.page
+99 -74
View File
@@ -66,6 +66,7 @@ refresh(); // automatically include new ethernet ports
Array.prototype.dups = function(){return this.sort().filter(function(v,i,o){return i&&v===o[i-1]?v:0;}).length;}
function prepareSettings(form) {
var dns = form.DHCP_KEEPRESOLV !== undefined;
if (form.BONDING !== undefined) {
var member = '';
for (var i=0,item; item=form.BONDNICS.options[i]; i++) {
@@ -93,7 +94,6 @@ function prepareSettings(form) {
item.disabled = false;
if (member.indexOf(',')>0) form.BRSTP.value = 'yes';
}
if (form.DHCP_KEEPRESOLV !== undefined) form.DHCP_KEEPRESOLV.disabled = false;
if (form.TYPE.value == 'access') {
$(form).find('input[name^="VLANID:"]').prop('disabled',true);
$(form).find('input[name^="DESCRIPTION:"]').not('input[name$=":0"]').prop('disabled',true);
@@ -103,6 +103,10 @@ function prepareSettings(form) {
$(form).find('input[name^="IPADDR6:"]').not('input[name$=":0"]').prop('disabled',true);
$(form).find('select[name^="NETMASK:"]').not('select[name$=":0"]').prop('disabled',true);
$(form).find('input[name^="NETMASK6:"]').not('input[name$=":0"]').prop('disabled',true);
$(form).find('select[name^="GATEWAY:"]').not('select[name$=":0"]').prop('disabled',true);
$(form).find('input[name^="GATEWAY6:"]').not('input[name$=":0"]').prop('disabled',true);
$(form).find('input[name^="METRIC:"]').not('input[name$=":0"]').prop('disabled',true);
$(form).find('input[name^="METRIC6:"]').not('input[name$=":0"]').prop('disabled',true);
} else {
var vlans = [];
$(form).find('input[name^="VLANID:"]').each(function(){vlans.push($(this).val());});
@@ -117,25 +121,44 @@ function prepareSettings(form) {
if (protocol == 'ipv6') {
$(form).find('input[name="IPADDR:'+i+'"]').prop('disabled',true);
$(form).find('select[name="NETMASK:'+i+'"]').prop('disabled',true);
if (i==0) $(form).find('input[name="GATEWAY"]').prop('disabled',true);
$(form).find('input[name="GATEWAY:'+i+'"]').prop('disabled',true);
$(form).find('input[name="METRIC:'+i+'"]').prop('disabled',true);
if (i==0) $(form).find('input[name^="DNS_SERVER"]').prop('disabled',true);
}
if (protocol == 'ipv4') {
$(form).find('input[name="IPADDR6:'+i+'"]').prop('disabled',true);
$(form).find('input[name="NETMASK6:'+i+'"]').prop('disabled',true);
if (i==0) $(form).find('input[name="GATEWAY6"]').prop('disabled',true);
$(form).find('input[name="GATEWAY6:'+i+'"]').prop('disabled',true);
$(form).find('input[name="METRIC6:'+i+'"]').prop('disabled',true);
if (i==0) $(form).find('input[name^="DNS6_SERVER"]').prop('disabled',true);
}
if (protocol != 'ipv6') {
var metric = $(form).find('input[name="METRIC:'+i+'"]').val();
var gateway = $(form).find('input[name="GATEWAY:'+i+'"]');
if (metric) gateway.val(gateway.val()+'#'+metric);
}
if (protocol != 'ipv4') {
var metric6 = $(form).find('input[name="METRIC6:'+i+'"]').val();
var gateway6 = $(form).find('input[name="GATEWAY6:'+i+'"]');
if (metric6) gateway6.val(gateway6.val()+'#'+metric6);
}
});
$(form).find('select[name^="USE_DHCP:"]').each(function() {
if ($(this).prop('disabled')==false && $(this).val()=='yes') {
var i = $(this).attr('name').substr(9);
var protocol = $(form).find('select[name="PROTOCOL:'+i+'"]').val() || 'ipv4';
if (protocol != 'ipv6') $(form).find('input[name="IPADDR:'+i+'"]').val('Obtaining IPv4 address...');
if (protocol != 'ipv4') $(form).find('input[name="IPADDR6:'+i+'"]').val('Obtaining IPv6 address...');
if (protocol != 'ipv6') {
$(form).find('input[name="IPADDR:'+i+'"]').val('Obtaining IPv4 address...');
$(form).find('input[name="GATEWAY:'+i+'"]').val('Obtaining IPv4 gateway...');
}
if (protocol != 'ipv4') {
$(form).find('input[name="IPADDR6:'+i+'"]').val('Obtaining IPv6 address...');
$(form).find('input[name="GATEWAY6:'+i+'"]').val('Obtaining IPv6 gateway...');
}
}
});
if ($(form).find('select[name="DHCP_KEEPRESOLV"]').val()=='no') {
if (dns && form.DHCP_KEEPRESOLV.value=='no') {
form.DHCP_KEEPRESOLV.disabled = false;
var protocol = $(form).find('select[name="PROTOCOL:0"]').val() || 'ipv4';
if (protocol != 'ipv6') $(form).find('input[name^="DNS_SERVER"]').val('Obtaining DNSv4 server...');
if (protocol != 'ipv4') $(form).find('input[name^="DNS6_SERVER"]').val('Obtaining DNSv6 server...');
@@ -155,7 +178,7 @@ function selectProtocol(form,port,index) {
case 'ipv6': net4.hide(); net6.show(); break;
case 'ipv4+ipv6': net4.show(); net6.show(); break;
}
checkNetworkSettings(form,i);
checkNetworkSettings(form,i,true);
});
} else {
var protocol = $(form).find('select[name="PROTOCOL:'+index+'"]').val() || 'ipv4';
@@ -170,55 +193,33 @@ function selectProtocol(form,port,index) {
if (index==0) checkDNSSettings(form);
}
}
function checkNetworkSettings(form,index) {
function checkNetworkSettings(form,index,open) {
var dns = form.DHCP_KEEPRESOLV !== undefined;
if (index == null) {
$(form).find('select[name^="USE_DHCP:"]').each(function() {
var i = $(this).attr('name').substr(9);
var disabled = $(this).val()!='no';
var protocol = $(form).find('select[name="PROTOCOL:'+i+'"]').val() || 'ipv4';
if (protocol != 'ipv6') {
var ipaddr = $(form).find('input[name="IPADDR:'+i+'"]');
var netmask = $(form).find('select[name="NETMASK:'+i+'"]');
ipaddr.prop('disabled',disabled).prop('required',!disabled);
netmask.prop('disabled',disabled);
if (ipaddr.val()=='') netmask.append('<option value="none" selected="selected"></option>');
if (i==0 && form.GATEWAY !== undefined) {form.GATEWAY.disabled = disabled; form.GATEWAY.required = !disabled;}
}
if (protocol != 'ipv4') {
var ipaddr6 = $(form).find('input[name="IPADDR6:'+i+'"]');
var netmask6 = $(form).find('input[name="NETMASK6:'+i+'"]');
ipaddr6.prop('disabled',disabled).prop('required',!disabled);
netmask6.prop('disabled',disabled).prop('required',!disabled);
if (i==0 && form.GATEWAY6 !== undefined) {form.GATEWAY6.disabled = disabled; form.GATEWAY6.required = !disabled;}
}
if (dns && i==0) form.DHCP_KEEPRESOLV.disabled = !disabled;
});
} else {
var disabled = $(form).find('select[name="USE_DHCP:'+index+'"]').val()!='no';
var protocol = $(form).find('select[name="PROTOCOL:'+index+'"]').val() || 'ipv4';
if (protocol != 'ipv6') {
$(form).find('input[name="IPADDR:'+index+'"]').prop('disabled',disabled).prop('required',!disabled);
var netmask = $(form).find('select[name="NETMASK:'+index+'"]');
netmask.prop('disabled',disabled);
if (index==0 && form.GATEWAY !== undefined) {form.GATEWAY.disabled = disabled; form.GATEWAY.required = !disabled;}
if (!disabled) {
var none = netmask.find('option[value="none"]');
if (none.length) {netmask.val('255.255.255.0'); none.remove();}
}
}
if (protocol != 'ipv4') {
$(form).find('input[name="IPADDR6:'+index+'"]').prop('disabled',disabled).prop('required',!disabled);
var netmask6 = $(form).find('input[name="NETMASK6:'+index+'"]');
netmask6.prop('disabled',disabled).prop('required',!disabled);
if (index==0 && form.GATEWAY6 !== undefined) {form.GATEWAY6.disabled = disabled; form.GATEWAY6.required = !disabled;}
}
if (dns && index==0) {
form.DHCP_KEEPRESOLV.value = disabled ? 'no' : 'yes'
form.DHCP_KEEPRESOLV.disabled = !disabled;
checkDNSSettings(form);
var disabled = $(form).find('select[name="USE_DHCP:'+index+'"]').val()!='no';
var protocol = $(form).find('select[name="PROTOCOL:'+index+'"]').val() || 'ipv4';
if (protocol != 'ipv6') {
$(form).find('input[name="IPADDR:'+index+'"]').prop('disabled',disabled).prop('required',!disabled);
var netmask = $(form).find('select[name="NETMASK:'+index+'"]');
var gateway = $(form).find('input[name="GATEWAY:'+index+'"]');
netmask.prop('disabled',disabled);
gateway.prop('disabled',disabled);
if (!disabled) {
var none = netmask.find('option[value="none"]');
if (none.length) {netmask.val('255.255.255.0'); none.remove();}
}
}
if (protocol != 'ipv4') {
$(form).find('input[name="IPADDR6:'+index+'"]').prop('disabled',disabled).prop('required',!disabled);
var netmask6 = $(form).find('input[name="NETMASK6:'+index+'"]');
var gateway6 = $(form).find('input[name="GATEWAY6:'+index+'"]');
netmask6.prop('disabled',disabled).prop('required',!disabled);
gateway6.prop('disabled',disabled);
}
if (dns && index==0) {
if (!open) form.DHCP_KEEPRESOLV.value = disabled ? 'no' : 'yes';
form.DHCP_KEEPRESOLV.disabled = !disabled;
checkDNSSettings(form);
}
}
function checkDNSSettings(form) {
var disabled = form.DHCP_KEEPRESOLV.value=='no';
@@ -280,7 +281,6 @@ function addVLAN(port,disabled) {
var template = $($('<div/>').loadTemplate($('#network-template-'+port)).html().replace(/INDEX/g,index));
var element = $('[id^="index-'+port+'-"]').last();
$(element).after(template);
checkNetworkSettings($('form[name="'+$(element).parent().attr('name')+'"]'));
selectProtocol($('form[name="'+$(element).parent().attr('name')+'"]'),port);
$(element).find('input').first().trigger('change');
}
@@ -329,7 +329,6 @@ $(function() {
checkBondingSettings(form,0);
checkBridgingSettings(form,0);
checkNetworkAccess(form,'eth0');
checkNetworkSettings(form);
selectProtocol(form,'eth0');
<?if ($service):?>
disableForm(form);
@@ -427,7 +426,7 @@ Bridging members:
</div>
Interface description:
: <input type="text" name="DESCRIPTION:<?=$i?>" maxlength="40" value="<?=htmlspecialchars($eth0["DESCRIPTION:$i"])?>" onchange="exitCode(this.form,true)">
: <input type="text" name="DESCRIPTION:<?=$i?>" maxlength="80" value="<?=htmlspecialchars($eth0["DESCRIPTION:$i"])?>" onchange="exitCode(this.form,true)">
> Use this optional field to provide addditional information about the purpose of the connection.
@@ -452,7 +451,7 @@ IP address assignment:
<div class="eth0-ipv4-<?=$i?>" style="display:none" markdown="1">
IPv4 address:
: <input type="text" name="IPADDR:<?=$i?>" maxlength="40" value="<?=$eth0["IPADDR:$i"]?>" class="narrow" pattern="<?=$validIP4?>" title="IPv4 address A.B.C.D">
: <input type="text" name="IPADDR:<?=$i?>" maxlength="15" value="<?=$eth0["IPADDR:$i"]?>" class="narrow" pattern="<?=$validIP4?>" title="IPv4 address A.B.C.D">
> Greyed out when using DHCP server. Otherwise specify here the IPv4 address of the system.
@@ -473,14 +472,15 @@ IPv4 network mask:
> Greyed out when using DHCP server. Otherwise specify here the associated network mask, by default 255.255.255.0 is selected.
IPv4 default gateway:
: <input type="text" name="GATEWAY" maxlength="40" value="<?=$eth0['GATEWAY']?>" class="narrow" pattern="<?=$validIP4?>" title="IPv4 address A.B.C.D">
: <input type="text" name="GATEWAY:<?=$i?>" maxlength="15" value="<?=$eth0["GATEWAY:$i"]?>" class="narrow" pattern="<?=$validIP4?>" title="IPv4 address A.B.C.D">
<input type="text" name="METRIC:<?=$i?>" min="1" max="9999" value="<?=$eth0["METRIC:$i"]?>" class="trim"><em><i class="fa fa-sort-numeric-asc"></i> optional metric (lowest is preferred)</em>
> Greyed out when using DHCP server. Otherwise specify here the IPv4 address of your router.
</div>
<div class="eth0-ipv6-<?=$i?>" style="display:none" markdown="1">
IPv6 address:
: <input type="text" name="IPADDR6:<?=$i?>" maxlength="80" value="<?=$eth0["IPADDR6:$i"]?>" pattern="<?=$validIP6?>" title="IPv6 address nnnn:xxxx::yyyy">
: <input type="text" name="IPADDR6:<?=$i?>" maxlength="39" value="<?=$eth0["IPADDR6:$i"]?>" pattern="<?=$validIP6?>" title="IPv6 address nnnn:xxxx::yyyy">
> Greyed out when using DHCP server. Otherwise specify here the IPv6 address of the system.
@@ -490,7 +490,8 @@ IPv6 prefix:
> Greyed out when using DHCP server. Otherwise specify here the associated prefix value of 1 to 128.
IPv6 default gateway:
: <input type="text" name="GATEWAY6" maxlength="80" value="<?=$eth0['GATEWAY6']?>" pattern="<?=$validIP6?>" title="IPv6 address nnnn:xxxx::yyyy">
: <input type="text" name="GATEWAY6:<?=$i?>" maxlength="39" value="<?=$eth0["GATEWAY6:$i"]?>" pattern="<?=$validIP6?>" title="IPv6 address nnnn:xxxx::yyyy">
<input type="text" name="METRIC6:<?=$i?>" min="1" max="9999" value="<?=$eth0["METRIC6:$i"]?>" class="trim"><em><i class="fa fa-sort-numeric-asc"></i> optional metric (lowest is preferred)</em>
> Greyed out when using DHCP server. Otherwise specify here the IPv6 address of your router.
@@ -508,22 +509,22 @@ DNS server assignment:
<div class="eth0-ipv4-<?=$i?>" style="display:none" markdown="1">
IPv4 DNS server:
: <input type="text" name="DNS_SERVER1" maxlength="80" value="<?=$eth0['DNS_SERVER1'];?>" class="narrow" pattern="<?=$validIP4?>" title="IPv4 address A.B.C.D">
: <input type="text" name="DNS_SERVER1" maxlength="15" value="<?=$eth0['DNS_SERVER1'];?>" class="narrow" pattern="<?=$validIP4?>" title="IPv4 address A.B.C.D">
> This is the primary DNS server to use. Enter a FQDN or an IP address.
> This is the primary DNS server to use. Enter an IPv4 address.
>
> Note: for *Active Directory* you **must** ensure this is set to the IP address of your AD Domain server.
<div id="dnsserver2" style="display:none" markdown="1">
IPv4 DNS server 2:
: <input type="text" name="DNS_SERVER2" maxlength="80" value="<?=$eth0['DNS_SERVER2'];?>" class="narrow" pattern="<?=$validIP4?>" title="IPv4 address A.B.C.D">
: <input type="text" name="DNS_SERVER2" maxlength="15" value="<?=$eth0['DNS_SERVER2'];?>" class="narrow" pattern="<?=$validIP4?>" title="IPv4 address A.B.C.D">
> This is the DNS server to use when DNS server 1 is down.
</div>
<div id="dnsserver3" style="display:none" markdown="1">
IPv4 DNS server 3:
: <input type="text" name="DNS_SERVER3" maxlength="80" value="<?=$eth0['DNS_SERVER3'];?>" class="narrow" pattern="<?=$validIP4?>" title="IPv4 address A.B.C.D">
: <input type="text" name="DNS_SERVER3" maxlength="15" value="<?=$eth0['DNS_SERVER3'];?>" class="narrow" pattern="<?=$validIP4?>" title="IPv4 address A.B.C.D">
> This is the DNS server to use when DNS servers 1 and 2 are both down.
@@ -531,20 +532,20 @@ IPv4 DNS server 3:
</div>
<div class="eth0-ipv6-<?=$i?>" style="display:none" markdown="1">
IPv6 DNS server:
: <input type="text" name="DNS6_SERVER1" maxlength="80" value="<?=$eth0['DNS6_SERVER1'];?>" pattern="<?=$validIP6?>" title="IPv6 address nnnn:xxxx::yyyy">
: <input type="text" name="DNS6_SERVER1" maxlength="39" value="<?=$eth0['DNS6_SERVER1'];?>" pattern="<?=$validIP6?>" title="IPv6 address nnnn:xxxx::yyyy">
> This is the primary DNS IPv6 server to use. Enter a FQDN or an IPv6 address.
> This is the primary DNS IPv6 server to use. Enter an IPv6 address.
<div id="dns6server2" style="display:none" markdown="1">
IPv6 DNS server 2:
: <input type="text" name="DNS6_SERVER2" maxlength="80" value="<?=$eth0['DNS6_SERVER2'];?>" pattern="<?=$validIP6?>" title="IPv6 address nnnn:xxxx::yyyy">
: <input type="text" name="DNS6_SERVER2" maxlength="39" value="<?=$eth0['DNS6_SERVER2'];?>" pattern="<?=$validIP6?>" title="IPv6 address nnnn:xxxx::yyyy">
> This is the DNS IPv6 server to use when DNS IPv6 server 1 is down.
</div>
<div id="dns6server3" style="display:none" markdown="1">
IPv6 DNS server 3:
: <input type="text" name="DNS6_SERVER3" maxlength="80" value="<?=$eth0['DNS6_SERVER3'];?>" pattern="<?=$validIP6?>" title="IPv6 address nnnn:xxxx::yyyy">
: <input type="text" name="DNS6_SERVER3" maxlength="39" value="<?=$eth0['DNS6_SERVER3'];?>" pattern="<?=$validIP6?>" title="IPv6 address nnnn:xxxx::yyyy">
> This is the DNS IPv6 server to use when DNS IPv6 servers 1 and 2 are both down.
@@ -571,7 +572,7 @@ VLAN number:
> Give each VLAN a unique identifier. Numbers range from 1 to 4095.
Interface description:
: <input type="text" name="DESCRIPTION:<?=$i?>" maxlength="40" value="<?=htmlspecialchars($eth0["DESCRIPTION:$i"])?>" onchange="exitCode(this.form,true)">
: <input type="text" name="DESCRIPTION:<?=$i?>" maxlength="80" value="<?=htmlspecialchars($eth0["DESCRIPTION:$i"])?>" onchange="exitCode(this.form,true)">
> Use this optional field to provide addditional information about the purpose of the connection.
@@ -599,7 +600,7 @@ IP address assignment:
<div class="eth0-ipv4-<?=$i?>" style="display:none" markdown="1">
IPv4 address:
: <input type="text" name="IPADDR:<?=$i?>" maxlength="40" value="<?=$eth0["IPADDR:$i"]?>" class="narrow" pattern="<?=$validIP4?>" title="IPv4 address A.B.C.D">
: <input type="text" name="IPADDR:<?=$i?>" maxlength="15" value="<?=$eth0["IPADDR:$i"]?>" class="narrow" pattern="<?=$validIP4?>" title="IPv4 address A.B.C.D">
> Greyed out when using DHCP server. Otherwise specify here the IPv4 address of the system.
@@ -619,10 +620,16 @@ IPv4 network mask:
> Greyed out when using DHCP server. Otherwise specify here the associated network mask, by default 255.255.255.0 is selected.
IPv4 default gateway:
: <input type="text" name="GATEWAY:<?=$i?>" maxlength="15" value="<?=$eth0["GATEWAY:$i"]?>" class="narrow" pattern="<?=$validIP4?>" title="IPv4 address A.B.C.D">
<input type="text" name="METRIC:<?=$i?>" min="1" max="9999" value="<?=$eth0["METRIC:$i"]?>" class="trim"><em><i class="fa fa-sort-numeric-asc"></i> optional metric (lowest is preferred)</em>
> Greyed out when using DHCP server. Otherwise specify here the IPv4 address of your router.
</div>
<div class="eth0-ipv6-<?=$i?>" style="display:none" markdown="1">
IPv6 address:
: <input type="text" name="IPADDR6:<?=$i?>" maxlength="80" value="<?=$eth0["IPADDR6:$i"]?>" pattern="<?=$validIP6?>" title="IPv6 address nnnn:xxxx::yyyy">
: <input type="text" name="IPADDR6:<?=$i?>" maxlength="39" value="<?=$eth0["IPADDR6:$i"]?>" pattern="<?=$validIP6?>" title="IPv6 address nnnn:xxxx::yyyy">
> Greyed out when using DHCP server. Otherwise specify here the IPv6 address of the system.
@@ -631,6 +638,12 @@ IPv6 prefix:
> Greyed out when using DHCP server. Otherwise specify here the associated prefix value of 1 to 128.
IPv6 default gateway:
: <input type="text" name="GATEWAY6:<?=$i?>" maxlength="39" value="<?=$eth0["GATEWAY6:$i"]?>" pattern="<?=$validIP6?>" title="IPv6 address nnnn:xxxx::yyyy">
<input type="text" name="METRIC6:<?=$i?>" min="1" max="9999" value="<?=$eth0["METRIC6:$i"]?>" class="trim"><em><i class="fa fa-sort-numeric-asc"></i> optional metric (lowest is preferred)</em>
> Greyed out when using DHCP server. Otherwise specify here the IPv6 address of your router.
</div>
</div>
<?endif;?>
@@ -646,7 +659,7 @@ VLAN number:
> Give each VLAN a unique identifier. Numbers range from 1 to 4095.
Interface description:
: <input type="text" name="DESCRIPTION:INDEX" maxlength="40" value="<?=htmlspecialchars($eth0["DESCRIPTION:INDEX"])?>" onchange="exitCode(this.form,true)">
: <input type="text" name="DESCRIPTION:INDEX" maxlength="80" value="<?=htmlspecialchars($eth0["DESCRIPTION:INDEX"])?>" onchange="exitCode(this.form,true)">
> Use this optional field to provide addditional information about the purpose of the connection.
@@ -672,7 +685,7 @@ IP address assignment:
<div class="eth0-ipv4-INDEX" style="display:none" markdown="1">
IPv4 address:
: <input type="text" name="IPADDR:INDEX" maxlength="40" value="<?=$eth0["IPADDR:INDEX"]?>" class="narrow" pattern="<?=$validIP4?>" title="IPv4 address A.B.C.D">
: <input type="text" name="IPADDR:INDEX" maxlength="15" value="<?=$eth0["IPADDR:INDEX"]?>" class="narrow" pattern="<?=$validIP4?>" title="IPv4 address A.B.C.D">
> Greyed out when using DHCP server or NONE assignment. Otherwise specify here the IPv4 address of the system.
@@ -692,10 +705,16 @@ IPv4 network mask:
> Greyed out when using DHCP server or NONE assignment. Otherwise specify here the associated network mask, by default 255.255.255.0 is selected.
IPv4 default gateway:
: <input type="text" name="GATEWAY:INDEX" maxlength="15" value="<?=$eth0["GATEWAY:INDEX"]?>" class="narrow" pattern="<?=$validIP4?>" title="IPv4 address A.B.C.D">
<input type="text" name="METRIC:INDEX" min="1" max="9999" value="<?=$eth0["METRIC:INDEX"]?>" class="trim"><em><i class="fa fa-sort-numeric-asc"></i> optional metric (lowest is preferred)</em>
> Greyed out when using DHCP server. Otherwise specify here the IPv4 address of your router.
</div>
<div class="eth0-ipv6-INDEX" style="display:none" markdown="1">
IPv6 address:
: <input type="text" name="IPADDR6:INDEX" maxlength="80" value="<?=$eth0["IPADDR6:INDEX"]?>" pattern="<?=$validIP6?>" title="IPv6 address nnnn:xxxx::yyyy">
: <input type="text" name="IPADDR6:INDEX" maxlength="39" value="<?=$eth0["IPADDR6:INDEX"]?>" pattern="<?=$validIP6?>" title="IPv6 address nnnn:xxxx::yyyy">
> Greyed out when using DHCP server. Otherwise specify here the IPv6 address of the system.
@@ -704,6 +723,12 @@ IPv6 prefix:
> Greyed out when using DHCP server. Otherwise specify here the associated prefix value of 1 to 128.
IPv6 default gateway:
: <input type="text" name="GATEWAY6:INDEX" maxlength="39" value="<?=$eth0["GATEWAY6:INDEX"]?>" pattern="<?=$validIP6?>" title="IPv6 address nnnn:xxxx::yyyy">
<input type="text" name="METRIC6:INDEX" min="1" max="9999" value="<?=$eth0["METRIC6:INDEX"]?>" class="trim"><em><i class="fa fa-sort-numeric-asc"></i> optional metric (lowest is preferred)</em>
> Greyed out when using DHCP server. Otherwise specify here the IPv6 address of your router.
</div>
</div>
</script>
plugins/dynamix/EthX.page
+45 -9
View File
@@ -111,7 +111,7 @@ Enable bridging:
<?endif;?>
Interface description:
: <input type="text" name="DESCRIPTION:<?=$i?>" maxlength="40" value="<?=htmlspecialchars($ethX["DESCRIPTION:$i"])?>" onchange="exitCode(this.form,true)">
: <input type="text" name="DESCRIPTION:<?=$i?>" maxlength="80" value="<?=htmlspecialchars($ethX["DESCRIPTION:$i"])?>" onchange="exitCode(this.form,true)">
> Use this field to give addditional information about the purpose of the connection.
@@ -137,7 +137,7 @@ IP address assignment:
<div class="ethX-ipv4-<?=$i?>" style="display:none" markdown="1">
IPv4 address:
: <input type="text" name="IPADDR:<?=$i?>" maxlength="40" value="<?=$ethX["IPADDR:$i"]?>" class="narrow" pattern="<?=$validIP4?>" title="IPv4 address A.B.C.D">
: <input type="text" name="IPADDR:<?=$i?>" maxlength="15" value="<?=$ethX["IPADDR:$i"]?>" class="narrow" pattern="<?=$validIP4?>" title="IPv4 address A.B.C.D">
> Greyed out when using DHCP server. Otherwise specify here the IPv4 address of the interface.
@@ -157,10 +157,16 @@ IPv4 network mask:
> Greyed out when using DHCP server. Otherwise specify here the associated network mask, by default 255.255.255.0 is selected.
IPv4 default gateway:
: <input type="text" name="GATEWAY:<?=$i?>" maxlength="15" value="<?=$ethX["GATEWAY:$i"]?>" class="narrow" pattern="<?=$validIP4?>" title="IPv4 address A.B.C.D">
<input type="text" name="METRIC:<?=$i?>" min="1" max="9999" value="<?=$ethX["METRIC:$i"]?>" class="trim"><em><i class="fa fa-sort-numeric-asc"></i> optional metric (lowest is preferred)</em>
> Greyed out when using DHCP server. Otherwise specify here the IPv4 address of your router.
</div>
<div class="ethX-ipv6-<?=$i?>" style="display:none" markdown="1">
IPv6 address:
: <input type="text" name="IPADDR6:<?=$i?>" maxlength="80" value="<?=$ethX["IPADDR6:$i"]?>" pattern="<?=$validIP6?>" title="IPv6 address nnnn:xxxx::yyyy">
: <input type="text" name="IPADDR6:<?=$i?>" maxlength="39" value="<?=$ethX["IPADDR6:$i"]?>" pattern="<?=$validIP6?>" title="IPv6 address nnnn:xxxx::yyyy">
> Greyed out when using DHCP server. Otherwise specify here the IPv6 address of the interface.
@@ -169,6 +175,12 @@ IPv6 prefix:
> Greyed out when using DHCP server. Otherwise specify here the associated prefix value of 1 to 128.
IPv6 default gateway:
: <input type="text" name="GATEWAY6:<?=$i?>" maxlength="39" value="<?=$ethX["GATEWAY6:$i"]?>" pattern="<?=$validIP6?>" title="IPv6 address nnnn:xxxx::yyyy">
<input type="text" name="METRIC6:<?=$i?>" min="1" max="9999" value="<?=$ethX["METRIC6:$i"]?>" class="trim"><em><i class="fa fa-sort-numeric-asc"></i> optional metric (lowest is preferred)</em>
> Greyed out when using DHCP server. Otherwise specify here the IPv6 address of your router.
</div>
Desired MTU:
: <input type="number" name="MTU" min="68" max="9198" value="<?=$locked?$eth0['MTU']:$ethX['MTU']?>" class="narrow">
@@ -191,7 +203,7 @@ VLAN number:
> Give each VLAN a unique identifier. Numbers range from 1 to 4095.
Interface description:
: <input type="text" name="DESCRIPTION:<?=$i?>" maxlength="40" value="<?=htmlspecialchars($ethX["DESCRIPTION:$i"])?>" onchange="exitCode(this.form,true)">
: <input type="text" name="DESCRIPTION:<?=$i?>" maxlength="80" value="<?=htmlspecialchars($ethX["DESCRIPTION:$i"])?>" onchange="exitCode(this.form,true)">
> Use this field to give addditional information about the purpose of the connection.
@@ -217,7 +229,7 @@ IP address assignment:
<div class="ethX-ipv4-<?=$i?>" style="display:none" markdown="1">
IPv4 address:
: <input type="text" name="IPADDR:<?=$i?>" maxlength="40" value="<?=$ethX["IPADDR:$i"]?>" class="narrow" pattern="<?=$validIP4?>" title="IPv4 address A.B.C.D">
: <input type="text" name="IPADDR:<?=$i?>" maxlength="15" value="<?=$ethX["IPADDR:$i"]?>" class="narrow" pattern="<?=$validIP4?>" title="IPv4 address A.B.C.D">
> Greyed out when using DHCP server or NONE assignment. Otherwise specify here the IPv4 address of the interface.
@@ -237,10 +249,16 @@ IPv4 network mask:
> Greyed out when using DHCP server or NONE assignment. Otherwise specify here the associated network mask, by default 255.255.255.0 is selected.
IPv4 default gateway:
: <input type="text" name="GATEWAY:<?=$i?>" maxlength="15" value="<?=$ethX["GATEWAY:$i"]?>" class="narrow" pattern="<?=$validIP4?>" title="IPv4 address A.B.C.D">
<input type="text" name="METRIC:<?=$i?>" min="1" max="9999" value="<?=$ethX["METRIC:$i"]?>" class="trim"><em><i class="fa fa-sort-numeric-asc"></i> optional metric (lowest is preferred)</em>
> Greyed out when using DHCP server. Otherwise specify here the IPv4 address of your router.
</div>
<div class="ethX-ipv6-<?=$i?>" style="display:none" markdown="1">
IPv6 address:
: <input type="text" name="IPADDR6:<?=$i?>" maxlength="80" value="<?=$ethX["IPADDR6:$i"]?>" pattern="<?=$validIP6?>" title="IPv6 address nnnn:xxxx::yyyy">
: <input type="text" name="IPADDR6:<?=$i?>" maxlength="39" value="<?=$ethX["IPADDR6:$i"]?>" pattern="<?=$validIP6?>" title="IPv6 address nnnn:xxxx::yyyy">
> Greyed out when using DHCP server. Otherwise specify here the IPv6 address of the interface.
@@ -249,6 +267,12 @@ IPv6 prefix:
> Greyed out when using DHCP server. Otherwise specify here the associated prefix value of 1 to 128.
IPv6 default gateway:
: <input type="text" name="GATEWAY6:<?=$i?>" maxlength="39" value="<?=$ethX["GATEWAY6:$i"]?>" pattern="<?=$validIP6?>" title="IPv6 address nnnn:xxxx::yyyy">
<input type="text" name="METRIC6:<?=$i?>" min="1" max="9999" value="<?=$ethX["METRIC6:$i"]?>" class="trim"><em><i class="fa fa-sort-numeric-asc"></i> optional metric (lowest is preferred)</em>
> Greyed out when using DHCP server. Otherwise specify here the IPv6 address of your router.
</div>
</div>
<?endif;?>
@@ -264,7 +288,7 @@ VLAN number:
> Give each VLAN a unique identifier. Numbers range from 1 to 4095.
Interface description:
: <input type="text" name="DESCRIPTION:INDEX" maxlength="40" value="<?=htmlspecialchars($ethX["DESCRIPTION:INDEX"])?>" onchange="exitCode(this.form,true)">
: <input type="text" name="DESCRIPTION:INDEX" maxlength="80" value="<?=htmlspecialchars($ethX["DESCRIPTION:INDEX"])?>" onchange="exitCode(this.form,true)">
> Use this field to give addditional information about the purpose of the connection.
@@ -290,7 +314,7 @@ IP address assignment:
<div class="ethX-ipv4-INDEX" style="display:none" markdown="1">
IPv4 address:
: <input type="text" name="IPADDR:INDEX" maxlength="40" value="<?=$ethX["IPADDR:INDEX"]?>" class="narrow" pattern="<?=$validIP4?>" title="IPv4 address A.B.C.D">
: <input type="text" name="IPADDR:INDEX" maxlength="15" value="<?=$ethX["IPADDR:INDEX"]?>" class="narrow" pattern="<?=$validIP4?>" title="IPv4 address A.B.C.D">
> Greyed out when using DHCP server or NONE assignment. Otherwise specify here the IPv4 address of the interface.
@@ -310,10 +334,16 @@ IPv4 network mask:
> Greyed out when using DHCP server or NONE assignment. Otherwise specify here the associated network mask, by default 255.255.255.0 is selected.
IPv4 default gateway:
: <input type="text" name="GATEWAY:INDEX" maxlength="15" value="<?=$ethX["GATEWAY:INDEX"]?>" class="narrow" pattern="<?=$validIP4?>" title="IPv4 address A.B.C.D">
<input type="text" name="METRIC:INDEX" min="1" max="9999" value="<?=$ethX["METRIC:INDEX"]?>" class="trim"><em><i class="fa fa-sort-numeric-asc"></i> optional metric (lowest is preferred)</em>
> Greyed out when using DHCP server. Otherwise specify here the IPv4 address of your router.
</div>
<div class="ethX-ipv6-INDEX" style="display:none" markdown="1">
IPv6 address:
: <input type="text" name="IPADDR6:INDEX" maxlength="80" value="<?=$ethX["IPADDR6:INDEX"]?>" pattern="<?=$validIP6?>" title="IPv6 address nnnn:xxxx::yyyy">
: <input type="text" name="IPADDR6:INDEX" maxlength="39" value="<?=$ethX["IPADDR6:INDEX"]?>" pattern="<?=$validIP6?>" title="IPv6 address nnnn:xxxx::yyyy">
> Greyed out when using DHCP server. Otherwise specify here the IPv6 address of the interface.
@@ -322,6 +352,12 @@ IPv6 prefix:
> Greyed out when using DHCP server. Otherwise specify here the associated prefix value of 1 to 128.
IPv6 default gateway:
: <input type="text" name="GATEWAY6:INDEX" maxlength="39" value="<?=$ethX["GATEWAY6:INDEX"]?>" pattern="<?=$validIP6?>" title="IPv6 address nnnn:xxxx::yyyy">
<input type="text" name="METRIC6:INDEX" min="1" max="9999" value="<?=$ethX["METRIC6:INDEX"]?>" class="trim"><em><i class="fa fa-sort-numeric-asc"></i> optional metric (lowest is preferred)</em>
> Greyed out when using DHCP server. Otherwise specify here the IPv6 address of your router.
</div>
</div>
</script>
plugins/dynamix/scripts/netconfig
+6 -3
View File
@@ -78,12 +78,12 @@ foreach ($ini as $name => $port) {
if (!$bonding && preg_match('/^(BONDING_MODE|BONDING_MIIMON|BONDNICS|BONDNAME)/',$key)) continue;
if (!$bridge && preg_match('/^(BRSTP|BRFD|BRNICS|BRNAME)/',$key)) continue;
list($item,$x) = explode(':',$key,2);
if ($trunk && $x>0 && preg_match('/^(VLANID|USE_DHCP|IPADDR6?|NETMASK6?|DESCRIPTION|PROTOCOL)/',$key)) {
if ($trunk && $x>0 && preg_match('/^(VLANID|USE_DHCP|IPADDR6?|NETMASK6?|GATEWAY6?|METRIC6?|DESCRIPTION|PROTOCOL)/',$key)) {
if ($x0 != $x) {$x0 = $x; $j++;}
$vlan = ",$j]";
} else $vlan = '';
if (!$vlan && preg_match('/^VLANID/',$key)) continue;
$new[] = $item.(preg_match('/^(GATEWAY|DNS6?_SERVER|DHCP_KEEPRESOLV)/',$key)?'':'['.$i.($vlan?'':']')).$vlan."=\"$val\"";
$new[] = $item.(preg_match('/^(DNS6?_SERVER|DHCP_KEEPRESOLV)/',$key)?'':'['.$i.($vlan?'':']')).$vlan."=\"$val\"";
}
if ($trunk) $new[] = "VLANS[$i]=\"".($j+1)."\"";
$i++;
@@ -93,6 +93,9 @@ $new[] = "SYSNICS=\"$i\"";
file_put_contents($cfg,implode("\r\n",$new)."\r\n");
// start interface with updated (new) configuration
// don't execute when only interface description has changed
if ($run) exec("/etc/rc.d/rc.inet1 ".escapeshellarg("{$ifname}_start")." >/dev/null");
if ($run) {
exec("/etc/rc.d/rc.inet1 ".escapeshellarg("{$ifname}_start")." >/dev/null");
exec("/usr/local/sbin/create_network_ini >/dev/null");
}
exit(0);
?>