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

networking code enhancement

Browse Source
This commit is contained in:
bergware
2025-01-26 21:31:31 +01:00
parent 91abb80095
commit 3691a4f50b
2 changed files with 13 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
emhttp/plugins/dynamix/Eth0.page
+10 -48
View File
@@ -24,6 +24,13 @@ $ini = '/var/local/emhttp/network.ini';
$validIP4 = "(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)(\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}";
$validIP6 = "(([0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}|(:|([0-9a-fA-F]{1,4}:)+):(([0-9a-fA-F]{1,4}:)*[0-9a-fA-F]{1,4})?)";
$masks = [
'255.0.0.0' => '8', '255.255.0.0' => '16', '255.255.128.0' => '17', '255.255.192.0' => '18',
'255.255.224.0' => '19', '255.255.240.0' => '20', '255.255.248.0' => '21', '255.255.252.0' => '22',
'255.255.254.0' => '23', '255.255.255.0' => '24', '255.255.255.128' => '25', '255.255.255.192' => '26',
'255.255.255.224' => '27', '255.255.255.240' => '28', '255.255.255.248' => '29', '255.255.255.252' => '30'
];
// get available ethernet ports (excluding eth0)
exec("ls --indicator-style=none /sys/class/net|grep -P '^eth[1-9][0-9]*$'",$ports);
@@ -615,22 +622,7 @@ _(IPv4 address assignment)_:
<div markdown="1" class="more-ipv4-eth0-0 hide">
_(IPv4 address)_:
: <input type="text" name="IPADDR:0" maxlength="15" autocomplete="off" spellcheck="false" value="<?=_var($eth0,"IPADDR:0")?>" class="narrow" pattern="<?=$validIP4?>" title="_(IPv4 address A.B.C.D)_">/<select name="NETMASK:0" class="slim">
<?=mk_option(_var($eth0,"NETMASK:0"), "255.0.0.0", "8")?>
<?=mk_option(_var($eth0,"NETMASK:0"), "255.255.0.0", "16")?>
<?=mk_option(_var($eth0,"NETMASK:0"), "255.255.128.0", "17")?>
<?=mk_option(_var($eth0,"NETMASK:0"), "255.255.192.0", "18")?>
<?=mk_option(_var($eth0,"NETMASK:0"), "255.255.224.0", "19")?>
<?=mk_option(_var($eth0,"NETMASK:0"), "255.255.240.0", "20")?>
<?=mk_option(_var($eth0,"NETMASK:0"), "255.255.248.0", "21")?>
<?=mk_option(_var($eth0,"NETMASK:0"), "255.255.252.0", "22")?>
<?=mk_option(_var($eth0,"NETMASK:0"), "255.255.254.0", "23")?>
<?=mk_option(_var($eth0,"NETMASK:0"), "255.255.255.0", "24", $eth0["IPADDR:0"]?"":"selected")?>
<?=mk_option(_var($eth0,"NETMASK:0"), "255.255.255.128", "25")?>
<?=mk_option(_var($eth0,"NETMASK:0"), "255.255.255.192", "26")?>
<?=mk_option(_var($eth0,"NETMASK:0"), "255.255.255.224", "27")?>
<?=mk_option(_var($eth0,"NETMASK:0"), "255.255.255.240", "28")?>
<?=mk_option(_var($eth0,"NETMASK:0"), "255.255.255.248", "29")?>
<?=mk_option(_var($eth0,"NETMASK:0"), "255.255.255.252", "30")?>
<?foreach ($masks as $mask => $prefix) echo mk_option(_var($eth0,"NETMASK:0"), $mask, $prefix, _var($eth0,"NETMASK:0")=='' && $prefix=='24'?'selected':'');?>
</select>
:eth_ipv4_address_help:
@@ -728,22 +720,7 @@ _(IPv4 address assignment)_:
<div markdown="1" class="more-ipv4-eth0-<?=$i?> hide">
_(IPv4 address)_:
: <input type="text" name="IPADDR:<?=$i?>" maxlength="15" autocomplete="off" spellcheck="false" value="<?=_var($eth0,"IPADDR:$i")?>" class="narrow" pattern="<?=$validIP4?>" title="_(IPv4 address A.B.C.D)_">/<select name="NETMASK:<?=$i?>" class="slim">
<?=mk_option(_var($eth0,"NETMASK:$i"), "255.0.0.0", "8")?>
<?=mk_option(_var($eth0,"NETMASK:$i"), "255.255.0.0", "16")?>
<?=mk_option(_var($eth0,"NETMASK:$i"), "255.255.128.0", "17")?>
<?=mk_option(_var($eth0,"NETMASK:$i"), "255.255.192.0", "18")?>
<?=mk_option(_var($eth0,"NETMASK:$i"), "255.255.224.0", "19")?>
<?=mk_option(_var($eth0,"NETMASK:$i"), "255.255.240.0", "20")?>
<?=mk_option(_var($eth0,"NETMASK:$i"), "255.255.248.0", "21")?>
<?=mk_option(_var($eth0,"NETMASK:$i"), "255.255.252.0", "22")?>
<?=mk_option(_var($eth0,"NETMASK:$i"), "255.255.254.0", "23")?>
<?=mk_option(_var($eth0,"NETMASK:$i"), "255.255.255.0", "24", _var($eth0,"IPADDR:$i")?"":"selected")?>
<?=mk_option(_var($eth0,"NETMASK:$i"), "255.255.255.128", "25")?>
<?=mk_option(_var($eth0,"NETMASK:$i"), "255.255.255.192", "26")?>
<?=mk_option(_var($eth0,"NETMASK:$i"), "255.255.255.224", "27")?>
<?=mk_option(_var($eth0,"NETMASK:$i"), "255.255.255.240", "28")?>
<?=mk_option(_var($eth0,"NETMASK:$i"), "255.255.255.248", "29")?>
<?=mk_option(_var($eth0,"NETMASK:$i"), "255.255.255.252", "30")?>
<?foreach ($masks as $mask => $prefix) echo mk_option(_var($eth0,"NETMASK:$i"), $mask, $prefix, _var($eth0,"NETMASK:$i")=='' && $prefix=='24'?'selected':'');?>
</select>
:eth_ipv4_address_help:
@@ -830,22 +807,7 @@ _(IPv4 address assignment)_:
<div markdown="1" class="more-ipv4-eth0-INDEX hide">
_(IPv4 address)_:
: <input type="text" name="IPADDR:INDEX" maxlength="15" autocomplete="off" spellcheck="false" value="<?=_var($eth0,"IPADDR:INDEX")?>" class="narrow" pattern="<?=$validIP4?>" title="=_(IPv4 address A.B.C.D)_">/<select name="NETMASK:INDEX" class="slim">
<?=mk_option(_var($eth0,"NETMASK:INDEX"), "255.0.0.0", "8")?>
<?=mk_option(_var($eth0,"NETMASK:INDEX"), "255.255.0.0", "16")?>
<?=mk_option(_var($eth0,"NETMASK:INDEX"), "255.255.128.0", "17")?>
<?=mk_option(_var($eth0,"NETMASK:INDEX"), "255.255.192.0", "18")?>
<?=mk_option(_var($eth0,"NETMASK:INDEX"), "255.255.224.0", "19")?>
<?=mk_option(_var($eth0,"NETMASK:INDEX"), "255.255.240.0", "20")?>
<?=mk_option(_var($eth0,"NETMASK:INDEX"), "255.255.248.0", "21")?>
<?=mk_option(_var($eth0,"NETMASK:INDEX"), "255.255.252.0", "22")?>
<?=mk_option(_var($eth0,"NETMASK:INDEX"), "255.255.254.0", "23")?>
<?=mk_option(_var($eth0,"NETMASK:INDEX"), "255.255.255.0", "24", "selected")?>
<?=mk_option(_var($eth0,"NETMASK:INDEX"), "255.255.255.128", "25")?>
<?=mk_option(_var($eth0,"NETMASK:INDEX"), "255.255.255.192", "26")?>
<?=mk_option(_var($eth0,"NETMASK:INDEX"), "255.255.255.224", "27")?>
<?=mk_option(_var($eth0,"NETMASK:INDEX"), "255.255.255.240", "28")?>
<?=mk_option(_var($eth0,"NETMASK:INDEX"), "255.255.255.248", "29")?>
<?=mk_option(_var($eth0,"NETMASK:INDEX"), "255.255.255.252", "30")?>
<?foreach ($masks as $mask => $prefix) echo mk_option(_var($eth0,"NETMASK:INDEX"), $mask, $prefix, $prefix=='24'?'selected':'');?>
</select>
_(IPv4 default gateway)_:
emhttp/plugins/dynamix/EthX.page
+3 -48
View File
@@ -175,22 +175,7 @@ _(IPv4 address assignment)_:
<div markdown="1" class="more-ipv4-ethX-0 hide">
_(IPv4 address)_:
: <input type="text" name="IPADDR:0" maxlength="15" autocomplete="off" spellcheck="false" value="<?=_var($ethX,"IPADDR:0")?>" class="narrow" pattern="<?=$validIP4?>" title="_(IPv4 address A.B.C.D)_">/<select name="NETMASK:0" class="slim">
<?=mk_option(_var($ethX,"NETMASK:0"), "255.0.0.0", "8")?>
<?=mk_option(_var($ethX,"NETMASK:0"), "255.255.0.0", "16")?>
<?=mk_option(_var($ethX,"NETMASK:0"), "255.255.128.0", "17")?>
<?=mk_option(_var($ethX,"NETMASK:0"), "255.255.192.0", "18")?>
<?=mk_option(_var($ethX,"NETMASK:0"), "255.255.224.0", "19")?>
<?=mk_option(_var($ethX,"NETMASK:0"), "255.255.240.0", "20")?>
<?=mk_option(_var($ethX,"NETMASK:0"), "255.255.248.0", "21")?>
<?=mk_option(_var($ethX,"NETMASK:0"), "255.255.252.0", "22")?>
<?=mk_option(_var($ethX,"NETMASK:0"), "255.255.254.0", "23")?>
<?=mk_option(_var($ethX,"NETMASK:0"), "255.255.255.0", "24", _var($ethX,"IPADDR:0")?"":"selected")?>
<?=mk_option(_var($ethX,"NETMASK:0"), "255.255.255.128", "25")?>
<?=mk_option(_var($ethX,"NETMASK:0"), "255.255.255.192", "26")?>
<?=mk_option(_var($ethX,"NETMASK:0"), "255.255.255.224", "27")?>
<?=mk_option(_var($ethX,"NETMASK:0"), "255.255.255.240", "28")?>
<?=mk_option(_var($ethX,"NETMASK:0"), "255.255.255.248", "29")?>
<?=mk_option(_var($ethX,"NETMASK:0"), "255.255.255.252", "30")?>
<?foreach ($masks as $mask => $prefix) echo mk_option(_var($ethX,"NETMASK:0"), $mask, $prefix, _var($ethX,"NETMASK:0")=='' && $prefix=='24'?'selected':'');?>
</select>
:eth_ipv4_address_help:
@@ -290,22 +275,7 @@ _(IPv4 address assignment)_:
<div markdown="1" class="more-ipv4-ethX-<?=$i?> hide">
_(IPv4 address)_:
: <input type="text" name="IPADDR:<?=$i?>" maxlength="15" autocomplete="off" spellcheck="false" value="<?=_var($ethX,"IPADDR:$i")?>" class="narrow" pattern="<?=$validIP4?>" title="_(IPv4 address A.B.C.D)_">/<select name="NETMASK:<?=$i?>" class="slim">
<?=mk_option(_var($ethX,"NETMASK:$i"), "255.0.0.0", "8")?>
<?=mk_option(_var($ethX,"NETMASK:$i"), "255.255.0.0", "16")?>
<?=mk_option(_var($ethX,"NETMASK:$i"), "255.255.128.0", "17")?>
<?=mk_option(_var($ethX,"NETMASK:$i"), "255.255.192.0", "18")?>
<?=mk_option(_var($ethX,"NETMASK:$i"), "255.255.224.0", "19")?>
<?=mk_option(_var($ethX,"NETMASK:$i"), "255.255.240.0", "20")?>
<?=mk_option(_var($ethX,"NETMASK:$i"), "255.255.248.0", "21")?>
<?=mk_option(_var($ethX,"NETMASK:$i"), "255.255.252.0", "22")?>
<?=mk_option(_var($ethX,"NETMASK:$i"), "255.255.254.0", "23")?>
<?=mk_option(_var($ethX,"NETMASK:$i"), "255.255.255.0", "24", isset($ethX["IPADDR:$i"])?"":"selected")?>
<?=mk_option(_var($ethX,"NETMASK:$i"), "255.255.255.128", "25")?>
<?=mk_option(_var($ethX,"NETMASK:$i"), "255.255.255.192", "26")?>
<?=mk_option(_var($ethX,"NETMASK:$i"), "255.255.255.224", "27")?>
<?=mk_option(_var($ethX,"NETMASK:$i"), "255.255.255.240", "28")?>
<?=mk_option(_var($ethX,"NETMASK:$i"), "255.255.255.248", "29")?>
<?=mk_option(_var($ethX,"NETMASK:$i"), "255.255.255.252", "30")?>
<?foreach ($masks as $mask => $prefix) echo mk_option(_var($ethX,"NETMASK:$i"), $mask, $prefix, _var($ethX,"NETMASK:$i")=='' && $prefix=='24'?'selected':'');?>
</select>
:eth_ipv4_address_help:
@@ -391,22 +361,7 @@ _(IPv4 address assignment)_:
<div markdown="1" class="more-ipv4-ethX-INDEX hide">
_(IPv4 address)_:
: <input type="text" name="IPADDR:INDEX" maxlength="15" autocomplete="off" spellcheck="false" value="<?=_var($ethX,"IPADDR:INDEX")?>" class="narrow" pattern="<?=$validIP4?>" title="_(IPv4 address A.B.C.D)_">/<select name="NETMASK:INDEX" class="slim">
<?=mk_option(_var($ethX,"NETMASK:INDEX"), "255.0.0.0", "8")?>
<?=mk_option(_var($ethX,"NETMASK:INDEX"), "255.255.0.0", "16")?>
<?=mk_option(_var($ethX,"NETMASK:INDEX"), "255.255.128.0", "17")?>
<?=mk_option(_var($ethX,"NETMASK:INDEX"), "255.255.192.0", "18")?>
<?=mk_option(_var($ethX,"NETMASK:INDEX"), "255.255.224.0", "19")?>
<?=mk_option(_var($ethX,"NETMASK:INDEX"), "255.255.240.0", "20")?>
<?=mk_option(_var($ethX,"NETMASK:INDEX"), "255.255.248.0", "21")?>
<?=mk_option(_var($ethX,"NETMASK:INDEX"), "255.255.252.0", "22")?>
<?=mk_option(_var($ethX,"NETMASK:INDEX"), "255.255.254.0", "23")?>
<?=mk_option(_var($ethX,"NETMASK:INDEX"), "255.255.255.0", "24", "selected")?>
<?=mk_option(_var($ethX,"NETMASK:INDEX"), "255.255.255.128", "25")?>
<?=mk_option(_var($ethX,"NETMASK:INDEX"), "255.255.255.192", "26")?>
<?=mk_option(_var($ethX,"NETMASK:INDEX"), "255.255.255.224", "27")?>
<?=mk_option(_var($ethX,"NETMASK:INDEX"), "255.255.255.240", "28")?>
<?=mk_option(_var($ethX,"NETMASK:INDEX"), "255.255.255.248", "29")?>
<?=mk_option(_var($ethX,"NETMASK:INDEX"), "255.255.255.252", "30")?>
<?foreach ($masks as $mask => $prefix) echo mk_option(_var($ethX,"NETMASK:INDEX"), $mask, $prefix, $prefix=='24'?'selected':'');?>
</select>
_(IPv4 default gateway)_: