Merge branch 'master' into next

config/cfgroot/header.pl

@@ -195,7 +195,7 @@ print <<END;
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 	<link rel="shortcut icon" href="/favicon.ico" />
 	<script type="text/javascript" src="/include/jquery.js"></script>
-	<script src="/include/rrdimage.js"></script>
+	<script src="/include/rrdimage.js?v=20240926"></script>
 
 	$extrahead
 	<script type="text/javascript">

config/rootfiles/oldcore/189/filelists/files

@@ -5,6 +5,7 @@ etc/rc.d/init.d/networking/functions.network
 etc/rc.d/init.d/suricata
 srv/web/ipfire/cgi-bin/getrrdimage.cgi
 srv/web/ipfire/cgi-bin/ids.cgi
+srv/web/ipfire/cgi-bin/ovpnmain.cgi
 srv/web/ipfire/html/include/rrdimage.js
 usr/bin/suricata-watcher
 var/ipfire/graphs.pl

html/cgi-bin/ovpnmain.cgi

@@ -4402,7 +4402,7 @@ if ($cgiparams{'TYPE'} eq 'net') {
 				print CCDRWCONF "#This client uses the dynamic pool\n";
 			}else{
 				print CCDRWCONF "#Ip address client and server\n";
-				print CCDRWCONF "ifconfig-push $ccdip ".&General::getlastip($ccdip,1)."\n";
+				print CCDRWCONF "ifconfig-push $ccdip ". &Network::bin2ip(&Network::ip2bin($ccdip) - 1) ."\n";
 			}
 			if ($confighash{$key}[34] eq 'on'){
 				print CCDRWCONF "\n#Redirect Gateway: \n#All IP traffic is redirected through the vpn \n";