From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 22 Sep 2024 14:33:03 +0000 (+0000)
Subject: ovpnmain.cgi: Fix IP address calculation with static pools
X-Git-Tag: v2.29-core190~114
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c55ce64de5dfbb6944ad93556c1f0f581ca9c140;p=ipfire-2.x.git

ovpnmain.cgi: Fix IP address calculation with static pools

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/config/rootfiles/core/190/filelists/files b/config/rootfiles/core/190/filelists/files
index dd820891d6..61317e4958 100644
--- a/config/rootfiles/core/190/filelists/files
+++ b/config/rootfiles/core/190/filelists/files
@@ -3,5 +3,6 @@ etc/collectd.d
 etc/rc.d/init.d/collectd
 srv/web/ipfire/cgi-bin/index.cgi
 srv/web/ipfire/cgi-bin/logs.cgi/log.dat
+srv/web/ipfire/cgi-bin/ovpnmain.cgi
 srv/web/ipfire/cgi-bin/vpnmain.cgi
 var/ipfire/network-functions.pl
diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index 72695f892f..daaa059a49 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) {