From d1a3fd9e0debf994055a410fbc7e5ba7c7c074b0 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 22 Sep 2024 14:33:03 +0000
Subject: [PATCH 1/3] ovpnmain.cgi: Fix IP address calculation with static
 pools

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 config/rootfiles/core/189/filelists/files | 1 +
 html/cgi-bin/ovpnmain.cgi                 | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/config/rootfiles/core/189/filelists/files b/config/rootfiles/core/189/filelists/files
index 7afa1ac2e..7e7959886 100644
--- a/config/rootfiles/core/189/filelists/files
+++ b/config/rootfiles/core/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
diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index 72695f892..daaa059a4 100755
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -569,7 +569,7 @@ sub getccdadresses
 	for (my $i=1;$i<=$count;$i++) {
 		my $tmpip=$iprange[$i-1];
 		my $stepper=$i*4;
-		$iprange[$i]= &General::getnextip($tmpip,4);
+		$iprange[$i]= &Network::bin2ip(&Network::ip2bin($tmpip) + 4);
 	}
 	my $r=0;
 	foreach my $key (keys %ccdhash) {

From 0555434effc70080d8278ca3db38fef51bba1efa Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 26 Sep 2024 14:13:10 +0000
Subject: [PATCH 2/3] header.pl: Force browsers to reload rrdimage.js

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 config/cfgroot/header.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl
index 3778c4e59..2d4aa89f2 100644
--- a/config/cfgroot/header.pl
+++ b/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">

From a7ac62f4a67fa2016edc27735cec71bc1474c2b7 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 26 Sep 2024 20:40:04 +0000
Subject: [PATCH 3/3] ovpnmain.cgi: Remove using dropped &General::getlastip()
 function

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 html/cgi-bin/ovpnmain.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index daaa059a4..20f256f4b 100755
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/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";