From 1f3cd0de2338d9aa0883e5c0f0be6587c9d0c9f7 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 9 Apr 2024 18:00:48 +0200
Subject: [PATCH] ovpnmain.cgi: Move MTU setting to advanced settings

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 html/cgi-bin/ovpnmain.cgi | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index a17952e82..1596c2b3b 100755
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -948,6 +948,7 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save-adv-options'}) {
     #DAN this value has to leave.
 #new settings for daemon
     $vpnsettings{'DPROTOCOL'} = $cgiparams{'DPROTOCOL'};
+    $vpnsettings{'DMTU'} = $cgiparams{'DMTU'};
     $vpnsettings{'LOG_VERB'} = $cgiparams{'LOG_VERB'};
     $vpnsettings{'KEEPALIVE_1'} = $cgiparams{'KEEPALIVE_1'};
     $vpnsettings{'KEEPALIVE_2'} = $cgiparams{'KEEPALIVE_2'};
@@ -982,6 +983,12 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save-adv-options'}) {
 		}
 	}
 
+	# Check MTU
+    if (($cgiparams{'DMTU'} eq "") || (($cgiparams{'DMTU'}) < 1280 )) {
+        $errormessage = $Lang::tr{'invalid mtu input'};
+        goto ADV_ERROR;
+    }
+
     if ($cgiparams{'FRAGMENT'} eq '') {
     	delete $vpnsettings{'FRAGMENT'};
     } else {
@@ -1356,10 +1363,6 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save'} && $cgiparams{'TYPE'} eq '' && $cg
         $errormessage = $Lang::tr{'invalid input'};
         goto SETTINGS_ERROR;
     }
-    if ((length($cgiparams{'DMTU'})==0) || (($cgiparams{'DMTU'}) < 1000 )) {
-        $errormessage = $Lang::tr{'invalid mtu input'};
-        goto SETTINGS_ERROR;
-    }
 
     unless (&General::validport($cgiparams{'DDEST_PORT'})) {
 	$errormessage = $Lang::tr{'invalid port'};
@@ -1382,7 +1385,6 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save'} && $cgiparams{'TYPE'} eq '' && $cg
     $vpnsettings{'VPN_IP'} = $cgiparams{'VPN_IP'};
     $vpnsettings{'DOVPN_SUBNET'} = $cgiparams{'DOVPN_SUBNET'};
     $vpnsettings{'DDEST_PORT'} = $cgiparams{'DDEST_PORT'};
-    $vpnsettings{'DMTU'} = $cgiparams{'DMTU'};
 
 #new settings for daemon
     &General::writehash("${General::swroot}/ovpn/settings", \%vpnsettings);
@@ -2725,6 +2727,9 @@ ADV_ERROR:
 	if ($cgiparams{'DAUTH'} eq '') {
 		$cgiparams{'DAUTH'} = 'SHA512';
 	}
+	if ($cgiparams{'DMTU'} eq '') {
+		$cgiparams{'DMTU'} =  '1400';
+	}
     if ($cgiparams{'MAX_CLIENTS'} eq '') {
 		$cgiparams{'MAX_CLIENTS'} =  '100';
     }
@@ -2963,6 +2968,13 @@ END
 		</td>
 	</tr>
 
+	<tr>
+		<td class='base'>$Lang::tr{'mtu'}</td>
+		<td>
+			<input type='number' name='DMTU' value='$cgiparams{'DMTU'}' min="1280" max="9000" />
+		</td>
+	</tr>
+
 	<tr>
 		<td class='base'>Client-To-Client</td>
 		<td><input type='checkbox' name='CLIENT2CLIENT' $checked{'CLIENT2CLIENT'}{'on'} /></td>
@@ -5174,9 +5186,6 @@ END
     if ($cgiparams{'DDEST_PORT'} eq '') {
 		$cgiparams{'DDEST_PORT'} =  '1194';
     }
-    if ($cgiparams{'DMTU'} eq '') {
-		$cgiparams{'DMTU'} =  '1400';
-    }
     if ($cgiparams{'MSSFIX'} eq '') {
 		$cgiparams{'MSSFIX'} = 'off';
     }
@@ -5247,8 +5256,6 @@ END
         <td></td>
         <td class='boldbase'>$Lang::tr{'destination port'}:</td>
         <td><input type='TEXT' name='DDEST_PORT' value='$cgiparams{'DDEST_PORT'}' size='5' /></td></tr>
-    <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'MTU'}&nbsp;</td>
-        <td> <input type='TEXT' name='DMTU' VALUE='$cgiparams{'DMTU'}' size='5' /></td>
     </tr>
 
 	<tr><td colspan='4'><br></td></tr>
-- 
2.39.5