michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-02-03 14:13:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Handle case where --to-destination is followed by a bare IPv6 address

Browse Source 
https://github.com/webmin/webmin/issues/2434
This commit is contained in:
Jamie Cameron
2025-03-15 09:58:46 -07:00
parent 45ef8d11c1
commit 3736f26a84
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
firewall/edit_rule.cgi
View File

@@ -141,6 +141,12 @@ if (($table->{'name'} eq 'nat' && $rule->{'chain'} ne 'POSTROUTING') &&
$dpfrom = $2;
$dpto = $4;
}
elsif (&check_ipvx_ipaddress($rule->{'to-destination'}->[1])) {
$dipfrom = $rule->{'to-destination'}->[1];
$dipto = "";
$dpfrom = "";
$dpto = "";
}
}
print &ui_table_row($text{'edit_dnat'},
&ui_radio("dnatdef", $dipfrom eq "" ? 1 : 0,

2
firewall/firewall6-lib.pl
View File

@@ -39,7 +39,7 @@ else {
"icmp6-addr-unreachable", "icmp6-port-unreachable",
"echo-reply", "tcp-reset" );
$ipvx_todestpattern='^\[([0-9A-Fa-f:]+)](\-([0-9A-Fa-f:]+))?(:(\d+)(\-(\d+))?)?$';
$ipvx_todestpattern='^\[([0-9A-Fa-f:]+)\](\-([0-9A-Fa-f:]+))?(:(\d+)(\-(\d+))?)?$';
# set IP Version
&set_ipvx_version('ipv6');