From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject:
 Re: [PATCH] OpenVPN: Deleted mtu-disc completely since it has been dropped.
Date: Tue, 10 Jul 2018 18:41:02 +0100
Message-ID: <c33464af8f4da7458e896263c3aa54d7d1a2d807.camel@ipfire.org>
In-Reply-To: <1530849479-13169-1-git-send-email-erik.kapfer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1551345728807046703=="
List-Id: <development.lists.ipfire.org>

--===============1551345728807046703==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Merged.

On Fri, 2018-07-06 at 05:57 +0200, Erik Kapfer wrote:
> Signed-off-by: Erik Kapfer <erik.kapfer(a)ipfire.org>
> ---
>  html/cgi-bin/ovpnmain.cgi | 17 ++---------------
>  1 file changed, 2 insertions(+), 15 deletions(-)
>=20
> diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
> index f06e7cf..976300f 100644
> --- a/html/cgi-bin/ovpnmain.cgi
> +++ b/html/cgi-bin/ovpnmain.cgi
> @@ -271,7 +271,7 @@ sub writeserverconf {
>      print CONF "server $tempovpnsubnet[0] $tempovpnsubnet[1]\n";
>      #print CONF "push \"route $netsettings{'GREEN_NETADDRESS'}
> $netsettings{'GREEN_NETMASK'}\"\n";
> =20
> -    # Check if we are using mssfix, fragment or mtu-disc and set the corre=
tct
> mtu of 1500.
> +    # Check if we are using mssfix, fragment and set the corretct mtu of
> 1500.
>      # If we doesn't use one of them, we can use the configured mtu value.
>      if ($sovpnsettings{'MSSFIX'} eq 'on')=20
>  	{ print CONF "tun-mtu 1500\n"; }
> @@ -2183,15 +2183,6 @@ if ($confighash{$cgiparams{'KEY'}}[3] eq 'net'){
>     if ($confighash{$cgiparams{'KEY'}}[24] ne '') {print CLIENTCONF "fragme=
nt
> $confighash{$cgiparams{'KEY'}}[24]\n";}
>     if ($confighash{$cgiparams{'KEY'}}[23] eq 'on') {print CLIENTCONF
> "mssfix\n";}
>     }
> -   if (($confighash{$cgiparams{'KEY'}}[38] eq 'yes') ||
> -       ($confighash{$cgiparams{'KEY'}}[38] eq 'maybe') ||
> -       ($confighash{$cgiparams{'KEY'}}[38] eq 'no' )) {
> -	if (($confighash{$cgiparams{'KEY'}}[23] ne 'on') ||
> ($confighash{$cgiparams{'KEY'}}[24] eq '')) {
> -		if ($tunmtu eq '1500' ) {
> -			print CLIENTCONF "mtu-disc
> $confighash{$cgiparams{'KEY'}}[38]\n";
> -		}
> -	}
> -   }
>     # Check host certificate if X509 is RFC3280 compliant.
>     # If not, old --ns-cert-type directive will be used.
>     # If appropriate key usage extension exists, new --remote-cert-tls
> directive will be used.
> @@ -2272,7 +2263,7 @@ else
>      print CLIENTCONF "dev tun\r\n";
>      print CLIENTCONF "proto $vpnsettings{'DPROTOCOL'}\r\n";
> =20
> -    # Check if we are using fragment, mssfix or mtu-disc and set MTU to 15=
00
> +    # Check if we are using fragment, mssfix and set MTU to 1500
>      # or use configured value.
>      if ($vpnsettings{FRAGMENT} ne '' && $vpnsettings{DPROTOCOL} ne 'tcp' )
>  	{ print CLIENTCONF "tun-mtu 1500\r\n"; }
> @@ -3378,7 +3369,6 @@ my $complzoactive;
>  my $mssfixactive;
>  my $authactive;
>  my $n2nfragment;
> -my @n2nmtudisc =3D split(/ /, (grep { /^mtu-disc/ } @firen2nconf)[0]);
>  my @n2nproto2 =3D split(/ /, (grep { /^proto/ } @firen2nconf)[0]);
>  my @n2nproto =3D split(/-/, $n2nproto2[1]);
>  my @n2nport =3D split(/ /, (grep { /^port/ } @firen2nconf)[0]);
> @@ -3414,7 +3404,6 @@ $n2nremsub[2] =3D~ s/\n|\r//g;
>  $n2nlocalsub[2] =3D~ s/\n|\r//g;
>  $n2nfragment[1] =3D~ s/\n|\r//g;
>  $n2nmgmt[2] =3D~ s/\n|\r//g;
> -$n2nmtudisc[1] =3D~ s/\n|\r//g;
>  $n2ncipher[1] =3D~ s/\n|\r//g;
>  $n2nauth[1] =3D~ s/\n|\r//g;
>  chomp ($complzoactive);
> @@ -3491,7 +3480,6 @@ foreach my $dkey (keys %confighash) {
>  	$confighash{$key}[29] =3D $n2nport[1];
>  	$confighash{$key}[30] =3D $complzoactive;
>  	$confighash{$key}[31] =3D $n2ntunmtu[1];
> -	$confighash{$key}[38] =3D $n2nmtudisc[1];
>  	$confighash{$key}[39] =3D $n2nauth[1];
>  	$confighash{$key}[40] =3D $n2ncipher[1];
>  	$confighash{$key}[41] =3D 'disabled';
> @@ -3531,7 +3519,6 @@ foreach my $dkey (keys %confighash) {
>  		<tr><td class=3D'boldbase'
> nowrap=3D'nowrap'>MSSFIX:</td><td><b>$confighash{$key}[23]</b></td></tr>
>  		<tr><td class=3D'boldbase'
> nowrap=3D'nowrap'>Fragment:</td><td><b>$confighash{$key}[24]</b></td></tr>
>  		<tr><td class=3D'boldbase'
> nowrap=3D'nowrap'>$Lang::tr{'MTU'}</td><td><b>$confighash{$key}[31]</b></td=
></tr
> >
> -		<tr><td class=3D'boldbase' nowrap=3D'nowrap'>$Lang::tr{'ovpn mtu-
> disc'}</td><td><b>$confighash{$key}[38]</b></td></tr>
>  		<tr><td class=3D'boldbase' nowrap=3D'nowrap'>Management Port
> </td><td><b>$confighash{$key}[22]</b></td></tr>
>  		<tr><td class=3D'boldbase' nowrap=3D'nowrap'>$Lang::tr{'ovpn
> hmac'}:</td><td><b>$confighash{$key}[39]</b></td></tr>
>  		<tr><td class=3D'boldbase'
> nowrap=3D'nowrap'>$Lang::tr{'cipher'}</td><td><b>$confighash{$key}[40]</b><=
/td><
> /tr>

--===============1551345728807046703==--