mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-28 11:43:25 +02:00
firewall.cgi: replace space by tab and OS rebuild for wireguard
wireguard feature has changes in followg lfs, so remove the build log below for OS rebuild to include wireguard rm log_loongarch64/web-user-interface-ipfire rm log_loongarch64/configroot rm log_loongarch64/iproute2-6.10.0 rm log_loongarch64/initscripts rm log_loongarch64/stage2 rm log_loongarch64/misc-progs Signed-off-by: Vincent Li <vincent.mc.li@gmail.com>
This commit is contained in:
@@ -1321,7 +1321,7 @@ sub get_ip
|
|||||||
&General::readhash("$configovpn",\%ovpnsettings);
|
&General::readhash("$configovpn",\%ovpnsettings);
|
||||||
($a,$b) = split (/\//, $ovpnsettings{'DOVPN_SUBNET'});
|
($a,$b) = split (/\//, $ovpnsettings{'DOVPN_SUBNET'});
|
||||||
$b=&General::iporsubtocidr($b);
|
$b=&General::iporsubtocidr($b);
|
||||||
}
|
|
||||||
# WireGuard
|
# WireGuard
|
||||||
} elsif ($fwdfwsettings{$fwdfwsettings{$grp}} eq "WGRW") {
|
} elsif ($fwdfwsettings{$fwdfwsettings{$grp}} eq "WGRW") {
|
||||||
return $Wireguard::settings{'CLIENT_POOL'};
|
return $Wireguard::settings{'CLIENT_POOL'};
|
||||||
@@ -1566,6 +1566,7 @@ sub getcolor
|
|||||||
$tdcolor="style='background-color: $Header::colourvpn;color:white;'";
|
$tdcolor="style='background-color: $Header::colourvpn;color:white;'";
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ALIASE
|
#ALIASE
|
||||||
foreach my $alias (sort keys %aliases)
|
foreach my $alias (sort keys %aliases)
|
||||||
{
|
{
|
||||||
@@ -2635,12 +2636,11 @@ END
|
|||||||
if(&fwlib::get_ovpn_host_ip($host,33) eq ''){
|
if(&fwlib::get_ovpn_host_ip($host,33) eq ''){
|
||||||
$coloryellow='on';
|
$coloryellow='on';
|
||||||
}
|
}
|
||||||
}elsif ($$hash{$key}[3] eq 'wg_peer_src') {
|
}elsif($$hash{$key}[3] eq 'wg_peer_src') {
|
||||||
if (!defined &Wireguard::get_peer_by_name($host)) {
|
if (!defined &Wireguard::get_peer_by_name($host)) {
|
||||||
$coloryellow = 'on';
|
$coloryellow = 'on';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
foreach my $host (@tmptgt){
|
foreach my $host (@tmptgt){
|
||||||
if($$hash{$key}[5] eq 'ipsec_net_tgt'){
|
if($$hash{$key}[5] eq 'ipsec_net_tgt'){
|
||||||
@@ -2659,7 +2659,7 @@ END
|
|||||||
if(&fwlib::get_ovpn_host_ip($host,33) eq ''){
|
if(&fwlib::get_ovpn_host_ip($host,33) eq ''){
|
||||||
$coloryellow='on';
|
$coloryellow='on';
|
||||||
}
|
}
|
||||||
}elsif ($$hash{$key}[3] eq 'wg_peer_tgt') {
|
}elsif($$hash{$key}[3] eq 'wg_peer_tgt') {
|
||||||
if (!defined &Wireguard::get_peer_by_name($host)) {
|
if (!defined &Wireguard::get_peer_by_name($host)) {
|
||||||
$coloryellow = 'on';
|
$coloryellow = 'on';
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user